Model changes: add AnalysisTarget, update Analysis