Use new schema and enrich-date