Adding lightweight canonicalizer