Update to new routes and context versions