Modified enrich-format module.