Some changes to URIRouter