Added event type, put in callback