Add terse version 2 output format