More work on the Semantic Analyzer