Solutions for scalability issues