Rebuild and update tracking code for GA