content model refactoring