Update Analytics

Update Analytics to new code