Updated AST parser