Improved performance and memory issues