Replaced more explicit paths with routes