Updated current routes to new proposal