Changed data structure for Data and Conditions