Added much needed rotation support