Update to new AnalysisTable/AnalysisQuery model