Routemap: refactoring