Follow new API response format