Update normalize to match new schema