Added synonyms dictionary and changed using of globals rules