Added support for independent moving scales