Refactored Endpoints