Removed domainEntity from composing elements & files.