Updated router to allow matching in namespace