Refactor to use routing helpers