Prepare for 3D rotation support