[Ayanga] updated event types and tasks