Added some synonyms, some refactoring