Add option for canonical output