Changes to support mobile app