Merge "Add EID to types 1.1"