improvements on ContentModelBase