Added event_id and device_time capturing to the general event extraction