Added analytics tracking