Changes for Sky Go Android and generalising routes.