Improved analytics tracking