Update Analytics code

Update Analytics code