refactor PublishedContentModelFactory