Use the new schema to be passed to templates