Updating API implementation for SAK-26318