Added entity_uuid