Add rotation and state