Feature/event fields