Updated router to have paths