Added Rotation support