Updated router to match more complex URIs