Re #994 - GUI now exposes enriched EDM