Changed after testing events

Event type changed to any instead of Event