Update for experimental API