Refactoring of the content system