Multiple changes for performance improvements