Event support improved