Finalizing the first version of the Analyzer