Revised the JSON event structure a little