Endpoints Refactor