Updated CombineData to work with new data structure