Added switch to enable/disable analytics added some more data.