Add map to Router
Merge branch 'sharils' into wip