Changed event handling to use static methods.