Update the EID handling