Incremental change to update API to match as implemented.