Upgrade All Analytics Reporting To Directive