switch to BaseEntityUUID