Update for API 100004