Changed event handling to deticated class