Updated analytics tracking