Reduced usage of copy-solutions for better performance