Added 'csv' and 'json' display formats