Tidy up how EID is accessed when entity initialsied with EID rather than attrs