Synonym tagging. Addresses #278