Adding setting to enable / disable analytics