Further refactoring of the content model