Added some custom event tracking