Feature/extended event information