Additional refactoring of the project and preformance tuning.