Updated route collection to handle route matching