Currently, EntityContent is much too long and has too many responsibilities. Some refactoring is needed to move most of the code out of this class into separate helper classes which then can also be easily exchanged and reused for other entity types.
The ultimate goal would be to get rid of EntityContent or only use it for ids and maybe redirect things.