Switch to new data format