Even more performance improvements