Added autoscale support