Convert to new schema, add a couple of properties