Scalability Enhancements