EPD-302: More work on integrating MSI-NM with EPD