Added auto scaling