Updated Analytics Tracking