Added custom canonicalizer