Added mapping support for the engine
Improved the route-map to return parameters