Added support for Auto Scaling