ContentModelBase refactoring