More changes to support mobile