Scalability-related changes