Adding support for -scale