Added defaults for canonical