Improved Analyzer to handle nested Lists