NCH-2286 used more generic way to define event

https://nzzdev.atlassian.net/browse/NCH-2286