Index: ObjXMPP.xcodeproj/project.pbxproj
==================================================================
--- ObjXMPP.xcodeproj/project.pbxproj
+++ ObjXMPP.xcodeproj/project.pbxproj
@@ -14,15 +14,18 @@
 		4B19F57A14D17082005D52DC /* XMPPCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B19F57614D17081005D52DC /* XMPPCallback.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4B19F57B14D17082005D52DC /* XMPPCallback.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B19F57714D17081005D52DC /* XMPPCallback.m */; };
 		4B19F57C14D17082005D52DC /* XMPPEXTERNALAuth.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B19F57814D17081005D52DC /* XMPPEXTERNALAuth.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4B19F57D14D17082005D52DC /* XMPPEXTERNALAuth.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B19F57914D17081005D52DC /* XMPPEXTERNALAuth.m */; };
 		4B19F5A314D1779E005D52DC /* ObjOpenSSL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B19F5A214D1779E005D52DC /* ObjOpenSSL.framework */; };
-		4B19F5D114D20B01005D52DC /* XMPPMulticastDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B19F5CF14D20B01005D52DC /* XMPPMulticastDelegate.h */; };
+		4B19F5D114D20B01005D52DC /* XMPPMulticastDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B19F5CF14D20B01005D52DC /* XMPPMulticastDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4B19F5D214D20B01005D52DC /* XMPPMulticastDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B19F5D014D20B01005D52DC /* XMPPMulticastDelegate.m */; };
 		4B4844F5138BBC7500EB48A5 /* XMPPSRVLookup.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B4844F3138BBC7400EB48A5 /* XMPPSRVLookup.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4B4844F6138BBC7500EB48A5 /* XMPPSRVLookup.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B4844F4138BBC7500EB48A5 /* XMPPSRVLookup.m */; };
 		4B484501138BBEEB00EB48A5 /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B484500138BBEEB00EB48A5 /* libresolv.dylib */; };
+		4B48B95E14DC260000546D39 /* ObjXMPP.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B48B95B14DC260000546D39 /* ObjXMPP.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		4B48B95F14DC260000546D39 /* XMPPXMLElementBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B48B95C14DC260000546D39 /* XMPPXMLElementBuilder.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		4B48B96014DC260000546D39 /* XMPPXMLElementBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B48B95D14DC260000546D39 /* XMPPXMLElementBuilder.m */; };
 		4BC559D71337ABD300E345C7 /* ObjFW.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BC559D61337ABD300E345C7 /* ObjFW.framework */; };
 		4BC559EC1337AC0900E345C7 /* XMPPAuthenticator.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BC559DA1337AC0900E345C7 /* XMPPAuthenticator.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4BC559ED1337AC0900E345C7 /* XMPPAuthenticator.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BC559DB1337AC0900E345C7 /* XMPPAuthenticator.m */; };
 		4BC559EE1337AC0900E345C7 /* XMPPConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BC559DC1337AC0900E345C7 /* XMPPConnection.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4BC559EF1337AC0900E345C7 /* XMPPConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BC559DD1337AC0900E345C7 /* XMPPConnection.m */; };
@@ -73,10 +76,13 @@
 		4B19F5CF14D20B01005D52DC /* XMPPMulticastDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XMPPMulticastDelegate.h; path = src/XMPPMulticastDelegate.h; sourceTree = SOURCE_ROOT; };
 		4B19F5D014D20B01005D52DC /* XMPPMulticastDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = XMPPMulticastDelegate.m; path = src/XMPPMulticastDelegate.m; sourceTree = SOURCE_ROOT; };
 		4B4844F3138BBC7400EB48A5 /* XMPPSRVLookup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XMPPSRVLookup.h; path = src/XMPPSRVLookup.h; sourceTree = SOURCE_ROOT; };
 		4B4844F4138BBC7500EB48A5 /* XMPPSRVLookup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = XMPPSRVLookup.m; path = src/XMPPSRVLookup.m; sourceTree = SOURCE_ROOT; };
 		4B484500138BBEEB00EB48A5 /* libresolv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libresolv.dylib; path = usr/lib/libresolv.dylib; sourceTree = SDKROOT; };
+		4B48B95B14DC260000546D39 /* ObjXMPP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ObjXMPP.h; path = src/ObjXMPP.h; sourceTree = SOURCE_ROOT; };
+		4B48B95C14DC260000546D39 /* XMPPXMLElementBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XMPPXMLElementBuilder.h; path = src/XMPPXMLElementBuilder.h; sourceTree = SOURCE_ROOT; };
+		4B48B95D14DC260000546D39 /* XMPPXMLElementBuilder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = XMPPXMLElementBuilder.m; path = src/XMPPXMLElementBuilder.m; sourceTree = SOURCE_ROOT; };
 		4BC559911337A65400E345C7 /* ObjXMPP.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ObjXMPP.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		4BC559D61337ABD300E345C7 /* ObjFW.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ObjFW.framework; path = ../../../../Library/Frameworks/ObjFW.framework; sourceTree = "<group>"; };
 		4BC559DA1337AC0900E345C7 /* XMPPAuthenticator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XMPPAuthenticator.h; path = src/XMPPAuthenticator.h; sourceTree = SOURCE_ROOT; };
 		4BC559DB1337AC0900E345C7 /* XMPPAuthenticator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = XMPPAuthenticator.m; path = src/XMPPAuthenticator.m; sourceTree = SOURCE_ROOT; };
 		4BC559DC1337AC0900E345C7 /* XMPPConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XMPPConnection.h; path = src/XMPPConnection.h; sourceTree = SOURCE_ROOT; };
@@ -174,10 +180,11 @@
 		};
 		4BC5599A1337A65400E345C7 /* ObjXMPP */ = {
 			isa = PBXGroup;
 			children = (
 				4BC5599B1337A65400E345C7 /* Supporting Files */,
+				4B48B95B14DC260000546D39 /* ObjXMPP.h */,
 				4BC559DA1337AC0900E345C7 /* XMPPAuthenticator.h */,
 				4BC559DB1337AC0900E345C7 /* XMPPAuthenticator.m */,
 				4B19F57614D17081005D52DC /* XMPPCallback.h */,
 				4B19F57714D17081005D52DC /* XMPPCallback.m */,
 				4BC559DC1337AC0900E345C7 /* XMPPConnection.h */,
@@ -206,10 +213,12 @@
 				4BC559FD1337AC1800E345C7 /* XMPPSCRAMAuth.m */,
 				4B4844F3138BBC7400EB48A5 /* XMPPSRVLookup.h */,
 				4B4844F4138BBC7500EB48A5 /* XMPPSRVLookup.m */,
 				4BC559FE1337AC1800E345C7 /* XMPPStanza.h */,
 				4BC559FF1337AC1800E345C7 /* XMPPStanza.m */,
+				4B48B95C14DC260000546D39 /* XMPPXMLElementBuilder.h */,
+				4B48B95D14DC260000546D39 /* XMPPXMLElementBuilder.m */,
 				4B01D01F137C7E7D005624EA /* namespaces.h */,
 			);
 			path = ObjXMPP;
 			sourceTree = "<group>";
 		};
@@ -227,27 +236,29 @@
 /* Begin PBXHeadersBuildPhase section */
 		4BC5598E1337A65400E345C7 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4B48B95E14DC260000546D39 /* ObjXMPP.h in Headers */,
 				4BC559EC1337AC0900E345C7 /* XMPPAuthenticator.h in Headers */,
 				4B19F57A14D17082005D52DC /* XMPPCallback.h in Headers */,
 				4BC559EE1337AC0900E345C7 /* XMPPConnection.h in Headers */,
 				4BC559F01337AC0900E345C7 /* XMPPExceptions.h in Headers */,
 				4B19F57C14D17082005D52DC /* XMPPEXTERNALAuth.h in Headers */,
 				4BC559F21337AC0900E345C7 /* XMPPIQ.h in Headers */,
 				4BC559F41337AC0900E345C7 /* XMPPJID.h in Headers */,
 				4BC559F61337AC0900E345C7 /* XMPPMessage.h in Headers */,
+				4B19F5D114D20B01005D52DC /* XMPPMulticastDelegate.h in Headers */,
 				4BC559F81337AC0900E345C7 /* XMPPPLAINAuth.h in Headers */,
 				4BC559FA1337AC0900E345C7 /* XMPPPresence.h in Headers */,
 				4BDEF8071340B240000156D1 /* XMPPRoster.h in Headers */,
 				4BD9BF59134003F700DAB43A /* XMPPRosterItem.h in Headers */,
 				4BC559FC1337AC0900E345C7 /* XMPPSCRAMAuth.h in Headers */,
 				4B4844F5138BBC7500EB48A5 /* XMPPSRVLookup.h in Headers */,
 				4BC55A011337AC1800E345C7 /* XMPPStanza.h in Headers */,
+				4B48B95F14DC260000546D39 /* XMPPXMLElementBuilder.h in Headers */,
 				4B01D020137C7E7D005624EA /* namespaces.h in Headers */,
-				4B19F5D114D20B01005D52DC /* XMPPMulticastDelegate.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXHeadersBuildPhase section */
 
@@ -350,10 +361,11 @@
 				4BC55A021337AC1800E345C7 /* XMPPStanza.m in Sources */,
 				4BD9BF5A134003F700DAB43A /* XMPPRosterItem.m in Sources */,
 				4BDEF8081340B240000156D1 /* XMPPRoster.m in Sources */,
 				4B4844F6138BBC7500EB48A5 /* XMPPSRVLookup.m in Sources */,
 				4B19F5D214D20B01005D52DC /* XMPPMulticastDelegate.m in Sources */,
+				4B48B96014DC260000546D39 /* XMPPXMLElementBuilder.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */