Removed MEF9 dependency