Refactored Endpoint