scalability improvements