Add wrapper objects for AST nodes