Update for schema v9.