Added mobile-mode support