Issue #5702: Update API

Issue #5702: Update API