Proper addContent handling, not overwriting contents
Upgrade to latest doctrine lib