New API format