Significant changes for first Analyzer gen