Updated Analytics code placement