Semantic Analyser Enhanced