Reworked Endpoints