Improved memory usage.