made fields optional for events