Changed the type of events that are generated using CLI tool