Changed format of Event wrappers for easier function pointering