Adding events tracking