Update to Analytics 2.0.0