Prepare refactoring of content model