Improves the eml metadata handling