Added some fields to Event and Response Option