Feature/kni event handlers