Compatibility with new CD version

Moving to the "content blocks" methodology in the latest CD version.