Replaced Parser with AST Parser