Added handling of new events