Updating to match new API.