Implement new data format (not tested yet)