Hotfix for API endpoints