Reworked data format