Enrich MX metadata

We need to fill these metadata