Updated Analytics tracking