I have no strong objections against #2 at this point. The responsibilities of EntityContent are rather fuzzy to me and it has design issues. In case this makes it worse, the effect will still be isolated to a small part of our codebase. I'd need to have a detailed look at the whole system to provide further input. So +0 from my side.

Cheers

--
Jeroen De Dauw
http://www.bn2vs.com
Don't panic. Don't be evil. ~=[,,_,,]:3
--