Added event tracking