More work on AnalysisEngine