Update for simplified API.