Add more robust analytics tracking