Updated to match the API.