Refactoring + improve routes and create needs.