Added more analytics tracking