Added support for scaling