Ongoing rewrite of routing map