Refactor and added new route