Finished the event type threatments