Added more orientation support