Added support for scale