Match canonical output format