Changed dependencies for EMI-2