Made some modifications to mobile and poi module to better suite the
mobile application.