Added rotation support