Update for v9 and v19