Added event parsing