Added router
Minor tweaks to router and map modules