Further refactoring of content model.