Update for AST change