Add canonicalization support