Adding initial rotation support