Changes to map routing