Improved auto-scaling