Enhance analytics tracking