Improved Performance.
Improved synonym lookup and performance.
Refactored some duplicated code.