[TASK] Streamline EM dependency resolving