More work on AST Builder