SSP-1534 Fix formatting and add some extra fields