add analytics tracking support