Scalability related improvements