used more generic way to define event
NCH-2286 #4