major updates to DataAnalyzer approach