Improve scalability and performance