Updated to current schema.