Updated data format to fit visualisation better