Bug Fixes

Added AnalyticsDataManager to control analytic calls