Switched to packaged event handler