Update to handle synonyms
update to handle sysnonyms