DigitalEntity refactored