Remove events field for now and better structure the data