Added support for synonyms in template maps