Added synonyms support