Significant performance improvements