Updated TargetAnalyser