Add saving of unexpected event and unexpected events handlers