Adding orientation support