Adding more event tracking