Major performance improvements