Use EntityId where is it possible