Refactor for Routes feature