added synonym support