Improved performance on codebase