Structuring better API Endpoint and API Sort handling.