Analytics upgrade/Legacy updates