Many performance and scalability related changes