Start refactoring for mobile support.