Add map function to Router

With fixed