Improve rotation support