Refactoring of enrich-date.