Refactored names of RouteMatch
Added new feateures to RouteMatch