Added support for rotation