Improved performance on the codebase.