add efsm and expr