Migrated to the new saola API.