Adding event tracking