Updates for removal of SQL Reporting