Modify for API1.1
Fix API specification change