CMS-1377 Honing of Content Data classes
Use constructors instead of builds internally, since constructors are less prone to change.