Added changes for data_simulation format