Handles more event types now