CMS-711 Change Data model back to original where Data and DataSet inherits an Entry
Also insertion order of entries in a DataSet is preserved.