Added support for scales