Update event format and add cli options