Updates for MatchRoute and Router