More memory and performance improvements