Added some more AST builder code