Support more canonicalization methods