Added AST nodes for atoms and pairs