Ported more routes to the new system