CMS-971 Refactor Entries away and into DataSet