Add handling of warning events