Experimental refactoring and dependencies support for EM
Experimental refactoring and dependencies support for EM