Pass event handling better