Update all endpoints and start refactoring