Updated Analytics Tracker