Add support for all orientations