Adding support for Scale