Improved load balancing support, code quality