Added support for mfei_event + removed mfei_list