Added Events Tracking logic