Added proper event pump