Refactor routes includes againe