Canonicalise mappings and add moj to whitelist