git » swiftpm » commit 3304274

Latest borogove changes

Latest borogove changes

diff --git a/.gitmodules b/.gitmodules
index 7264edd..83a4b7b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "Sources/strophe/libstrophe"]
 	path = Sources/strophe/libstrophe
-	url = https://github.com/strophe/libstrophe
+	url = https://github.com/singpolyma/libstrophe
 [submodule "Sources/libpcre2-8/pcre2"]
 	path = Sources/libpcre2-8/pcre2
 	url = https://github.com/PCRE2Project/pcre2
diff --git a/Sources/Snikket/Snikket.swift b/Sources/Snikket/Snikket.swift
index 18b518b..c1b1996 100644
--- a/Sources/Snikket/Snikket.swift
+++ b/Sources/Snikket/Snikket.swift
@@ -510,7 +510,7 @@ public class ChatMessage: SDKObject, @unchecked Sendable {
 	/**
 	 The URI of an icon for the thread associated with this message, or NULL
 	 */
-	public func threadIcon() -> String?? {
+	public func threadIcon() -> String? {
 		useString(c_snikket.snikket_chat_message_thread_icon(
 			self.o
 		))
@@ -907,6 +907,12 @@ public class Notification: SDKObject, @unchecked Sendable {
 		}
 	}
 
+	public var senderId: String {
+		get {
+			useString(c_snikket.snikket_notification_sender_id(o))!
+		}
+	}
+
 	public var messageId: String {
 		get {
 			useString(c_snikket.snikket_notification_message_id(o))!
@@ -1321,7 +1327,7 @@ public class Chat: SDKObject, @unchecked Sendable {
 	/**
 	 Block this chat so it will not re-open
 	 */
-	public func block(reportSpam: ChatMessage?, onServer: Bool) -> Void {
+	public func block(reportSpam: ChatMessage? = nil, onServer: Bool = true) -> Void {
 		c_snikket.snikket_chat_block(
 			self.o,
 			reportSpam?.o,
@@ -1675,6 +1681,12 @@ public class InitiatedSession: SDKObject, Session, @unchecked Sendable {
 		}
 	}
 
+	public var chatId: String {
+		get {
+			useString(c_snikket.snikket_jingle_initiated_session_chat_id(o))!
+		}
+	}
+
 	public func accept() -> Void {
 		c_snikket.snikket_jingle_initiated_session_accept(
 			self.o
@@ -2040,15 +2052,15 @@ public class Client: SDKObject, @unchecked Sendable {
 	/**
 	 Event fired when a new call comes in
 	 
-	 @param handler takes two arguments, the call Session and the associated Chat ID
+	 @param handler takes one argument, the call Session
 	 */
-	public func addCallRingListener(handler: @escaping (Session, String)->Void) -> Void {
+	public func addCallRingListener(handler: @escaping (Session)->Void) -> Void {
 		let __handler_ptr = UnsafeMutableRawPointer(Unmanaged.passRetained(handler as AnyObject).toOpaque())
 		c_snikket.snikket_client_add_call_ring_listener(
 			self.o,
-			{ (a0, a1, ctx) in
-				let handler = Unmanaged<AnyObject>.fromOpaque(ctx!).takeUnretainedValue() as! (Session, String)->Void
-				handler(AnySession(a0!), useString(a1)!)
+			{ (a0, ctx) in
+				let handler = Unmanaged<AnyObject>.fromOpaque(ctx!).takeUnretainedValue() as! (Session)->Void
+				handler(AnySession(a0!))
 			},
 			__handler_ptr
 		)
@@ -2059,13 +2071,13 @@ public class Client: SDKObject, @unchecked Sendable {
 	 
 	 @param handler takes one argument, the associated Chat ID
 	 */
-	public func addCallRetractListener(handler: @escaping (String)->Void) -> Void {
+	public func addCallRetractListener(handler: @escaping (String, String)->Void) -> Void {
 		let __handler_ptr = UnsafeMutableRawPointer(Unmanaged.passRetained(handler as AnyObject).toOpaque())
 		c_snikket.snikket_client_add_call_retract_listener(
 			self.o,
-			{ (a0, ctx) in
-				let handler = Unmanaged<AnyObject>.fromOpaque(ctx!).takeUnretainedValue() as! (String)->Void
-				handler(useString(a0)!)
+			{ (a0, a1, ctx) in
+				let handler = Unmanaged<AnyObject>.fromOpaque(ctx!).takeUnretainedValue() as! (String, String)->Void
+				handler(useString(a0)!, useString(a1)!)
 			},
 			__handler_ptr
 		)
@@ -2076,13 +2088,13 @@ public class Client: SDKObject, @unchecked Sendable {
 	 
 	 @param handler takes one argument, the associated Chat ID
 	 */
-	public func addCallRingingListener(handler: @escaping (String)->Void) -> Void {
+	public func addCallRingingListener(handler: @escaping (String, String)->Void) -> Void {
 		let __handler_ptr = UnsafeMutableRawPointer(Unmanaged.passRetained(handler as AnyObject).toOpaque())
 		c_snikket.snikket_client_add_call_ringing_listener(
 			self.o,
-			{ (a0, ctx) in
-				let handler = Unmanaged<AnyObject>.fromOpaque(ctx!).takeUnretainedValue() as! (String)->Void
-				handler(useString(a0)!)
+			{ (a0, a1, ctx) in
+				let handler = Unmanaged<AnyObject>.fromOpaque(ctx!).takeUnretainedValue() as! (String, String)->Void
+				handler(useString(a0)!, useString(a1)!)
 			},
 			__handler_ptr
 		)
@@ -2245,6 +2257,59 @@ public class CustomEmojiReaction: Reaction, @unchecked Sendable {
 
 }
 
+public class Identicon: SDKObject, @unchecked Sendable {
+	public let o: UnsafeMutableRawPointer
+
+	internal init(_ ptr: UnsafeMutableRawPointer) {
+		o = ptr
+	}
+
+	public static func svg(source: String) -> String {
+		useString(c_snikket.snikket_identicon_svg(
+			source
+		))!
+	}
+
+	deinit {
+		c_snikket.snikket_release(o)
+	}
+}
+
+public class Config: SDKObject, @unchecked Sendable {
+	public let o: UnsafeMutableRawPointer
+
+	internal init(_ ptr: UnsafeMutableRawPointer) {
+		o = ptr
+	}
+
+	/**
+	 Produce /.well-known/ni/ paths instead of ni:/// URIs
+	 for referencing media by hash.
+	 
+	 This can be useful eg for intercepting with a Service Worker.
+	 */
+	public var relativeHashUri: Bool {
+		get {
+			c_snikket.snikket_config_relative_hash_uri()
+		}
+		set {
+			c_snikket.snikket_config_set_relative_hash_uri(newValue)
+		}
+	}
+
+	/**
+	 Trades off some performance for lower / more consistent memory usage
+	 */
+	public static func enableConstrainedMemoryMode() -> Void {
+		c_snikket.snikket_config_enable_constrained_memory_mode(
+		)
+	}
+
+	deinit {
+		c_snikket.snikket_release(o)
+	}
+}
+
 public class DTMFSender: SDKObject, @unchecked Sendable {
 	public let o: UnsafeMutableRawPointer
 
diff --git a/Sources/c_snikket/iinclude/Reflect.h b/Sources/c_snikket/iinclude/Reflect.h
index 87d8d52..a86cb6a 100644
--- a/Sources/c_snikket/iinclude/Reflect.h
+++ b/Sources/c_snikket/iinclude/Reflect.h
@@ -82,6 +82,9 @@ class HXCPP_CLASS_ATTRIBUTES Reflect_obj : public ::hx::Object
 		static bool isEnumValue( ::Dynamic v);
 		static ::Dynamic isEnumValue_dyn();
 
+		static bool deleteField( ::Dynamic o,::String field);
+		static ::Dynamic deleteField_dyn();
+
 		static  ::Dynamic copy( ::Dynamic o);
 		static ::Dynamic copy_dyn();
 
diff --git a/Sources/c_snikket/iinclude/Xml.h b/Sources/c_snikket/iinclude/Xml.h
index 2b2f152..6019e13 100644
--- a/Sources/c_snikket/iinclude/Xml.h
+++ b/Sources/c_snikket/iinclude/Xml.h
@@ -48,40 +48,13 @@ class HXCPP_CLASS_ATTRIBUTES Xml_obj : public ::hx::Object
 
 		static void __boot();
 		static int Element;
-		static int PCData;
-		static int CData;
-		static int Comment;
-		static int DocType;
-		static int ProcessingInstruction;
 		static int Document;
-		static  ::Xml parse(::String str);
-		static ::Dynamic parse_dyn();
-
 		static  ::Xml createElement(::String name);
 		static ::Dynamic createElement_dyn();
 
-		static  ::Xml createPCData(::String data);
-		static ::Dynamic createPCData_dyn();
-
-		static  ::Xml createCData(::String data);
-		static ::Dynamic createCData_dyn();
-
-		static  ::Xml createComment(::String data);
-		static ::Dynamic createComment_dyn();
-
-		static  ::Xml createDocType(::String data);
-		static ::Dynamic createDocType_dyn();
-
-		static  ::Xml createProcessingInstruction(::String data);
-		static ::Dynamic createProcessingInstruction_dyn();
-
-		static  ::Xml createDocument();
-		static ::Dynamic createDocument_dyn();
-
 		int nodeType;
 		::String nodeName;
 		::String nodeValue;
-		 ::Xml parent;
 		::Array< ::Dynamic> children;
 		 ::haxe::ds::StringMap attributeMap;
 		::String get(::String att);
@@ -90,21 +63,12 @@ class HXCPP_CLASS_ATTRIBUTES Xml_obj : public ::hx::Object
 		void set(::String att,::String value);
 		::Dynamic set_dyn();
 
-		bool exists(::String att);
-		::Dynamic exists_dyn();
-
 		 ::Dynamic attributes();
 		::Dynamic attributes_dyn();
 
 		 ::Xml firstElement();
 		::Dynamic firstElement_dyn();
 
-		void addChild( ::Xml x);
-		::Dynamic addChild_dyn();
-
-		bool removeChild( ::Xml x);
-		::Dynamic removeChild_dyn();
-
 		virtual ::String toString();
 		::Dynamic toString_dyn();
 
diff --git a/Sources/c_snikket/iinclude/haxe/ds/_List/ListIterator.h b/Sources/c_snikket/iinclude/haxe/ds/_List/ListIterator.h
new file mode 100644
index 0000000..8b742fa
--- /dev/null
+++ b/Sources/c_snikket/iinclude/haxe/ds/_List/ListIterator.h
@@ -0,0 +1,62 @@
+// Generated by Haxe 4.3.3
+#ifndef INCLUDED_haxe_ds__List_ListIterator
+#define INCLUDED_haxe_ds__List_ListIterator
+
+#ifndef HXCPP_H
+#include <hxcpp.h>
+#endif
+
+HX_DECLARE_CLASS3(haxe,ds,_List,ListIterator)
+HX_DECLARE_CLASS3(haxe,ds,_List,ListNode)
+
+namespace haxe{
+namespace ds{
+namespace _List{
+
+
+class HXCPP_CLASS_ATTRIBUTES ListIterator_obj : public ::hx::Object
+{
+	public:
+		typedef ::hx::Object super;
+		typedef ListIterator_obj OBJ_;
+		ListIterator_obj();
+
+	public:
+		enum { _hx_ClassId = 0x7cc93b54 };
+
+		void __construct( ::haxe::ds::_List::ListNode head);
+		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="haxe.ds._List.ListIterator")
+			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
+		inline void *operator new(size_t inSize, int extra)
+			{ return ::hx::Object::operator new(inSize+extra,true,"haxe.ds._List.ListIterator"); }
+		static ::hx::ObjectPtr< ListIterator_obj > __new( ::haxe::ds::_List::ListNode head);
+		static ::hx::ObjectPtr< ListIterator_obj > __alloc(::hx::Ctx *_hx_ctx, ::haxe::ds::_List::ListNode head);
+		static void * _hx_vtable;
+		static Dynamic __CreateEmpty();
+		static Dynamic __Create(::hx::DynamicArray inArgs);
+		//~ListIterator_obj();
+
+		HX_DO_RTTI_ALL;
+		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
+		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
+		void __GetFields(Array< ::String> &outFields);
+		static void __register();
+		void __Mark(HX_MARK_PARAMS);
+		void __Visit(HX_VISIT_PARAMS);
+		bool _hx_isInstanceOf(int inClassId);
+		::String __ToString() const { return HX_("ListIterator",8c,fc,31,c4); }
+
+		 ::haxe::ds::_List::ListNode head;
+		bool hasNext();
+		::Dynamic hasNext_dyn();
+
+		 ::Dynamic next();
+		::Dynamic next_dyn();
+
+};
+
+} // end namespace haxe
+} // end namespace ds
+} // end namespace _List
+
+#endif /* INCLUDED_haxe_ds__List_ListIterator */ 
diff --git a/Sources/c_snikket/iinclude/snikket/Autolink.h b/Sources/c_snikket/iinclude/snikket/Autolink.h
index f244927..720a5f0 100644
--- a/Sources/c_snikket/iinclude/snikket/Autolink.h
+++ b/Sources/c_snikket/iinclude/snikket/Autolink.h
@@ -6,6 +6,7 @@
 #include <hxcpp.h>
 #endif
 
+HX_DECLARE_CLASS0(EReg)
 HX_DECLARE_CLASS1(snikket,Autolink)
 
 namespace snikket{
@@ -73,14 +74,14 @@ class HXCPP_CLASS_ATTRIBUTES Autolink_obj : public ::hx::Object
 		static ::String RELAXED_DOMAIN_NAME;
 		static ::String WEB_URL_WITHOUT_PROTOCOL;
 		static ::String WEB_URL_WITH_PROTOCOL;
-		static ::String AUTOLINK_WEB_URL;
-		static ::String TEL_URI;
-		static ::String SMS_URI;
-		static ::String XMPP_URI;
+		static  ::EReg AUTOLINK_WEB_URL;
+		static  ::EReg TEL_URI;
+		static  ::EReg SMS_URI;
+		static  ::EReg XMPP_URI;
 		static  ::Dynamic one(::String s,int start);
 		static ::Dynamic one_dyn();
 
-		static  ::Dynamic match(::String s,int start,::String pattern,bool addHttps);
+		static  ::Dynamic match(::String s,int start, ::EReg pattern,bool addHttps);
 		static ::Dynamic match_dyn();
 
 };
diff --git a/Sources/c_snikket/iinclude/snikket/Caps.h b/Sources/c_snikket/iinclude/snikket/Caps.h
index 908402f..0153f95 100644
--- a/Sources/c_snikket/iinclude/snikket/Caps.h
+++ b/Sources/c_snikket/iinclude/snikket/Caps.h
@@ -25,13 +25,13 @@ class HXCPP_CLASS_ATTRIBUTES Caps_obj : public ::hx::Object
 	public:
 		enum { _hx_ClassId = 0x02663c7e };
 
-		void __construct(::String node,::Array< ::Dynamic> identities,::Array< ::String > features);
+		void __construct(::String node,::Array< ::Dynamic> identities,::Array< ::String > features,::Array< unsigned char > ver);
 		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.Caps")
 			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
 		inline void *operator new(size_t inSize, int extra)
 			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.Caps"); }
-		static ::hx::ObjectPtr< Caps_obj > __new(::String node,::Array< ::Dynamic> identities,::Array< ::String > features);
-		static ::hx::ObjectPtr< Caps_obj > __alloc(::hx::Ctx *_hx_ctx,::String node,::Array< ::Dynamic> identities,::Array< ::String > features);
+		static ::hx::ObjectPtr< Caps_obj > __new(::String node,::Array< ::Dynamic> identities,::Array< ::String > features,::Array< unsigned char > ver);
+		static ::hx::ObjectPtr< Caps_obj > __alloc(::hx::Ctx *_hx_ctx,::String node,::Array< ::Dynamic> identities,::Array< ::String > features,::Array< unsigned char > ver);
 		static void * _hx_vtable;
 		static Dynamic __CreateEmpty();
 		static Dynamic __Create(::hx::DynamicArray inArgs);
diff --git a/Sources/c_snikket/iinclude/snikket/Chat.h b/Sources/c_snikket/iinclude/snikket/Chat.h
index 244dff4..97bbad9 100644
--- a/Sources/c_snikket/iinclude/snikket/Chat.h
+++ b/Sources/c_snikket/iinclude/snikket/Chat.h
@@ -161,12 +161,15 @@ class HXCPP_CLASS_ATTRIBUTES Chat_obj : public ::hx::Object
 		void togglePinned();
 		::Dynamic togglePinned_dyn();
 
-		void block( ::snikket::ChatMessage reportSpam,bool onServer);
+		void block( ::snikket::ChatMessage reportSpam,::hx::Null< bool >  onServer);
 		::Dynamic block_dyn();
 
 		void unblock(bool onServer);
 		::Dynamic unblock_dyn();
 
+		void setNotificationsInternal(bool filtered,bool mention,bool reply);
+		::Dynamic setNotificationsInternal_dyn();
+
 		void setNotifications(bool filtered,bool mention,bool reply);
 		::Dynamic setNotifications_dyn();
 
diff --git a/Sources/c_snikket/iinclude/snikket/Client.h b/Sources/c_snikket/iinclude/snikket/Client.h
index 99bf55b..33fc1fb 100644
--- a/Sources/c_snikket/iinclude/snikket/Client.h
+++ b/Sources/c_snikket/iinclude/snikket/Client.h
@@ -197,17 +197,17 @@ class HXCPP_CLASS_ATTRIBUTES Client_obj : public  ::snikket::EventEmitter_obj
 		void addCallRingListener( ::Dynamic handler);
 		::Dynamic addCallRingListener_dyn();
 
-		void addCallRingListener__fromC(::cpp::Function< void  (void*,const char*,void*) > handler,void* handler__context);
+		void addCallRingListener__fromC(::cpp::Function< void  (void*,void*) > handler,void* handler__context);
 
 		void addCallRetractListener( ::Dynamic handler);
 		::Dynamic addCallRetractListener_dyn();
 
-		void addCallRetractListener__fromC(::cpp::Function< void  (const char*,void*) > handler,void* handler__context);
+		void addCallRetractListener__fromC(::cpp::Function< void  (const char*,const char*,void*) > handler,void* handler__context);
 
 		void addCallRingingListener( ::Dynamic handler);
 		::Dynamic addCallRingingListener_dyn();
 
-		void addCallRingingListener__fromC(::cpp::Function< void  (const char*,void*) > handler,void* handler__context);
+		void addCallRingingListener__fromC(::cpp::Function< void  (const char*,const char*,void*) > handler,void* handler__context);
 
 		void addCallMediaListener( ::Dynamic handler);
 		::Dynamic addCallMediaListener_dyn();
diff --git a/Sources/c_snikket/iinclude/snikket/Config.h b/Sources/c_snikket/iinclude/snikket/Config.h
index a987dd2..72304bb 100644
--- a/Sources/c_snikket/iinclude/snikket/Config.h
+++ b/Sources/c_snikket/iinclude/snikket/Config.h
@@ -52,7 +52,18 @@ class HXCPP_CLASS_ATTRIBUTES Config_obj : public ::hx::Object
 		::String __ToString() const { return HX_("Config",e2,ca,66,fc); }
 
 		static void __boot();
+		static  ::Dynamic __meta__;
 		static bool relativeHashUri;
+		static bool relativeHashUri__fromC();
+		static ::Dynamic relativeHashUri__fromC_dyn();
+
+		static void set_relativeHashUri__fromC(bool value);
+		static ::Dynamic set_relativeHashUri__fromC_dyn();
+
+		static bool constrainedMemoryMode;
+		static void enableConstrainedMemoryMode();
+		static ::Dynamic enableConstrainedMemoryMode_dyn();
+
 };
 
 } // end namespace snikket
diff --git a/Sources/c_snikket/iinclude/snikket/JID.h b/Sources/c_snikket/iinclude/snikket/JID.h
index c64d0d0..de929aa 100644
--- a/Sources/c_snikket/iinclude/snikket/JID.h
+++ b/Sources/c_snikket/iinclude/snikket/JID.h
@@ -21,13 +21,13 @@ class HXCPP_CLASS_ATTRIBUTES JID_obj : public ::hx::Object
 	public:
 		enum { _hx_ClassId = 0x18238908 };
 
-		void __construct(::String node,::String domain,::String resource);
+		void __construct(::String node,::String domain,::String resource, ::Dynamic __o_raw);
 		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.JID")
 			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
 		inline void *operator new(size_t inSize, int extra)
 			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.JID"); }
-		static ::hx::ObjectPtr< JID_obj > __new(::String node,::String domain,::String resource);
-		static ::hx::ObjectPtr< JID_obj > __alloc(::hx::Ctx *_hx_ctx,::String node,::String domain,::String resource);
+		static ::hx::ObjectPtr< JID_obj > __new(::String node,::String domain,::String resource, ::Dynamic __o_raw);
+		static ::hx::ObjectPtr< JID_obj > __alloc(::hx::Ctx *_hx_ctx,::String node,::String domain,::String resource, ::Dynamic __o_raw);
 		static void * _hx_vtable;
 		static Dynamic __CreateEmpty();
 		static Dynamic __Create(::hx::DynamicArray inArgs);
diff --git a/Sources/c_snikket/iinclude/snikket/Node.h b/Sources/c_snikket/iinclude/snikket/Node.h
index 31bf990..9f8b7ab 100644
--- a/Sources/c_snikket/iinclude/snikket/Node.h
+++ b/Sources/c_snikket/iinclude/snikket/Node.h
@@ -8,7 +8,6 @@
 
 HX_DECLARE_CLASS1(snikket,Node)
 HX_DECLARE_CLASS1(snikket,Stanza)
-HX_DECLARE_CLASS1(snikket,TextNode)
 HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
 namespace snikket{
 
@@ -27,7 +26,7 @@ class Node_obj : public ::hx::EnumBase_obj
 		::String GetEnumName( ) const { return HX_("snikket.Node",b3,af,c7,53); }
 		::String __ToString() const { return HX_("Node.",cc,27,ec,32) + _hx_tag; }
 
-		static ::snikket::Node CData( ::snikket::TextNode textNode);
+		static ::snikket::Node CData(::String textNode);
 		static ::Dynamic CData_dyn();
 		static ::snikket::Node Element( ::snikket::Stanza stanza);
 		static ::Dynamic Element_dyn();
diff --git a/Sources/c_snikket/iinclude/snikket/Notification.h b/Sources/c_snikket/iinclude/snikket/Notification.h
index 8de8038..e27d01e 100644
--- a/Sources/c_snikket/iinclude/snikket/Notification.h
+++ b/Sources/c_snikket/iinclude/snikket/Notification.h
@@ -6,7 +6,7 @@
 #include <hxcpp.h>
 #endif
 
-HX_DECLARE_STACK_FRAME(_hx_pos_b0a79cae3ba17812_30_new)
+HX_DECLARE_STACK_FRAME(_hx_pos_b0a79cae3ba17812_31_new)
 HX_DECLARE_CLASS1(snikket,ChatMessage)
 HX_DECLARE_CLASS1(snikket,Notification)
 HX_DECLARE_CLASS1(snikket,Stanza)
@@ -25,34 +25,35 @@ class HXCPP_CLASS_ATTRIBUTES Notification_obj : public ::hx::Object
 	public:
 		enum { _hx_ClassId = 0x778a3c48 };
 
-		void __construct(::String title,::String body,::String accountId,::String chatId,::String messageId,int type,::String callStatus,::String callSid,::String imageUri,::String lang,::String timestamp);
+		void __construct(::String title,::String body,::String accountId,::String chatId,::String senderId,::String messageId,int type,::String callStatus,::String callSid,::String imageUri,::String lang,::String timestamp);
 		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.Notification")
 			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
 		inline void *operator new(size_t inSize, int extra)
 			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.Notification"); }
 
-		inline static ::hx::ObjectPtr< Notification_obj > __new(::String title,::String body,::String accountId,::String chatId,::String messageId,int type,::String callStatus,::String callSid,::String imageUri,::String lang,::String timestamp) {
+		inline static ::hx::ObjectPtr< Notification_obj > __new(::String title,::String body,::String accountId,::String chatId,::String senderId,::String messageId,int type,::String callStatus,::String callSid,::String imageUri,::String lang,::String timestamp) {
 			::hx::ObjectPtr< Notification_obj > __this = new Notification_obj();
-			__this->__construct(title,body,accountId,chatId,messageId,type,callStatus,callSid,imageUri,lang,timestamp);
+			__this->__construct(title,body,accountId,chatId,senderId,messageId,type,callStatus,callSid,imageUri,lang,timestamp);
 			return __this;
 		}
 
-		inline static ::hx::ObjectPtr< Notification_obj > __alloc(::hx::Ctx *_hx_ctx,::String title,::String body,::String accountId,::String chatId,::String messageId,int type,::String callStatus,::String callSid,::String imageUri,::String lang,::String timestamp) {
+		inline static ::hx::ObjectPtr< Notification_obj > __alloc(::hx::Ctx *_hx_ctx,::String title,::String body,::String accountId,::String chatId,::String senderId,::String messageId,int type,::String callStatus,::String callSid,::String imageUri,::String lang,::String timestamp) {
 			Notification_obj *__this = (Notification_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Notification_obj), true, "snikket.Notification"));
 			*(void **)__this = Notification_obj::_hx_vtable;
 {
-            	HX_STACKFRAME(&_hx_pos_b0a79cae3ba17812_30_new)
-HXLINE(  31)		( ( ::snikket::Notification)(__this) )->title = title;
-HXLINE(  32)		( ( ::snikket::Notification)(__this) )->body = body;
-HXLINE(  33)		( ( ::snikket::Notification)(__this) )->accountId = accountId;
-HXLINE(  34)		( ( ::snikket::Notification)(__this) )->chatId = chatId;
-HXLINE(  35)		( ( ::snikket::Notification)(__this) )->messageId = messageId;
-HXLINE(  36)		( ( ::snikket::Notification)(__this) )->type = type;
-HXLINE(  37)		( ( ::snikket::Notification)(__this) )->callStatus = callStatus;
-HXLINE(  38)		( ( ::snikket::Notification)(__this) )->callSid = callSid;
-HXLINE(  39)		( ( ::snikket::Notification)(__this) )->imageUri = imageUri;
-HXLINE(  40)		( ( ::snikket::Notification)(__this) )->lang = lang;
-HXLINE(  41)		( ( ::snikket::Notification)(__this) )->timestamp = timestamp;
+            	HX_STACKFRAME(&_hx_pos_b0a79cae3ba17812_31_new)
+HXLINE(  32)		( ( ::snikket::Notification)(__this) )->title = title;
+HXLINE(  33)		( ( ::snikket::Notification)(__this) )->body = body;
+HXLINE(  34)		( ( ::snikket::Notification)(__this) )->accountId = accountId;
+HXLINE(  35)		( ( ::snikket::Notification)(__this) )->chatId = chatId;
+HXLINE(  36)		( ( ::snikket::Notification)(__this) )->senderId = senderId;
+HXLINE(  37)		( ( ::snikket::Notification)(__this) )->messageId = messageId;
+HXLINE(  38)		( ( ::snikket::Notification)(__this) )->type = type;
+HXLINE(  39)		( ( ::snikket::Notification)(__this) )->callStatus = callStatus;
+HXLINE(  40)		( ( ::snikket::Notification)(__this) )->callSid = callSid;
+HXLINE(  41)		( ( ::snikket::Notification)(__this) )->imageUri = imageUri;
+HXLINE(  42)		( ( ::snikket::Notification)(__this) )->lang = lang;
+HXLINE(  43)		( ( ::snikket::Notification)(__this) )->timestamp = timestamp;
             	}
 		
 			return __this;
@@ -98,6 +99,10 @@ HXLINE(  41)		( ( ::snikket::Notification)(__this) )->timestamp = timestamp;
 		::String chatId__fromC();
 		::Dynamic chatId__fromC_dyn();
 
+		::String senderId;
+		::String senderId__fromC();
+		::Dynamic senderId__fromC_dyn();
+
 		::String messageId;
 		::String messageId__fromC();
 		::Dynamic messageId__fromC_dyn();
diff --git a/Sources/c_snikket/iinclude/snikket/StanzaError.h b/Sources/c_snikket/iinclude/snikket/StanzaError.h
index a16d52c..4096108 100644
--- a/Sources/c_snikket/iinclude/snikket/StanzaError.h
+++ b/Sources/c_snikket/iinclude/snikket/StanzaError.h
@@ -6,7 +6,7 @@
 #include <hxcpp.h>
 #endif
 
-HX_DECLARE_STACK_FRAME(_hx_pos_ba7467be1e1fd22b_46_new)
+HX_DECLARE_STACK_FRAME(_hx_pos_ba7467be1e1fd22b_75_new)
 HX_DECLARE_CLASS1(snikket,StanzaError)
 
 namespace snikket{
@@ -38,10 +38,10 @@ class HXCPP_CLASS_ATTRIBUTES StanzaError_obj : public ::hx::Object
 			StanzaError_obj *__this = (StanzaError_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(StanzaError_obj), true, "snikket.StanzaError"));
 			*(void **)__this = StanzaError_obj::_hx_vtable;
 {
-            	HX_STACKFRAME(&_hx_pos_ba7467be1e1fd22b_46_new)
-HXLINE(  47)		( ( ::snikket::StanzaError)(__this) )->type = type_;
-HXLINE(  48)		( ( ::snikket::StanzaError)(__this) )->condition = condition_;
-HXLINE(  49)		( ( ::snikket::StanzaError)(__this) )->text = text_;
+            	HX_STACKFRAME(&_hx_pos_ba7467be1e1fd22b_75_new)
+HXLINE(  76)		( ( ::snikket::StanzaError)(__this) )->type = type_;
+HXLINE(  77)		( ( ::snikket::StanzaError)(__this) )->condition = condition_;
+HXLINE(  78)		( ( ::snikket::StanzaError)(__this) )->text = text_;
             	}
 		
 			return __this;
diff --git a/Sources/c_snikket/iinclude/snikket/TextNodeClass.h b/Sources/c_snikket/iinclude/snikket/TextNodeClass.h
new file mode 100644
index 0000000..c019070
--- /dev/null
+++ b/Sources/c_snikket/iinclude/snikket/TextNodeClass.h
@@ -0,0 +1,64 @@
+// Generated by Haxe 4.3.3
+#ifndef INCLUDED_snikket_TextNodeClass
+#define INCLUDED_snikket_TextNodeClass
+
+#ifndef HXCPP_H
+#include <hxcpp.h>
+#endif
+
+#ifndef INCLUDED_snikket__Stanza_NodeInterface
+#include <snikket/_Stanza/NodeInterface.h>
+#endif
+HX_DECLARE_CLASS1(snikket,Stanza)
+HX_DECLARE_CLASS1(snikket,TextNodeClass)
+HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
+
+namespace snikket{
+
+
+class HXCPP_CLASS_ATTRIBUTES TextNodeClass_obj : public ::hx::Object
+{
+	public:
+		typedef ::hx::Object super;
+		typedef TextNodeClass_obj OBJ_;
+		TextNodeClass_obj();
+
+	public:
+		enum { _hx_ClassId = 0x1ed164d0 };
+
+		void __construct(::String node);
+		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.TextNodeClass")
+			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
+		inline void *operator new(size_t inSize, int extra)
+			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.TextNodeClass"); }
+		static ::hx::ObjectPtr< TextNodeClass_obj > __new(::String node);
+		static ::hx::ObjectPtr< TextNodeClass_obj > __alloc(::hx::Ctx *_hx_ctx,::String node);
+		static void * _hx_vtable;
+		static Dynamic __CreateEmpty();
+		static Dynamic __Create(::hx::DynamicArray inArgs);
+		//~TextNodeClass_obj();
+
+		HX_DO_RTTI_ALL;
+		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
+		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
+		void __GetFields(Array< ::String> &outFields);
+		static void __register();
+		void __Mark(HX_MARK_PARAMS);
+		void __Visit(HX_VISIT_PARAMS);
+		bool _hx_isInstanceOf(int inClassId);
+		void *_hx_getInterface(int inHash);
+		::Dynamic traverse_881a854a( ::Dynamic f);
+		::String __ToString() const { return HX_("TextNodeClass",49,3c,11,ec); }
+
+		::String node;
+		::String serialize();
+		::Dynamic serialize_dyn();
+
+		 ::snikket::TextNodeClass traverse( ::Dynamic f);
+		::Dynamic traverse_dyn();
+
+};
+
+} // end namespace snikket
+
+#endif /* INCLUDED_snikket_TextNodeClass */ 
diff --git a/Sources/c_snikket/iinclude/snikket/jingle/IncomingProposedSession.h b/Sources/c_snikket/iinclude/snikket/jingle/IncomingProposedSession.h
index ba3b24a..cb8ed6f 100644
--- a/Sources/c_snikket/iinclude/snikket/jingle/IncomingProposedSession.h
+++ b/Sources/c_snikket/iinclude/snikket/jingle/IncomingProposedSession.h
@@ -60,6 +60,7 @@ class HXCPP_CLASS_ATTRIBUTES IncomingProposedSession_obj : public ::hx::Object
 		::String __ToString() const { return HX_("IncomingProposedSession",ea,a1,86,13); }
 
 		::String sid;
+		::String chatId;
 		 ::snikket::Client client;
 		 ::snikket::JID from;
 		::String _sid;
@@ -106,6 +107,9 @@ class HXCPP_CLASS_ATTRIBUTES IncomingProposedSession_obj : public ::hx::Object
 		::String get_sid();
 		::Dynamic get_sid_dyn();
 
+		::String get_chatId();
+		::Dynamic get_chatId_dyn();
+
 };
 
 } // end namespace snikket
diff --git a/Sources/c_snikket/iinclude/snikket/jingle/InitiatedSession.h b/Sources/c_snikket/iinclude/snikket/jingle/InitiatedSession.h
index 569256c..c622d06 100644
--- a/Sources/c_snikket/iinclude/snikket/jingle/InitiatedSession.h
+++ b/Sources/c_snikket/iinclude/snikket/jingle/InitiatedSession.h
@@ -72,6 +72,10 @@ class HXCPP_CLASS_ATTRIBUTES InitiatedSession_obj : public ::hx::Object
 		::String sid__fromC();
 		::Dynamic sid__fromC_dyn();
 
+		::String chatId;
+		::String chatId__fromC();
+		::Dynamic chatId__fromC_dyn();
+
 		 ::snikket::Client client;
 		 ::snikket::JID counterpart;
 		::String _sid;
@@ -90,6 +94,9 @@ class HXCPP_CLASS_ATTRIBUTES InitiatedSession_obj : public ::hx::Object
 		::String get_sid();
 		::Dynamic get_sid_dyn();
 
+		::String get_chatId();
+		::Dynamic get_chatId_dyn();
+
 		void ring();
 		::Dynamic ring_dyn();
 
diff --git a/Sources/c_snikket/iinclude/snikket/jingle/OutgoingProposedSession.h b/Sources/c_snikket/iinclude/snikket/jingle/OutgoingProposedSession.h
index 04be360..202c56d 100644
--- a/Sources/c_snikket/iinclude/snikket/jingle/OutgoingProposedSession.h
+++ b/Sources/c_snikket/iinclude/snikket/jingle/OutgoingProposedSession.h
@@ -62,6 +62,7 @@ class HXCPP_CLASS_ATTRIBUTES OutgoingProposedSession_obj : public ::hx::Object
 		::String __ToString() const { return HX_("OutgoingProposedSession",24,31,32,16); }
 
 		::String sid;
+		::String chatId;
 		 ::snikket::Client client;
 		 ::snikket::JID to;
 		::String _sid;
@@ -109,6 +110,9 @@ class HXCPP_CLASS_ATTRIBUTES OutgoingProposedSession_obj : public ::hx::Object
 		::String get_sid();
 		::Dynamic get_sid_dyn();
 
+		::String get_chatId();
+		::Dynamic get_chatId_dyn();
+
 };
 
 } // end namespace snikket
diff --git a/Sources/c_snikket/iinclude/snikket/jingle/Session.h b/Sources/c_snikket/iinclude/snikket/jingle/Session.h
index 306298c..41c01cf 100644
--- a/Sources/c_snikket/iinclude/snikket/jingle/Session.h
+++ b/Sources/c_snikket/iinclude/snikket/jingle/Session.h
@@ -27,6 +27,10 @@ class HXCPP_CLASS_ATTRIBUTES Session_obj {
 		::String (::hx::Object :: *_hx_get_sid)(); 
 		static inline ::String get_sid( ::Dynamic _hx_) {
 			return (_hx_.mPtr->*( ::hx::interface_cast< ::snikket::jingle::Session_obj *>(_hx_.mPtr->_hx_getInterface(0x79d60748)))->_hx_get_sid)();
+		}
+		::String (::hx::Object :: *_hx_get_chatId)(); 
+		static inline ::String get_chatId( ::Dynamic _hx_) {
+			return (_hx_.mPtr->*( ::hx::interface_cast< ::snikket::jingle::Session_obj *>(_hx_.mPtr->_hx_getInterface(0x79d60748)))->_hx_get_chatId)();
 		}
 		 ::snikket::jingle::InitiatedSession (::hx::Object :: *_hx_initiate)( ::snikket::Stanza stanza); 
 		static inline  ::snikket::jingle::InitiatedSession initiate( ::Dynamic _hx_, ::snikket::Stanza stanza) {
diff --git a/Sources/c_snikket/iinclude/snikket/persistence/Sqlite.h b/Sources/c_snikket/iinclude/snikket/persistence/Sqlite.h
index 8418150..357f83d 100644
--- a/Sources/c_snikket/iinclude/snikket/persistence/Sqlite.h
+++ b/Sources/c_snikket/iinclude/snikket/persistence/Sqlite.h
@@ -14,6 +14,7 @@
 #endif
 HX_DECLARE_CLASS1(haxe,IMap)
 HX_DECLARE_CLASS1(haxe,Timer)
+HX_DECLARE_CLASS2(haxe,ds,ObjectMap)
 HX_DECLARE_CLASS2(haxe,ds,StringMap)
 HX_DECLARE_CLASS1(snikket,Caps)
 HX_DECLARE_CLASS1(snikket,Chat)
@@ -129,6 +130,9 @@ class HXCPP_CLASS_ATTRIBUTES Sqlite_obj : public ::hx::Object
 		void storeCaps( ::snikket::Caps caps);
 		::Dynamic storeCaps_dyn();
 
+		void storeCapsSet( ::haxe::ds::ObjectMap capsSet);
+		::Dynamic storeCapsSet_dyn();
+
 		void getCaps(::String ver, ::Dynamic callback);
 		::Dynamic getCaps_dyn();
 
diff --git a/Sources/c_snikket/iinclude/snikket/persistence/SqliteDriver.h b/Sources/c_snikket/iinclude/snikket/persistence/SqliteDriver.h
index d13d4d8..c6e6e81 100644
--- a/Sources/c_snikket/iinclude/snikket/persistence/SqliteDriver.h
+++ b/Sources/c_snikket/iinclude/snikket/persistence/SqliteDriver.h
@@ -8,6 +8,9 @@
 
 HX_DECLARE_CLASS2(snikket,persistence,SqliteDriver)
 HX_DECLARE_CLASS2(sys,db,Connection)
+HX_DECLARE_CLASS2(sys,thread,Deque)
+HX_DECLARE_CLASS2(sys,thread,EventLoop)
+HX_DECLARE_CLASS2(sys,thread,IThreadPool)
 HX_DECLARE_CLASS1(thenshim,Thenable)
 
 namespace snikket{
@@ -24,13 +27,13 @@ class HXCPP_CLASS_ATTRIBUTES SqliteDriver_obj : public ::hx::Object
 	public:
 		enum { _hx_ClassId = 0x0672539a };
 
-		void __construct(::String dbfile);
+		void __construct(::String dbfile, ::Dynamic migrate);
 		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="snikket.persistence.SqliteDriver")
 			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
 		inline void *operator new(size_t inSize, int extra)
 			{ return ::hx::Object::operator new(inSize+extra,true,"snikket.persistence.SqliteDriver"); }
-		static ::hx::ObjectPtr< SqliteDriver_obj > __new(::String dbfile);
-		static ::hx::ObjectPtr< SqliteDriver_obj > __alloc(::hx::Ctx *_hx_ctx,::String dbfile);
+		static ::hx::ObjectPtr< SqliteDriver_obj > __new(::String dbfile, ::Dynamic migrate);
+		static ::hx::ObjectPtr< SqliteDriver_obj > __alloc(::hx::Ctx *_hx_ctx,::String dbfile, ::Dynamic migrate);
 		static void * _hx_vtable;
 		static Dynamic __CreateEmpty();
 		static Dynamic __Create(::hx::DynamicArray inArgs);
@@ -46,11 +49,21 @@ class HXCPP_CLASS_ATTRIBUTES SqliteDriver_obj : public ::hx::Object
 		bool _hx_isInstanceOf(int inClassId);
 		::String __ToString() const { return HX_("SqliteDriver",34,0a,34,44); }
 
-		::Dynamic db;
+		 ::sys::thread::Deque dbs;
+		::Dynamic writePool;
+		::Dynamic readPool;
+		::String dbfile;
+		::Dynamic ready;
+		 ::Dynamic setReady;
+		Dynamic setReady_dyn() { return setReady;}
+		 ::sys::thread::EventLoop mainLoop;
+		::Dynamic execute(::Dynamic pool,::Array< ::String > qs,::cpp::VirtualArray params);
+		::Dynamic execute_dyn();
+
 		::Dynamic exec( ::Dynamic sql,::cpp::VirtualArray params);
 		::Dynamic exec_dyn();
 
-		::String prepare(::String sql,::cpp::VirtualArray params);
+		::String prepare(::Dynamic db,::String sql,::cpp::VirtualArray params);
 		::Dynamic prepare_dyn();
 
 };
diff --git a/Sources/c_snikket/iinclude/snikket/streams/XmppStropheStream.h b/Sources/c_snikket/iinclude/snikket/streams/XmppStropheStream.h
index f2101f2..dca39c0 100644
--- a/Sources/c_snikket/iinclude/snikket/streams/XmppStropheStream.h
+++ b/Sources/c_snikket/iinclude/snikket/streams/XmppStropheStream.h
@@ -14,6 +14,7 @@
 #include "strophe.h"
 #endif
 HX_DECLARE_CLASS1(haxe,IMap)
+HX_DECLARE_CLASS1(haxe,Timer)
 HX_DECLARE_CLASS2(haxe,ds,BalancedTree)
 HX_DECLARE_CLASS2(haxe,ds,EnumValueMap)
 HX_DECLARE_CLASS1(snikket,EventEmitter)
@@ -23,7 +24,6 @@ HX_DECLARE_CLASS1(snikket,IqResult)
 HX_DECLARE_CLASS1(snikket,Stanza)
 HX_DECLARE_CLASS2(snikket,_Stanza,NodeInterface)
 HX_DECLARE_CLASS2(snikket,streams,XmppStropheStream)
-HX_DECLARE_CLASS2(sys,thread,EventLoop)
 
 #include "strophe.h"
 namespace snikket{
@@ -54,6 +54,7 @@ class HXCPP_CLASS_ATTRIBUTES XmppStropheStream_obj : public  ::snikket::GenericS
 
 		HX_DO_RTTI_ALL;
 		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
+		static bool __GetStatic(const ::String &inString, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
 		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
 		void __GetFields(Array< ::String> &outFields);
 		static void __register();
@@ -74,14 +75,18 @@ class HXCPP_CLASS_ATTRIBUTES XmppStropheStream_obj : public  ::snikket::GenericS
 
 		static int strophe_stanza( xmpp_conn_t* conn, xmpp_stanza_t* sstanza,void* userdata);
 
-		static void strophe_connect( xmpp_conn_t* conn, xmpp_conn_event_t event,int error, xmpp_stream_error_t* stream_error,void* userdata);
+		static void strophe_connect( xmpp_conn_t* conn, xmpp_conn_event_t event,int error, xmpp_stream_error_t* stream_error,int resumed,void* userdata);
+
+		static  ::snikket::Stanza parseStanza(::String s);
+		static ::Dynamic parseStanza_dyn();
 
 		static  ::snikket::Stanza convertToStanza( xmpp_stanza_t* el,void* dummy);
 
 		 ::haxe::ds::EnumValueMap iqHandlers;
 		::Array< ::Dynamic> pending;
+		 ::haxe::Timer pollTimer;
 		bool ready;
-		 ::sys::thread::EventLoop mainThread;
+		bool stanzaThisPoll;
 		::String newId();
 
 		void onIq( ::snikket::IqRequestType type,::String tag,::String xmlns, ::Dynamic handler);
@@ -90,6 +95,9 @@ class HXCPP_CLASS_ATTRIBUTES XmppStropheStream_obj : public  ::snikket::GenericS
 
 		void disconnect();
 
+		void poll( ::Dynamic timeout);
+		::Dynamic poll_dyn();
+
 		 xmpp_stanza_t* convertFromStanza( ::snikket::Stanza el);
 		::Dynamic convertFromStanza_dyn();
 
@@ -99,7 +107,7 @@ class HXCPP_CLASS_ATTRIBUTES XmppStropheStream_obj : public  ::snikket::GenericS
 		::Dynamic finalize_dyn();
 
 
-	private: xmpp_ctx_t *ctx;
+	private: static xmpp_ctx_t *ctx;
 	private: xmpp_conn_t *conn;
 
 };
diff --git a/Sources/c_snikket/iinclude/sqlite3.h b/Sources/c_snikket/iinclude/sqlite3.h
new file mode 100644
index 0000000..082a9f9
--- /dev/null
+++ b/Sources/c_snikket/iinclude/sqlite3.h
@@ -0,0 +1,13715 @@
+/*
+** 2001-09-15
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** This header file defines the interface that the SQLite library
+** presents to client programs.  If a C-function, structure, datatype,
+** or constant definition does not appear in this file, then it is
+** not a published API of SQLite, is subject to change without
+** notice, and should not be referenced by programs that use SQLite.
+**
+** Some of the definitions that are in this file are marked as
+** "experimental".  Experimental interfaces are normally new
+** features recently added to SQLite.  We do not anticipate changes
+** to experimental interfaces but reserve the right to make minor changes
+** if experience from use "in the wild" suggest such changes are prudent.
+**
+** The official C-language API documentation for SQLite is derived
+** from comments in this file.  This file is the authoritative source
+** on how SQLite interfaces are supposed to operate.
+**
+** The name of this file under configuration management is "sqlite.h.in".
+** The makefile makes some minor changes to this file (such as inserting
+** the version number) and changes its name to "sqlite3.h" as
+** part of the build process.
+*/
+#ifndef SQLITE3_H
+#define SQLITE3_H
+#include <stdarg.h>     /* Needed for the definition of va_list */
+
+/*
+** Make sure we can call this stuff from C++.
+*/
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*
+** Facilitate override of interface linkage and calling conventions.
+** Be aware that these macros may not be used within this particular
+** translation of the amalgamation and its associated header file.
+**
+** The SQLITE_EXTERN and SQLITE_API macros are used to instruct the
+** compiler that the target identifier should have external linkage.
+**
+** The SQLITE_CDECL macro is used to set the calling convention for
+** public functions that accept a variable number of arguments.
+**
+** The SQLITE_APICALL macro is used to set the calling convention for
+** public functions that accept a fixed number of arguments.
+**
+** The SQLITE_STDCALL macro is no longer used and is now deprecated.
+**
+** The SQLITE_CALLBACK macro is used to set the calling convention for
+** function pointers.
+**
+** The SQLITE_SYSAPI macro is used to set the calling convention for
+** functions provided by the operating system.
+**
+** Currently, the SQLITE_CDECL, SQLITE_APICALL, SQLITE_CALLBACK, and
+** SQLITE_SYSAPI macros are used only when building for environments
+** that require non-default calling conventions.
+*/
+#ifndef SQLITE_EXTERN
+# define SQLITE_EXTERN extern
+#endif
+#ifndef SQLITE_API
+# define SQLITE_API
+#endif
+#ifndef SQLITE_CDECL
+# define SQLITE_CDECL
+#endif
+#ifndef SQLITE_APICALL
+# define SQLITE_APICALL
+#endif
+#ifndef SQLITE_STDCALL
+# define SQLITE_STDCALL SQLITE_APICALL
+#endif
+#ifndef SQLITE_CALLBACK
+# define SQLITE_CALLBACK
+#endif
+#ifndef SQLITE_SYSAPI
+# define SQLITE_SYSAPI
+#endif
+
+/*
+** These no-op macros are used in front of interfaces to mark those
+** interfaces as either deprecated or experimental.  New applications
+** should not use deprecated interfaces - they are supported for backwards
+** compatibility only.  Application writers should be aware that
+** experimental interfaces are subject to change in point releases.
+**
+** These macros used to resolve to various kinds of compiler magic that
+** would generate warning messages when they were used.  But that
+** compiler magic ended up generating such a flurry of bug reports
+** that we have taken it all out and gone back to using simple
+** noop macros.
+*/
+#define SQLITE_DEPRECATED
+#define SQLITE_EXPERIMENTAL
+
+/*
+** Ensure these symbols were not defined by some previous header file.
+*/
+#ifdef SQLITE_VERSION
+# undef SQLITE_VERSION
+#endif
+#ifdef SQLITE_VERSION_NUMBER
+# undef SQLITE_VERSION_NUMBER
+#endif
+
+/*
+** CAPI3REF: Compile-Time Library Version Numbers
+**
+** ^(The [SQLITE_VERSION] C preprocessor macro in the sqlite3.h header
+** evaluates to a string literal that is the SQLite version in the
+** format "X.Y.Z" where X is the major version number (always 3 for
+** SQLite3) and Y is the minor version number and Z is the release number.)^
+** ^(The [SQLITE_VERSION_NUMBER] C preprocessor macro resolves to an integer
+** with the value (X*1000000 + Y*1000 + Z) where X, Y, and Z are the same
+** numbers used in [SQLITE_VERSION].)^
+** The SQLITE_VERSION_NUMBER for any given release of SQLite will also
+** be larger than the release from which it is derived.  Either Y will
+** be held constant and Z will be incremented or else Y will be incremented
+** and Z will be reset to zero.
+**
+** Since [version 3.6.18] ([dateof:3.6.18]),
+** SQLite source code has been stored in the
+** <a href="http://www.fossil-scm.org/">Fossil configuration management
+** system</a>.  ^The SQLITE_SOURCE_ID macro evaluates to
+** a string which identifies a particular check-in of SQLite
+** within its configuration management system.  ^The SQLITE_SOURCE_ID
+** string contains the date and time of the check-in (UTC) and a SHA1
+** or SHA3-256 hash of the entire source tree.  If the source code has
+** been edited in any way since it was last checked in, then the last
+** four hexadecimal digits of the hash may be modified.
+**
+** See also: [sqlite3_libversion()],
+** [sqlite3_libversion_number()], [sqlite3_sourceid()],
+** [sqlite_version()] and [sqlite_source_id()].
+*/
+#define SQLITE_VERSION        "3.49.1"
+#define SQLITE_VERSION_NUMBER 3049001
+#define SQLITE_SOURCE_ID      "2025-02-18 13:38:58 873d4e274b4988d260ba8354a9718324a1c26187a4ab4c1cc0227c03d0f10e70"
+
+/*
+** CAPI3REF: Run-Time Library Version Numbers
+** KEYWORDS: sqlite3_version sqlite3_sourceid
+**
+** These interfaces provide the same information as the [SQLITE_VERSION],
+** [SQLITE_VERSION_NUMBER], and [SQLITE_SOURCE_ID] C preprocessor macros
+** but are associated with the library instead of the header file.  ^(Cautious
+** programmers might include assert() statements in their application to
+** verify that values returned by these interfaces match the macros in
+** the header, and thus ensure that the application is
+** compiled with matching library and header files.
+**
+** <blockquote><pre>
+** assert( sqlite3_libversion_number()==SQLITE_VERSION_NUMBER );
+** assert( strncmp(sqlite3_sourceid(),SQLITE_SOURCE_ID,80)==0 );
+** assert( strcmp(sqlite3_libversion(),SQLITE_VERSION)==0 );
+** </pre></blockquote>)^
+**
+** ^The sqlite3_version[] string constant contains the text of [SQLITE_VERSION]
+** macro.  ^The sqlite3_libversion() function returns a pointer to the
+** to the sqlite3_version[] string constant.  The sqlite3_libversion()
+** function is provided for use in DLLs since DLL users usually do not have
+** direct access to string constants within the DLL.  ^The
+** sqlite3_libversion_number() function returns an integer equal to
+** [SQLITE_VERSION_NUMBER].  ^(The sqlite3_sourceid() function returns
+** a pointer to a string constant whose value is the same as the
+** [SQLITE_SOURCE_ID] C preprocessor macro.  Except if SQLite is built
+** using an edited copy of [the amalgamation], then the last four characters
+** of the hash might be different from [SQLITE_SOURCE_ID].)^
+**
+** See also: [sqlite_version()] and [sqlite_source_id()].
+*/
+SQLITE_API SQLITE_EXTERN const char sqlite3_version[];
+SQLITE_API const char *sqlite3_libversion(void);
+SQLITE_API const char *sqlite3_sourceid(void);
+SQLITE_API int sqlite3_libversion_number(void);
+
+/*
+** CAPI3REF: Run-Time Library Compilation Options Diagnostics
+**
+** ^The sqlite3_compileoption_used() function returns 0 or 1
+** indicating whether the specified option was defined at
+** compile time.  ^The SQLITE_ prefix may be omitted from the
+** option name passed to sqlite3_compileoption_used().
+**
+** ^The sqlite3_compileoption_get() function allows iterating
+** over the list of options that were defined at compile time by
+** returning the N-th compile time option string.  ^If N is out of range,
+** sqlite3_compileoption_get() returns a NULL pointer.  ^The SQLITE_
+** prefix is omitted from any strings returned by
+** sqlite3_compileoption_get().
+**
+** ^Support for the diagnostic functions sqlite3_compileoption_used()
+** and sqlite3_compileoption_get() may be omitted by specifying the
+** [SQLITE_OMIT_COMPILEOPTION_DIAGS] option at compile time.
+**
+** See also: SQL functions [sqlite_compileoption_used()] and
+** [sqlite_compileoption_get()] and the [compile_options pragma].
+*/
+#ifndef SQLITE_OMIT_COMPILEOPTION_DIAGS
+SQLITE_API int sqlite3_compileoption_used(const char *zOptName);
+SQLITE_API const char *sqlite3_compileoption_get(int N);
+#else
+# define sqlite3_compileoption_used(X) 0
+# define sqlite3_compileoption_get(X)  ((void*)0)
+#endif
+
+/*
+** CAPI3REF: Test To See If The Library Is Threadsafe
+**
+** ^The sqlite3_threadsafe() function returns zero if and only if
+** SQLite was compiled with mutexing code omitted due to the
+** [SQLITE_THREADSAFE] compile-time option being set to 0.
+**
+** SQLite can be compiled with or without mutexes.  When
+** the [SQLITE_THREADSAFE] C preprocessor macro is 1 or 2, mutexes
+** are enabled and SQLite is threadsafe.  When the
+** [SQLITE_THREADSAFE] macro is 0,
+** the mutexes are omitted.  Without the mutexes, it is not safe
+** to use SQLite concurrently from more than one thread.
+**
+** Enabling mutexes incurs a measurable performance penalty.
+** So if speed is of utmost importance, it makes sense to disable
+** the mutexes.  But for maximum safety, mutexes should be enabled.
+** ^The default behavior is for mutexes to be enabled.
+**
+** This interface can be used by an application to make sure that the
+** version of SQLite that it is linking against was compiled with
+** the desired setting of the [SQLITE_THREADSAFE] macro.
+**
+** This interface only reports on the compile-time mutex setting
+** of the [SQLITE_THREADSAFE] flag.  If SQLite is compiled with
+** SQLITE_THREADSAFE=1 or =2 then mutexes are enabled by default but
+** can be fully or partially disabled using a call to [sqlite3_config()]
+** with the verbs [SQLITE_CONFIG_SINGLETHREAD], [SQLITE_CONFIG_MULTITHREAD],
+** or [SQLITE_CONFIG_SERIALIZED].  ^(The return value of the
+** sqlite3_threadsafe() function shows only the compile-time setting of
+** thread safety, not any run-time changes to that setting made by
+** sqlite3_config(). In other words, the return value from sqlite3_threadsafe()
+** is unchanged by calls to sqlite3_config().)^
+**
+** See the [threading mode] documentation for additional information.
+*/
+SQLITE_API int sqlite3_threadsafe(void);
+
+/*
+** CAPI3REF: Database Connection Handle
+** KEYWORDS: {database connection} {database connections}
+**
+** Each open SQLite database is represented by a pointer to an instance of
+** the opaque structure named "sqlite3".  It is useful to think of an sqlite3
+** pointer as an object.  The [sqlite3_open()], [sqlite3_open16()], and
+** [sqlite3_open_v2()] interfaces are its constructors, and [sqlite3_close()]
+** and [sqlite3_close_v2()] are its destructors.  There are many other
+** interfaces (such as
+** [sqlite3_prepare_v2()], [sqlite3_create_function()], and
+** [sqlite3_busy_timeout()] to name but three) that are methods on an
+** sqlite3 object.
+*/
+typedef struct sqlite3 sqlite3;
+
+/*
+** CAPI3REF: 64-Bit Integer Types
+** KEYWORDS: sqlite_int64 sqlite_uint64
+**
+** Because there is no cross-platform way to specify 64-bit integer types
+** SQLite includes typedefs for 64-bit signed and unsigned integers.
+**
+** The sqlite3_int64 and sqlite3_uint64 are the preferred type definitions.
+** The sqlite_int64 and sqlite_uint64 types are supported for backwards
+** compatibility only.
+**
+** ^The sqlite3_int64 and sqlite_int64 types can store integer values
+** between -9223372036854775808 and +9223372036854775807 inclusive.  ^The
+** sqlite3_uint64 and sqlite_uint64 types can store integer values
+** between 0 and +18446744073709551615 inclusive.
+*/
+#ifdef SQLITE_INT64_TYPE
+  typedef SQLITE_INT64_TYPE sqlite_int64;
+# ifdef SQLITE_UINT64_TYPE
+    typedef SQLITE_UINT64_TYPE sqlite_uint64;
+# else
+    typedef unsigned SQLITE_INT64_TYPE sqlite_uint64;
+# endif
+#elif defined(_MSC_VER) || defined(__BORLANDC__)
+  typedef __int64 sqlite_int64;
+  typedef unsigned __int64 sqlite_uint64;
+#else
+  typedef long long int sqlite_int64;
+  typedef unsigned long long int sqlite_uint64;
+#endif
+typedef sqlite_int64 sqlite3_int64;
+typedef sqlite_uint64 sqlite3_uint64;
+
+/*
+** If compiling for a processor that lacks floating point support,
+** substitute integer for floating-point.
+*/
+#ifdef SQLITE_OMIT_FLOATING_POINT
+# define double sqlite3_int64
+#endif
+
+/*
+** CAPI3REF: Closing A Database Connection
+** DESTRUCTOR: sqlite3
+**
+** ^The sqlite3_close() and sqlite3_close_v2() routines are destructors
+** for the [sqlite3] object.
+** ^Calls to sqlite3_close() and sqlite3_close_v2() return [SQLITE_OK] if
+** the [sqlite3] object is successfully destroyed and all associated
+** resources are deallocated.
+**
+** Ideally, applications should [sqlite3_finalize | finalize] all
+** [prepared statements], [sqlite3_blob_close | close] all [BLOB handles], and
+** [sqlite3_backup_finish | finish] all [sqlite3_backup] objects associated
+** with the [sqlite3] object prior to attempting to close the object.
+** ^If the database connection is associated with unfinalized prepared
+** statements, BLOB handlers, and/or unfinished sqlite3_backup objects then
+** sqlite3_close() will leave the database connection open and return
+** [SQLITE_BUSY]. ^If sqlite3_close_v2() is called with unfinalized prepared
+** statements, unclosed BLOB handlers, and/or unfinished sqlite3_backups,
+** it returns [SQLITE_OK] regardless, but instead of deallocating the database
+** connection immediately, it marks the database connection as an unusable
+** "zombie" and makes arrangements to automatically deallocate the database
+** connection after all prepared statements are finalized, all BLOB handles
+** are closed, and all backups have finished. The sqlite3_close_v2() interface
+** is intended for use with host languages that are garbage collected, and
+** where the order in which destructors are called is arbitrary.
+**
+** ^If an [sqlite3] object is destroyed while a transaction is open,
+** the transaction is automatically rolled back.
+**
+** The C parameter to [sqlite3_close(C)] and [sqlite3_close_v2(C)]
+** must be either a NULL
+** pointer or an [sqlite3] object pointer obtained
+** from [sqlite3_open()], [sqlite3_open16()], or
+** [sqlite3_open_v2()], and not previously closed.
+** ^Calling sqlite3_close() or sqlite3_close_v2() with a NULL pointer
+** argument is a harmless no-op.
+*/
+SQLITE_API int sqlite3_close(sqlite3*);
+SQLITE_API int sqlite3_close_v2(sqlite3*);
+
+/*
+** The type for a callback function.
+** This is legacy and deprecated.  It is included for historical
+** compatibility and is not documented.
+*/
+typedef int (*sqlite3_callback)(void*,int,char**, char**);
+
+/*
+** CAPI3REF: One-Step Query Execution Interface
+** METHOD: sqlite3
+**
+** The sqlite3_exec() interface is a convenience wrapper around
+** [sqlite3_prepare_v2()], [sqlite3_step()], and [sqlite3_finalize()],
+** that allows an application to run multiple statements of SQL
+** without having to use a lot of C code.
+**
+** ^The sqlite3_exec() interface runs zero or more UTF-8 encoded,
+** semicolon-separate SQL statements passed into its 2nd argument,
+** in the context of the [database connection] passed in as its 1st
+** argument.  ^If the callback function of the 3rd argument to
+** sqlite3_exec() is not NULL, then it is invoked for each result row
+** coming out of the evaluated SQL statements.  ^The 4th argument to
+** sqlite3_exec() is relayed through to the 1st argument of each
+** callback invocation.  ^If the callback pointer to sqlite3_exec()
+** is NULL, then no callback is ever invoked and result rows are
+** ignored.
+**
+** ^If an error occurs while evaluating the SQL statements passed into
+** sqlite3_exec(), then execution of the current statement stops and
+** subsequent statements are skipped.  ^If the 5th parameter to sqlite3_exec()
+** is not NULL then any error message is written into memory obtained
+** from [sqlite3_malloc()] and passed back through the 5th parameter.
+** To avoid memory leaks, the application should invoke [sqlite3_free()]
+** on error message strings returned through the 5th parameter of
+** sqlite3_exec() after the error message string is no longer needed.
+** ^If the 5th parameter to sqlite3_exec() is not NULL and no errors
+** occur, then sqlite3_exec() sets the pointer in its 5th parameter to
+** NULL before returning.
+**
+** ^If an sqlite3_exec() callback returns non-zero, the sqlite3_exec()
+** routine returns SQLITE_ABORT without invoking the callback again and
+** without running any subsequent SQL statements.
+**
+** ^The 2nd argument to the sqlite3_exec() callback function is the
+** number of columns in the result.  ^The 3rd argument to the sqlite3_exec()
+** callback is an array of pointers to strings obtained as if from
+** [sqlite3_column_text()], one for each column.  ^If an element of a
+** result row is NULL then the corresponding string pointer for the
+** sqlite3_exec() callback is a NULL pointer.  ^The 4th argument to the
+** sqlite3_exec() callback is an array of pointers to strings where each
+** entry represents the name of corresponding result column as obtained
+** from [sqlite3_column_name()].
+**
+** ^If the 2nd parameter to sqlite3_exec() is a NULL pointer, a pointer
+** to an empty string, or a pointer that contains only whitespace and/or
+** SQL comments, then no SQL statements are evaluated and the database
+** is not changed.
+**
+** Restrictions:
+**
+** <ul>
+** <li> The application must ensure that the 1st parameter to sqlite3_exec()
+**      is a valid and open [database connection].
+** <li> The application must not close the [database connection] specified by
+**      the 1st parameter to sqlite3_exec() while sqlite3_exec() is running.
+** <li> The application must not modify the SQL statement text passed into
+**      the 2nd parameter of sqlite3_exec() while sqlite3_exec() is running.
+** <li> The application must not dereference the arrays or string pointers
+**       passed as the 3rd and 4th callback parameters after it returns.
+** </ul>
+*/
+SQLITE_API int sqlite3_exec(
+  sqlite3*,                                  /* An open database */
+  const char *sql,                           /* SQL to be evaluated */
+  int (*callback)(void*,int,char**,char**),  /* Callback function */
+  void *,                                    /* 1st argument to callback */
+  char **errmsg                              /* Error msg written here */
+);
+
+/*
+** CAPI3REF: Result Codes
+** KEYWORDS: {result code definitions}
+**
+** Many SQLite functions return an integer result code from the set shown
+** here in order to indicate success or failure.
+**
+** New error codes may be added in future versions of SQLite.
+**
+** See also: [extended result code definitions]
+*/
+#define SQLITE_OK           0   /* Successful result */
+/* beginning-of-error-codes */
+#define SQLITE_ERROR        1   /* Generic error */
+#define SQLITE_INTERNAL     2   /* Internal logic error in SQLite */
+#define SQLITE_PERM         3   /* Access permission denied */
+#define SQLITE_ABORT        4   /* Callback routine requested an abort */
+#define SQLITE_BUSY         5   /* The database file is locked */
+#define SQLITE_LOCKED       6   /* A table in the database is locked */
+#define SQLITE_NOMEM        7   /* A malloc() failed */
+#define SQLITE_READONLY     8   /* Attempt to write a readonly database */
+#define SQLITE_INTERRUPT    9   /* Operation terminated by sqlite3_interrupt()*/
+#define SQLITE_IOERR       10   /* Some kind of disk I/O error occurred */
+#define SQLITE_CORRUPT     11   /* The database disk image is malformed */
+#define SQLITE_NOTFOUND    12   /* Unknown opcode in sqlite3_file_control() */
+#define SQLITE_FULL        13   /* Insertion failed because database is full */
+#define SQLITE_CANTOPEN    14   /* Unable to open the database file */
+#define SQLITE_PROTOCOL    15   /* Database lock protocol error */
+#define SQLITE_EMPTY       16   /* Internal use only */
+#define SQLITE_SCHEMA      17   /* The database schema changed */
+#define SQLITE_TOOBIG      18   /* String or BLOB exceeds size limit */
+#define SQLITE_CONSTRAINT  19   /* Abort due to constraint violation */
+#define SQLITE_MISMATCH    20   /* Data type mismatch */
+#define SQLITE_MISUSE      21   /* Library used incorrectly */
+#define SQLITE_NOLFS       22   /* Uses OS features not supported on host */
+#define SQLITE_AUTH        23   /* Authorization denied */
+#define SQLITE_FORMAT      24   /* Not used */
+#define SQLITE_RANGE       25   /* 2nd parameter to sqlite3_bind out of range */
+#define SQLITE_NOTADB      26   /* File opened that is not a database file */
+#define SQLITE_NOTICE      27   /* Notifications from sqlite3_log() */
+#define SQLITE_WARNING     28   /* Warnings from sqlite3_log() */
+#define SQLITE_ROW         100  /* sqlite3_step() has another row ready */
+#define SQLITE_DONE        101  /* sqlite3_step() has finished executing */
+/* end-of-error-codes */
+
+/*
+** CAPI3REF: Extended Result Codes
+** KEYWORDS: {extended result code definitions}
+**
+** In its default configuration, SQLite API routines return one of 30 integer
+** [result codes].  However, experience has shown that many of
+** these result codes are too coarse-grained.  They do not provide as
+** much information about problems as programmers might like.  In an effort to
+** address this, newer versions of SQLite (version 3.3.8 [dateof:3.3.8]
+** and later) include
+** support for additional result codes that provide more detailed information
+** about errors. These [extended result codes] are enabled or disabled
+** on a per database connection basis using the
+** [sqlite3_extended_result_codes()] API.  Or, the extended code for
+** the most recent error can be obtained using
+** [sqlite3_extended_errcode()].
+*/
+#define SQLITE_ERROR_MISSING_COLLSEQ   (SQLITE_ERROR | (1<<8))
+#define SQLITE_ERROR_RETRY             (SQLITE_ERROR | (2<<8))
+#define SQLITE_ERROR_SNAPSHOT          (SQLITE_ERROR | (3<<8))
+#define SQLITE_IOERR_READ              (SQLITE_IOERR | (1<<8))
+#define SQLITE_IOERR_SHORT_READ        (SQLITE_IOERR | (2<<8))
+#define SQLITE_IOERR_WRITE             (SQLITE_IOERR | (3<<8))
+#define SQLITE_IOERR_FSYNC             (SQLITE_IOERR | (4<<8))
+#define SQLITE_IOERR_DIR_FSYNC         (SQLITE_IOERR | (5<<8))
+#define SQLITE_IOERR_TRUNCATE          (SQLITE_IOERR | (6<<8))
+#define SQLITE_IOERR_FSTAT             (SQLITE_IOERR | (7<<8))
+#define SQLITE_IOERR_UNLOCK            (SQLITE_IOERR | (8<<8))
+#define SQLITE_IOERR_RDLOCK            (SQLITE_IOERR | (9<<8))
+#define SQLITE_IOERR_DELETE            (SQLITE_IOERR | (10<<8))
+#define SQLITE_IOERR_BLOCKED           (SQLITE_IOERR | (11<<8))
+#define SQLITE_IOERR_NOMEM             (SQLITE_IOERR | (12<<8))
+#define SQLITE_IOERR_ACCESS            (SQLITE_IOERR | (13<<8))
+#define SQLITE_IOERR_CHECKRESERVEDLOCK (SQLITE_IOERR | (14<<8))
+#define SQLITE_IOERR_LOCK              (SQLITE_IOERR | (15<<8))
+#define SQLITE_IOERR_CLOSE             (SQLITE_IOERR | (16<<8))
+#define SQLITE_IOERR_DIR_CLOSE         (SQLITE_IOERR | (17<<8))
+#define SQLITE_IOERR_SHMOPEN           (SQLITE_IOERR | (18<<8))
+#define SQLITE_IOERR_SHMSIZE           (SQLITE_IOERR | (19<<8))
+#define SQLITE_IOERR_SHMLOCK           (SQLITE_IOERR | (20<<8))
+#define SQLITE_IOERR_SHMMAP            (SQLITE_IOERR | (21<<8))
+#define SQLITE_IOERR_SEEK              (SQLITE_IOERR | (22<<8))
+#define SQLITE_IOERR_DELETE_NOENT      (SQLITE_IOERR | (23<<8))
+#define SQLITE_IOERR_MMAP              (SQLITE_IOERR | (24<<8))
+#define SQLITE_IOERR_GETTEMPPATH       (SQLITE_IOERR | (25<<8))
+#define SQLITE_IOERR_CONVPATH          (SQLITE_IOERR | (26<<8))
+#define SQLITE_IOERR_VNODE             (SQLITE_IOERR | (27<<8))
+#define SQLITE_IOERR_AUTH              (SQLITE_IOERR | (28<<8))
+#define SQLITE_IOERR_BEGIN_ATOMIC      (SQLITE_IOERR | (29<<8))
+#define SQLITE_IOERR_COMMIT_ATOMIC     (SQLITE_IOERR | (30<<8))
+#define SQLITE_IOERR_ROLLBACK_ATOMIC   (SQLITE_IOERR | (31<<8))
+#define SQLITE_IOERR_DATA              (SQLITE_IOERR | (32<<8))
+#define SQLITE_IOERR_CORRUPTFS         (SQLITE_IOERR | (33<<8))
+#define SQLITE_IOERR_IN_PAGE           (SQLITE_IOERR | (34<<8))
+#define SQLITE_LOCKED_SHAREDCACHE      (SQLITE_LOCKED |  (1<<8))
+#define SQLITE_LOCKED_VTAB             (SQLITE_LOCKED |  (2<<8))
+#define SQLITE_BUSY_RECOVERY           (SQLITE_BUSY   |  (1<<8))
+#define SQLITE_BUSY_SNAPSHOT           (SQLITE_BUSY   |  (2<<8))
+#define SQLITE_BUSY_TIMEOUT            (SQLITE_BUSY   |  (3<<8))
+#define SQLITE_CANTOPEN_NOTEMPDIR      (SQLITE_CANTOPEN | (1<<8))
+#define SQLITE_CANTOPEN_ISDIR          (SQLITE_CANTOPEN | (2<<8))
+#define SQLITE_CANTOPEN_FULLPATH       (SQLITE_CANTOPEN | (3<<8))
+#define SQLITE_CANTOPEN_CONVPATH       (SQLITE_CANTOPEN | (4<<8))
+#define SQLITE_CANTOPEN_DIRTYWAL       (SQLITE_CANTOPEN | (5<<8)) /* Not Used */
+#define SQLITE_CANTOPEN_SYMLINK        (SQLITE_CANTOPEN | (6<<8))
+#define SQLITE_CORRUPT_VTAB            (SQLITE_CORRUPT | (1<<8))
+#define SQLITE_CORRUPT_SEQUENCE        (SQLITE_CORRUPT | (2<<8))
+#define SQLITE_CORRUPT_INDEX           (SQLITE_CORRUPT | (3<<8))
+#define SQLITE_READONLY_RECOVERY       (SQLITE_READONLY | (1<<8))
+#define SQLITE_READONLY_CANTLOCK       (SQLITE_READONLY | (2<<8))
+#define SQLITE_READONLY_ROLLBACK       (SQLITE_READONLY | (3<<8))
+#define SQLITE_READONLY_DBMOVED        (SQLITE_READONLY | (4<<8))
+#define SQLITE_READONLY_CANTINIT       (SQLITE_READONLY | (5<<8))
+#define SQLITE_READONLY_DIRECTORY      (SQLITE_READONLY | (6<<8))
+#define SQLITE_ABORT_ROLLBACK          (SQLITE_ABORT | (2<<8))
+#define SQLITE_CONSTRAINT_CHECK        (SQLITE_CONSTRAINT | (1<<8))
+#define SQLITE_CONSTRAINT_COMMITHOOK   (SQLITE_CONSTRAINT | (2<<8))
+#define SQLITE_CONSTRAINT_FOREIGNKEY   (SQLITE_CONSTRAINT | (3<<8))
+#define SQLITE_CONSTRAINT_FUNCTION     (SQLITE_CONSTRAINT | (4<<8))
+#define SQLITE_CONSTRAINT_NOTNULL      (SQLITE_CONSTRAINT | (5<<8))
+#define SQLITE_CONSTRAINT_PRIMARYKEY   (SQLITE_CONSTRAINT | (6<<8))
+#define SQLITE_CONSTRAINT_TRIGGER      (SQLITE_CONSTRAINT | (7<<8))
+#define SQLITE_CONSTRAINT_UNIQUE       (SQLITE_CONSTRAINT | (8<<8))
+#define SQLITE_CONSTRAINT_VTAB         (SQLITE_CONSTRAINT | (9<<8))
+#define SQLITE_CONSTRAINT_ROWID        (SQLITE_CONSTRAINT |(10<<8))
+#define SQLITE_CONSTRAINT_PINNED       (SQLITE_CONSTRAINT |(11<<8))
+#define SQLITE_CONSTRAINT_DATATYPE     (SQLITE_CONSTRAINT |(12<<8))
+#define SQLITE_NOTICE_RECOVER_WAL      (SQLITE_NOTICE | (1<<8))
+#define SQLITE_NOTICE_RECOVER_ROLLBACK (SQLITE_NOTICE | (2<<8))
+#define SQLITE_NOTICE_RBU              (SQLITE_NOTICE | (3<<8))
+#define SQLITE_WARNING_AUTOINDEX       (SQLITE_WARNING | (1<<8))
+#define SQLITE_AUTH_USER               (SQLITE_AUTH | (1<<8))
+#define SQLITE_OK_LOAD_PERMANENTLY     (SQLITE_OK | (1<<8))
+#define SQLITE_OK_SYMLINK              (SQLITE_OK | (2<<8)) /* internal use only */
+
+/*
+** CAPI3REF: Flags For File Open Operations
+**
+** These bit values are intended for use in the
+** 3rd parameter to the [sqlite3_open_v2()] interface and
+** in the 4th parameter to the [sqlite3_vfs.xOpen] method.
+**
+** Only those flags marked as "Ok for sqlite3_open_v2()" may be
+** used as the third argument to the [sqlite3_open_v2()] interface.
+** The other flags have historically been ignored by sqlite3_open_v2(),
+** though future versions of SQLite might change so that an error is
+** raised if any of the disallowed bits are passed into sqlite3_open_v2().
+** Applications should not depend on the historical behavior.
+**
+** Note in particular that passing the SQLITE_OPEN_EXCLUSIVE flag into
+** [sqlite3_open_v2()] does *not* cause the underlying database file
+** to be opened using O_EXCL.  Passing SQLITE_OPEN_EXCLUSIVE into
+** [sqlite3_open_v2()] has historically be a no-op and might become an
+** error in future versions of SQLite.
+*/
+#define SQLITE_OPEN_READONLY         0x00000001  /* Ok for sqlite3_open_v2() */
+#define SQLITE_OPEN_READWRITE        0x00000002  /* Ok for sqlite3_open_v2() */
+#define SQLITE_OPEN_CREATE           0x00000004  /* Ok for sqlite3_open_v2() */
+#define SQLITE_OPEN_DELETEONCLOSE    0x00000008  /* VFS only */
+#define SQLITE_OPEN_EXCLUSIVE        0x00000010  /* VFS only */
+#define SQLITE_OPEN_AUTOPROXY        0x00000020  /* VFS only */
+#define SQLITE_OPEN_URI              0x00000040  /* Ok for sqlite3_open_v2() */
+#define SQLITE_OPEN_MEMORY           0x00000080  /* Ok for sqlite3_open_v2() */
+#define SQLITE_OPEN_MAIN_DB          0x00000100  /* VFS only */
+#define SQLITE_OPEN_TEMP_DB          0x00000200  /* VFS only */
+#define SQLITE_OPEN_TRANSIENT_DB     0x00000400  /* VFS only */
+#define SQLITE_OPEN_MAIN_JOURNAL     0x00000800  /* VFS only */
+#define SQLITE_OPEN_TEMP_JOURNAL     0x00001000  /* VFS only */
+#define SQLITE_OPEN_SUBJOURNAL       0x00002000  /* VFS only */
+#define SQLITE_OPEN_SUPER_JOURNAL    0x00004000  /* VFS only */
+#define SQLITE_OPEN_NOMUTEX          0x00008000  /* Ok for sqlite3_open_v2() */
+#define SQLITE_OPEN_FULLMUTEX        0x00010000  /* Ok for sqlite3_open_v2() */
+#define SQLITE_OPEN_SHAREDCACHE      0x00020000  /* Ok for sqlite3_open_v2() */
+#define SQLITE_OPEN_PRIVATECACHE     0x00040000  /* Ok for sqlite3_open_v2() */
+#define SQLITE_OPEN_WAL              0x00080000  /* VFS only */
+#define SQLITE_OPEN_NOFOLLOW         0x01000000  /* Ok for sqlite3_open_v2() */
+#define SQLITE_OPEN_EXRESCODE        0x02000000  /* Extended result codes */
+
+/* Reserved:                         0x00F00000 */
+/* Legacy compatibility: */
+#define SQLITE_OPEN_MASTER_JOURNAL   0x00004000  /* VFS only */
+
+
+/*
+** CAPI3REF: Device Characteristics
+**
+** The xDeviceCharacteristics method of the [sqlite3_io_methods]
+** object returns an integer which is a vector of these
+** bit values expressing I/O characteristics of the mass storage
+** device that holds the file that the [sqlite3_io_methods]
+** refers to.
+**
+** The SQLITE_IOCAP_ATOMIC property means that all writes of
+** any size are atomic.  The SQLITE_IOCAP_ATOMICnnn values
+** mean that writes of blocks that are nnn bytes in size and
+** are aligned to an address which is an integer multiple of
+** nnn are atomic.  The SQLITE_IOCAP_SAFE_APPEND value means
+** that when data is appended to a file, the data is appended
+** first then the size of the file is extended, never the other
+** way around.  The SQLITE_IOCAP_SEQUENTIAL property means that
+** information is written to disk in the same order as calls
+** to xWrite().  The SQLITE_IOCAP_POWERSAFE_OVERWRITE property means that
+** after reboot following a crash or power loss, the only bytes in a
+** file that were written at the application level might have changed
+** and that adjacent bytes, even bytes within the same sector are
+** guaranteed to be unchanged.  The SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN
+** flag indicates that a file cannot be deleted when open.  The
+** SQLITE_IOCAP_IMMUTABLE flag indicates that the file is on
+** read-only media and cannot be changed even by processes with
+** elevated privileges.
+**
+** The SQLITE_IOCAP_BATCH_ATOMIC property means that the underlying
+** filesystem supports doing multiple write operations atomically when those
+** write operations are bracketed by [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] and
+** [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE].
+**
+** The SQLITE_IOCAP_SUBPAGE_READ property means that it is ok to read
+** from the database file in amounts that are not a multiple of the
+** page size and that do not begin at a page boundary.  Without this
+** property, SQLite is careful to only do full-page reads and write
+** on aligned pages, with the one exception that it will do a sub-page
+** read of the first page to access the database header.
+*/
+#define SQLITE_IOCAP_ATOMIC                 0x00000001
+#define SQLITE_IOCAP_ATOMIC512              0x00000002
+#define SQLITE_IOCAP_ATOMIC1K               0x00000004
+#define SQLITE_IOCAP_ATOMIC2K               0x00000008
+#define SQLITE_IOCAP_ATOMIC4K               0x00000010
+#define SQLITE_IOCAP_ATOMIC8K               0x00000020
+#define SQLITE_IOCAP_ATOMIC16K              0x00000040
+#define SQLITE_IOCAP_ATOMIC32K              0x00000080
+#define SQLITE_IOCAP_ATOMIC64K              0x00000100
+#define SQLITE_IOCAP_SAFE_APPEND            0x00000200
+#define SQLITE_IOCAP_SEQUENTIAL             0x00000400
+#define SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN  0x00000800
+#define SQLITE_IOCAP_POWERSAFE_OVERWRITE    0x00001000
+#define SQLITE_IOCAP_IMMUTABLE              0x00002000
+#define SQLITE_IOCAP_BATCH_ATOMIC           0x00004000
+#define SQLITE_IOCAP_SUBPAGE_READ           0x00008000
+
+/*
+** CAPI3REF: File Locking Levels
+**
+** SQLite uses one of these integer values as the second
+** argument to calls it makes to the xLock() and xUnlock() methods
+** of an [sqlite3_io_methods] object.  These values are ordered from
+** lest restrictive to most restrictive.
+**
+** The argument to xLock() is always SHARED or higher.  The argument to
+** xUnlock is either SHARED or NONE.
+*/
+#define SQLITE_LOCK_NONE          0       /* xUnlock() only */
+#define SQLITE_LOCK_SHARED        1       /* xLock() or xUnlock() */
+#define SQLITE_LOCK_RESERVED      2       /* xLock() only */
+#define SQLITE_LOCK_PENDING       3       /* xLock() only */
+#define SQLITE_LOCK_EXCLUSIVE     4       /* xLock() only */
+
+/*
+** CAPI3REF: Synchronization Type Flags
+**
+** When SQLite invokes the xSync() method of an
+** [sqlite3_io_methods] object it uses a combination of
+** these integer values as the second argument.
+**
+** When the SQLITE_SYNC_DATAONLY flag is used, it means that the
+** sync operation only needs to flush data to mass storage.  Inode
+** information need not be flushed. If the lower four bits of the flag
+** equal SQLITE_SYNC_NORMAL, that means to use normal fsync() semantics.
+** If the lower four bits equal SQLITE_SYNC_FULL, that means
+** to use Mac OS X style fullsync instead of fsync().
+**
+** Do not confuse the SQLITE_SYNC_NORMAL and SQLITE_SYNC_FULL flags
+** with the [PRAGMA synchronous]=NORMAL and [PRAGMA synchronous]=FULL
+** settings.  The [synchronous pragma] determines when calls to the
+** xSync VFS method occur and applies uniformly across all platforms.
+** The SQLITE_SYNC_NORMAL and SQLITE_SYNC_FULL flags determine how
+** energetic or rigorous or forceful the sync operations are and
+** only make a difference on Mac OSX for the default SQLite code.
+** (Third-party VFS implementations might also make the distinction
+** between SQLITE_SYNC_NORMAL and SQLITE_SYNC_FULL, but among the
+** operating systems natively supported by SQLite, only Mac OSX
+** cares about the difference.)
+*/
+#define SQLITE_SYNC_NORMAL        0x00002
+#define SQLITE_SYNC_FULL          0x00003
+#define SQLITE_SYNC_DATAONLY      0x00010
+
+/*
+** CAPI3REF: OS Interface Open File Handle
+**
+** An [sqlite3_file] object represents an open file in the
+** [sqlite3_vfs | OS interface layer].  Individual OS interface
+** implementations will
+** want to subclass this object by appending additional fields
+** for their own use.  The pMethods entry is a pointer to an
+** [sqlite3_io_methods] object that defines methods for performing
+** I/O operations on the open file.
+*/
+typedef struct sqlite3_file sqlite3_file;
+struct sqlite3_file {
+  const struct sqlite3_io_methods *pMethods;  /* Methods for an open file */
+};
+
+/*
+** CAPI3REF: OS Interface File Virtual Methods Object
+**
+** Every file opened by the [sqlite3_vfs.xOpen] method populates an
+** [sqlite3_file] object (or, more commonly, a subclass of the
+** [sqlite3_file] object) with a pointer to an instance of this object.
+** This object defines the methods used to perform various operations
+** against the open file represented by the [sqlite3_file] object.
+**
+** If the [sqlite3_vfs.xOpen] method sets the sqlite3_file.pMethods element
+** to a non-NULL pointer, then the sqlite3_io_methods.xClose method
+** may be invoked even if the [sqlite3_vfs.xOpen] reported that it failed.  The
+** only way to prevent a call to xClose following a failed [sqlite3_vfs.xOpen]
+** is for the [sqlite3_vfs.xOpen] to set the sqlite3_file.pMethods element
+** to NULL.
+**
+** The flags argument to xSync may be one of [SQLITE_SYNC_NORMAL] or
+** [SQLITE_SYNC_FULL].  The first choice is the normal fsync().
+** The second choice is a Mac OS X style fullsync.  The [SQLITE_SYNC_DATAONLY]
+** flag may be ORed in to indicate that only the data of the file
+** and not its inode needs to be synced.
+**
+** The integer values to xLock() and xUnlock() are one of
+** <ul>
+** <li> [SQLITE_LOCK_NONE],
+** <li> [SQLITE_LOCK_SHARED],
+** <li> [SQLITE_LOCK_RESERVED],
+** <li> [SQLITE_LOCK_PENDING], or
+** <li> [SQLITE_LOCK_EXCLUSIVE].
+** </ul>
+** xLock() upgrades the database file lock.  In other words, xLock() moves the
+** database file lock in the direction NONE toward EXCLUSIVE. The argument to
+** xLock() is always one of SHARED, RESERVED, PENDING, or EXCLUSIVE, never
+** SQLITE_LOCK_NONE.  If the database file lock is already at or above the
+** requested lock, then the call to xLock() is a no-op.
+** xUnlock() downgrades the database file lock to either SHARED or NONE.
+** If the lock is already at or below the requested lock state, then the call
+** to xUnlock() is a no-op.
+** The xCheckReservedLock() method checks whether any database connection,
+** either in this process or in some other process, is holding a RESERVED,
+** PENDING, or EXCLUSIVE lock on the file.  It returns, via its output
+** pointer parameter, true if such a lock exists and false otherwise.
+**
+** The xFileControl() method is a generic interface that allows custom
+** VFS implementations to directly control an open file using the
+** [sqlite3_file_control()] interface.  The second "op" argument is an
+** integer opcode.  The third argument is a generic pointer intended to
+** point to a structure that may contain arguments or space in which to
+** write return values.  Potential uses for xFileControl() might be
+** functions to enable blocking locks with timeouts, to change the
+** locking strategy (for example to use dot-file locks), to inquire
+** about the status of a lock, or to break stale locks.  The SQLite
+** core reserves all opcodes less than 100 for its own use.
+** A [file control opcodes | list of opcodes] less than 100 is available.
+** Applications that define a custom xFileControl method should use opcodes
+** greater than 100 to avoid conflicts.  VFS implementations should
+** return [SQLITE_NOTFOUND] for file control opcodes that they do not
+** recognize.
+**
+** The xSectorSize() method returns the sector size of the
+** device that underlies the file.  The sector size is the
+** minimum write that can be performed without disturbing
+** other bytes in the file.  The xDeviceCharacteristics()
+** method returns a bit vector describing behaviors of the
+** underlying device:
+**
+** <ul>
+** <li> [SQLITE_IOCAP_ATOMIC]
+** <li> [SQLITE_IOCAP_ATOMIC512]
+** <li> [SQLITE_IOCAP_ATOMIC1K]
+** <li> [SQLITE_IOCAP_ATOMIC2K]
+** <li> [SQLITE_IOCAP_ATOMIC4K]
+** <li> [SQLITE_IOCAP_ATOMIC8K]
+** <li> [SQLITE_IOCAP_ATOMIC16K]
+** <li> [SQLITE_IOCAP_ATOMIC32K]
+** <li> [SQLITE_IOCAP_ATOMIC64K]
+** <li> [SQLITE_IOCAP_SAFE_APPEND]
+** <li> [SQLITE_IOCAP_SEQUENTIAL]
+** <li> [SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN]
+** <li> [SQLITE_IOCAP_POWERSAFE_OVERWRITE]
+** <li> [SQLITE_IOCAP_IMMUTABLE]
+** <li> [SQLITE_IOCAP_BATCH_ATOMIC]
+** <li> [SQLITE_IOCAP_SUBPAGE_READ]
+** </ul>
+**
+** The SQLITE_IOCAP_ATOMIC property means that all writes of
+** any size are atomic.  The SQLITE_IOCAP_ATOMICnnn values
+** mean that writes of blocks that are nnn bytes in size and
+** are aligned to an address which is an integer multiple of
+** nnn are atomic.  The SQLITE_IOCAP_SAFE_APPEND value means
+** that when data is appended to a file, the data is appended
+** first then the size of the file is extended, never the other
+** way around.  The SQLITE_IOCAP_SEQUENTIAL property means that
+** information is written to disk in the same order as calls
+** to xWrite().
+**
+** If xRead() returns SQLITE_IOERR_SHORT_READ it must also fill
+** in the unread portions of the buffer with zeros.  A VFS that
+** fails to zero-fill short reads might seem to work.  However,
+** failure to zero-fill short reads will eventually lead to
+** database corruption.
+*/
+typedef struct sqlite3_io_methods sqlite3_io_methods;
+struct sqlite3_io_methods {
+  int iVersion;
+  int (*xClose)(sqlite3_file*);
+  int (*xRead)(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst);
+  int (*xWrite)(sqlite3_file*, const void*, int iAmt, sqlite3_int64 iOfst);
+  int (*xTruncate)(sqlite3_file*, sqlite3_int64 size);
+  int (*xSync)(sqlite3_file*, int flags);
+  int (*xFileSize)(sqlite3_file*, sqlite3_int64 *pSize);
+  int (*xLock)(sqlite3_file*, int);
+  int (*xUnlock)(sqlite3_file*, int);
+  int (*xCheckReservedLock)(sqlite3_file*, int *pResOut);
+  int (*xFileControl)(sqlite3_file*, int op, void *pArg);
+  int (*xSectorSize)(sqlite3_file*);
+  int (*xDeviceCharacteristics)(sqlite3_file*);
+  /* Methods above are valid for version 1 */
+  int (*xShmMap)(sqlite3_file*, int iPg, int pgsz, int, void volatile**);
+  int (*xShmLock)(sqlite3_file*, int offset, int n, int flags);
+  void (*xShmBarrier)(sqlite3_file*);
+  int (*xShmUnmap)(sqlite3_file*, int deleteFlag);
+  /* Methods above are valid for version 2 */
+  int (*xFetch)(sqlite3_file*, sqlite3_int64 iOfst, int iAmt, void **pp);
+  int (*xUnfetch)(sqlite3_file*, sqlite3_int64 iOfst, void *p);
+  /* Methods above are valid for version 3 */
+  /* Additional methods may be added in future releases */
+};
+
+/*
+** CAPI3REF: Standard File Control Opcodes
+** KEYWORDS: {file control opcodes} {file control opcode}
+**
+** These integer constants are opcodes for the xFileControl method
+** of the [sqlite3_io_methods] object and for the [sqlite3_file_control()]
+** interface.
+**
+** <ul>
+** <li>[[SQLITE_FCNTL_LOCKSTATE]]
+** The [SQLITE_FCNTL_LOCKSTATE] opcode is used for debugging.  This
+** opcode causes the xFileControl method to write the current state of
+** the lock (one of [SQLITE_LOCK_NONE], [SQLITE_LOCK_SHARED],
+** [SQLITE_LOCK_RESERVED], [SQLITE_LOCK_PENDING], or [SQLITE_LOCK_EXCLUSIVE])
+** into an integer that the pArg argument points to.
+** This capability is only available if SQLite is compiled with [SQLITE_DEBUG].
+**
+** <li>[[SQLITE_FCNTL_SIZE_HINT]]
+** The [SQLITE_FCNTL_SIZE_HINT] opcode is used by SQLite to give the VFS
+** layer a hint of how large the database file will grow to be during the
+** current transaction.  This hint is not guaranteed to be accurate but it
+** is often close.  The underlying VFS might choose to preallocate database
+** file space based on this hint in order to help writes to the database
+** file run faster.
+**
+** <li>[[SQLITE_FCNTL_SIZE_LIMIT]]
+** The [SQLITE_FCNTL_SIZE_LIMIT] opcode is used by in-memory VFS that
+** implements [sqlite3_deserialize()] to set an upper bound on the size
+** of the in-memory database.  The argument is a pointer to a [sqlite3_int64].
+** If the integer pointed to is negative, then it is filled in with the
+** current limit.  Otherwise the limit is set to the larger of the value
+** of the integer pointed to and the current database size.  The integer
+** pointed to is set to the new limit.
+**
+** <li>[[SQLITE_FCNTL_CHUNK_SIZE]]
+** The [SQLITE_FCNTL_CHUNK_SIZE] opcode is used to request that the VFS
+** extends and truncates the database file in chunks of a size specified
+** by the user. The fourth argument to [sqlite3_file_control()] should
+** point to an integer (type int) containing the new chunk-size to use
+** for the nominated database. Allocating database file space in large
+** chunks (say 1MB at a time), may reduce file-system fragmentation and
+** improve performance on some systems.
+**
+** <li>[[SQLITE_FCNTL_FILE_POINTER]]
+** The [SQLITE_FCNTL_FILE_POINTER] opcode is used to obtain a pointer
+** to the [sqlite3_file] object associated with a particular database
+** connection.  See also [SQLITE_FCNTL_JOURNAL_POINTER].
+**
+** <li>[[SQLITE_FCNTL_JOURNAL_POINTER]]
+** The [SQLITE_FCNTL_JOURNAL_POINTER] opcode is used to obtain a pointer
+** to the [sqlite3_file] object associated with the journal file (either
+** the [rollback journal] or the [write-ahead log]) for a particular database
+** connection.  See also [SQLITE_FCNTL_FILE_POINTER].
+**
+** <li>[[SQLITE_FCNTL_SYNC_OMITTED]]
+** No longer in use.
+**
+** <li>[[SQLITE_FCNTL_SYNC]]
+** The [SQLITE_FCNTL_SYNC] opcode is generated internally by SQLite and
+** sent to the VFS immediately before the xSync method is invoked on a
+** database file descriptor. Or, if the xSync method is not invoked
+** because the user has configured SQLite with
+** [PRAGMA synchronous | PRAGMA synchronous=OFF] it is invoked in place
+** of the xSync method. In most cases, the pointer argument passed with
+** this file-control is NULL. However, if the database file is being synced
+** as part of a multi-database commit, the argument points to a nul-terminated
+** string containing the transactions super-journal file name. VFSes that
+** do not need this signal should silently ignore this opcode. Applications
+** should not call [sqlite3_file_control()] with this opcode as doing so may
+** disrupt the operation of the specialized VFSes that do require it.
+**
+** <li>[[SQLITE_FCNTL_COMMIT_PHASETWO]]
+** The [SQLITE_FCNTL_COMMIT_PHASETWO] opcode is generated internally by SQLite
+** and sent to the VFS after a transaction has been committed immediately
+** but before the database is unlocked. VFSes that do not need this signal
+** should silently ignore this opcode. Applications should not call
+** [sqlite3_file_control()] with this opcode as doing so may disrupt the
+** operation of the specialized VFSes that do require it.
+**
+** <li>[[SQLITE_FCNTL_WIN32_AV_RETRY]]
+** ^The [SQLITE_FCNTL_WIN32_AV_RETRY] opcode is used to configure automatic
+** retry counts and intervals for certain disk I/O operations for the
+** windows [VFS] in order to provide robustness in the presence of
+** anti-virus programs.  By default, the windows VFS will retry file read,
+** file write, and file delete operations up to 10 times, with a delay
+** of 25 milliseconds before the first retry and with the delay increasing
+** by an additional 25 milliseconds with each subsequent retry.  This
+** opcode allows these two values (10 retries and 25 milliseconds of delay)
+** to be adjusted.  The values are changed for all database connections
+** within the same process.  The argument is a pointer to an array of two
+** integers where the first integer is the new retry count and the second
+** integer is the delay.  If either integer is negative, then the setting
+** is not changed but instead the prior value of that setting is written
+** into the array entry, allowing the current retry settings to be
+** interrogated.  The zDbName parameter is ignored.
+**
+** <li>[[SQLITE_FCNTL_PERSIST_WAL]]
+** ^The [SQLITE_FCNTL_PERSIST_WAL] opcode is used to set or query the
+** persistent [WAL | Write Ahead Log] setting.  By default, the auxiliary
+** write ahead log ([WAL file]) and shared memory
+** files used for transaction control
+** are automatically deleted when the latest connection to the database
+** closes.  Setting persistent WAL mode causes those files to persist after
+** close.  Persisting the files is useful when other processes that do not
+** have write permission on the directory containing the database file want
+** to read the database file, as the WAL and shared memory files must exist
+** in order for the database to be readable.  The fourth parameter to
+** [sqlite3_file_control()] for this opcode should be a pointer to an integer.
+** That integer is 0 to disable persistent WAL mode or 1 to enable persistent
+** WAL mode.  If the integer is -1, then it is overwritten with the current
+** WAL persistence setting.
+**
+** <li>[[SQLITE_FCNTL_POWERSAFE_OVERWRITE]]
+** ^The [SQLITE_FCNTL_POWERSAFE_OVERWRITE] opcode is used to set or query the
+** persistent "powersafe-overwrite" or "PSOW" setting.  The PSOW setting
+** determines the [SQLITE_IOCAP_POWERSAFE_OVERWRITE] bit of the
+** xDeviceCharacteristics methods. The fourth parameter to
+** [sqlite3_file_control()] for this opcode should be a pointer to an integer.
+** That integer is 0 to disable zero-damage mode or 1 to enable zero-damage
+** mode.  If the integer is -1, then it is overwritten with the current
+** zero-damage mode setting.
+**
+** <li>[[SQLITE_FCNTL_OVERWRITE]]
+** ^The [SQLITE_FCNTL_OVERWRITE] opcode is invoked by SQLite after opening
+** a write transaction to indicate that, unless it is rolled back for some
+** reason, the entire database file will be overwritten by the current
+** transaction. This is used by VACUUM operations.
+**
+** <li>[[SQLITE_FCNTL_VFSNAME]]
+** ^The [SQLITE_FCNTL_VFSNAME] opcode can be used to obtain the names of
+** all [VFSes] in the VFS stack.  The names are of all VFS shims and the
+** final bottom-level VFS are written into memory obtained from
+** [sqlite3_malloc()] and the result is stored in the char* variable
+** that the fourth parameter of [sqlite3_file_control()] points to.
+** The caller is responsible for freeing the memory when done.  As with
+** all file-control actions, there is no guarantee that this will actually
+** do anything.  Callers should initialize the char* variable to a NULL
+** pointer in case this file-control is not implemented.  This file-control
+** is intended for diagnostic use only.
+**
+** <li>[[SQLITE_FCNTL_VFS_POINTER]]
+** ^The [SQLITE_FCNTL_VFS_POINTER] opcode finds a pointer to the top-level
+** [VFSes] currently in use.  ^(The argument X in
+** sqlite3_file_control(db,SQLITE_FCNTL_VFS_POINTER,X) must be
+** of type "[sqlite3_vfs] **".  This opcodes will set *X
+** to a pointer to the top-level VFS.)^
+** ^When there are multiple VFS shims in the stack, this opcode finds the
+** upper-most shim only.
+**
+** <li>[[SQLITE_FCNTL_PRAGMA]]
+** ^Whenever a [PRAGMA] statement is parsed, an [SQLITE_FCNTL_PRAGMA]
+** file control is sent to the open [sqlite3_file] object corresponding
+** to the database file to which the pragma statement refers. ^The argument
+** to the [SQLITE_FCNTL_PRAGMA] file control is an array of
+** pointers to strings (char**) in which the second element of the array
+** is the name of the pragma and the third element is the argument to the
+** pragma or NULL if the pragma has no argument.  ^The handler for an
+** [SQLITE_FCNTL_PRAGMA] file control can optionally make the first element
+** of the char** argument point to a string obtained from [sqlite3_mprintf()]
+** or the equivalent and that string will become the result of the pragma or
+** the error message if the pragma fails. ^If the
+** [SQLITE_FCNTL_PRAGMA] file control returns [SQLITE_NOTFOUND], then normal
+** [PRAGMA] processing continues.  ^If the [SQLITE_FCNTL_PRAGMA]
+** file control returns [SQLITE_OK], then the parser assumes that the
+** VFS has handled the PRAGMA itself and the parser generates a no-op
+** prepared statement if result string is NULL, or that returns a copy
+** of the result string if the string is non-NULL.
+** ^If the [SQLITE_FCNTL_PRAGMA] file control returns
+** any result code other than [SQLITE_OK] or [SQLITE_NOTFOUND], that means
+** that the VFS encountered an error while handling the [PRAGMA] and the
+** compilation of the PRAGMA fails with an error.  ^The [SQLITE_FCNTL_PRAGMA]
+** file control occurs at the beginning of pragma statement analysis and so
+** it is able to override built-in [PRAGMA] statements.
+**
+** <li>[[SQLITE_FCNTL_BUSYHANDLER]]
+** ^The [SQLITE_FCNTL_BUSYHANDLER]
+** file-control may be invoked by SQLite on the database file handle
+** shortly after it is opened in order to provide a custom VFS with access
+** to the connection's busy-handler callback. The argument is of type (void**)
+** - an array of two (void *) values. The first (void *) actually points
+** to a function of type (int (*)(void *)). In order to invoke the connection's
+** busy-handler, this function should be invoked with the second (void *) in
+** the array as the only argument. If it returns non-zero, then the operation
+** should be retried. If it returns zero, the custom VFS should abandon the
+** current operation.
+**
+** <li>[[SQLITE_FCNTL_TEMPFILENAME]]
+** ^Applications can invoke the [SQLITE_FCNTL_TEMPFILENAME] file-control
+** to have SQLite generate a
+** temporary filename using the same algorithm that is followed to generate
+** temporary filenames for TEMP tables and other internal uses.  The
+** argument should be a char** which will be filled with the filename
+** written into memory obtained from [sqlite3_malloc()].  The caller should
+** invoke [sqlite3_free()] on the result to avoid a memory leak.
+**
+** <li>[[SQLITE_FCNTL_MMAP_SIZE]]
+** The [SQLITE_FCNTL_MMAP_SIZE] file control is used to query or set the
+** maximum number of bytes that will be used for memory-mapped I/O.
+** The argument is a pointer to a value of type sqlite3_int64 that
+** is an advisory maximum number of bytes in the file to memory map.  The
+** pointer is overwritten with the old value.  The limit is not changed if
+** the value originally pointed to is negative, and so the current limit
+** can be queried by passing in a pointer to a negative number.  This
+** file-control is used internally to implement [PRAGMA mmap_size].
+**
+** <li>[[SQLITE_FCNTL_TRACE]]
+** The [SQLITE_FCNTL_TRACE] file control provides advisory information
+** to the VFS about what the higher layers of the SQLite stack are doing.
+** This file control is used by some VFS activity tracing [shims].
+** The argument is a zero-terminated string.  Higher layers in the
+** SQLite stack may generate instances of this file control if
+** the [SQLITE_USE_FCNTL_TRACE] compile-time option is enabled.
+**
+** <li>[[SQLITE_FCNTL_HAS_MOVED]]
+** The [SQLITE_FCNTL_HAS_MOVED] file control interprets its argument as a
+** pointer to an integer and it writes a boolean into that integer depending
+** on whether or not the file has been renamed, moved, or deleted since it
+** was first opened.
+**
+** <li>[[SQLITE_FCNTL_WIN32_GET_HANDLE]]
+** The [SQLITE_FCNTL_WIN32_GET_HANDLE] opcode can be used to obtain the
+** underlying native file handle associated with a file handle.  This file
+** control interprets its argument as a pointer to a native file handle and
+** writes the resulting value there.
+**
+** <li>[[SQLITE_FCNTL_WIN32_SET_HANDLE]]
+** The [SQLITE_FCNTL_WIN32_SET_HANDLE] opcode is used for debugging.  This
+** opcode causes the xFileControl method to swap the file handle with the one
+** pointed to by the pArg argument.  This capability is used during testing
+** and only needs to be supported when SQLITE_TEST is defined.
+**
+** <li>[[SQLITE_FCNTL_NULL_IO]]
+** The [SQLITE_FCNTL_NULL_IO] opcode sets the low-level file descriptor
+** or file handle for the [sqlite3_file] object such that it will no longer
+** read or write to the database file.
+**
+** <li>[[SQLITE_FCNTL_WAL_BLOCK]]
+** The [SQLITE_FCNTL_WAL_BLOCK] is a signal to the VFS layer that it might
+** be advantageous to block on the next WAL lock if the lock is not immediately
+** available.  The WAL subsystem issues this signal during rare
+** circumstances in order to fix a problem with priority inversion.
+** Applications should <em>not</em> use this file-control.
+**
+** <li>[[SQLITE_FCNTL_ZIPVFS]]
+** The [SQLITE_FCNTL_ZIPVFS] opcode is implemented by zipvfs only. All other
+** VFS should return SQLITE_NOTFOUND for this opcode.
+**
+** <li>[[SQLITE_FCNTL_RBU]]
+** The [SQLITE_FCNTL_RBU] opcode is implemented by the special VFS used by
+** the RBU extension only.  All other VFS should return SQLITE_NOTFOUND for
+** this opcode.
+**
+** <li>[[SQLITE_FCNTL_BEGIN_ATOMIC_WRITE]]
+** If the [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] opcode returns SQLITE_OK, then
+** the file descriptor is placed in "batch write mode", which
+** means all subsequent write operations will be deferred and done
+** atomically at the next [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE].  Systems
+** that do not support batch atomic writes will return SQLITE_NOTFOUND.
+** ^Following a successful SQLITE_FCNTL_BEGIN_ATOMIC_WRITE and prior to
+** the closing [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE] or
+** [SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE], SQLite will make
+** no VFS interface calls on the same [sqlite3_file] file descriptor
+** except for calls to the xWrite method and the xFileControl method
+** with [SQLITE_FCNTL_SIZE_HINT].
+**
+** <li>[[SQLITE_FCNTL_COMMIT_ATOMIC_WRITE]]
+** The [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE] opcode causes all write
+** operations since the previous successful call to
+** [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] to be performed atomically.
+** This file control returns [SQLITE_OK] if and only if the writes were
+** all performed successfully and have been committed to persistent storage.
+** ^Regardless of whether or not it is successful, this file control takes
+** the file descriptor out of batch write mode so that all subsequent
+** write operations are independent.
+** ^SQLite will never invoke SQLITE_FCNTL_COMMIT_ATOMIC_WRITE without
+** a prior successful call to [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE].
+**
+** <li>[[SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE]]
+** The [SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE] opcode causes all write
+** operations since the previous successful call to
+** [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] to be rolled back.
+** ^This file control takes the file descriptor out of batch write mode
+** so that all subsequent write operations are independent.
+** ^SQLite will never invoke SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE without
+** a prior successful call to [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE].
+**
+** <li>[[SQLITE_FCNTL_LOCK_TIMEOUT]]
+** The [SQLITE_FCNTL_LOCK_TIMEOUT] opcode is used to configure a VFS
+** to block for up to M milliseconds before failing when attempting to
+** obtain a file lock using the xLock or xShmLock methods of the VFS.
+** The parameter is a pointer to a 32-bit signed integer that contains
+** the value that M is to be set to. Before returning, the 32-bit signed
+** integer is overwritten with the previous value of M.
+**
+** <li>[[SQLITE_FCNTL_DATA_VERSION]]
+** The [SQLITE_FCNTL_DATA_VERSION] opcode is used to detect changes to
+** a database file.  The argument is a pointer to a 32-bit unsigned integer.
+** The "data version" for the pager is written into the pointer.  The
+** "data version" changes whenever any change occurs to the corresponding
+** database file, either through SQL statements on the same database
+** connection or through transactions committed by separate database
+** connections possibly in other processes. The [sqlite3_total_changes()]
+** interface can be used to find if any database on the connection has changed,
+** but that interface responds to changes on TEMP as well as MAIN and does
+** not provide a mechanism to detect changes to MAIN only.  Also, the
+** [sqlite3_total_changes()] interface responds to internal changes only and
+** omits changes made by other database connections.  The
+** [PRAGMA data_version] command provides a mechanism to detect changes to
+** a single attached database that occur due to other database connections,
+** but omits changes implemented by the database connection on which it is
+** called.  This file control is the only mechanism to detect changes that
+** happen either internally or externally and that are associated with
+** a particular attached database.
+**
+** <li>[[SQLITE_FCNTL_CKPT_START]]
+** The [SQLITE_FCNTL_CKPT_START] opcode is invoked from within a checkpoint
+** in wal mode before the client starts to copy pages from the wal
+** file to the database file.
+**
+** <li>[[SQLITE_FCNTL_CKPT_DONE]]
+** The [SQLITE_FCNTL_CKPT_DONE] opcode is invoked from within a checkpoint
+** in wal mode after the client has finished copying pages from the wal
+** file to the database file, but before the *-shm file is updated to
+** record the fact that the pages have been checkpointed.
+**
+** <li>[[SQLITE_FCNTL_EXTERNAL_READER]]
+** The EXPERIMENTAL [SQLITE_FCNTL_EXTERNAL_READER] opcode is used to detect
+** whether or not there is a database client in another process with a wal-mode
+** transaction open on the database or not. It is only available on unix.The
+** (void*) argument passed with this file-control should be a pointer to a
+** value of type (int). The integer value is set to 1 if the database is a wal
+** mode database and there exists at least one client in another process that
+** currently has an SQL transaction open on the database. It is set to 0 if
+** the database is not a wal-mode db, or if there is no such connection in any
+** other process. This opcode cannot be used to detect transactions opened
+** by clients within the current process, only within other processes.
+**
+** <li>[[SQLITE_FCNTL_CKSM_FILE]]
+** The [SQLITE_FCNTL_CKSM_FILE] opcode is for use internally by the
+** [checksum VFS shim] only.
+**
+** <li>[[SQLITE_FCNTL_RESET_CACHE]]
+** If there is currently no transaction open on the database, and the
+** database is not a temp db, then the [SQLITE_FCNTL_RESET_CACHE] file-control
+** purges the contents of the in-memory page cache. If there is an open
+** transaction, or if the db is a temp-db, this opcode is a no-op, not an error.
+** </ul>
+*/
+#define SQLITE_FCNTL_LOCKSTATE               1
+#define SQLITE_FCNTL_GET_LOCKPROXYFILE       2
+#define SQLITE_FCNTL_SET_LOCKPROXYFILE       3
+#define SQLITE_FCNTL_LAST_ERRNO              4
+#define SQLITE_FCNTL_SIZE_HINT               5
+#define SQLITE_FCNTL_CHUNK_SIZE              6
+#define SQLITE_FCNTL_FILE_POINTER            7
+#define SQLITE_FCNTL_SYNC_OMITTED            8
+#define SQLITE_FCNTL_WIN32_AV_RETRY          9
+#define SQLITE_FCNTL_PERSIST_WAL            10
+#define SQLITE_FCNTL_OVERWRITE              11
+#define SQLITE_FCNTL_VFSNAME                12
+#define SQLITE_FCNTL_POWERSAFE_OVERWRITE    13
+#define SQLITE_FCNTL_PRAGMA                 14
+#define SQLITE_FCNTL_BUSYHANDLER            15
+#define SQLITE_FCNTL_TEMPFILENAME           16
+#define SQLITE_FCNTL_MMAP_SIZE              18
+#define SQLITE_FCNTL_TRACE                  19
+#define SQLITE_FCNTL_HAS_MOVED              20
+#define SQLITE_FCNTL_SYNC                   21
+#define SQLITE_FCNTL_COMMIT_PHASETWO        22
+#define SQLITE_FCNTL_WIN32_SET_HANDLE       23
+#define SQLITE_FCNTL_WAL_BLOCK              24
+#define SQLITE_FCNTL_ZIPVFS                 25
+#define SQLITE_FCNTL_RBU                    26
+#define SQLITE_FCNTL_VFS_POINTER            27
+#define SQLITE_FCNTL_JOURNAL_POINTER        28
+#define SQLITE_FCNTL_WIN32_GET_HANDLE       29
+#define SQLITE_FCNTL_PDB                    30
+#define SQLITE_FCNTL_BEGIN_ATOMIC_WRITE     31
+#define SQLITE_FCNTL_COMMIT_ATOMIC_WRITE    32
+#define SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE  33
+#define SQLITE_FCNTL_LOCK_TIMEOUT           34
+#define SQLITE_FCNTL_DATA_VERSION           35
+#define SQLITE_FCNTL_SIZE_LIMIT             36
+#define SQLITE_FCNTL_CKPT_DONE              37
+#define SQLITE_FCNTL_RESERVE_BYTES          38
+#define SQLITE_FCNTL_CKPT_START             39
+#define SQLITE_FCNTL_EXTERNAL_READER        40
+#define SQLITE_FCNTL_CKSM_FILE              41
+#define SQLITE_FCNTL_RESET_CACHE            42
+#define SQLITE_FCNTL_NULL_IO                43
+
+/* deprecated names */
+#define SQLITE_GET_LOCKPROXYFILE      SQLITE_FCNTL_GET_LOCKPROXYFILE
+#define SQLITE_SET_LOCKPROXYFILE      SQLITE_FCNTL_SET_LOCKPROXYFILE
+#define SQLITE_LAST_ERRNO             SQLITE_FCNTL_LAST_ERRNO
+
+
+/*
+** CAPI3REF: Mutex Handle
+**
+** The mutex module within SQLite defines [sqlite3_mutex] to be an
+** abstract type for a mutex object.  The SQLite core never looks
+** at the internal representation of an [sqlite3_mutex].  It only
+** deals with pointers to the [sqlite3_mutex] object.
+**
+** Mutexes are created using [sqlite3_mutex_alloc()].
+*/
+typedef struct sqlite3_mutex sqlite3_mutex;
+
+/*
+** CAPI3REF: Loadable Extension Thunk
+**
+** A pointer to the opaque sqlite3_api_routines structure is passed as
+** the third parameter to entry points of [loadable extensions].  This
+** structure must be typedefed in order to work around compiler warnings
+** on some platforms.
+*/
+typedef struct sqlite3_api_routines sqlite3_api_routines;
+
+/*
+** CAPI3REF: File Name
+**
+** Type [sqlite3_filename] is used by SQLite to pass filenames to the
+** xOpen method of a [VFS]. It may be cast to (const char*) and treated
+** as a normal, nul-terminated, UTF-8 buffer containing the filename, but
+** may also be passed to special APIs such as:
+**
+** <ul>
+** <li>  sqlite3_filename_database()
+** <li>  sqlite3_filename_journal()
+** <li>  sqlite3_filename_wal()
+** <li>  sqlite3_uri_parameter()
+** <li>  sqlite3_uri_boolean()
+** <li>  sqlite3_uri_int64()
+** <li>  sqlite3_uri_key()
+** </ul>
+*/
+typedef const char *sqlite3_filename;
+
+/*
+** CAPI3REF: OS Interface Object
+**
+** An instance of the sqlite3_vfs object defines the interface between
+** the SQLite core and the underlying operating system.  The "vfs"
+** in the name of the object stands for "virtual file system".  See
+** the [VFS | VFS documentation] for further information.
+**
+** The VFS interface is sometimes extended by adding new methods onto
+** the end.  Each time such an extension occurs, the iVersion field
+** is incremented.  The iVersion value started out as 1 in
+** SQLite [version 3.5.0] on [dateof:3.5.0], then increased to 2
+** with SQLite [version 3.7.0] on [dateof:3.7.0], and then increased
+** to 3 with SQLite [version 3.7.6] on [dateof:3.7.6].  Additional fields
+** may be appended to the sqlite3_vfs object and the iVersion value
+** may increase again in future versions of SQLite.
+** Note that due to an oversight, the structure
+** of the sqlite3_vfs object changed in the transition from
+** SQLite [version 3.5.9] to [version 3.6.0] on [dateof:3.6.0]
+** and yet the iVersion field was not increased.
+**
+** The szOsFile field is the size of the subclassed [sqlite3_file]
+** structure used by this VFS.  mxPathname is the maximum length of
+** a pathname in this VFS.
+**
+** Registered sqlite3_vfs objects are kept on a linked list formed by
+** the pNext pointer.  The [sqlite3_vfs_register()]
+** and [sqlite3_vfs_unregister()] interfaces manage this list
+** in a thread-safe way.  The [sqlite3_vfs_find()] interface
+** searches the list.  Neither the application code nor the VFS
+** implementation should use the pNext pointer.
+**
+** The pNext field is the only field in the sqlite3_vfs
+** structure that SQLite will ever modify.  SQLite will only access
+** or modify this field while holding a particular static mutex.
+** The application should never modify anything within the sqlite3_vfs
+** object once the object has been registered.
+**
+** The zName field holds the name of the VFS module.  The name must
+** be unique across all VFS modules.
+**
+** [[sqlite3_vfs.xOpen]]
+** ^SQLite guarantees that the zFilename parameter to xOpen
+** is either a NULL pointer or string obtained
+** from xFullPathname() with an optional suffix added.
+** ^If a suffix is added to the zFilename parameter, it will
+** consist of a single "-" character followed by no more than
+** 11 alphanumeric and/or "-" characters.
+** ^SQLite further guarantees that
+** the string will be valid and unchanged until xClose() is
+** called. Because of the previous sentence,
+** the [sqlite3_file] can safely store a pointer to the
+** filename if it needs to remember the filename for some reason.
+** If the zFilename parameter to xOpen is a NULL pointer then xOpen
+** must invent its own temporary name for the file.  ^Whenever the
+** xFilename parameter is NULL it will also be the case that the
+** flags parameter will include [SQLITE_OPEN_DELETEONCLOSE].
+**
+** The flags argument to xOpen() includes all bits set in
+** the flags argument to [sqlite3_open_v2()].  Or if [sqlite3_open()]
+** or [sqlite3_open16()] is used, then flags includes at least
+** [SQLITE_OPEN_READWRITE] | [SQLITE_OPEN_CREATE].
+** If xOpen() opens a file read-only then it sets *pOutFlags to
+** include [SQLITE_OPEN_READONLY].  Other bits in *pOutFlags may be set.
+**
+** ^(SQLite will also add one of the following flags to the xOpen()
+** call, depending on the object being opened:
+**
+** <ul>
+** <li>  [SQLITE_OPEN_MAIN_DB]
+** <li>  [SQLITE_OPEN_MAIN_JOURNAL]
+** <li>  [SQLITE_OPEN_TEMP_DB]
+** <li>  [SQLITE_OPEN_TEMP_JOURNAL]
+** <li>  [SQLITE_OPEN_TRANSIENT_DB]
+** <li>  [SQLITE_OPEN_SUBJOURNAL]
+** <li>  [SQLITE_OPEN_SUPER_JOURNAL]
+** <li>  [SQLITE_OPEN_WAL]
+** </ul>)^
+**
+** The file I/O implementation can use the object type flags to
+** change the way it deals with files.  For example, an application
+** that does not care about crash recovery or rollback might make
+** the open of a journal file a no-op.  Writes to this journal would
+** also be no-ops, and any attempt to read the journal would return
+** SQLITE_IOERR.  Or the implementation might recognize that a database
+** file will be doing page-aligned sector reads and writes in a random
+** order and set up its I/O subsystem accordingly.
+**
+** SQLite might also add one of the following flags to the xOpen method:
+**
+** <ul>
+** <li> [SQLITE_OPEN_DELETEONCLOSE]
+** <li> [SQLITE_OPEN_EXCLUSIVE]
+** </ul>
+**
+** The [SQLITE_OPEN_DELETEONCLOSE] flag means the file should be
+** deleted when it is closed.  ^The [SQLITE_OPEN_DELETEONCLOSE]
+** will be set for TEMP databases and their journals, transient
+** databases, and subjournals.
+**
+** ^The [SQLITE_OPEN_EXCLUSIVE] flag is always used in conjunction
+** with the [SQLITE_OPEN_CREATE] flag, which are both directly
+** analogous to the O_EXCL and O_CREAT flags of the POSIX open()
+** API.  The SQLITE_OPEN_EXCLUSIVE flag, when paired with the
+** SQLITE_OPEN_CREATE, is used to indicate that file should always
+** be created, and that it is an error if it already exists.
+** It is <i>not</i> used to indicate the file should be opened
+** for exclusive access.
+**
+** ^At least szOsFile bytes of memory are allocated by SQLite
+** to hold the [sqlite3_file] structure passed as the third
+** argument to xOpen.  The xOpen method does not have to
+** allocate the structure; it should just fill it in.  Note that
+** the xOpen method must set the sqlite3_file.pMethods to either
+** a valid [sqlite3_io_methods] object or to NULL.  xOpen must do
+** this even if the open fails.  SQLite expects that the sqlite3_file.pMethods
+** element will be valid after xOpen returns regardless of the success
+** or failure of the xOpen call.
+**
+** [[sqlite3_vfs.xAccess]]
+** ^The flags argument to xAccess() may be [SQLITE_ACCESS_EXISTS]
+** to test for the existence of a file, or [SQLITE_ACCESS_READWRITE] to
+** test whether a file is readable and writable, or [SQLITE_ACCESS_READ]
+** to test whether a file is at least readable.  The SQLITE_ACCESS_READ
+** flag is never actually used and is not implemented in the built-in
+** VFSes of SQLite.  The file is named by the second argument and can be a
+** directory. The xAccess method returns [SQLITE_OK] on success or some
+** non-zero error code if there is an I/O error or if the name of
+** the file given in the second argument is illegal.  If SQLITE_OK
+** is returned, then non-zero or zero is written into *pResOut to indicate
+** whether or not the file is accessible.
+**
+** ^SQLite will always allocate at least mxPathname+1 bytes for the
+** output buffer xFullPathname.  The exact size of the output buffer
+** is also passed as a parameter to both  methods. If the output buffer
+** is not large enough, [SQLITE_CANTOPEN] should be returned. Since this is
+** handled as a fatal error by SQLite, vfs implementations should endeavor
+** to prevent this by setting mxPathname to a sufficiently large value.
+**
+** The xRandomness(), xSleep(), xCurrentTime(), and xCurrentTimeInt64()
+** interfaces are not strictly a part of the filesystem, but they are
+** included in the VFS structure for completeness.
+** The xRandomness() function attempts to return nBytes bytes
+** of good-quality randomness into zOut.  The return value is
+** the actual number of bytes of randomness obtained.
+** The xSleep() method causes the calling thread to sleep for at
+** least the number of microseconds given.  ^The xCurrentTime()
+** method returns a Julian Day Number for the current date and time as
+** a floating point value.
+** ^The xCurrentTimeInt64() method returns, as an integer, the Julian
+** Day Number multiplied by 86400000 (the number of milliseconds in
+** a 24-hour day).
+** ^SQLite will use the xCurrentTimeInt64() method to get the current
+** date and time if that method is available (if iVersion is 2 or
+** greater and the function pointer is not NULL) and will fall back
+** to xCurrentTime() if xCurrentTimeInt64() is unavailable.
+**
+** ^The xSetSystemCall(), xGetSystemCall(), and xNestSystemCall() interfaces
+** are not used by the SQLite core.  These optional interfaces are provided
+** by some VFSes to facilitate testing of the VFS code. By overriding
+** system calls with functions under its control, a test program can
+** simulate faults and error conditions that would otherwise be difficult
+** or impossible to induce.  The set of system calls that can be overridden
+** varies from one VFS to another, and from one version of the same VFS to the
+** next.  Applications that use these interfaces must be prepared for any
+** or all of these interfaces to be NULL or for their behavior to change
+** from one release to the next.  Applications must not attempt to access
+** any of these methods if the iVersion of the VFS is less than 3.
+*/
+typedef struct sqlite3_vfs sqlite3_vfs;
+typedef void (*sqlite3_syscall_ptr)(void);
+struct sqlite3_vfs {
+  int iVersion;            /* Structure version number (currently 3) */
+  int szOsFile;            /* Size of subclassed sqlite3_file */
+  int mxPathname;          /* Maximum file pathname length */
+  sqlite3_vfs *pNext;      /* Next registered VFS */
+  const char *zName;       /* Name of this virtual file system */
+  void *pAppData;          /* Pointer to application-specific data */
+  int (*xOpen)(sqlite3_vfs*, sqlite3_filename zName, sqlite3_file*,
+               int flags, int *pOutFlags);
+  int (*xDelete)(sqlite3_vfs*, const char *zName, int syncDir);
+  int (*xAccess)(sqlite3_vfs*, const char *zName, int flags, int *pResOut);
+  int (*xFullPathname)(sqlite3_vfs*, const char *zName, int nOut, char *zOut);
+  void *(*xDlOpen)(sqlite3_vfs*, const char *zFilename);
+  void (*xDlError)(sqlite3_vfs*, int nByte, char *zErrMsg);
+  void (*(*xDlSym)(sqlite3_vfs*,void*, const char *zSymbol))(void);
+  void (*xDlClose)(sqlite3_vfs*, void*);
+  int (*xRandomness)(sqlite3_vfs*, int nByte, char *zOut);
+  int (*xSleep)(sqlite3_vfs*, int microseconds);
+  int (*xCurrentTime)(sqlite3_vfs*, double*);
+  int (*xGetLastError)(sqlite3_vfs*, int, char *);
+  /*
+  ** The methods above are in version 1 of the sqlite_vfs object
+  ** definition.  Those that follow are added in version 2 or later
+  */
+  int (*xCurrentTimeInt64)(sqlite3_vfs*, sqlite3_int64*);
+  /*
+  ** The methods above are in versions 1 and 2 of the sqlite_vfs object.
+  ** Those below are for version 3 and greater.
+  */
+  int (*xSetSystemCall)(sqlite3_vfs*, const char *zName, sqlite3_syscall_ptr);
+  sqlite3_syscall_ptr (*xGetSystemCall)(sqlite3_vfs*, const char *zName);
+  const char *(*xNextSystemCall)(sqlite3_vfs*, const char *zName);
+  /*
+  ** The methods above are in versions 1 through 3 of the sqlite_vfs object.
+  ** New fields may be appended in future versions.  The iVersion
+  ** value will increment whenever this happens.
+  */
+};
+
+/*
+** CAPI3REF: Flags for the xAccess VFS method
+**
+** These integer constants can be used as the third parameter to
+** the xAccess method of an [sqlite3_vfs] object.  They determine
+** what kind of permissions the xAccess method is looking for.
+** With SQLITE_ACCESS_EXISTS, the xAccess method
+** simply checks whether the file exists.
+** With SQLITE_ACCESS_READWRITE, the xAccess method
+** checks whether the named directory is both readable and writable
+** (in other words, if files can be added, removed, and renamed within
+** the directory).
+** The SQLITE_ACCESS_READWRITE constant is currently used only by the
+** [temp_store_directory pragma], though this could change in a future
+** release of SQLite.
+** With SQLITE_ACCESS_READ, the xAccess method
+** checks whether the file is readable.  The SQLITE_ACCESS_READ constant is
+** currently unused, though it might be used in a future release of
+** SQLite.
+*/
+#define SQLITE_ACCESS_EXISTS    0
+#define SQLITE_ACCESS_READWRITE 1   /* Used by PRAGMA temp_store_directory */
+#define SQLITE_ACCESS_READ      2   /* Unused */
+
+/*
+** CAPI3REF: Flags for the xShmLock VFS method
+**
+** These integer constants define the various locking operations
+** allowed by the xShmLock method of [sqlite3_io_methods].  The
+** following are the only legal combinations of flags to the
+** xShmLock method:
+**
+** <ul>
+** <li>  SQLITE_SHM_LOCK | SQLITE_SHM_SHARED
+** <li>  SQLITE_SHM_LOCK | SQLITE_SHM_EXCLUSIVE
+** <li>  SQLITE_SHM_UNLOCK | SQLITE_SHM_SHARED
+** <li>  SQLITE_SHM_UNLOCK | SQLITE_SHM_EXCLUSIVE
+** </ul>
+**
+** When unlocking, the same SHARED or EXCLUSIVE flag must be supplied as
+** was given on the corresponding lock.
+**
+** The xShmLock method can transition between unlocked and SHARED or
+** between unlocked and EXCLUSIVE.  It cannot transition between SHARED
+** and EXCLUSIVE.
+*/
+#define SQLITE_SHM_UNLOCK       1
+#define SQLITE_SHM_LOCK         2
+#define SQLITE_SHM_SHARED       4
+#define SQLITE_SHM_EXCLUSIVE    8
+
+/*
+** CAPI3REF: Maximum xShmLock index
+**
+** The xShmLock method on [sqlite3_io_methods] may use values
+** between 0 and this upper bound as its "offset" argument.
+** The SQLite core will never attempt to acquire or release a
+** lock outside of this range
+*/
+#define SQLITE_SHM_NLOCK        8
+
+
+/*
+** CAPI3REF: Initialize The SQLite Library
+**
+** ^The sqlite3_initialize() routine initializes the
+** SQLite library.  ^The sqlite3_shutdown() routine
+** deallocates any resources that were allocated by sqlite3_initialize().
+** These routines are designed to aid in process initialization and
+** shutdown on embedded systems.  Workstation applications using
+** SQLite normally do not need to invoke either of these routines.
+**
+** A call to sqlite3_initialize() is an "effective" call if it is
+** the first time sqlite3_initialize() is invoked during the lifetime of
+** the process, or if it is the first time sqlite3_initialize() is invoked
+** following a call to sqlite3_shutdown().  ^(Only an effective call
+** of sqlite3_initialize() does any initialization.  All other calls
+** are harmless no-ops.)^
+**
+** A call to sqlite3_shutdown() is an "effective" call if it is the first
+** call to sqlite3_shutdown() since the last sqlite3_initialize().  ^(Only
+** an effective call to sqlite3_shutdown() does any deinitialization.
+** All other valid calls to sqlite3_shutdown() are harmless no-ops.)^
+**
+** The sqlite3_initialize() interface is threadsafe, but sqlite3_shutdown()
+** is not.  The sqlite3_shutdown() interface must only be called from a
+** single thread.  All open [database connections] must be closed and all
+** other SQLite resources must be deallocated prior to invoking
+** sqlite3_shutdown().
+**
+** Among other things, ^sqlite3_initialize() will invoke
+** sqlite3_os_init().  Similarly, ^sqlite3_shutdown()
+** will invoke sqlite3_os_end().
+**
+** ^The sqlite3_initialize() routine returns [SQLITE_OK] on success.
+** ^If for some reason, sqlite3_initialize() is unable to initialize
+** the library (perhaps it is unable to allocate a needed resource such
+** as a mutex) it returns an [error code] other than [SQLITE_OK].
+**
+** ^The sqlite3_initialize() routine is called internally by many other
+** SQLite interfaces so that an application usually does not need to
+** invoke sqlite3_initialize() directly.  For example, [sqlite3_open()]
+** calls sqlite3_initialize() so the SQLite library will be automatically
+** initialized when [sqlite3_open()] is called if it has not be initialized
+** already.  ^However, if SQLite is compiled with the [SQLITE_OMIT_AUTOINIT]
+** compile-time option, then the automatic calls to sqlite3_initialize()
+** are omitted and the application must call sqlite3_initialize() directly
+** prior to using any other SQLite interface.  For maximum portability,
+** it is recommended that applications always invoke sqlite3_initialize()
+** directly prior to using any other SQLite interface.  Future releases
+** of SQLite may require this.  In other words, the behavior exhibited
+** when SQLite is compiled with [SQLITE_OMIT_AUTOINIT] might become the
+** default behavior in some future release of SQLite.
+**
+** The sqlite3_os_init() routine does operating-system specific
+** initialization of the SQLite library.  The sqlite3_os_end()
+** routine undoes the effect of sqlite3_os_init().  Typical tasks
+** performed by these routines include allocation or deallocation
+** of static resources, initialization of global variables,
+** setting up a default [sqlite3_vfs] module, or setting up
+** a default configuration using [sqlite3_config()].
+**
+** The application should never invoke either sqlite3_os_init()
+** or sqlite3_os_end() directly.  The application should only invoke
+** sqlite3_initialize() and sqlite3_shutdown().  The sqlite3_os_init()
+** interface is called automatically by sqlite3_initialize() and
+** sqlite3_os_end() is called by sqlite3_shutdown().  Appropriate
+** implementations for sqlite3_os_init() and sqlite3_os_end()
+** are built into SQLite when it is compiled for Unix, Windows, or OS/2.
+** When [custom builds | built for other platforms]
+** (using the [SQLITE_OS_OTHER=1] compile-time
+** option) the application must supply a suitable implementation for
+** sqlite3_os_init() and sqlite3_os_end().  An application-supplied
+** implementation of sqlite3_os_init() or sqlite3_os_end()
+** must return [SQLITE_OK] on success and some other [error code] upon
+** failure.
+*/
+SQLITE_API int sqlite3_initialize(void);
+SQLITE_API int sqlite3_shutdown(void);
+SQLITE_API int sqlite3_os_init(void);
+SQLITE_API int sqlite3_os_end(void);
+
+/*
+** CAPI3REF: Configuring The SQLite Library
+**
+** The sqlite3_config() interface is used to make global configuration
+** changes to SQLite in order to tune SQLite to the specific needs of
+** the application.  The default configuration is recommended for most
+** applications and so this routine is usually not necessary.  It is
+** provided to support rare applications with unusual needs.
+**
+** <b>The sqlite3_config() interface is not threadsafe. The application
+** must ensure that no other SQLite interfaces are invoked by other
+** threads while sqlite3_config() is running.</b>
+**
+** The first argument to sqlite3_config() is an integer
+** [configuration option] that determines
+** what property of SQLite is to be configured.  Subsequent arguments
+** vary depending on the [configuration option]
+** in the first argument.
+**
+** For most configuration options, the sqlite3_config() interface
+** may only be invoked prior to library initialization using
+** [sqlite3_initialize()] or after shutdown by [sqlite3_shutdown()].
+** The exceptional configuration options that may be invoked at any time
+** are called "anytime configuration options".
+** ^If sqlite3_config() is called after [sqlite3_initialize()] and before
+** [sqlite3_shutdown()] with a first argument that is not an anytime
+** configuration option, then the sqlite3_config() call will return SQLITE_MISUSE.
+** Note, however, that ^sqlite3_config() can be called as part of the
+** implementation of an application-defined [sqlite3_os_init()].
+**
+** ^When a configuration option is set, sqlite3_config() returns [SQLITE_OK].
+** ^If the option is unknown or SQLite is unable to set the option
+** then this routine returns a non-zero [error code].
+*/
+SQLITE_API int sqlite3_config(int, ...);
+
+/*
+** CAPI3REF: Configure database connections
+** METHOD: sqlite3
+**
+** The sqlite3_db_config() interface is used to make configuration
+** changes to a [database connection].  The interface is similar to
+** [sqlite3_config()] except that the changes apply to a single
+** [database connection] (specified in the first argument).
+**
+** The second argument to sqlite3_db_config(D,V,...)  is the
+** [SQLITE_DBCONFIG_LOOKASIDE | configuration verb] - an integer code
+** that indicates what aspect of the [database connection] is being configured.
+** Subsequent arguments vary depending on the configuration verb.
+**
+** ^Calls to sqlite3_db_config() return SQLITE_OK if and only if
+** the call is considered successful.
+*/
+SQLITE_API int sqlite3_db_config(sqlite3*, int op, ...);
+
+/*
+** CAPI3REF: Memory Allocation Routines
+**
+** An instance of this object defines the interface between SQLite
+** and low-level memory allocation routines.
+**
+** This object is used in only one place in the SQLite interface.
+** A pointer to an instance of this object is the argument to
+** [sqlite3_config()] when the configuration option is
+** [SQLITE_CONFIG_MALLOC] or [SQLITE_CONFIG_GETMALLOC].
+** By creating an instance of this object
+** and passing it to [sqlite3_config]([SQLITE_CONFIG_MALLOC])
+** during configuration, an application can specify an alternative
+** memory allocation subsystem for SQLite to use for all of its
+** dynamic memory needs.
+**
+** Note that SQLite comes with several [built-in memory allocators]
+** that are perfectly adequate for the overwhelming majority of applications
+** and that this object is only useful to a tiny minority of applications
+** with specialized memory allocation requirements.  This object is
+** also used during testing of SQLite in order to specify an alternative
+** memory allocator that simulates memory out-of-memory conditions in
+** order to verify that SQLite recovers gracefully from such
+** conditions.
+**
+** The xMalloc, xRealloc, and xFree methods must work like the
+** malloc(), realloc() and free() functions from the standard C library.
+** ^SQLite guarantees that the second argument to
+** xRealloc is always a value returned by a prior call to xRoundup.
+**
+** xSize should return the allocated size of a memory allocation
+** previously obtained from xMalloc or xRealloc.  The allocated size
+** is always at least as big as the requested size but may be larger.
+**
+** The xRoundup method returns what would be the allocated size of
+** a memory allocation given a particular requested size.  Most memory
+** allocators round up memory allocations at least to the next multiple
+** of 8.  Some allocators round up to a larger multiple or to a power of 2.
+** Every memory allocation request coming in through [sqlite3_malloc()]
+** or [sqlite3_realloc()] first calls xRoundup.  If xRoundup returns 0,
+** that causes the corresponding memory allocation to fail.
+**
+** The xInit method initializes the memory allocator.  For example,
+** it might allocate any required mutexes or initialize internal data
+** structures.  The xShutdown method is invoked (indirectly) by
+** [sqlite3_shutdown()] and should deallocate any resources acquired
+** by xInit.  The pAppData pointer is used as the only parameter to
+** xInit and xShutdown.
+**
+** SQLite holds the [SQLITE_MUTEX_STATIC_MAIN] mutex when it invokes
+** the xInit method, so the xInit method need not be threadsafe.  The
+** xShutdown method is only called from [sqlite3_shutdown()] so it does
+** not need to be threadsafe either.  For all other methods, SQLite
+** holds the [SQLITE_MUTEX_STATIC_MEM] mutex as long as the
+** [SQLITE_CONFIG_MEMSTATUS] configuration option is turned on (which
+** it is by default) and so the methods are automatically serialized.
+** However, if [SQLITE_CONFIG_MEMSTATUS] is disabled, then the other
+** methods must be threadsafe or else make their own arrangements for
+** serialization.
+**
+** SQLite will never invoke xInit() more than once without an intervening
+** call to xShutdown().
+*/
+typedef struct sqlite3_mem_methods sqlite3_mem_methods;
+struct sqlite3_mem_methods {
+  void *(*xMalloc)(int);         /* Memory allocation function */
+  void (*xFree)(void*);          /* Free a prior allocation */
+  void *(*xRealloc)(void*,int);  /* Resize an allocation */
+  int (*xSize)(void*);           /* Return the size of an allocation */
+  int (*xRoundup)(int);          /* Round up request size to allocation size */
+  int (*xInit)(void*);           /* Initialize the memory allocator */
+  void (*xShutdown)(void*);      /* Deinitialize the memory allocator */
+  void *pAppData;                /* Argument to xInit() and xShutdown() */
+};
+
+/*
+** CAPI3REF: Configuration Options
+** KEYWORDS: {configuration option}
+**
+** These constants are the available integer configuration options that
+** can be passed as the first argument to the [sqlite3_config()] interface.
+**
+** Most of the configuration options for sqlite3_config()
+** will only work if invoked prior to [sqlite3_initialize()] or after
+** [sqlite3_shutdown()].  The few exceptions to this rule are called
+** "anytime configuration options".
+** ^Calling [sqlite3_config()] with a first argument that is not an
+** anytime configuration option in between calls to [sqlite3_initialize()] and
+** [sqlite3_shutdown()] is a no-op that returns SQLITE_MISUSE.
+**
+** The set of anytime configuration options can change (by insertions
+** and/or deletions) from one release of SQLite to the next.
+** As of SQLite version 3.42.0, the complete set of anytime configuration
+** options is:
+** <ul>
+** <li> SQLITE_CONFIG_LOG
+** <li> SQLITE_CONFIG_PCACHE_HDRSZ
+** </ul>
+**
+** New configuration options may be added in future releases of SQLite.
+** Existing configuration options might be discontinued.  Applications
+** should check the return code from [sqlite3_config()] to make sure that
+** the call worked.  The [sqlite3_config()] interface will return a
+** non-zero [error code] if a discontinued or unsupported configuration option
+** is invoked.
+**
+** <dl>
+** [[SQLITE_CONFIG_SINGLETHREAD]] <dt>SQLITE_CONFIG_SINGLETHREAD</dt>
+** <dd>There are no arguments to this option.  ^This option sets the
+** [threading mode] to Single-thread.  In other words, it disables
+** all mutexing and puts SQLite into a mode where it can only be used
+** by a single thread.   ^If SQLite is compiled with
+** the [SQLITE_THREADSAFE | SQLITE_THREADSAFE=0] compile-time option then
+** it is not possible to change the [threading mode] from its default
+** value of Single-thread and so [sqlite3_config()] will return
+** [SQLITE_ERROR] if called with the SQLITE_CONFIG_SINGLETHREAD
+** configuration option.</dd>
+**
+** [[SQLITE_CONFIG_MULTITHREAD]] <dt>SQLITE_CONFIG_MULTITHREAD</dt>
+** <dd>There are no arguments to this option.  ^This option sets the
+** [threading mode] to Multi-thread.  In other words, it disables
+** mutexing on [database connection] and [prepared statement] objects.
+** The application is responsible for serializing access to
+** [database connections] and [prepared statements].  But other mutexes
+** are enabled so that SQLite will be safe to use in a multi-threaded
+** environment as long as no two threads attempt to use the same
+** [database connection] at the same time.  ^If SQLite is compiled with
+** the [SQLITE_THREADSAFE | SQLITE_THREADSAFE=0] compile-time option then
+** it is not possible to set the Multi-thread [threading mode] and
+** [sqlite3_config()] will return [SQLITE_ERROR] if called with the
+** SQLITE_CONFIG_MULTITHREAD configuration option.</dd>
+**
+** [[SQLITE_CONFIG_SERIALIZED]] <dt>SQLITE_CONFIG_SERIALIZED</dt>
+** <dd>There are no arguments to this option.  ^This option sets the
+** [threading mode] to Serialized. In other words, this option enables
+** all mutexes including the recursive
+** mutexes on [database connection] and [prepared statement] objects.
+** In this mode (which is the default when SQLite is compiled with
+** [SQLITE_THREADSAFE=1]) the SQLite library will itself serialize access
+** to [database connections] and [prepared statements] so that the
+** application is free to use the same [database connection] or the
+** same [prepared statement] in different threads at the same time.
+** ^If SQLite is compiled with
+** the [SQLITE_THREADSAFE | SQLITE_THREADSAFE=0] compile-time option then
+** it is not possible to set the Serialized [threading mode] and
+** [sqlite3_config()] will return [SQLITE_ERROR] if called with the
+** SQLITE_CONFIG_SERIALIZED configuration option.</dd>
+**
+** [[SQLITE_CONFIG_MALLOC]] <dt>SQLITE_CONFIG_MALLOC</dt>
+** <dd> ^(The SQLITE_CONFIG_MALLOC option takes a single argument which is
+** a pointer to an instance of the [sqlite3_mem_methods] structure.
+** The argument specifies
+** alternative low-level memory allocation routines to be used in place of
+** the memory allocation routines built into SQLite.)^ ^SQLite makes
+** its own private copy of the content of the [sqlite3_mem_methods] structure
+** before the [sqlite3_config()] call returns.</dd>
+**
+** [[SQLITE_CONFIG_GETMALLOC]] <dt>SQLITE_CONFIG_GETMALLOC</dt>
+** <dd> ^(The SQLITE_CONFIG_GETMALLOC option takes a single argument which
+** is a pointer to an instance of the [sqlite3_mem_methods] structure.
+** The [sqlite3_mem_methods]
+** structure is filled with the currently defined memory allocation routines.)^
+** This option can be used to overload the default memory allocation
+** routines with a wrapper that simulations memory allocation failure or
+** tracks memory usage, for example. </dd>
+**
+** [[SQLITE_CONFIG_SMALL_MALLOC]] <dt>SQLITE_CONFIG_SMALL_MALLOC</dt>
+** <dd> ^The SQLITE_CONFIG_SMALL_MALLOC option takes single argument of
+** type int, interpreted as a boolean, which if true provides a hint to
+** SQLite that it should avoid large memory allocations if possible.
+** SQLite will run faster if it is free to make large memory allocations,
+** but some application might prefer to run slower in exchange for
+** guarantees about memory fragmentation that are possible if large
+** allocations are avoided.  This hint is normally off.
+** </dd>
+**
+** [[SQLITE_CONFIG_MEMSTATUS]] <dt>SQLITE_CONFIG_MEMSTATUS</dt>
+** <dd> ^The SQLITE_CONFIG_MEMSTATUS option takes single argument of type int,
+** interpreted as a boolean, which enables or disables the collection of
+** memory allocation statistics. ^(When memory allocation statistics are
+** disabled, the following SQLite interfaces become non-operational:
+**   <ul>
+**   <li> [sqlite3_hard_heap_limit64()]
+**   <li> [sqlite3_memory_used()]
+**   <li> [sqlite3_memory_highwater()]
+**   <li> [sqlite3_soft_heap_limit64()]
+**   <li> [sqlite3_status64()]
+**   </ul>)^
+** ^Memory allocation statistics are enabled by default unless SQLite is
+** compiled with [SQLITE_DEFAULT_MEMSTATUS]=0 in which case memory
+** allocation statistics are disabled by default.
+** </dd>
+**
+** [[SQLITE_CONFIG_SCRATCH]] <dt>SQLITE_CONFIG_SCRATCH</dt>
+** <dd> The SQLITE_CONFIG_SCRATCH option is no longer used.
+** </dd>
+**
+** [[SQLITE_CONFIG_PAGECACHE]] <dt>SQLITE_CONFIG_PAGECACHE</dt>
+** <dd> ^The SQLITE_CONFIG_PAGECACHE option specifies a memory pool
+** that SQLite can use for the database page cache with the default page
+** cache implementation.
+** This configuration option is a no-op if an application-defined page
+** cache implementation is loaded using the [SQLITE_CONFIG_PCACHE2].
+** ^There are three arguments to SQLITE_CONFIG_PAGECACHE: A pointer to
+** 8-byte aligned memory (pMem), the size of each page cache line (sz),
+** and the number of cache lines (N).
+** The sz argument should be the size of the largest database page
+** (a power of two between 512 and 65536) plus some extra bytes for each
+** page header.  ^The number of extra bytes needed by the page header
+** can be determined using [SQLITE_CONFIG_PCACHE_HDRSZ].
+** ^It is harmless, apart from the wasted memory,
+** for the sz parameter to be larger than necessary.  The pMem
+** argument must be either a NULL pointer or a pointer to an 8-byte
+** aligned block of memory of at least sz*N bytes, otherwise
+** subsequent behavior is undefined.
+** ^When pMem is not NULL, SQLite will strive to use the memory provided
+** to satisfy page cache needs, falling back to [sqlite3_malloc()] if
+** a page cache line is larger than sz bytes or if all of the pMem buffer
+** is exhausted.
+** ^If pMem is NULL and N is non-zero, then each database connection
+** does an initial bulk allocation for page cache memory
+** from [sqlite3_malloc()] sufficient for N cache lines if N is positive or
+** of -1024*N bytes if N is negative, . ^If additional
+** page cache memory is needed beyond what is provided by the initial
+** allocation, then SQLite goes to [sqlite3_malloc()] separately for each
+** additional cache line. </dd>
+**
+** [[SQLITE_CONFIG_HEAP]] <dt>SQLITE_CONFIG_HEAP</dt>
+** <dd> ^The SQLITE_CONFIG_HEAP option specifies a static memory buffer
+** that SQLite will use for all of its dynamic memory allocation needs
+** beyond those provided for by [SQLITE_CONFIG_PAGECACHE].
+** ^The SQLITE_CONFIG_HEAP option is only available if SQLite is compiled
+** with either [SQLITE_ENABLE_MEMSYS3] or [SQLITE_ENABLE_MEMSYS5] and returns
+** [SQLITE_ERROR] if invoked otherwise.
+** ^There are three arguments to SQLITE_CONFIG_HEAP:
+** An 8-byte aligned pointer to the memory,
+** the number of bytes in the memory buffer, and the minimum allocation size.
+** ^If the first pointer (the memory pointer) is NULL, then SQLite reverts
+** to using its default memory allocator (the system malloc() implementation),
+** undoing any prior invocation of [SQLITE_CONFIG_MALLOC].  ^If the
+** memory pointer is not NULL then the alternative memory
+** allocator is engaged to handle all of SQLites memory allocation needs.
+** The first pointer (the memory pointer) must be aligned to an 8-byte
+** boundary or subsequent behavior of SQLite will be undefined.
+** The minimum allocation size is capped at 2**12. Reasonable values
+** for the minimum allocation size are 2**5 through 2**8.</dd>
+**
+** [[SQLITE_CONFIG_MUTEX]] <dt>SQLITE_CONFIG_MUTEX</dt>
+** <dd> ^(The SQLITE_CONFIG_MUTEX option takes a single argument which is a
+** pointer to an instance of the [sqlite3_mutex_methods] structure.
+** The argument specifies alternative low-level mutex routines to be used
+** in place the mutex routines built into SQLite.)^  ^SQLite makes a copy of
+** the content of the [sqlite3_mutex_methods] structure before the call to
+** [sqlite3_config()] returns. ^If SQLite is compiled with
+** the [SQLITE_THREADSAFE | SQLITE_THREADSAFE=0] compile-time option then
+** the entire mutexing subsystem is omitted from the build and hence calls to
+** [sqlite3_config()] with the SQLITE_CONFIG_MUTEX configuration option will
+** return [SQLITE_ERROR].</dd>
+**
+** [[SQLITE_CONFIG_GETMUTEX]] <dt>SQLITE_CONFIG_GETMUTEX</dt>
+** <dd> ^(The SQLITE_CONFIG_GETMUTEX option takes a single argument which
+** is a pointer to an instance of the [sqlite3_mutex_methods] structure.  The
+** [sqlite3_mutex_methods]
+** structure is filled with the currently defined mutex routines.)^
+** This option can be used to overload the default mutex allocation
+** routines with a wrapper used to track mutex usage for performance
+** profiling or testing, for example.   ^If SQLite is compiled with
+** the [SQLITE_THREADSAFE | SQLITE_THREADSAFE=0] compile-time option then
+** the entire mutexing subsystem is omitted from the build and hence calls to
+** [sqlite3_config()] with the SQLITE_CONFIG_GETMUTEX configuration option will
+** return [SQLITE_ERROR].</dd>
+**
+** [[SQLITE_CONFIG_LOOKASIDE]] <dt>SQLITE_CONFIG_LOOKASIDE</dt>
+** <dd> ^(The SQLITE_CONFIG_LOOKASIDE option takes two arguments that determine
+** the default size of lookaside memory on each [database connection].
+** The first argument is the
+** size of each lookaside buffer slot and the second is the number of
+** slots allocated to each database connection.)^  ^(SQLITE_CONFIG_LOOKASIDE
+** sets the <i>default</i> lookaside size. The [SQLITE_DBCONFIG_LOOKASIDE]
+** option to [sqlite3_db_config()] can be used to change the lookaside
+** configuration on individual connections.)^ </dd>
+**
+** [[SQLITE_CONFIG_PCACHE2]] <dt>SQLITE_CONFIG_PCACHE2</dt>
+** <dd> ^(The SQLITE_CONFIG_PCACHE2 option takes a single argument which is
+** a pointer to an [sqlite3_pcache_methods2] object.  This object specifies
+** the interface to a custom page cache implementation.)^
+** ^SQLite makes a copy of the [sqlite3_pcache_methods2] object.</dd>
+**
+** [[SQLITE_CONFIG_GETPCACHE2]] <dt>SQLITE_CONFIG_GETPCACHE2</dt>
+** <dd> ^(The SQLITE_CONFIG_GETPCACHE2 option takes a single argument which
+** is a pointer to an [sqlite3_pcache_methods2] object.  SQLite copies of
+** the current page cache implementation into that object.)^ </dd>
+**
+** [[SQLITE_CONFIG_LOG]] <dt>SQLITE_CONFIG_LOG</dt>
+** <dd> The SQLITE_CONFIG_LOG option is used to configure the SQLite
+** global [error log].
+** (^The SQLITE_CONFIG_LOG option takes two arguments: a pointer to a
+** function with a call signature of void(*)(void*,int,const char*),
+** and a pointer to void. ^If the function pointer is not NULL, it is
+** invoked by [sqlite3_log()] to process each logging event.  ^If the
+** function pointer is NULL, the [sqlite3_log()] interface becomes a no-op.
+** ^The void pointer that is the second argument to SQLITE_CONFIG_LOG is
+** passed through as the first parameter to the application-defined logger
+** function whenever that function is invoked.  ^The second parameter to
+** the logger function is a copy of the first parameter to the corresponding
+** [sqlite3_log()] call and is intended to be a [result code] or an
+** [extended result code].  ^The third parameter passed to the logger is
+** log message after formatting via [sqlite3_snprintf()].
+** The SQLite logging interface is not reentrant; the logger function
+** supplied by the application must not invoke any SQLite interface.
+** In a multi-threaded application, the application-defined logger
+** function must be threadsafe. </dd>
+**
+** [[SQLITE_CONFIG_URI]] <dt>SQLITE_CONFIG_URI
+** <dd>^(The SQLITE_CONFIG_URI option takes a single argument of type int.
+** If non-zero, then URI handling is globally enabled. If the parameter is zero,
+** then URI handling is globally disabled.)^ ^If URI handling is globally
+** enabled, all filenames passed to [sqlite3_open()], [sqlite3_open_v2()],
+** [sqlite3_open16()] or
+** specified as part of [ATTACH] commands are interpreted as URIs, regardless
+** of whether or not the [SQLITE_OPEN_URI] flag is set when the database
+** connection is opened. ^If it is globally disabled, filenames are
+** only interpreted as URIs if the SQLITE_OPEN_URI flag is set when the
+** database connection is opened. ^(By default, URI handling is globally
+** disabled. The default value may be changed by compiling with the
+** [SQLITE_USE_URI] symbol defined.)^
+**
+** [[SQLITE_CONFIG_COVERING_INDEX_SCAN]] <dt>SQLITE_CONFIG_COVERING_INDEX_SCAN
+** <dd>^The SQLITE_CONFIG_COVERING_INDEX_SCAN option takes a single integer
+** argument which is interpreted as a boolean in order to enable or disable
+** the use of covering indices for full table scans in the query optimizer.
+** ^The default setting is determined
+** by the [SQLITE_ALLOW_COVERING_INDEX_SCAN] compile-time option, or is "on"
+** if that compile-time option is omitted.
+** The ability to disable the use of covering indices for full table scans
+** is because some incorrectly coded legacy applications might malfunction
+** when the optimization is enabled.  Providing the ability to
+** disable the optimization allows the older, buggy application code to work
+** without change even with newer versions of SQLite.
+**
+** [[SQLITE_CONFIG_PCACHE]] [[SQLITE_CONFIG_GETPCACHE]]
+** <dt>SQLITE_CONFIG_PCACHE and SQLITE_CONFIG_GETPCACHE
+** <dd> These options are obsolete and should not be used by new code.
+** They are retained for backwards compatibility but are now no-ops.
+** </dd>
+**
+** [[SQLITE_CONFIG_SQLLOG]]
+** <dt>SQLITE_CONFIG_SQLLOG
+** <dd>This option is only available if sqlite is compiled with the
+** [SQLITE_ENABLE_SQLLOG] pre-processor macro defined. The first argument should
+** be a pointer to a function of type void(*)(void*,sqlite3*,const char*, int).
+** The second should be of type (void*). The callback is invoked by the library
+** in three separate circumstances, identified by the value passed as the
+** fourth parameter. If the fourth parameter is 0, then the database connection
+** passed as the second argument has just been opened. The third argument
+** points to a buffer containing the name of the main database file. If the
+** fourth parameter is 1, then the SQL statement that the third parameter
+** points to has just been executed. Or, if the fourth parameter is 2, then
+** the connection being passed as the second parameter is being closed. The
+** third parameter is passed NULL In this case.  An example of using this
+** configuration option can be seen in the "test_sqllog.c" source file in
+** the canonical SQLite source tree.</dd>
+**
+** [[SQLITE_CONFIG_MMAP_SIZE]]
+** <dt>SQLITE_CONFIG_MMAP_SIZE
+** <dd>^SQLITE_CONFIG_MMAP_SIZE takes two 64-bit integer (sqlite3_int64) values
+** that are the default mmap size limit (the default setting for
+** [PRAGMA mmap_size]) and the maximum allowed mmap size limit.
+** ^The default setting can be overridden by each database connection using
+** either the [PRAGMA mmap_size] command, or by using the
+** [SQLITE_FCNTL_MMAP_SIZE] file control.  ^(The maximum allowed mmap size
+** will be silently truncated if necessary so that it does not exceed the
+** compile-time maximum mmap size set by the
+** [SQLITE_MAX_MMAP_SIZE] compile-time option.)^
+** ^If either argument to this option is negative, then that argument is
+** changed to its compile-time default.
+**
+** [[SQLITE_CONFIG_WIN32_HEAPSIZE]]
+** <dt>SQLITE_CONFIG_WIN32_HEAPSIZE
+** <dd>^The SQLITE_CONFIG_WIN32_HEAPSIZE option is only available if SQLite is
+** compiled for Windows with the [SQLITE_WIN32_MALLOC] pre-processor macro
+** defined. ^SQLITE_CONFIG_WIN32_HEAPSIZE takes a 32-bit unsigned integer value
+** that specifies the maximum size of the created heap.
+**
+** [[SQLITE_CONFIG_PCACHE_HDRSZ]]
+** <dt>SQLITE_CONFIG_PCACHE_HDRSZ
+** <dd>^The SQLITE_CONFIG_PCACHE_HDRSZ option takes a single parameter which
+** is a pointer to an integer and writes into that integer the number of extra
+** bytes per page required for each page in [SQLITE_CONFIG_PAGECACHE].
+** The amount of extra space required can change depending on the compiler,
+** target platform, and SQLite version.
+**
+** [[SQLITE_CONFIG_PMASZ]]
+** <dt>SQLITE_CONFIG_PMASZ
+** <dd>^The SQLITE_CONFIG_PMASZ option takes a single parameter which
+** is an unsigned integer and sets the "Minimum PMA Size" for the multithreaded
+** sorter to that integer.  The default minimum PMA Size is set by the
+** [SQLITE_SORTER_PMASZ] compile-time option.  New threads are launched
+** to help with sort operations when multithreaded sorting
+** is enabled (using the [PRAGMA threads] command) and the amount of content
+** to be sorted exceeds the page size times the minimum of the
+** [PRAGMA cache_size] setting and this value.
+**
+** [[SQLITE_CONFIG_STMTJRNL_SPILL]]
+** <dt>SQLITE_CONFIG_STMTJRNL_SPILL
+** <dd>^The SQLITE_CONFIG_STMTJRNL_SPILL option takes a single parameter which
+** becomes the [statement journal] spill-to-disk threshold.
+** [Statement journals] are held in memory until their size (in bytes)
+** exceeds this threshold, at which point they are written to disk.
+** Or if the threshold is -1, statement journals are always held
+** exclusively in memory.
+** Since many statement journals never become large, setting the spill
+** threshold to a value such as 64KiB can greatly reduce the amount of
+** I/O required to support statement rollback.
+** The default value for this setting is controlled by the
+** [SQLITE_STMTJRNL_SPILL] compile-time option.
+**
+** [[SQLITE_CONFIG_SORTERREF_SIZE]]
+** <dt>SQLITE_CONFIG_SORTERREF_SIZE
+** <dd>The SQLITE_CONFIG_SORTERREF_SIZE option accepts a single parameter
+** of type (int) - the new value of the sorter-reference size threshold.
+** Usually, when SQLite uses an external sort to order records according
+** to an ORDER BY clause, all fields required by the caller are present in the
+** sorted records. However, if SQLite determines based on the declared type
+** of a table column that its values are likely to be very large - larger
+** than the configured sorter-reference size threshold - then a reference
+** is stored in each sorted record and the required column values loaded
+** from the database as records are returned in sorted order. The default
+** value for this option is to never use this optimization. Specifying a
+** negative value for this option restores the default behavior.
+** This option is only available if SQLite is compiled with the
+** [SQLITE_ENABLE_SORTER_REFERENCES] compile-time option.
+**
+** [[SQLITE_CONFIG_MEMDB_MAXSIZE]]
+** <dt>SQLITE_CONFIG_MEMDB_MAXSIZE
+** <dd>The SQLITE_CONFIG_MEMDB_MAXSIZE option accepts a single parameter
+** [sqlite3_int64] parameter which is the default maximum size for an in-memory
+** database created using [sqlite3_deserialize()].  This default maximum
+** size can be adjusted up or down for individual databases using the
+** [SQLITE_FCNTL_SIZE_LIMIT] [sqlite3_file_control|file-control].  If this
+** configuration setting is never used, then the default maximum is determined
+** by the [SQLITE_MEMDB_DEFAULT_MAXSIZE] compile-time option.  If that
+** compile-time option is not set, then the default maximum is 1073741824.
+**
+** [[SQLITE_CONFIG_ROWID_IN_VIEW]]
+** <dt>SQLITE_CONFIG_ROWID_IN_VIEW
+** <dd>The SQLITE_CONFIG_ROWID_IN_VIEW option enables or disables the ability
+** for VIEWs to have a ROWID.  The capability can only be enabled if SQLite is
+** compiled with -DSQLITE_ALLOW_ROWID_IN_VIEW, in which case the capability
+** defaults to on.  This configuration option queries the current setting or
+** changes the setting to off or on.  The argument is a pointer to an integer.
+** If that integer initially holds a value of 1, then the ability for VIEWs to
+** have ROWIDs is activated.  If the integer initially holds zero, then the
+** ability is deactivated.  Any other initial value for the integer leaves the
+** setting unchanged.  After changes, if any, the integer is written with
+** a 1 or 0, if the ability for VIEWs to have ROWIDs is on or off.  If SQLite
+** is compiled without -DSQLITE_ALLOW_ROWID_IN_VIEW (which is the usual and
+** recommended case) then the integer is always filled with zero, regardless
+** if its initial value.
+** </dl>
+*/
+#define SQLITE_CONFIG_SINGLETHREAD         1  /* nil */
+#define SQLITE_CONFIG_MULTITHREAD          2  /* nil */
+#define SQLITE_CONFIG_SERIALIZED           3  /* nil */
+#define SQLITE_CONFIG_MALLOC               4  /* sqlite3_mem_methods* */
+#define SQLITE_CONFIG_GETMALLOC            5  /* sqlite3_mem_methods* */
+#define SQLITE_CONFIG_SCRATCH              6  /* No longer used */
+#define SQLITE_CONFIG_PAGECACHE            7  /* void*, int sz, int N */
+#define SQLITE_CONFIG_HEAP                 8  /* void*, int nByte, int min */
+#define SQLITE_CONFIG_MEMSTATUS            9  /* boolean */
+#define SQLITE_CONFIG_MUTEX               10  /* sqlite3_mutex_methods* */
+#define SQLITE_CONFIG_GETMUTEX            11  /* sqlite3_mutex_methods* */
+/* previously SQLITE_CONFIG_CHUNKALLOC    12 which is now unused. */
+#define SQLITE_CONFIG_LOOKASIDE           13  /* int int */
+#define SQLITE_CONFIG_PCACHE              14  /* no-op */
+#define SQLITE_CONFIG_GETPCACHE           15  /* no-op */
+#define SQLITE_CONFIG_LOG                 16  /* xFunc, void* */
+#define SQLITE_CONFIG_URI                 17  /* int */
+#define SQLITE_CONFIG_PCACHE2             18  /* sqlite3_pcache_methods2* */
+#define SQLITE_CONFIG_GETPCACHE2          19  /* sqlite3_pcache_methods2* */
+#define SQLITE_CONFIG_COVERING_INDEX_SCAN 20  /* int */
+#define SQLITE_CONFIG_SQLLOG              21  /* xSqllog, void* */
+#define SQLITE_CONFIG_MMAP_SIZE           22  /* sqlite3_int64, sqlite3_int64 */
+#define SQLITE_CONFIG_WIN32_HEAPSIZE      23  /* int nByte */
+#define SQLITE_CONFIG_PCACHE_HDRSZ        24  /* int *psz */
+#define SQLITE_CONFIG_PMASZ               25  /* unsigned int szPma */
+#define SQLITE_CONFIG_STMTJRNL_SPILL      26  /* int nByte */
+#define SQLITE_CONFIG_SMALL_MALLOC        27  /* boolean */
+#define SQLITE_CONFIG_SORTERREF_SIZE      28  /* int nByte */
+#define SQLITE_CONFIG_MEMDB_MAXSIZE       29  /* sqlite3_int64 */
+#define SQLITE_CONFIG_ROWID_IN_VIEW       30  /* int* */
+
+/*
+** CAPI3REF: Database Connection Configuration Options
+**
+** These constants are the available integer configuration options that
+** can be passed as the second parameter to the [sqlite3_db_config()] interface.
+**
+** The [sqlite3_db_config()] interface is a var-args functions.  It takes a
+** variable number of parameters, though always at least two.  The number of
+** parameters passed into sqlite3_db_config() depends on which of these
+** constants is given as the second parameter.  This documentation page
+** refers to parameters beyond the second as "arguments".  Thus, when this
+** page says "the N-th argument" it means "the N-th parameter past the
+** configuration option" or "the (N+2)-th parameter to sqlite3_db_config()".
+**
+** New configuration options may be added in future releases of SQLite.
+** Existing configuration options might be discontinued.  Applications
+** should check the return code from [sqlite3_db_config()] to make sure that
+** the call worked.  ^The [sqlite3_db_config()] interface will return a
+** non-zero [error code] if a discontinued or unsupported configuration option
+** is invoked.
+**
+** <dl>
+** [[SQLITE_DBCONFIG_LOOKASIDE]]
+** <dt>SQLITE_DBCONFIG_LOOKASIDE</dt>
+** <dd> The SQLITE_DBCONFIG_LOOKASIDE option is used to adjust the
+** configuration of the lookaside memory allocator within a database
+** connection.
+** The arguments to the SQLITE_DBCONFIG_LOOKASIDE option are <i>not</i>
+** in the [DBCONFIG arguments|usual format].
+** The SQLITE_DBCONFIG_LOOKASIDE option takes three arguments, not two,
+** so that a call to [sqlite3_db_config()] that uses SQLITE_DBCONFIG_LOOKASIDE
+** should have a total of five parameters.
+** ^The first argument (the third parameter to [sqlite3_db_config()] is a
+** pointer to a memory buffer to use for lookaside memory.
+** ^The first argument after the SQLITE_DBCONFIG_LOOKASIDE verb
+** may be NULL in which case SQLite will allocate the
+** lookaside buffer itself using [sqlite3_malloc()]. ^The second argument is the
+** size of each lookaside buffer slot.  ^The third argument is the number of
+** slots.  The size of the buffer in the first argument must be greater than
+** or equal to the product of the second and third arguments.  The buffer
+** must be aligned to an 8-byte boundary.  ^If the second argument to
+** SQLITE_DBCONFIG_LOOKASIDE is not a multiple of 8, it is internally
+** rounded down to the next smaller multiple of 8.  ^(The lookaside memory
+** configuration for a database connection can only be changed when that
+** connection is not currently using lookaside memory, or in other words
+** when the "current value" returned by
+** [sqlite3_db_status](D,[SQLITE_DBSTATUS_LOOKASIDE_USED],...) is zero.
+** Any attempt to change the lookaside memory configuration when lookaside
+** memory is in use leaves the configuration unchanged and returns
+** [SQLITE_BUSY].)^</dd>
+**
+** [[SQLITE_DBCONFIG_ENABLE_FKEY]]
+** <dt>SQLITE_DBCONFIG_ENABLE_FKEY</dt>
+** <dd> ^This option is used to enable or disable the enforcement of
+** [foreign key constraints].  This is the same setting that is
+** enabled or disabled by the [PRAGMA foreign_keys] statement.
+** The first argument is an integer which is 0 to disable FK enforcement,
+** positive to enable FK enforcement or negative to leave FK enforcement
+** unchanged.  The second parameter is a pointer to an integer into which
+** is written 0 or 1 to indicate whether FK enforcement is off or on
+** following this call.  The second parameter may be a NULL pointer, in
+** which case the FK enforcement setting is not reported back. </dd>
+**
+** [[SQLITE_DBCONFIG_ENABLE_TRIGGER]]
+** <dt>SQLITE_DBCONFIG_ENABLE_TRIGGER</dt>
+** <dd> ^This option is used to enable or disable [CREATE TRIGGER | triggers].
+** There should be two additional arguments.
+** The first argument is an integer which is 0 to disable triggers,
+** positive to enable triggers or negative to leave the setting unchanged.
+** The second parameter is a pointer to an integer into which
+** is written 0 or 1 to indicate whether triggers are disabled or enabled
+** following this call.  The second parameter may be a NULL pointer, in
+** which case the trigger setting is not reported back.
+**
+** <p>Originally this option disabled all triggers.  ^(However, since
+** SQLite version 3.35.0, TEMP triggers are still allowed even if
+** this option is off.  So, in other words, this option now only disables
+** triggers in the main database schema or in the schemas of [ATTACH]-ed
+** databases.)^ </dd>
+**
+** [[SQLITE_DBCONFIG_ENABLE_VIEW]]
+** <dt>SQLITE_DBCONFIG_ENABLE_VIEW</dt>
+** <dd> ^This option is used to enable or disable [CREATE VIEW | views].
+** There must be two additional arguments.
+** The first argument is an integer which is 0 to disable views,
+** positive to enable views or negative to leave the setting unchanged.
+** The second parameter is a pointer to an integer into which
+** is written 0 or 1 to indicate whether views are disabled or enabled
+** following this call.  The second parameter may be a NULL pointer, in
+** which case the view setting is not reported back.
+**
+** <p>Originally this option disabled all views.  ^(However, since
+** SQLite version 3.35.0, TEMP views are still allowed even if
+** this option is off.  So, in other words, this option now only disables
+** views in the main database schema or in the schemas of ATTACH-ed
+** databases.)^ </dd>
+**
+** [[SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER]]
+** <dt>SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER</dt>
+** <dd> ^This option is used to enable or disable the
+** [fts3_tokenizer()] function which is part of the
+** [FTS3] full-text search engine extension.
+** There must be two additional arguments.
+** The first argument is an integer which is 0 to disable fts3_tokenizer() or
+** positive to enable fts3_tokenizer() or negative to leave the setting
+** unchanged.
+** The second parameter is a pointer to an integer into which
+** is written 0 or 1 to indicate whether fts3_tokenizer is disabled or enabled
+** following this call.  The second parameter may be a NULL pointer, in
+** which case the new setting is not reported back. </dd>
+**
+** [[SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION]]
+** <dt>SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION</dt>
+** <dd> ^This option is used to enable or disable the [sqlite3_load_extension()]
+** interface independently of the [load_extension()] SQL function.
+** The [sqlite3_enable_load_extension()] API enables or disables both the
+** C-API [sqlite3_load_extension()] and the SQL function [load_extension()].
+** There must be two additional arguments.
+** When the first argument to this interface is 1, then only the C-API is
+** enabled and the SQL function remains disabled.  If the first argument to
+** this interface is 0, then both the C-API and the SQL function are disabled.
+** If the first argument is -1, then no changes are made to state of either the
+** C-API or the SQL function.
+** The second parameter is a pointer to an integer into which
+** is written 0 or 1 to indicate whether [sqlite3_load_extension()] interface
+** is disabled or enabled following this call.  The second parameter may
+** be a NULL pointer, in which case the new setting is not reported back.
+** </dd>
+**
+** [[SQLITE_DBCONFIG_MAINDBNAME]] <dt>SQLITE_DBCONFIG_MAINDBNAME</dt>
+** <dd> ^This option is used to change the name of the "main" database
+** schema.  This option does not follow the
+** [DBCONFIG arguments|usual SQLITE_DBCONFIG argument format].
+** This option takes exactly one additional argument so that the
+** [sqlite3_db_config()] call has a total of three parameters.  The
+** extra argument must be a pointer to a constant UTF8 string which
+** will become the new schema name in place of "main".  ^SQLite does
+** not make a copy of the new main schema name string, so the application
+** must ensure that the argument passed into SQLITE_DBCONFIG MAINDBNAME
+** is unchanged until after the database connection closes.
+** </dd>
+**
+** [[SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE]]
+** <dt>SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE</dt>
+** <dd> Usually, when a database in [WAL mode] is closed or detached from a
+** database handle, SQLite checks if if there are other connections to the
+** same database, and if there are no other database connection (if the
+** connection being closed is the last open connection to the database),
+** then SQLite performs a [checkpoint] before closing the connection and
+** deletes the WAL file.  The SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE option can
+** be used to override that behavior. The first argument passed to this
+** operation (the third parameter to [sqlite3_db_config()]) is an integer
+** which is positive to disable checkpoints-on-close, or zero (the default)
+** to enable them, and negative to leave the setting unchanged.
+** The second argument (the fourth parameter) is a pointer to an integer
+** into which is written 0 or 1 to indicate whether checkpoints-on-close
+** have been disabled - 0 if they are not disabled, 1 if they are.
+** </dd>
+**
+** [[SQLITE_DBCONFIG_ENABLE_QPSG]] <dt>SQLITE_DBCONFIG_ENABLE_QPSG</dt>
+** <dd>^(The SQLITE_DBCONFIG_ENABLE_QPSG option activates or deactivates
+** the [query planner stability guarantee] (QPSG).  When the QPSG is active,
+** a single SQL query statement will always use the same algorithm regardless
+** of values of [bound parameters].)^ The QPSG disables some query optimizations
+** that look at the values of bound parameters, which can make some queries
+** slower.  But the QPSG has the advantage of more predictable behavior.  With
+** the QPSG active, SQLite will always use the same query plan in the field as
+** was used during testing in the lab.
+** The first argument to this setting is an integer which is 0 to disable
+** the QPSG, positive to enable QPSG, or negative to leave the setting
+** unchanged. The second parameter is a pointer to an integer into which
+** is written 0 or 1 to indicate whether the QPSG is disabled or enabled
+** following this call.
+** </dd>
+**
+** [[SQLITE_DBCONFIG_TRIGGER_EQP]] <dt>SQLITE_DBCONFIG_TRIGGER_EQP</dt>
+** <dd> By default, the output of EXPLAIN QUERY PLAN commands does not
+** include output for any operations performed by trigger programs. This
+** option is used to set or clear (the default) a flag that governs this
+** behavior. The first parameter passed to this operation is an integer -
+** positive to enable output for trigger programs, or zero to disable it,
+** or negative to leave the setting unchanged.
+** The second parameter is a pointer to an integer into which is written
+** 0 or 1 to indicate whether output-for-triggers has been disabled - 0 if
+** it is not disabled, 1 if it is.
+** </dd>
+**
+** [[SQLITE_DBCONFIG_RESET_DATABASE]] <dt>SQLITE_DBCONFIG_RESET_DATABASE</dt>
+** <dd> Set the SQLITE_DBCONFIG_RESET_DATABASE flag and then run
+** [VACUUM] in order to reset a database back to an empty database
+** with no schema and no content. The following process works even for
+** a badly corrupted database file:
+** <ol>
+** <li> If the database connection is newly opened, make sure it has read the
+**      database schema by preparing then discarding some query against the
+**      database, or calling sqlite3_table_column_metadata(), ignoring any
+**      errors.  This step is only necessary if the application desires to keep
+**      the database in WAL mode after the reset if it was in WAL mode before
+**      the reset.
+** <li> sqlite3_db_config(db, SQLITE_DBCONFIG_RESET_DATABASE, 1, 0);
+** <li> [sqlite3_exec](db, "[VACUUM]", 0, 0, 0);
+** <li> sqlite3_db_config(db, SQLITE_DBCONFIG_RESET_DATABASE, 0, 0);
+** </ol>
+** Because resetting a database is destructive and irreversible, the
+** process requires the use of this obscure API and multiple steps to
+** help ensure that it does not happen by accident. Because this
+** feature must be capable of resetting corrupt databases, and
+** shutting down virtual tables may require access to that corrupt
+** storage, the library must abandon any installed virtual tables
+** without calling their xDestroy() methods.
+**
+** [[SQLITE_DBCONFIG_DEFENSIVE]] <dt>SQLITE_DBCONFIG_DEFENSIVE</dt>
+** <dd>The SQLITE_DBCONFIG_DEFENSIVE option activates or deactivates the
+** "defensive" flag for a database connection.  When the defensive
+** flag is enabled, language features that allow ordinary SQL to
+** deliberately corrupt the database file are disabled.  The disabled
+** features include but are not limited to the following:
+** <ul>
+** <li> The [PRAGMA writable_schema=ON] statement.
+** <li> The [PRAGMA journal_mode=OFF] statement.
+** <li> The [PRAGMA schema_version=N] statement.
+** <li> Writes to the [sqlite_dbpage] virtual table.
+** <li> Direct writes to [shadow tables].
+** </ul>
+** </dd>
+**
+** [[SQLITE_DBCONFIG_WRITABLE_SCHEMA]] <dt>SQLITE_DBCONFIG_WRITABLE_SCHEMA</dt>
+** <dd>The SQLITE_DBCONFIG_WRITABLE_SCHEMA option activates or deactivates the
+** "writable_schema" flag. This has the same effect and is logically equivalent
+** to setting [PRAGMA writable_schema=ON] or [PRAGMA writable_schema=OFF].
+** The first argument to this setting is an integer which is 0 to disable
+** the writable_schema, positive to enable writable_schema, or negative to
+** leave the setting unchanged. The second parameter is a pointer to an
+** integer into which is written 0 or 1 to indicate whether the writable_schema
+** is enabled or disabled following this call.
+** </dd>
+**
+** [[SQLITE_DBCONFIG_LEGACY_ALTER_TABLE]]
+** <dt>SQLITE_DBCONFIG_LEGACY_ALTER_TABLE</dt>
+** <dd>The SQLITE_DBCONFIG_LEGACY_ALTER_TABLE option activates or deactivates
+** the legacy behavior of the [ALTER TABLE RENAME] command such it
+** behaves as it did prior to [version 3.24.0] (2018-06-04).  See the
+** "Compatibility Notice" on the [ALTER TABLE RENAME documentation] for
+** additional information. This feature can also be turned on and off
+** using the [PRAGMA legacy_alter_table] statement.
+** </dd>
+**
+** [[SQLITE_DBCONFIG_DQS_DML]]
+** <dt>SQLITE_DBCONFIG_DQS_DML</dt>
+** <dd>The SQLITE_DBCONFIG_DQS_DML option activates or deactivates
+** the legacy [double-quoted string literal] misfeature for DML statements
+** only, that is DELETE, INSERT, SELECT, and UPDATE statements. The
+** default value of this setting is determined by the [-DSQLITE_DQS]
+** compile-time option.
+** </dd>
+**
+** [[SQLITE_DBCONFIG_DQS_DDL]]
+** <dt>SQLITE_DBCONFIG_DQS_DDL</dt>
+** <dd>The SQLITE_DBCONFIG_DQS option activates or deactivates
+** the legacy [double-quoted string literal] misfeature for DDL statements,
+** such as CREATE TABLE and CREATE INDEX. The
+** default value of this setting is determined by the [-DSQLITE_DQS]
+** compile-time option.
+** </dd>
+**
+** [[SQLITE_DBCONFIG_TRUSTED_SCHEMA]]
+** <dt>SQLITE_DBCONFIG_TRUSTED_SCHEMA</dt>
+** <dd>The SQLITE_DBCONFIG_TRUSTED_SCHEMA option tells SQLite to
+** assume that database schemas are untainted by malicious content.
+** When the SQLITE_DBCONFIG_TRUSTED_SCHEMA option is disabled, SQLite
+** takes additional defensive steps to protect the application from harm
+** including:
+** <ul>
+** <li> Prohibit the use of SQL functions inside triggers, views,
+** CHECK constraints, DEFAULT clauses, expression indexes,
+** partial indexes, or generated columns
+** unless those functions are tagged with [SQLITE_INNOCUOUS].
+** <li> Prohibit the use of virtual tables inside of triggers or views
+** unless those virtual tables are tagged with [SQLITE_VTAB_INNOCUOUS].
+** </ul>
+** This setting defaults to "on" for legacy compatibility, however
+** all applications are advised to turn it off if possible. This setting
+** can also be controlled using the [PRAGMA trusted_schema] statement.
+** </dd>
+**
+** [[SQLITE_DBCONFIG_LEGACY_FILE_FORMAT]]
+** <dt>SQLITE_DBCONFIG_LEGACY_FILE_FORMAT</dt>
+** <dd>The SQLITE_DBCONFIG_LEGACY_FILE_FORMAT option activates or deactivates
+** the legacy file format flag.  When activated, this flag causes all newly
+** created database file to have a schema format version number (the 4-byte
+** integer found at offset 44 into the database header) of 1.  This in turn
+** means that the resulting database file will be readable and writable by
+** any SQLite version back to 3.0.0 ([dateof:3.0.0]).  Without this setting,
+** newly created databases are generally not understandable by SQLite versions
+** prior to 3.3.0 ([dateof:3.3.0]).  As these words are written, there
+** is now scarcely any need to generate database files that are compatible
+** all the way back to version 3.0.0, and so this setting is of little
+** practical use, but is provided so that SQLite can continue to claim the
+** ability to generate new database files that are compatible with  version
+** 3.0.0.
+** <p>Note that when the SQLITE_DBCONFIG_LEGACY_FILE_FORMAT setting is on,
+** the [VACUUM] command will fail with an obscure error when attempting to
+** process a table with generated columns and a descending index.  This is
+** not considered a bug since SQLite versions 3.3.0 and earlier do not support
+** either generated columns or descending indexes.
+** </dd>
+**
+** [[SQLITE_DBCONFIG_STMT_SCANSTATUS]]
+** <dt>SQLITE_DBCONFIG_STMT_SCANSTATUS</dt>
+** <dd>The SQLITE_DBCONFIG_STMT_SCANSTATUS option is only useful in
+** SQLITE_ENABLE_STMT_SCANSTATUS builds. In this case, it sets or clears
+** a flag that enables collection of the sqlite3_stmt_scanstatus_v2()
+** statistics. For statistics to be collected, the flag must be set on
+** the database handle both when the SQL statement is prepared and when it
+** is stepped. The flag is set (collection of statistics is enabled)
+** by default. <p>This option takes two arguments: an integer and a pointer to
+** an integer..  The first argument is 1, 0, or -1 to enable, disable, or
+** leave unchanged the statement scanstatus option.  If the second argument
+** is not NULL, then the value of the statement scanstatus setting after
+** processing the first argument is written into the integer that the second
+** argument points to.
+** </dd>
+**
+** [[SQLITE_DBCONFIG_REVERSE_SCANORDER]]
+** <dt>SQLITE_DBCONFIG_REVERSE_SCANORDER</dt>
+** <dd>The SQLITE_DBCONFIG_REVERSE_SCANORDER option changes the default order
+** in which tables and indexes are scanned so that the scans start at the end
+** and work toward the beginning rather than starting at the beginning and
+** working toward the end. Setting SQLITE_DBCONFIG_REVERSE_SCANORDER is the
+** same as setting [PRAGMA reverse_unordered_selects]. <p>This option takes
+** two arguments which are an integer and a pointer to an integer.  The first
+** argument is 1, 0, or -1 to enable, disable, or leave unchanged the
+** reverse scan order flag, respectively.  If the second argument is not NULL,
+** then 0 or 1 is written into the integer that the second argument points to
+** depending on if the reverse scan order flag is set after processing the
+** first argument.
+** </dd>
+**
+** [[SQLITE_DBCONFIG_ENABLE_ATTACH_CREATE]]
+** <dt>SQLITE_DBCONFIG_ENABLE_ATTACH_CREATE</dt>
+** <dd>The SQLITE_DBCONFIG_ENABLE_ATTACH_CREATE option enables or disables
+** the ability of the [ATTACH DATABASE] SQL command to create a new database
+** file if the database filed named in the ATTACH command does not already
+** exist.  This ability of ATTACH to create a new database is enabled by
+** default.  Applications can disable or reenable the ability for ATTACH to
+** create new database files using this DBCONFIG option.<p>
+** This option takes two arguments which are an integer and a pointer
+** to an integer.  The first argument is 1, 0, or -1 to enable, disable, or
+** leave unchanged the attach-create flag, respectively.  If the second
+** argument is not NULL, then 0 or 1 is written into the integer that the
+** second argument points to depending on if the attach-create flag is set
+** after processing the first argument.
+** </dd>
+**
+** [[SQLITE_DBCONFIG_ENABLE_ATTACH_WRITE]]
+** <dt>SQLITE_DBCONFIG_ENABLE_ATTACH_WRITE</dt>
+** <dd>The SQLITE_DBCONFIG_ENABLE_ATTACH_WRITE option enables or disables the
+** ability of the [ATTACH DATABASE] SQL command to open a database for writing.
+** This capability is enabled by default.  Applications can disable or
+** reenable this capability using the current DBCONFIG option.  If the
+** the this capability is disabled, the [ATTACH] command will still work,
+** but the database will be opened read-only.  If this option is disabled,
+** then the ability to create a new database using [ATTACH] is also disabled,
+** regardless of the value of the [SQLITE_DBCONFIG_ENABLE_ATTACH_CREATE]
+** option.<p>
+** This option takes two arguments which are an integer and a pointer
+** to an integer.  The first argument is 1, 0, or -1 to enable, disable, or
+** leave unchanged the ability to ATTACH another database for writing,
+** respectively.  If the second argument is not NULL, then 0 or 1 is written
+** into the integer to which the second argument points, depending on whether
+** the ability to ATTACH a read/write database is enabled or disabled
+** after processing the first argument.
+** </dd>
+**
+** [[SQLITE_DBCONFIG_ENABLE_COMMENTS]]
+** <dt>SQLITE_DBCONFIG_ENABLE_COMMENTS</dt>
+** <dd>The SQLITE_DBCONFIG_ENABLE_COMMENTS option enables or disables the
+** ability to include comments in SQL text.  Comments are enabled by default.
+** An application can disable or reenable comments in SQL text using this
+** DBCONFIG option.<p>
+** This option takes two arguments which are an integer and a pointer
+** to an integer.  The first argument is 1, 0, or -1 to enable, disable, or
+** leave unchanged the ability to use comments in SQL text,
+** respectively.  If the second argument is not NULL, then 0 or 1 is written
+** into the integer that the second argument points to depending on if
+** comments are allowed in SQL text after processing the first argument.
+** </dd>
+**
+** </dl>
+**
+** [[DBCONFIG arguments]] <h3>Arguments To SQLITE_DBCONFIG Options</h3>
+**
+** <p>Most of the SQLITE_DBCONFIG options take two arguments, so that the
+** overall call to [sqlite3_db_config()] has a total of four parameters.
+** The first argument (the third parameter to sqlite3_db_config()) is a integer.
+** The second argument is a pointer to an integer.  If the first argument is 1,
+** then the option becomes enabled.  If the first integer argument is 0, then the
+** option is disabled.  If the first argument is -1, then the option setting
+** is unchanged.  The second argument, the pointer to an integer, may be NULL.
+** If the second argument is not NULL, then a value of 0 or 1 is written into
+** the integer to which the second argument points, depending on whether the
+** setting is disabled or enabled after applying any changes specified by
+** the first argument.
+**
+** <p>While most SQLITE_DBCONFIG options use the argument format
+** described in the previous paragraph, the [SQLITE_DBCONFIG_MAINDBNAME]
+** and [SQLITE_DBCONFIG_LOOKASIDE] options are different.  See the
+** documentation of those exceptional options for details.
+*/
+#define SQLITE_DBCONFIG_MAINDBNAME            1000 /* const char* */
+#define SQLITE_DBCONFIG_LOOKASIDE             1001 /* void* int int */
+#define SQLITE_DBCONFIG_ENABLE_FKEY           1002 /* int int* */
+#define SQLITE_DBCONFIG_ENABLE_TRIGGER        1003 /* int int* */
+#define SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1004 /* int int* */
+#define SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION 1005 /* int int* */
+#define SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE      1006 /* int int* */
+#define SQLITE_DBCONFIG_ENABLE_QPSG           1007 /* int int* */
+#define SQLITE_DBCONFIG_TRIGGER_EQP           1008 /* int int* */
+#define SQLITE_DBCONFIG_RESET_DATABASE        1009 /* int int* */
+#define SQLITE_DBCONFIG_DEFENSIVE             1010 /* int int* */
+#define SQLITE_DBCONFIG_WRITABLE_SCHEMA       1011 /* int int* */
+#define SQLITE_DBCONFIG_LEGACY_ALTER_TABLE    1012 /* int int* */
+#define SQLITE_DBCONFIG_DQS_DML               1013 /* int int* */
+#define SQLITE_DBCONFIG_DQS_DDL               1014 /* int int* */
+#define SQLITE_DBCONFIG_ENABLE_VIEW           1015 /* int int* */
+#define SQLITE_DBCONFIG_LEGACY_FILE_FORMAT    1016 /* int int* */
+#define SQLITE_DBCONFIG_TRUSTED_SCHEMA        1017 /* int int* */
+#define SQLITE_DBCONFIG_STMT_SCANSTATUS       1018 /* int int* */
+#define SQLITE_DBCONFIG_REVERSE_SCANORDER     1019 /* int int* */
+#define SQLITE_DBCONFIG_ENABLE_ATTACH_CREATE  1020 /* int int* */
+#define SQLITE_DBCONFIG_ENABLE_ATTACH_WRITE   1021 /* int int* */
+#define SQLITE_DBCONFIG_ENABLE_COMMENTS       1022 /* int int* */
+#define SQLITE_DBCONFIG_MAX                   1022 /* Largest DBCONFIG */
+
+/*
+** CAPI3REF: Enable Or Disable Extended Result Codes
+** METHOD: sqlite3
+**
+** ^The sqlite3_extended_result_codes() routine enables or disables the
+** [extended result codes] feature of SQLite. ^The extended result
+** codes are disabled by default for historical compatibility.
+*/
+SQLITE_API int sqlite3_extended_result_codes(sqlite3*, int onoff);
+
+/*
+** CAPI3REF: Last Insert Rowid
+** METHOD: sqlite3
+**
+** ^Each entry in most SQLite tables (except for [WITHOUT ROWID] tables)
+** has a unique 64-bit signed
+** integer key called the [ROWID | "rowid"]. ^The rowid is always available
+** as an undeclared column named ROWID, OID, or _ROWID_ as long as those
+** names are not also used by explicitly declared columns. ^If
+** the table has a column of type [INTEGER PRIMARY KEY] then that column
+** is another alias for the rowid.
+**
+** ^The sqlite3_last_insert_rowid(D) interface usually returns the [rowid] of
+** the most recent successful [INSERT] into a rowid table or [virtual table]
+** on database connection D. ^Inserts into [WITHOUT ROWID] tables are not
+** recorded. ^If no successful [INSERT]s into rowid tables have ever occurred
+** on the database connection D, then sqlite3_last_insert_rowid(D) returns
+** zero.
+**
+** As well as being set automatically as rows are inserted into database
+** tables, the value returned by this function may be set explicitly by
+** [sqlite3_set_last_insert_rowid()]
+**
+** Some virtual table implementations may INSERT rows into rowid tables as
+** part of committing a transaction (e.g. to flush data accumulated in memory
+** to disk). In this case subsequent calls to this function return the rowid
+** associated with these internal INSERT operations, which leads to
+** unintuitive results. Virtual table implementations that do write to rowid
+** tables in this way can avoid this problem by restoring the original
+** rowid value using [sqlite3_set_last_insert_rowid()] before returning
+** control to the user.
+**
+** ^(If an [INSERT] occurs within a trigger then this routine will
+** return the [rowid] of the inserted row as long as the trigger is
+** running. Once the trigger program ends, the value returned
+** by this routine reverts to what it was before the trigger was fired.)^
+**
+** ^An [INSERT] that fails due to a constraint violation is not a
+** successful [INSERT] and does not change the value returned by this
+** routine.  ^Thus INSERT OR FAIL, INSERT OR IGNORE, INSERT OR ROLLBACK,
+** and INSERT OR ABORT make no changes to the return value of this
+** routine when their insertion fails.  ^(When INSERT OR REPLACE
+** encounters a constraint violation, it does not fail.  The
+** INSERT continues to completion after deleting rows that caused
+** the constraint problem so INSERT OR REPLACE will always change
+** the return value of this interface.)^
+**
+** ^For the purposes of this routine, an [INSERT] is considered to
+** be successful even if it is subsequently rolled back.
+**
+** This function is accessible to SQL statements via the
+** [last_insert_rowid() SQL function].
+**
+** If a separate thread performs a new [INSERT] on the same
+** database connection while the [sqlite3_last_insert_rowid()]
+** function is running and thus changes the last insert [rowid],
+** then the value returned by [sqlite3_last_insert_rowid()] is
+** unpredictable and might not equal either the old or the new
+** last insert [rowid].
+*/
+SQLITE_API sqlite3_int64 sqlite3_last_insert_rowid(sqlite3*);
+
+/*
+** CAPI3REF: Set the Last Insert Rowid value.
+** METHOD: sqlite3
+**
+** The sqlite3_set_last_insert_rowid(D, R) method allows the application to
+** set the value returned by calling sqlite3_last_insert_rowid(D) to R
+** without inserting a row into the database.
+*/
+SQLITE_API void sqlite3_set_last_insert_rowid(sqlite3*,sqlite3_int64);
+
+/*
+** CAPI3REF: Count The Number Of Rows Modified
+** METHOD: sqlite3
+**
+** ^These functions return the number of rows modified, inserted or
+** deleted by the most recently completed INSERT, UPDATE or DELETE
+** statement on the database connection specified by the only parameter.
+** The two functions are identical except for the type of the return value
+** and that if the number of rows modified by the most recent INSERT, UPDATE,
+** or DELETE is greater than the maximum value supported by type "int", then
+** the return value of sqlite3_changes() is undefined. ^Executing any other
+** type of SQL statement does not modify the value returned by these functions.
+** For the purposes of this interface, a CREATE TABLE AS SELECT statement
+** does not count as an INSERT, UPDATE or DELETE statement and hence the rows
+** added to the new table by the CREATE TABLE AS SELECT statement are not
+** counted.
+**
+** ^Only changes made directly by the INSERT, UPDATE or DELETE statement are
+** considered - auxiliary changes caused by [CREATE TRIGGER | triggers],
+** [foreign key actions] or [REPLACE] constraint resolution are not counted.
+**
+** Changes to a view that are intercepted by
+** [INSTEAD OF trigger | INSTEAD OF triggers] are not counted. ^The value
+** returned by sqlite3_changes() immediately after an INSERT, UPDATE or
+** DELETE statement run on a view is always zero. Only changes made to real
+** tables are counted.
+**
+** Things are more complicated if the sqlite3_changes() function is
+** executed while a trigger program is running. This may happen if the
+** program uses the [changes() SQL function], or if some other callback
+** function invokes sqlite3_changes() directly. Essentially:
+**
+** <ul>
+**   <li> ^(Before entering a trigger program the value returned by
+**        sqlite3_changes() function is saved. After the trigger program
+**        has finished, the original value is restored.)^
+**
+**   <li> ^(Within a trigger program each INSERT, UPDATE and DELETE
+**        statement sets the value returned by sqlite3_changes()
+**        upon completion as normal. Of course, this value will not include
+**        any changes performed by sub-triggers, as the sqlite3_changes()
+**        value will be saved and restored after each sub-trigger has run.)^
+** </ul>
+**
+** ^This means that if the changes() SQL function (or similar) is used
+** by the first INSERT, UPDATE or DELETE statement within a trigger, it
+** returns the value as set when the calling statement began executing.
+** ^If it is used by the second or subsequent such statement within a trigger
+** program, the value returned reflects the number of rows modified by the
+** previous INSERT, UPDATE or DELETE statement within the same trigger.
+**
+** If a separate thread makes changes on the same database connection
+** while [sqlite3_changes()] is running then the value returned
+** is unpredictable and not meaningful.
+**
+** See also:
+** <ul>
+** <li> the [sqlite3_total_changes()] interface
+** <li> the [count_changes pragma]
+** <li> the [changes() SQL function]
+** <li> the [data_version pragma]
+** </ul>
+*/
+SQLITE_API int sqlite3_changes(sqlite3*);
+SQLITE_API sqlite3_int64 sqlite3_changes64(sqlite3*);
+
+/*
+** CAPI3REF: Total Number Of Rows Modified
+** METHOD: sqlite3
+**
+** ^These functions return the total number of rows inserted, modified or
+** deleted by all [INSERT], [UPDATE] or [DELETE] statements completed
+** since the database connection was opened, including those executed as
+** part of trigger programs. The two functions are identical except for the
+** type of the return value and that if the number of rows modified by the
+** connection exceeds the maximum value supported by type "int", then
+** the return value of sqlite3_total_changes() is undefined. ^Executing
+** any other type of SQL statement does not affect the value returned by
+** sqlite3_total_changes().
+**
+** ^Changes made as part of [foreign key actions] are included in the
+** count, but those made as part of REPLACE constraint resolution are
+** not. ^Changes to a view that are intercepted by INSTEAD OF triggers
+** are not counted.
+**
+** The [sqlite3_total_changes(D)] interface only reports the number
+** of rows that changed due to SQL statement run against database
+** connection D.  Any changes by other database connections are ignored.
+** To detect changes against a database file from other database
+** connections use the [PRAGMA data_version] command or the
+** [SQLITE_FCNTL_DATA_VERSION] [file control].
+**
+** If a separate thread makes changes on the same database connection
+** while [sqlite3_total_changes()] is running then the value
+** returned is unpredictable and not meaningful.
+**
+** See also:
+** <ul>
+** <li> the [sqlite3_changes()] interface
+** <li> the [count_changes pragma]
+** <li> the [changes() SQL function]
+** <li> the [data_version pragma]
+** <li> the [SQLITE_FCNTL_DATA_VERSION] [file control]
+** </ul>
+*/
+SQLITE_API int sqlite3_total_changes(sqlite3*);
+SQLITE_API sqlite3_int64 sqlite3_total_changes64(sqlite3*);
+
+/*
+** CAPI3REF: Interrupt A Long-Running Query
+** METHOD: sqlite3
+**
+** ^This function causes any pending database operation to abort and
+** return at its earliest opportunity. This routine is typically
+** called in response to a user action such as pressing "Cancel"
+** or Ctrl-C where the user wants a long query operation to halt
+** immediately.
+**
+** ^It is safe to call this routine from a thread different from the
+** thread that is currently running the database operation.  But it
+** is not safe to call this routine with a [database connection] that
+** is closed or might close before sqlite3_interrupt() returns.
+**
+** ^If an SQL operation is very nearly finished at the time when
+** sqlite3_interrupt() is called, then it might not have an opportunity
+** to be interrupted and might continue to completion.
+**
+** ^An SQL operation that is interrupted will return [SQLITE_INTERRUPT].
+** ^If the interrupted SQL operation is an INSERT, UPDATE, or DELETE
+** that is inside an explicit transaction, then the entire transaction
+** will be rolled back automatically.
+**
+** ^The sqlite3_interrupt(D) call is in effect until all currently running
+** SQL statements on [database connection] D complete.  ^Any new SQL statements
+** that are started after the sqlite3_interrupt() call and before the
+** running statement count reaches zero are interrupted as if they had been
+** running prior to the sqlite3_interrupt() call.  ^New SQL statements
+** that are started after the running statement count reaches zero are
+** not effected by the sqlite3_interrupt().
+** ^A call to sqlite3_interrupt(D) that occurs when there are no running
+** SQL statements is a no-op and has no effect on SQL statements
+** that are started after the sqlite3_interrupt() call returns.
+**
+** ^The [sqlite3_is_interrupted(D)] interface can be used to determine whether
+** or not an interrupt is currently in effect for [database connection] D.
+** It returns 1 if an interrupt is currently in effect, or 0 otherwise.
+*/
+SQLITE_API void sqlite3_interrupt(sqlite3*);
+SQLITE_API int sqlite3_is_interrupted(sqlite3*);
+
+/*
+** CAPI3REF: Determine If An SQL Statement Is Complete
+**
+** These routines are useful during command-line input to determine if the
+** currently entered text seems to form a complete SQL statement or
+** if additional input is needed before sending the text into
+** SQLite for parsing.  ^These routines return 1 if the input string
+** appears to be a complete SQL statement.  ^A statement is judged to be
+** complete if it ends with a semicolon token and is not a prefix of a
+** well-formed CREATE TRIGGER statement.  ^Semicolons that are embedded within
+** string literals or quoted identifier names or comments are not
+** independent tokens (they are part of the token in which they are
+** embedded) and thus do not count as a statement terminator.  ^Whitespace
+** and comments that follow the final semicolon are ignored.
+**
+** ^These routines return 0 if the statement is incomplete.  ^If a
+** memory allocation fails, then SQLITE_NOMEM is returned.
+**
+** ^These routines do not parse the SQL statements thus
+** will not detect syntactically incorrect SQL.
+**
+** ^(If SQLite has not been initialized using [sqlite3_initialize()] prior
+** to invoking sqlite3_complete16() then sqlite3_initialize() is invoked
+** automatically by sqlite3_complete16().  If that initialization fails,
+** then the return value from sqlite3_complete16() will be non-zero
+** regardless of whether or not the input SQL is complete.)^
+**
+** The input to [sqlite3_complete()] must be a zero-terminated
+** UTF-8 string.
+**
+** The input to [sqlite3_complete16()] must be a zero-terminated
+** UTF-16 string in native byte order.
+*/
+SQLITE_API int sqlite3_complete(const char *sql);
+SQLITE_API int sqlite3_complete16(const void *sql);
+
+/*
+** CAPI3REF: Register A Callback To Handle SQLITE_BUSY Errors
+** KEYWORDS: {busy-handler callback} {busy handler}
+** METHOD: sqlite3
+**
+** ^The sqlite3_busy_handler(D,X,P) routine sets a callback function X
+** that might be invoked with argument P whenever
+** an attempt is made to access a database table associated with
+** [database connection] D when another thread
+** or process has the table locked.
+** The sqlite3_busy_handler() interface is used to implement
+** [sqlite3_busy_timeout()] and [PRAGMA busy_timeout].
+**
+** ^If the busy callback is NULL, then [SQLITE_BUSY]
+** is returned immediately upon encountering the lock.  ^If the busy callback
+** is not NULL, then the callback might be invoked with two arguments.
+**
+** ^The first argument to the busy handler is a copy of the void* pointer which
+** is the third argument to sqlite3_busy_handler().  ^The second argument to
+** the busy handler callback is the number of times that the busy handler has
+** been invoked previously for the same locking event.  ^If the
+** busy callback returns 0, then no additional attempts are made to
+** access the database and [SQLITE_BUSY] is returned
+** to the application.
+** ^If the callback returns non-zero, then another attempt
+** is made to access the database and the cycle repeats.
+**
+** The presence of a busy handler does not guarantee that it will be invoked
+** when there is lock contention. ^If SQLite determines that invoking the busy
+** handler could result in a deadlock, it will go ahead and return [SQLITE_BUSY]
+** to the application instead of invoking the
+** busy handler.
+** Consider a scenario where one process is holding a read lock that
+** it is trying to promote to a reserved lock and
+** a second process is holding a reserved lock that it is trying
+** to promote to an exclusive lock.  The first process cannot proceed
+** because it is blocked by the second and the second process cannot
+** proceed because it is blocked by the first.  If both processes
+** invoke the busy handlers, neither will make any progress.  Therefore,
+** SQLite returns [SQLITE_BUSY] for the first process, hoping that this
+** will induce the first process to release its read lock and allow
+** the second process to proceed.
+**
+** ^The default busy callback is NULL.
+**
+** ^(There can only be a single busy handler defined for each
+** [database connection].  Setting a new busy handler clears any
+** previously set handler.)^  ^Note that calling [sqlite3_busy_timeout()]
+** or evaluating [PRAGMA busy_timeout=N] will change the
+** busy handler and thus clear any previously set busy handler.
+**
+** The busy callback should not take any actions which modify the
+** database connection that invoked the busy handler.  In other words,
+** the busy handler is not reentrant.  Any such actions
+** result in undefined behavior.
+**
+** A busy handler must not close the database connection
+** or [prepared statement] that invoked the busy handler.
+*/
+SQLITE_API int sqlite3_busy_handler(sqlite3*,int(*)(void*,int),void*);
+
+/*
+** CAPI3REF: Set A Busy Timeout
+** METHOD: sqlite3
+**
+** ^This routine sets a [sqlite3_busy_handler | busy handler] that sleeps
+** for a specified amount of time when a table is locked.  ^The handler
+** will sleep multiple times until at least "ms" milliseconds of sleeping
+** have accumulated.  ^After at least "ms" milliseconds of sleeping,
+** the handler returns 0 which causes [sqlite3_step()] to return
+** [SQLITE_BUSY].
+**
+** ^Calling this routine with an argument less than or equal to zero
+** turns off all busy handlers.
+**
+** ^(There can only be a single busy handler for a particular
+** [database connection] at any given moment.  If another busy handler
+** was defined  (using [sqlite3_busy_handler()]) prior to calling
+** this routine, that other busy handler is cleared.)^
+**
+** See also:  [PRAGMA busy_timeout]
+*/
+SQLITE_API int sqlite3_busy_timeout(sqlite3*, int ms);
+
+/*
+** CAPI3REF: Convenience Routines For Running Queries
+** METHOD: sqlite3
+**
+** This is a legacy interface that is preserved for backwards compatibility.
+** Use of this interface is not recommended.
+**
+** Definition: A <b>result table</b> is memory data structure created by the
+** [sqlite3_get_table()] interface.  A result table records the
+** complete query results from one or more queries.
+**
+** The table conceptually has a number of rows and columns.  But
+** these numbers are not part of the result table itself.  These
+** numbers are obtained separately.  Let N be the number of rows
+** and M be the number of columns.
+**
+** A result table is an array of pointers to zero-terminated UTF-8 strings.
+** There are (N+1)*M elements in the array.  The first M pointers point
+** to zero-terminated strings that  contain the names of the columns.
+** The remaining entries all point to query results.  NULL values result
+** in NULL pointers.  All other values are in their UTF-8 zero-terminated
+** string representation as returned by [sqlite3_column_text()].
+**
+** A result table might consist of one or more memory allocations.
+** It is not safe to pass a result table directly to [sqlite3_free()].
+** A result table should be deallocated using [sqlite3_free_table()].
+**
+** ^(As an example of the result table format, suppose a query result
+** is as follows:
+**
+** <blockquote><pre>
+**        Name        | Age
+**        -----------------------
+**        Alice       | 43
+**        Bob         | 28
+**        Cindy       | 21
+** </pre></blockquote>
+**
+** There are two columns (M==2) and three rows (N==3).  Thus the
+** result table has 8 entries.  Suppose the result table is stored
+** in an array named azResult.  Then azResult holds this content:
+**
+** <blockquote><pre>
+**        azResult&#91;0] = "Name";
+**        azResult&#91;1] = "Age";
+**        azResult&#91;2] = "Alice";
+**        azResult&#91;3] = "43";
+**        azResult&#91;4] = "Bob";
+**        azResult&#91;5] = "28";
+**        azResult&#91;6] = "Cindy";
+**        azResult&#91;7] = "21";
+** </pre></blockquote>)^
+**
+** ^The sqlite3_get_table() function evaluates one or more
+** semicolon-separated SQL statements in the zero-terminated UTF-8
+** string of its 2nd parameter and returns a result table to the
+** pointer given in its 3rd parameter.
+**
+** After the application has finished with the result from sqlite3_get_table(),
+** it must pass the result table pointer to sqlite3_free_table() in order to
+** release the memory that was malloced.  Because of the way the
+** [sqlite3_malloc()] happens within sqlite3_get_table(), the calling
+** function must not try to call [sqlite3_free()] directly.  Only
+** [sqlite3_free_table()] is able to release the memory properly and safely.
+**
+** The sqlite3_get_table() interface is implemented as a wrapper around
+** [sqlite3_exec()].  The sqlite3_get_table() routine does not have access
+** to any internal data structures of SQLite.  It uses only the public
+** interface defined here.  As a consequence, errors that occur in the
+** wrapper layer outside of the internal [sqlite3_exec()] call are not
+** reflected in subsequent calls to [sqlite3_errcode()] or
+** [sqlite3_errmsg()].
+*/
+SQLITE_API int sqlite3_get_table(
+  sqlite3 *db,          /* An open database */
+  const char *zSql,     /* SQL to be evaluated */
+  char ***pazResult,    /* Results of the query */
+  int *pnRow,           /* Number of result rows written here */
+  int *pnColumn,        /* Number of result columns written here */
+  char **pzErrmsg       /* Error msg written here */
+);
+SQLITE_API void sqlite3_free_table(char **result);
+
+/*
+** CAPI3REF: Formatted String Printing Functions
+**
+** These routines are work-alikes of the "printf()" family of functions
+** from the standard C library.
+** These routines understand most of the common formatting options from
+** the standard library printf()
+** plus some additional non-standard formats ([%q], [%Q], [%w], and [%z]).
+** See the [built-in printf()] documentation for details.
+**
+** ^The sqlite3_mprintf() and sqlite3_vmprintf() routines write their
+** results into memory obtained from [sqlite3_malloc64()].
+** The strings returned by these two routines should be
+** released by [sqlite3_free()].  ^Both routines return a
+** NULL pointer if [sqlite3_malloc64()] is unable to allocate enough
+** memory to hold the resulting string.
+**
+** ^(The sqlite3_snprintf() routine is similar to "snprintf()" from
+** the standard C library.  The result is written into the
+** buffer supplied as the second parameter whose size is given by
+** the first parameter. Note that the order of the
+** first two parameters is reversed from snprintf().)^  This is an
+** historical accident that cannot be fixed without breaking
+** backwards compatibility.  ^(Note also that sqlite3_snprintf()
+** returns a pointer to its buffer instead of the number of
+** characters actually written into the buffer.)^  We admit that
+** the number of characters written would be a more useful return
+** value but we cannot change the implementation of sqlite3_snprintf()
+** now without breaking compatibility.
+**
+** ^As long as the buffer size is greater than zero, sqlite3_snprintf()
+** guarantees that the buffer is always zero-terminated.  ^The first
+** parameter "n" is the total size of the buffer, including space for
+** the zero terminator.  So the longest string that can be completely
+** written will be n-1 characters.
+**
+** ^The sqlite3_vsnprintf() routine is a varargs version of sqlite3_snprintf().
+**
+** See also:  [built-in printf()], [printf() SQL function]
+*/
+SQLITE_API char *sqlite3_mprintf(const char*,...);
+SQLITE_API char *sqlite3_vmprintf(const char*, va_list);
+SQLITE_API char *sqlite3_snprintf(int,char*,const char*, ...);
+SQLITE_API char *sqlite3_vsnprintf(int,char*,const char*, va_list);
+
+/*
+** CAPI3REF: Memory Allocation Subsystem
+**
+** The SQLite core uses these three routines for all of its own
+** internal memory allocation needs. "Core" in the previous sentence
+** does not include operating-system specific [VFS] implementation.  The
+** Windows VFS uses native malloc() and free() for some operations.
+**
+** ^The sqlite3_malloc() routine returns a pointer to a block
+** of memory at least N bytes in length, where N is the parameter.
+** ^If sqlite3_malloc() is unable to obtain sufficient free
+** memory, it returns a NULL pointer.  ^If the parameter N to
+** sqlite3_malloc() is zero or negative then sqlite3_malloc() returns
+** a NULL pointer.
+**
+** ^The sqlite3_malloc64(N) routine works just like
+** sqlite3_malloc(N) except that N is an unsigned 64-bit integer instead
+** of a signed 32-bit integer.
+**
+** ^Calling sqlite3_free() with a pointer previously returned
+** by sqlite3_malloc() or sqlite3_realloc() releases that memory so
+** that it might be reused.  ^The sqlite3_free() routine is
+** a no-op if is called with a NULL pointer.  Passing a NULL pointer
+** to sqlite3_free() is harmless.  After being freed, memory
+** should neither be read nor written.  Even reading previously freed
+** memory might result in a segmentation fault or other severe error.
+** Memory corruption, a segmentation fault, or other severe error
+** might result if sqlite3_free() is called with a non-NULL pointer that
+** was not obtained from sqlite3_malloc() or sqlite3_realloc().
+**
+** ^The sqlite3_realloc(X,N) interface attempts to resize a
+** prior memory allocation X to be at least N bytes.
+** ^If the X parameter to sqlite3_realloc(X,N)
+** is a NULL pointer then its behavior is identical to calling
+** sqlite3_malloc(N).
+** ^If the N parameter to sqlite3_realloc(X,N) is zero or
+** negative then the behavior is exactly the same as calling
+** sqlite3_free(X).
+** ^sqlite3_realloc(X,N) returns a pointer to a memory allocation
+** of at least N bytes in size or NULL if insufficient memory is available.
+** ^If M is the size of the prior allocation, then min(N,M) bytes
+** of the prior allocation are copied into the beginning of buffer returned
+** by sqlite3_realloc(X,N) and the prior allocation is freed.
+** ^If sqlite3_realloc(X,N) returns NULL and N is positive, then the
+** prior allocation is not freed.
+**
+** ^The sqlite3_realloc64(X,N) interfaces works the same as
+** sqlite3_realloc(X,N) except that N is a 64-bit unsigned integer instead
+** of a 32-bit signed integer.
+**
+** ^If X is a memory allocation previously obtained from sqlite3_malloc(),
+** sqlite3_malloc64(), sqlite3_realloc(), or sqlite3_realloc64(), then
+** sqlite3_msize(X) returns the size of that memory allocation in bytes.
+** ^The value returned by sqlite3_msize(X) might be larger than the number
+** of bytes requested when X was allocated.  ^If X is a NULL pointer then
+** sqlite3_msize(X) returns zero.  If X points to something that is not
+** the beginning of memory allocation, or if it points to a formerly
+** valid memory allocation that has now been freed, then the behavior
+** of sqlite3_msize(X) is undefined and possibly harmful.
+**
+** ^The memory returned by sqlite3_malloc(), sqlite3_realloc(),
+** sqlite3_malloc64(), and sqlite3_realloc64()
+** is always aligned to at least an 8 byte boundary, or to a
+** 4 byte boundary if the [SQLITE_4_BYTE_ALIGNED_MALLOC] compile-time
+** option is used.
+**
+** The pointer arguments to [sqlite3_free()] and [sqlite3_realloc()]
+** must be either NULL or else pointers obtained from a prior
+** invocation of [sqlite3_malloc()] or [sqlite3_realloc()] that have
+** not yet been released.
+**
+** The application must not read or write any part of
+** a block of memory after it has been released using
+** [sqlite3_free()] or [sqlite3_realloc()].
+*/
+SQLITE_API void *sqlite3_malloc(int);
+SQLITE_API void *sqlite3_malloc64(sqlite3_uint64);
+SQLITE_API void *sqlite3_realloc(void*, int);
+SQLITE_API void *sqlite3_realloc64(void*, sqlite3_uint64);
+SQLITE_API void sqlite3_free(void*);
+SQLITE_API sqlite3_uint64 sqlite3_msize(void*);
+
+/*
+** CAPI3REF: Memory Allocator Statistics
+**
+** SQLite provides these two interfaces for reporting on the status
+** of the [sqlite3_malloc()], [sqlite3_free()], and [sqlite3_realloc()]
+** routines, which form the built-in memory allocation subsystem.
+**
+** ^The [sqlite3_memory_used()] routine returns the number of bytes
+** of memory currently outstanding (malloced but not freed).
+** ^The [sqlite3_memory_highwater()] routine returns the maximum
+** value of [sqlite3_memory_used()] since the high-water mark
+** was last reset.  ^The values returned by [sqlite3_memory_used()] and
+** [sqlite3_memory_highwater()] include any overhead
+** added by SQLite in its implementation of [sqlite3_malloc()],
+** but not overhead added by the any underlying system library
+** routines that [sqlite3_malloc()] may call.
+**
+** ^The memory high-water mark is reset to the current value of
+** [sqlite3_memory_used()] if and only if the parameter to
+** [sqlite3_memory_highwater()] is true.  ^The value returned
+** by [sqlite3_memory_highwater(1)] is the high-water mark
+** prior to the reset.
+*/
+SQLITE_API sqlite3_int64 sqlite3_memory_used(void);
+SQLITE_API sqlite3_int64 sqlite3_memory_highwater(int resetFlag);
+
+/*
+** CAPI3REF: Pseudo-Random Number Generator
+**
+** SQLite contains a high-quality pseudo-random number generator (PRNG) used to
+** select random [ROWID | ROWIDs] when inserting new records into a table that
+** already uses the largest possible [ROWID].  The PRNG is also used for
+** the built-in random() and randomblob() SQL functions.  This interface allows
+** applications to access the same PRNG for other purposes.
+**
+** ^A call to this routine stores N bytes of randomness into buffer P.
+** ^The P parameter can be a NULL pointer.
+**
+** ^If this routine has not been previously called or if the previous
+** call had N less than one or a NULL pointer for P, then the PRNG is
+** seeded using randomness obtained from the xRandomness method of
+** the default [sqlite3_vfs] object.
+** ^If the previous call to this routine had an N of 1 or more and a
+** non-NULL P then the pseudo-randomness is generated
+** internally and without recourse to the [sqlite3_vfs] xRandomness
+** method.
+*/
+SQLITE_API void sqlite3_randomness(int N, void *P);
+
+/*
+** CAPI3REF: Compile-Time Authorization Callbacks
+** METHOD: sqlite3
+** KEYWORDS: {authorizer callback}
+**
+** ^This routine registers an authorizer callback with a particular
+** [database connection], supplied in the first argument.
+** ^The authorizer callback is invoked as SQL statements are being compiled
+** by [sqlite3_prepare()] or its variants [sqlite3_prepare_v2()],
+** [sqlite3_prepare_v3()], [sqlite3_prepare16()], [sqlite3_prepare16_v2()],
+** and [sqlite3_prepare16_v3()].  ^At various
+** points during the compilation process, as logic is being created
+** to perform various actions, the authorizer callback is invoked to
+** see if those actions are allowed.  ^The authorizer callback should
+** return [SQLITE_OK] to allow the action, [SQLITE_IGNORE] to disallow the
+** specific action but allow the SQL statement to continue to be
+** compiled, or [SQLITE_DENY] to cause the entire SQL statement to be
+** rejected with an error.  ^If the authorizer callback returns
+** any value other than [SQLITE_IGNORE], [SQLITE_OK], or [SQLITE_DENY]
+** then the [sqlite3_prepare_v2()] or equivalent call that triggered
+** the authorizer will fail with an error message.
+**
+** When the callback returns [SQLITE_OK], that means the operation
+** requested is ok.  ^When the callback returns [SQLITE_DENY], the
+** [sqlite3_prepare_v2()] or equivalent call that triggered the
+** authorizer will fail with an error message explaining that
+** access is denied.
+**
+** ^The first parameter to the authorizer callback is a copy of the third
+** parameter to the sqlite3_set_authorizer() interface. ^The second parameter
+** to the callback is an integer [SQLITE_COPY | action code] that specifies
+** the particular action to be authorized. ^The third through sixth parameters
+** to the callback are either NULL pointers or zero-terminated strings
+** that contain additional details about the action to be authorized.
+** Applications must always be prepared to encounter a NULL pointer in any
+** of the third through the sixth parameters of the authorization callback.
+**
+** ^If the action code is [SQLITE_READ]
+** and the callback returns [SQLITE_IGNORE] then the
+** [prepared statement] statement is constructed to substitute
+** a NULL value in place of the table column that would have
+** been read if [SQLITE_OK] had been returned.  The [SQLITE_IGNORE]
+** return can be used to deny an untrusted user access to individual
+** columns of a table.
+** ^When a table is referenced by a [SELECT] but no column values are
+** extracted from that table (for example in a query like
+** "SELECT count(*) FROM tab") then the [SQLITE_READ] authorizer callback
+** is invoked once for that table with a column name that is an empty string.
+** ^If the action code is [SQLITE_DELETE] and the callback returns
+** [SQLITE_IGNORE] then the [DELETE] operation proceeds but the
+** [truncate optimization] is disabled and all rows are deleted individually.
+**
+** An authorizer is used when [sqlite3_prepare | preparing]
+** SQL statements from an untrusted source, to ensure that the SQL statements
+** do not try to access data they are not allowed to see, or that they do not
+** try to execute malicious statements that damage the database.  For
+** example, an application may allow a user to enter arbitrary
+** SQL queries for evaluation by a database.  But the application does
+** not want the user to be able to make arbitrary changes to the
+** database.  An authorizer could then be put in place while the
+** user-entered SQL is being [sqlite3_prepare | prepared] that
+** disallows everything except [SELECT] statements.
+**
+** Applications that need to process SQL from untrusted sources
+** might also consider lowering resource limits using [sqlite3_limit()]
+** and limiting database size using the [max_page_count] [PRAGMA]
+** in addition to using an authorizer.
+**
+** ^(Only a single authorizer can be in place on a database connection
+** at a time.  Each call to sqlite3_set_authorizer overrides the
+** previous call.)^  ^Disable the authorizer by installing a NULL callback.
+** The authorizer is disabled by default.
+**
+** The authorizer callback must not do anything that will modify
+** the database connection that invoked the authorizer callback.
+** Note that [sqlite3_prepare_v2()] and [sqlite3_step()] both modify their
+** database connections for the meaning of "modify" in this paragraph.
+**
+** ^When [sqlite3_prepare_v2()] is used to prepare a statement, the
+** statement might be re-prepared during [sqlite3_step()] due to a
+** schema change.  Hence, the application should ensure that the
+** correct authorizer callback remains in place during the [sqlite3_step()].
+**
+** ^Note that the authorizer callback is invoked only during
+** [sqlite3_prepare()] or its variants.  Authorization is not
+** performed during statement evaluation in [sqlite3_step()], unless
+** as stated in the previous paragraph, sqlite3_step() invokes
+** sqlite3_prepare_v2() to reprepare a statement after a schema change.
+*/
+SQLITE_API int sqlite3_set_authorizer(
+  sqlite3*,
+  int (*xAuth)(void*,int,const char*,const char*,const char*,const char*),
+  void *pUserData
+);
+
+/*
+** CAPI3REF: Authorizer Return Codes
+**
+** The [sqlite3_set_authorizer | authorizer callback function] must
+** return either [SQLITE_OK] or one of these two constants in order
+** to signal SQLite whether or not the action is permitted.  See the
+** [sqlite3_set_authorizer | authorizer documentation] for additional
+** information.
+**
+** Note that SQLITE_IGNORE is also used as a [conflict resolution mode]
+** returned from the [sqlite3_vtab_on_conflict()] interface.
+*/
+#define SQLITE_DENY   1   /* Abort the SQL statement with an error */
+#define SQLITE_IGNORE 2   /* Don't allow access, but don't generate an error */
+
+/*
+** CAPI3REF: Authorizer Action Codes
+**
+** The [sqlite3_set_authorizer()] interface registers a callback function
+** that is invoked to authorize certain SQL statement actions.  The
+** second parameter to the callback is an integer code that specifies
+** what action is being authorized.  These are the integer action codes that
+** the authorizer callback may be passed.
+**
+** These action code values signify what kind of operation is to be
+** authorized.  The 3rd and 4th parameters to the authorization
+** callback function will be parameters or NULL depending on which of these
+** codes is used as the second parameter.  ^(The 5th parameter to the
+** authorizer callback is the name of the database ("main", "temp",
+** etc.) if applicable.)^  ^The 6th parameter to the authorizer callback
+** is the name of the inner-most trigger or view that is responsible for
+** the access attempt or NULL if this access attempt is directly from
+** top-level SQL code.
+*/
+/******************************************* 3rd ************ 4th ***********/
+#define SQLITE_CREATE_INDEX          1   /* Index Name      Table Name      */
+#define SQLITE_CREATE_TABLE          2   /* Table Name      NULL            */
+#define SQLITE_CREATE_TEMP_INDEX     3   /* Index Name      Table Name      */
+#define SQLITE_CREATE_TEMP_TABLE     4   /* Table Name      NULL            */
+#define SQLITE_CREATE_TEMP_TRIGGER   5   /* Trigger Name    Table Name      */
+#define SQLITE_CREATE_TEMP_VIEW      6   /* View Name       NULL            */
+#define SQLITE_CREATE_TRIGGER        7   /* Trigger Name    Table Name      */
+#define SQLITE_CREATE_VIEW           8   /* View Name       NULL            */
+#define SQLITE_DELETE                9   /* Table Name      NULL            */
+#define SQLITE_DROP_INDEX           10   /* Index Name      Table Name      */
+#define SQLITE_DROP_TABLE           11   /* Table Name      NULL            */
+#define SQLITE_DROP_TEMP_INDEX      12   /* Index Name      Table Name      */
+#define SQLITE_DROP_TEMP_TABLE      13   /* Table Name      NULL            */
+#define SQLITE_DROP_TEMP_TRIGGER    14   /* Trigger Name    Table Name      */
+#define SQLITE_DROP_TEMP_VIEW       15   /* View Name       NULL            */
+#define SQLITE_DROP_TRIGGER         16   /* Trigger Name    Table Name      */
+#define SQLITE_DROP_VIEW            17   /* View Name       NULL            */
+#define SQLITE_INSERT               18   /* Table Name      NULL            */
+#define SQLITE_PRAGMA               19   /* Pragma Name     1st arg or NULL */
+#define SQLITE_READ                 20   /* Table Name      Column Name     */
+#define SQLITE_SELECT               21   /* NULL            NULL            */
+#define SQLITE_TRANSACTION          22   /* Operation       NULL            */
+#define SQLITE_UPDATE               23   /* Table Name      Column Name     */
+#define SQLITE_ATTACH               24   /* Filename        NULL            */
+#define SQLITE_DETACH               25   /* Database Name   NULL            */
+#define SQLITE_ALTER_TABLE          26   /* Database Name   Table Name      */
+#define SQLITE_REINDEX              27   /* Index Name      NULL            */
+#define SQLITE_ANALYZE              28   /* Table Name      NULL            */
+#define SQLITE_CREATE_VTABLE        29   /* Table Name      Module Name     */
+#define SQLITE_DROP_VTABLE          30   /* Table Name      Module Name     */
+#define SQLITE_FUNCTION             31   /* NULL            Function Name   */
+#define SQLITE_SAVEPOINT            32   /* Operation       Savepoint Name  */
+#define SQLITE_COPY                  0   /* No longer used */
+#define SQLITE_RECURSIVE            33   /* NULL            NULL            */
+
+/*
+** CAPI3REF: Deprecated Tracing And Profiling Functions
+** DEPRECATED
+**
+** These routines are deprecated. Use the [sqlite3_trace_v2()] interface
+** instead of the routines described here.
+**
+** These routines register callback functions that can be used for
+** tracing and profiling the execution of SQL statements.
+**
+** ^The callback function registered by sqlite3_trace() is invoked at
+** various times when an SQL statement is being run by [sqlite3_step()].
+** ^The sqlite3_trace() callback is invoked with a UTF-8 rendering of the
+** SQL statement text as the statement first begins executing.
+** ^(Additional sqlite3_trace() callbacks might occur
+** as each triggered subprogram is entered.  The callbacks for triggers
+** contain a UTF-8 SQL comment that identifies the trigger.)^
+**
+** The [SQLITE_TRACE_SIZE_LIMIT] compile-time option can be used to limit
+** the length of [bound parameter] expansion in the output of sqlite3_trace().
+**
+** ^The callback function registered by sqlite3_profile() is invoked
+** as each SQL statement finishes.  ^The profile callback contains
+** the original statement text and an estimate of wall-clock time
+** of how long that statement took to run.  ^The profile callback
+** time is in units of nanoseconds, however the current implementation
+** is only capable of millisecond resolution so the six least significant
+** digits in the time are meaningless.  Future versions of SQLite
+** might provide greater resolution on the profiler callback.  Invoking
+** either [sqlite3_trace()] or [sqlite3_trace_v2()] will cancel the
+** profile callback.
+*/
+SQLITE_API SQLITE_DEPRECATED void *sqlite3_trace(sqlite3*,
+   void(*xTrace)(void*,const char*), void*);
+SQLITE_API SQLITE_DEPRECATED void *sqlite3_profile(sqlite3*,
+   void(*xProfile)(void*,const char*,sqlite3_uint64), void*);
+
+/*
+** CAPI3REF: SQL Trace Event Codes
+** KEYWORDS: SQLITE_TRACE
+**
+** These constants identify classes of events that can be monitored
+** using the [sqlite3_trace_v2()] tracing logic.  The M argument
+** to [sqlite3_trace_v2(D,M,X,P)] is an OR-ed combination of one or more of
+** the following constants.  ^The first argument to the trace callback
+** is one of the following constants.
+**
+** New tracing constants may be added in future releases.
+**
+** ^A trace callback has four arguments: xCallback(T,C,P,X).
+** ^The T argument is one of the integer type codes above.
+** ^The C argument is a copy of the context pointer passed in as the
+** fourth argument to [sqlite3_trace_v2()].
+** The P and X arguments are pointers whose meanings depend on T.
+**
+** <dl>
+** [[SQLITE_TRACE_STMT]] <dt>SQLITE_TRACE_STMT</dt>
+** <dd>^An SQLITE_TRACE_STMT callback is invoked when a prepared statement
+** first begins running and possibly at other times during the
+** execution of the prepared statement, such as at the start of each
+** trigger subprogram. ^The P argument is a pointer to the
+** [prepared statement]. ^The X argument is a pointer to a string which
+** is the unexpanded SQL text of the prepared statement or an SQL comment
+** that indicates the invocation of a trigger.  ^The callback can compute
+** the same text that would have been returned by the legacy [sqlite3_trace()]
+** interface by using the X argument when X begins with "--" and invoking
+** [sqlite3_expanded_sql(P)] otherwise.
+**
+** [[SQLITE_TRACE_PROFILE]] <dt>SQLITE_TRACE_PROFILE</dt>
+** <dd>^An SQLITE_TRACE_PROFILE callback provides approximately the same
+** information as is provided by the [sqlite3_profile()] callback.
+** ^The P argument is a pointer to the [prepared statement] and the
+** X argument points to a 64-bit integer which is approximately
+** the number of nanoseconds that the prepared statement took to run.
+** ^The SQLITE_TRACE_PROFILE callback is invoked when the statement finishes.
+**
+** [[SQLITE_TRACE_ROW]] <dt>SQLITE_TRACE_ROW</dt>
+** <dd>^An SQLITE_TRACE_ROW callback is invoked whenever a prepared
+** statement generates a single row of result.
+** ^The P argument is a pointer to the [prepared statement] and the
+** X argument is unused.
+**
+** [[SQLITE_TRACE_CLOSE]] <dt>SQLITE_TRACE_CLOSE</dt>
+** <dd>^An SQLITE_TRACE_CLOSE callback is invoked when a database
+** connection closes.
+** ^The P argument is a pointer to the [database connection] object
+** and the X argument is unused.
+** </dl>
+*/
+#define SQLITE_TRACE_STMT       0x01
+#define SQLITE_TRACE_PROFILE    0x02
+#define SQLITE_TRACE_ROW        0x04
+#define SQLITE_TRACE_CLOSE      0x08
+
+/*
+** CAPI3REF: SQL Trace Hook
+** METHOD: sqlite3
+**
+** ^The sqlite3_trace_v2(D,M,X,P) interface registers a trace callback
+** function X against [database connection] D, using property mask M
+** and context pointer P.  ^If the X callback is
+** NULL or if the M mask is zero, then tracing is disabled.  The
+** M argument should be the bitwise OR-ed combination of
+** zero or more [SQLITE_TRACE] constants.
+**
+** ^Each call to either sqlite3_trace(D,X,P) or sqlite3_trace_v2(D,M,X,P)
+** overrides (cancels) all prior calls to sqlite3_trace(D,X,P) or
+** sqlite3_trace_v2(D,M,X,P) for the [database connection] D.  Each
+** database connection may have at most one trace callback.
+**
+** ^The X callback is invoked whenever any of the events identified by
+** mask M occur.  ^The integer return value from the callback is currently
+** ignored, though this may change in future releases.  Callback
+** implementations should return zero to ensure future compatibility.
+**
+** ^A trace callback is invoked with four arguments: callback(T,C,P,X).
+** ^The T argument is one of the [SQLITE_TRACE]
+** constants to indicate why the callback was invoked.
+** ^The C argument is a copy of the context pointer.
+** The P and X arguments are pointers whose meanings depend on T.
+**
+** The sqlite3_trace_v2() interface is intended to replace the legacy
+** interfaces [sqlite3_trace()] and [sqlite3_profile()], both of which
+** are deprecated.
+*/
+SQLITE_API int sqlite3_trace_v2(
+  sqlite3*,
+  unsigned uMask,
+  int(*xCallback)(unsigned,void*,void*,void*),
+  void *pCtx
+);
+
+/*
+** CAPI3REF: Query Progress Callbacks
+** METHOD: sqlite3
+**
+** ^The sqlite3_progress_handler(D,N,X,P) interface causes the callback
+** function X to be invoked periodically during long running calls to
+** [sqlite3_step()] and [sqlite3_prepare()] and similar for
+** database connection D.  An example use for this
+** interface is to keep a GUI updated during a large query.
+**
+** ^The parameter P is passed through as the only parameter to the
+** callback function X.  ^The parameter N is the approximate number of
+** [virtual machine instructions] that are evaluated between successive
+** invocations of the callback X.  ^If N is less than one then the progress
+** handler is disabled.
+**
+** ^Only a single progress handler may be defined at one time per
+** [database connection]; setting a new progress handler cancels the
+** old one.  ^Setting parameter X to NULL disables the progress handler.
+** ^The progress handler is also disabled by setting N to a value less
+** than 1.
+**
+** ^If the progress callback returns non-zero, the operation is
+** interrupted.  This feature can be used to implement a
+** "Cancel" button on a GUI progress dialog box.
+**
+** The progress handler callback must not do anything that will modify
+** the database connection that invoked the progress handler.
+** Note that [sqlite3_prepare_v2()] and [sqlite3_step()] both modify their
+** database connections for the meaning of "modify" in this paragraph.
+**
+** The progress handler callback would originally only be invoked from the
+** bytecode engine.  It still might be invoked during [sqlite3_prepare()]
+** and similar because those routines might force a reparse of the schema
+** which involves running the bytecode engine.  However, beginning with
+** SQLite version 3.41.0, the progress handler callback might also be
+** invoked directly from [sqlite3_prepare()] while analyzing and generating
+** code for complex queries.
+*/
+SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
+
+/*
+** CAPI3REF: Opening A New Database Connection
+** CONSTRUCTOR: sqlite3
+**
+** ^These routines open an SQLite database file as specified by the
+** filename argument. ^The filename argument is interpreted as UTF-8 for
+** sqlite3_open() and sqlite3_open_v2() and as UTF-16 in the native byte
+** order for sqlite3_open16(). ^(A [database connection] handle is usually
+** returned in *ppDb, even if an error occurs.  The only exception is that
+** if SQLite is unable to allocate memory to hold the [sqlite3] object,
+** a NULL will be written into *ppDb instead of a pointer to the [sqlite3]
+** object.)^ ^(If the database is opened (and/or created) successfully, then
+** [SQLITE_OK] is returned.  Otherwise an [error code] is returned.)^ ^The
+** [sqlite3_errmsg()] or [sqlite3_errmsg16()] routines can be used to obtain
+** an English language description of the error following a failure of any
+** of the sqlite3_open() routines.
+**
+** ^The default encoding will be UTF-8 for databases created using
+** sqlite3_open() or sqlite3_open_v2().  ^The default encoding for databases
+** created using sqlite3_open16() will be UTF-16 in the native byte order.
+**
+** Whether or not an error occurs when it is opened, resources
+** associated with the [database connection] handle should be released by
+** passing it to [sqlite3_close()] when it is no longer required.
+**
+** The sqlite3_open_v2() interface works like sqlite3_open()
+** except that it accepts two additional parameters for additional control
+** over the new database connection.  ^(The flags parameter to
+** sqlite3_open_v2() must include, at a minimum, one of the following
+** three flag combinations:)^
+**
+** <dl>
+** ^(<dt>[SQLITE_OPEN_READONLY]</dt>
+** <dd>The database is opened in read-only mode.  If the database does
+** not already exist, an error is returned.</dd>)^
+**
+** ^(<dt>[SQLITE_OPEN_READWRITE]</dt>
+** <dd>The database is opened for reading and writing if possible, or
+** reading only if the file is write protected by the operating
+** system.  In either case the database must already exist, otherwise
+** an error is returned.  For historical reasons, if opening in
+** read-write mode fails due to OS-level permissions, an attempt is
+** made to open it in read-only mode. [sqlite3_db_readonly()] can be
+** used to determine whether the database is actually
+** read-write.</dd>)^
+**
+** ^(<dt>[SQLITE_OPEN_READWRITE] | [SQLITE_OPEN_CREATE]</dt>
+** <dd>The database is opened for reading and writing, and is created if
+** it does not already exist. This is the behavior that is always used for
+** sqlite3_open() and sqlite3_open16().</dd>)^
+** </dl>
+**
+** In addition to the required flags, the following optional flags are
+** also supported:
+**
+** <dl>
+** ^(<dt>[SQLITE_OPEN_URI]</dt>
+** <dd>The filename can be interpreted as a URI if this flag is set.</dd>)^
+**
+** ^(<dt>[SQLITE_OPEN_MEMORY]</dt>
+** <dd>The database will be opened as an in-memory database.  The database
+** is named by the "filename" argument for the purposes of cache-sharing,
+** if shared cache mode is enabled, but the "filename" is otherwise ignored.
+** </dd>)^
+**
+** ^(<dt>[SQLITE_OPEN_NOMUTEX]</dt>
+** <dd>The new database connection will use the "multi-thread"
+** [threading mode].)^  This means that separate threads are allowed
+** to use SQLite at the same time, as long as each thread is using
+** a different [database connection].
+**
+** ^(<dt>[SQLITE_OPEN_FULLMUTEX]</dt>
+** <dd>The new database connection will use the "serialized"
+** [threading mode].)^  This means the multiple threads can safely
+** attempt to use the same database connection at the same time.
+** (Mutexes will block any actual concurrency, but in this mode
+** there is no harm in trying.)
+**
+** ^(<dt>[SQLITE_OPEN_SHAREDCACHE]</dt>
+** <dd>The database is opened [shared cache] enabled, overriding
+** the default shared cache setting provided by
+** [sqlite3_enable_shared_cache()].)^
+** The [use of shared cache mode is discouraged] and hence shared cache
+** capabilities may be omitted from many builds of SQLite.  In such cases,
+** this option is a no-op.
+**
+** ^(<dt>[SQLITE_OPEN_PRIVATECACHE]</dt>
+** <dd>The database is opened [shared cache] disabled, overriding
+** the default shared cache setting provided by
+** [sqlite3_enable_shared_cache()].)^
+**
+** [[OPEN_EXRESCODE]] ^(<dt>[SQLITE_OPEN_EXRESCODE]</dt>
+** <dd>The database connection comes up in "extended result code mode".
+** In other words, the database behaves as if
+** [sqlite3_extended_result_codes(db,1)] were called on the database
+** connection as soon as the connection is created. In addition to setting
+** the extended result code mode, this flag also causes [sqlite3_open_v2()]
+** to return an extended result code.</dd>
+**
+** [[OPEN_NOFOLLOW]] ^(<dt>[SQLITE_OPEN_NOFOLLOW]</dt>
+** <dd>The database filename is not allowed to contain a symbolic link</dd>
+** </dl>)^
+**
+** If the 3rd parameter to sqlite3_open_v2() is not one of the
+** required combinations shown above optionally combined with other
+** [SQLITE_OPEN_READONLY | SQLITE_OPEN_* bits]
+** then the behavior is undefined.  Historic versions of SQLite
+** have silently ignored surplus bits in the flags parameter to
+** sqlite3_open_v2(), however that behavior might not be carried through
+** into future versions of SQLite and so applications should not rely
+** upon it.  Note in particular that the SQLITE_OPEN_EXCLUSIVE flag is a no-op
+** for sqlite3_open_v2().  The SQLITE_OPEN_EXCLUSIVE does *not* cause
+** the open to fail if the database already exists.  The SQLITE_OPEN_EXCLUSIVE
+** flag is intended for use by the [sqlite3_vfs|VFS interface] only, and not
+** by sqlite3_open_v2().
+**
+** ^The fourth parameter to sqlite3_open_v2() is the name of the
+** [sqlite3_vfs] object that defines the operating system interface that
+** the new database connection should use.  ^If the fourth parameter is
+** a NULL pointer then the default [sqlite3_vfs] object is used.
+**
+** ^If the filename is ":memory:", then a private, temporary in-memory database
+** is created for the connection.  ^This in-memory database will vanish when
+** the database connection is closed.  Future versions of SQLite might
+** make use of additional special filenames that begin with the ":" character.
+** It is recommended that when a database filename actually does begin with
+** a ":" character you should prefix the filename with a pathname such as
+** "./" to avoid ambiguity.
+**
+** ^If the filename is an empty string, then a private, temporary
+** on-disk database will be created.  ^This private database will be
+** automatically deleted as soon as the database connection is closed.
+**
+** [[URI filenames in sqlite3_open()]] <h3>URI Filenames</h3>
+**
+** ^If [URI filename] interpretation is enabled, and the filename argument
+** begins with "file:", then the filename is interpreted as a URI. ^URI
+** filename interpretation is enabled if the [SQLITE_OPEN_URI] flag is
+** set in the third argument to sqlite3_open_v2(), or if it has
+** been enabled globally using the [SQLITE_CONFIG_URI] option with the
+** [sqlite3_config()] method or by the [SQLITE_USE_URI] compile-time option.
+** URI filename interpretation is turned off
+** by default, but future releases of SQLite might enable URI filename
+** interpretation by default.  See "[URI filenames]" for additional
+** information.
+**
+** URI filenames are parsed according to RFC 3986. ^If the URI contains an
+** authority, then it must be either an empty string or the string
+** "localhost". ^If the authority is not an empty string or "localhost", an
+** error is returned to the caller. ^The fragment component of a URI, if
+** present, is ignored.
+**
+** ^SQLite uses the path component of the URI as the name of the disk file
+** which contains the database. ^If the path begins with a '/' character,
+** then it is interpreted as an absolute path. ^If the path does not begin
+** with a '/' (meaning that the authority section is omitted from the URI)
+** then the path is interpreted as a relative path.
+** ^(On windows, the first component of an absolute path
+** is a drive specification (e.g. "C:").)^
+**
+** [[core URI query parameters]]
+** The query component of a URI may contain parameters that are interpreted
+** either by SQLite itself, or by a [VFS | custom VFS implementation].
+** SQLite and its built-in [VFSes] interpret the
+** following query parameters:
+**
+** <ul>
+**   <li> <b>vfs</b>: ^The "vfs" parameter may be used to specify the name of
+**     a VFS object that provides the operating system interface that should
+**     be used to access the database file on disk. ^If this option is set to
+**     an empty string the default VFS object is used. ^Specifying an unknown
+**     VFS is an error. ^If sqlite3_open_v2() is used and the vfs option is
+**     present, then the VFS specified by the option takes precedence over
+**     the value passed as the fourth parameter to sqlite3_open_v2().
+**
+**   <li> <b>mode</b>: ^(The mode parameter may be set to either "ro", "rw",
+**     "rwc", or "memory". Attempting to set it to any other value is
+**     an error)^.
+**     ^If "ro" is specified, then the database is opened for read-only
+**     access, just as if the [SQLITE_OPEN_READONLY] flag had been set in the
+**     third argument to sqlite3_open_v2(). ^If the mode option is set to
+**     "rw", then the database is opened for read-write (but not create)
+**     access, as if SQLITE_OPEN_READWRITE (but not SQLITE_OPEN_CREATE) had
+**     been set. ^Value "rwc" is equivalent to setting both
+**     SQLITE_OPEN_READWRITE and SQLITE_OPEN_CREATE.  ^If the mode option is
+**     set to "memory" then a pure [in-memory database] that never reads
+**     or writes from disk is used. ^It is an error to specify a value for
+**     the mode parameter that is less restrictive than that specified by
+**     the flags passed in the third parameter to sqlite3_open_v2().
+**
+**   <li> <b>cache</b>: ^The cache parameter may be set to either "shared" or
+**     "private". ^Setting it to "shared" is equivalent to setting the
+**     SQLITE_OPEN_SHAREDCACHE bit in the flags argument passed to
+**     sqlite3_open_v2(). ^Setting the cache parameter to "private" is
+**     equivalent to setting the SQLITE_OPEN_PRIVATECACHE bit.
+**     ^If sqlite3_open_v2() is used and the "cache" parameter is present in
+**     a URI filename, its value overrides any behavior requested by setting
+**     SQLITE_OPEN_PRIVATECACHE or SQLITE_OPEN_SHAREDCACHE flag.
+**
+**  <li> <b>psow</b>: ^The psow parameter indicates whether or not the
+**     [powersafe overwrite] property does or does not apply to the
+**     storage media on which the database file resides.
+**
+**  <li> <b>nolock</b>: ^The nolock parameter is a boolean query parameter
+**     which if set disables file locking in rollback journal modes.  This
+**     is useful for accessing a database on a filesystem that does not
+**     support locking.  Caution:  Database corruption might result if two
+**     or more processes write to the same database and any one of those
+**     processes uses nolock=1.
+**
+**  <li> <b>immutable</b>: ^The immutable parameter is a boolean query
+**     parameter that indicates that the database file is stored on
+**     read-only media.  ^When immutable is set, SQLite assumes that the
+**     database file cannot be changed, even by a process with higher
+**     privilege, and so the database is opened read-only and all locking
+**     and change detection is disabled.  Caution: Setting the immutable
+**     property on a database file that does in fact change can result
+**     in incorrect query results and/or [SQLITE_CORRUPT] errors.
+**     See also: [SQLITE_IOCAP_IMMUTABLE].
+**
+** </ul>
+**
+** ^Specifying an unknown parameter in the query component of a URI is not an
+** error.  Future versions of SQLite might understand additional query
+** parameters.  See "[query parameters with special meaning to SQLite]" for
+** additional information.
+**
+** [[URI filename examples]] <h3>URI filename examples</h3>
+**
+** <table border="1" align=center cellpadding=5>
+** <tr><th> URI filenames <th> Results
+** <tr><td> file:data.db <td>
+**          Open the file "data.db" in the current directory.
+** <tr><td> file:/home/fred/data.db<br>
+**          file:///home/fred/data.db <br>
+**          file://localhost/home/fred/data.db <br> <td>
+**          Open the database file "/home/fred/data.db".
+** <tr><td> file://darkstar/home/fred/data.db <td>
+**          An error. "darkstar" is not a recognized authority.
+** <tr><td style="white-space:nowrap">
+**          file:///C:/Documents%20and%20Settings/fred/Desktop/data.db
+**     <td> Windows only: Open the file "data.db" on fred's desktop on drive
+**          C:. Note that the %20 escaping in this example is not strictly
+**          necessary - space characters can be used literally
+**          in URI filenames.
+** <tr><td> file:data.db?mode=ro&cache=private <td>
+**          Open file "data.db" in the current directory for read-only access.
+**          Regardless of whether or not shared-cache mode is enabled by
+**          default, use a private cache.
+** <tr><td> file:/home/fred/data.db?vfs=unix-dotfile <td>
+**          Open file "/home/fred/data.db". Use the special VFS "unix-dotfile"
+**          that uses dot-files in place of posix advisory locking.
+** <tr><td> file:data.db?mode=readonly <td>
+**          An error. "readonly" is not a valid option for the "mode" parameter.
+**          Use "ro" instead:  "file:data.db?mode=ro".
+** </table>
+**
+** ^URI hexadecimal escape sequences (%HH) are supported within the path and
+** query components of a URI. A hexadecimal escape sequence consists of a
+** percent sign - "%" - followed by exactly two hexadecimal digits
+** specifying an octet value. ^Before the path or query components of a
+** URI filename are interpreted, they are encoded using UTF-8 and all
+** hexadecimal escape sequences replaced by a single byte containing the
+** corresponding octet. If this process generates an invalid UTF-8 encoding,
+** the results are undefined.
+**
+** <b>Note to Windows users:</b>  The encoding used for the filename argument
+** of sqlite3_open() and sqlite3_open_v2() must be UTF-8, not whatever
+** codepage is currently defined.  Filenames containing international
+** characters must be converted to UTF-8 prior to passing them into
+** sqlite3_open() or sqlite3_open_v2().
+**
+** <b>Note to Windows Runtime users:</b>  The temporary directory must be set
+** prior to calling sqlite3_open() or sqlite3_open_v2().  Otherwise, various
+** features that require the use of temporary files may fail.
+**
+** See also: [sqlite3_temp_directory]
+*/
+SQLITE_API int sqlite3_open(
+  const char *filename,   /* Database filename (UTF-8) */
+  sqlite3 **ppDb          /* OUT: SQLite db handle */
+);
+SQLITE_API int sqlite3_open16(
+  const void *filename,   /* Database filename (UTF-16) */
+  sqlite3 **ppDb          /* OUT: SQLite db handle */
+);
+SQLITE_API int sqlite3_open_v2(
+  const char *filename,   /* Database filename (UTF-8) */
+  sqlite3 **ppDb,         /* OUT: SQLite db handle */
+  int flags,              /* Flags */
+  const char *zVfs        /* Name of VFS module to use */
+);
+
+/*
+** CAPI3REF: Obtain Values For URI Parameters
+**
+** These are utility routines, useful to [VFS|custom VFS implementations],
+** that check if a database file was a URI that contained a specific query
+** parameter, and if so obtains the value of that query parameter.
+**
+** The first parameter to these interfaces (hereafter referred to
+** as F) must be one of:
+** <ul>
+** <li> A database filename pointer created by the SQLite core and
+** passed into the xOpen() method of a VFS implementation, or
+** <li> A filename obtained from [sqlite3_db_filename()], or
+** <li> A new filename constructed using [sqlite3_create_filename()].
+** </ul>
+** If the F parameter is not one of the above, then the behavior is
+** undefined and probably undesirable.  Older versions of SQLite were
+** more tolerant of invalid F parameters than newer versions.
+**
+** If F is a suitable filename (as described in the previous paragraph)
+** and if P is the name of the query parameter, then
+** sqlite3_uri_parameter(F,P) returns the value of the P
+** parameter if it exists or a NULL pointer if P does not appear as a
+** query parameter on F.  If P is a query parameter of F and it
+** has no explicit value, then sqlite3_uri_parameter(F,P) returns
+** a pointer to an empty string.
+**
+** The sqlite3_uri_boolean(F,P,B) routine assumes that P is a boolean
+** parameter and returns true (1) or false (0) according to the value
+** of P.  The sqlite3_uri_boolean(F,P,B) routine returns true (1) if the
+** value of query parameter P is one of "yes", "true", or "on" in any
+** case or if the value begins with a non-zero number.  The
+** sqlite3_uri_boolean(F,P,B) routines returns false (0) if the value of
+** query parameter P is one of "no", "false", or "off" in any case or
+** if the value begins with a numeric zero.  If P is not a query
+** parameter on F or if the value of P does not match any of the
+** above, then sqlite3_uri_boolean(F,P,B) returns (B!=0).
+**
+** The sqlite3_uri_int64(F,P,D) routine converts the value of P into a
+** 64-bit signed integer and returns that integer, or D if P does not
+** exist.  If the value of P is something other than an integer, then
+** zero is returned.
+**
+** The sqlite3_uri_key(F,N) returns a pointer to the name (not
+** the value) of the N-th query parameter for filename F, or a NULL
+** pointer if N is less than zero or greater than the number of query
+** parameters minus 1.  The N value is zero-based so N should be 0 to obtain
+** the name of the first query parameter, 1 for the second parameter, and
+** so forth.
+**
+** If F is a NULL pointer, then sqlite3_uri_parameter(F,P) returns NULL and
+** sqlite3_uri_boolean(F,P,B) returns B.  If F is not a NULL pointer and
+** is not a database file pathname pointer that the SQLite core passed
+** into the xOpen VFS method, then the behavior of this routine is undefined
+** and probably undesirable.
+**
+** Beginning with SQLite [version 3.31.0] ([dateof:3.31.0]) the input F
+** parameter can also be the name of a rollback journal file or WAL file
+** in addition to the main database file.  Prior to version 3.31.0, these
+** routines would only work if F was the name of the main database file.
+** When the F parameter is the name of the rollback journal or WAL file,
+** it has access to all the same query parameters as were found on the
+** main database file.
+**
+** See the [URI filename] documentation for additional information.
+*/
+SQLITE_API const char *sqlite3_uri_parameter(sqlite3_filename z, const char *zParam);
+SQLITE_API int sqlite3_uri_boolean(sqlite3_filename z, const char *zParam, int bDefault);
+SQLITE_API sqlite3_int64 sqlite3_uri_int64(sqlite3_filename, const char*, sqlite3_int64);
+SQLITE_API const char *sqlite3_uri_key(sqlite3_filename z, int N);
+
+/*
+** CAPI3REF:  Translate filenames
+**
+** These routines are available to [VFS|custom VFS implementations] for
+** translating filenames between the main database file, the journal file,
+** and the WAL file.
+**
+** If F is the name of an sqlite database file, journal file, or WAL file
+** passed by the SQLite core into the VFS, then sqlite3_filename_database(F)
+** returns the name of the corresponding database file.
+**
+** If F is the name of an sqlite database file, journal file, or WAL file
+** passed by the SQLite core into the VFS, or if F is a database filename
+** obtained from [sqlite3_db_filename()], then sqlite3_filename_journal(F)
+** returns the name of the corresponding rollback journal file.
+**
+** If F is the name of an sqlite database file, journal file, or WAL file
+** that was passed by the SQLite core into the VFS, or if F is a database
+** filename obtained from [sqlite3_db_filename()], then
+** sqlite3_filename_wal(F) returns the name of the corresponding
+** WAL file.
+**
+** In all of the above, if F is not the name of a database, journal or WAL
+** filename passed into the VFS from the SQLite core and F is not the
+** return value from [sqlite3_db_filename()], then the result is
+** undefined and is likely a memory access violation.
+*/
+SQLITE_API const char *sqlite3_filename_database(sqlite3_filename);
+SQLITE_API const char *sqlite3_filename_journal(sqlite3_filename);
+SQLITE_API const char *sqlite3_filename_wal(sqlite3_filename);
+
+/*
+** CAPI3REF:  Database File Corresponding To A Journal
+**
+** ^If X is the name of a rollback or WAL-mode journal file that is
+** passed into the xOpen method of [sqlite3_vfs], then
+** sqlite3_database_file_object(X) returns a pointer to the [sqlite3_file]
+** object that represents the main database file.
+**
+** This routine is intended for use in custom [VFS] implementations
+** only.  It is not a general-purpose interface.
+** The argument sqlite3_file_object(X) must be a filename pointer that
+** has been passed into [sqlite3_vfs].xOpen method where the
+** flags parameter to xOpen contains one of the bits
+** [SQLITE_OPEN_MAIN_JOURNAL] or [SQLITE_OPEN_WAL].  Any other use
+** of this routine results in undefined and probably undesirable
+** behavior.
+*/
+SQLITE_API sqlite3_file *sqlite3_database_file_object(const char*);
+
+/*
+** CAPI3REF: Create and Destroy VFS Filenames
+**
+** These interfaces are provided for use by [VFS shim] implementations and
+** are not useful outside of that context.
+**
+** The sqlite3_create_filename(D,J,W,N,P) allocates memory to hold a version of
+** database filename D with corresponding journal file J and WAL file W and
+** with N URI parameters key/values pairs in the array P.  The result from
+** sqlite3_create_filename(D,J,W,N,P) is a pointer to a database filename that
+** is safe to pass to routines like:
+** <ul>
+** <li> [sqlite3_uri_parameter()],
+** <li> [sqlite3_uri_boolean()],
+** <li> [sqlite3_uri_int64()],
+** <li> [sqlite3_uri_key()],
+** <li> [sqlite3_filename_database()],
+** <li> [sqlite3_filename_journal()], or
+** <li> [sqlite3_filename_wal()].
+** </ul>
+** If a memory allocation error occurs, sqlite3_create_filename() might
+** return a NULL pointer.  The memory obtained from sqlite3_create_filename(X)
+** must be released by a corresponding call to sqlite3_free_filename(Y).
+**
+** The P parameter in sqlite3_create_filename(D,J,W,N,P) should be an array
+** of 2*N pointers to strings.  Each pair of pointers in this array corresponds
+** to a key and value for a query parameter.  The P parameter may be a NULL
+** pointer if N is zero.  None of the 2*N pointers in the P array may be
+** NULL pointers and key pointers should not be empty strings.
+** None of the D, J, or W parameters to sqlite3_create_filename(D,J,W,N,P) may
+** be NULL pointers, though they can be empty strings.
+**
+** The sqlite3_free_filename(Y) routine releases a memory allocation
+** previously obtained from sqlite3_create_filename().  Invoking
+** sqlite3_free_filename(Y) where Y is a NULL pointer is a harmless no-op.
+**
+** If the Y parameter to sqlite3_free_filename(Y) is anything other
+** than a NULL pointer or a pointer previously acquired from
+** sqlite3_create_filename(), then bad things such as heap
+** corruption or segfaults may occur. The value Y should not be
+** used again after sqlite3_free_filename(Y) has been called.  This means
+** that if the [sqlite3_vfs.xOpen()] method of a VFS has been called using Y,
+** then the corresponding [sqlite3_module.xClose() method should also be
+** invoked prior to calling sqlite3_free_filename(Y).
+*/
+SQLITE_API sqlite3_filename sqlite3_create_filename(
+  const char *zDatabase,
+  const char *zJournal,
+  const char *zWal,
+  int nParam,
+  const char **azParam
+);
+SQLITE_API void sqlite3_free_filename(sqlite3_filename);
+
+/*
+** CAPI3REF: Error Codes And Messages
+** METHOD: sqlite3
+**
+** ^If the most recent sqlite3_* API call associated with
+** [database connection] D failed, then the sqlite3_errcode(D) interface
+** returns the numeric [result code] or [extended result code] for that
+** API call.
+** ^The sqlite3_extended_errcode()
+** interface is the same except that it always returns the
+** [extended result code] even when extended result codes are
+** disabled.
+**
+** The values returned by sqlite3_errcode() and/or
+** sqlite3_extended_errcode() might change with each API call.
+** Except, there are some interfaces that are guaranteed to never
+** change the value of the error code.  The error-code preserving
+** interfaces include the following:
+**
+** <ul>
+** <li> sqlite3_errcode()
+** <li> sqlite3_extended_errcode()
+** <li> sqlite3_errmsg()
+** <li> sqlite3_errmsg16()
+** <li> sqlite3_error_offset()
+** </ul>
+**
+** ^The sqlite3_errmsg() and sqlite3_errmsg16() return English-language
+** text that describes the error, as either UTF-8 or UTF-16 respectively,
+** or NULL if no error message is available.
+** (See how SQLite handles [invalid UTF] for exceptions to this rule.)
+** ^(Memory to hold the error message string is managed internally.
+** The application does not need to worry about freeing the result.
+** However, the error string might be overwritten or deallocated by
+** subsequent calls to other SQLite interface functions.)^
+**
+** ^The sqlite3_errstr(E) interface returns the English-language text
+** that describes the [result code] E, as UTF-8, or NULL if E is not an
+** result code for which a text error message is available.
+** ^(Memory to hold the error message string is managed internally
+** and must not be freed by the application)^.
+**
+** ^If the most recent error references a specific token in the input
+** SQL, the sqlite3_error_offset() interface returns the byte offset
+** of the start of that token.  ^The byte offset returned by
+** sqlite3_error_offset() assumes that the input SQL is UTF8.
+** ^If the most recent error does not reference a specific token in the input
+** SQL, then the sqlite3_error_offset() function returns -1.
+**
+** When the serialized [threading mode] is in use, it might be the
+** case that a second error occurs on a separate thread in between
+** the time of the first error and the call to these interfaces.
+** When that happens, the second error will be reported since these
+** interfaces always report the most recent result.  To avoid
+** this, each thread can obtain exclusive use of the [database connection] D
+** by invoking [sqlite3_mutex_enter]([sqlite3_db_mutex](D)) before beginning
+** to use D and invoking [sqlite3_mutex_leave]([sqlite3_db_mutex](D)) after
+** all calls to the interfaces listed here are completed.
+**
+** If an interface fails with SQLITE_MISUSE, that means the interface
+** was invoked incorrectly by the application.  In that case, the
+** error code and message may or may not be set.
+*/
+SQLITE_API int sqlite3_errcode(sqlite3 *db);
+SQLITE_API int sqlite3_extended_errcode(sqlite3 *db);
+SQLITE_API const char *sqlite3_errmsg(sqlite3*);
+SQLITE_API const void *sqlite3_errmsg16(sqlite3*);
+SQLITE_API const char *sqlite3_errstr(int);
+SQLITE_API int sqlite3_error_offset(sqlite3 *db);
+
+/*
+** CAPI3REF: Prepared Statement Object
+** KEYWORDS: {prepared statement} {prepared statements}
+**
+** An instance of this object represents a single SQL statement that
+** has been compiled into binary form and is ready to be evaluated.
+**
+** Think of each SQL statement as a separate computer program.  The
+** original SQL text is source code.  A prepared statement object
+** is the compiled object code.  All SQL must be converted into a
+** prepared statement before it can be run.
+**
+** The life-cycle of a prepared statement object usually goes like this:
+**
+** <ol>
+** <li> Create the prepared statement object using [sqlite3_prepare_v2()].
+** <li> Bind values to [parameters] using the sqlite3_bind_*()
+**      interfaces.
+** <li> Run the SQL by calling [sqlite3_step()] one or more times.
+** <li> Reset the prepared statement using [sqlite3_reset()] then go back
+**      to step 2.  Do this zero or more times.
+** <li> Destroy the object using [sqlite3_finalize()].
+** </ol>
+*/
+typedef struct sqlite3_stmt sqlite3_stmt;
+
+/*
+** CAPI3REF: Run-time Limits
+** METHOD: sqlite3
+**
+** ^(This interface allows the size of various constructs to be limited
+** on a connection by connection basis.  The first parameter is the
+** [database connection] whose limit is to be set or queried.  The
+** second parameter is one of the [limit categories] that define a
+** class of constructs to be size limited.  The third parameter is the
+** new limit for that construct.)^
+**
+** ^If the new limit is a negative number, the limit is unchanged.
+** ^(For each limit category SQLITE_LIMIT_<i>NAME</i> there is a
+** [limits | hard upper bound]
+** set at compile-time by a C preprocessor macro called
+** [limits | SQLITE_MAX_<i>NAME</i>].
+** (The "_LIMIT_" in the name is changed to "_MAX_".))^
+** ^Attempts to increase a limit above its hard upper bound are
+** silently truncated to the hard upper bound.
+**
+** ^Regardless of whether or not the limit was changed, the
+** [sqlite3_limit()] interface returns the prior value of the limit.
+** ^Hence, to find the current value of a limit without changing it,
+** simply invoke this interface with the third parameter set to -1.
+**
+** Run-time limits are intended for use in applications that manage
+** both their own internal database and also databases that are controlled
+** by untrusted external sources.  An example application might be a
+** web browser that has its own databases for storing history and
+** separate databases controlled by JavaScript applications downloaded
+** off the Internet.  The internal databases can be given the
+** large, default limits.  Databases managed by external sources can
+** be given much smaller limits designed to prevent a denial of service
+** attack.  Developers might also want to use the [sqlite3_set_authorizer()]
+** interface to further control untrusted SQL.  The size of the database
+** created by an untrusted script can be contained using the
+** [max_page_count] [PRAGMA].
+**
+** New run-time limit categories may be added in future releases.
+*/
+SQLITE_API int sqlite3_limit(sqlite3*, int id, int newVal);
+
+/*
+** CAPI3REF: Run-Time Limit Categories
+** KEYWORDS: {limit category} {*limit categories}
+**
+** These constants define various performance limits
+** that can be lowered at run-time using [sqlite3_limit()].
+** The synopsis of the meanings of the various limits is shown below.
+** Additional information is available at [limits | Limits in SQLite].
+**
+** <dl>
+** [[SQLITE_LIMIT_LENGTH]] ^(<dt>SQLITE_LIMIT_LENGTH</dt>
+** <dd>The maximum size of any string or BLOB or table row, in bytes.<dd>)^
+**
+** [[SQLITE_LIMIT_SQL_LENGTH]] ^(<dt>SQLITE_LIMIT_SQL_LENGTH</dt>
+** <dd>The maximum length of an SQL statement, in bytes.</dd>)^
+**
+** [[SQLITE_LIMIT_COLUMN]] ^(<dt>SQLITE_LIMIT_COLUMN</dt>
+** <dd>The maximum number of columns in a table definition or in the
+** result set of a [SELECT] or the maximum number of columns in an index
+** or in an ORDER BY or GROUP BY clause.</dd>)^
+**
+** [[SQLITE_LIMIT_EXPR_DEPTH]] ^(<dt>SQLITE_LIMIT_EXPR_DEPTH</dt>
+** <dd>The maximum depth of the parse tree on any expression.</dd>)^
+**
+** [[SQLITE_LIMIT_COMPOUND_SELECT]] ^(<dt>SQLITE_LIMIT_COMPOUND_SELECT</dt>
+** <dd>The maximum number of terms in a compound SELECT statement.</dd>)^
+**
+** [[SQLITE_LIMIT_VDBE_OP]] ^(<dt>SQLITE_LIMIT_VDBE_OP</dt>
+** <dd>The maximum number of instructions in a virtual machine program
+** used to implement an SQL statement.  If [sqlite3_prepare_v2()] or
+** the equivalent tries to allocate space for more than this many opcodes
+** in a single prepared statement, an SQLITE_NOMEM error is returned.</dd>)^
+**
+** [[SQLITE_LIMIT_FUNCTION_ARG]] ^(<dt>SQLITE_LIMIT_FUNCTION_ARG</dt>
+** <dd>The maximum number of arguments on a function.</dd>)^
+**
+** [[SQLITE_LIMIT_ATTACHED]] ^(<dt>SQLITE_LIMIT_ATTACHED</dt>
+** <dd>The maximum number of [ATTACH | attached databases].)^</dd>
+**
+** [[SQLITE_LIMIT_LIKE_PATTERN_LENGTH]]
+** ^(<dt>SQLITE_LIMIT_LIKE_PATTERN_LENGTH</dt>
+** <dd>The maximum length of the pattern argument to the [LIKE] or
+** [GLOB] operators.</dd>)^
+**
+** [[SQLITE_LIMIT_VARIABLE_NUMBER]]
+** ^(<dt>SQLITE_LIMIT_VARIABLE_NUMBER</dt>
+** <dd>The maximum index number of any [parameter] in an SQL statement.)^
+**
+** [[SQLITE_LIMIT_TRIGGER_DEPTH]] ^(<dt>SQLITE_LIMIT_TRIGGER_DEPTH</dt>
+** <dd>The maximum depth of recursion for triggers.</dd>)^
+**
+** [[SQLITE_LIMIT_WORKER_THREADS]] ^(<dt>SQLITE_LIMIT_WORKER_THREADS</dt>
+** <dd>The maximum number of auxiliary worker threads that a single
+** [prepared statement] may start.</dd>)^
+** </dl>
+*/
+#define SQLITE_LIMIT_LENGTH                    0
+#define SQLITE_LIMIT_SQL_LENGTH                1
+#define SQLITE_LIMIT_COLUMN                    2
+#define SQLITE_LIMIT_EXPR_DEPTH                3
+#define SQLITE_LIMIT_COMPOUND_SELECT           4
+#define SQLITE_LIMIT_VDBE_OP                   5
+#define SQLITE_LIMIT_FUNCTION_ARG              6
+#define SQLITE_LIMIT_ATTACHED                  7
+#define SQLITE_LIMIT_LIKE_PATTERN_LENGTH       8
+#define SQLITE_LIMIT_VARIABLE_NUMBER           9
+#define SQLITE_LIMIT_TRIGGER_DEPTH            10
+#define SQLITE_LIMIT_WORKER_THREADS           11
+
+/*
+** CAPI3REF: Prepare Flags
+**
+** These constants define various flags that can be passed into
+** "prepFlags" parameter of the [sqlite3_prepare_v3()] and
+** [sqlite3_prepare16_v3()] interfaces.
+**
+** New flags may be added in future releases of SQLite.
+**
+** <dl>
+** [[SQLITE_PREPARE_PERSISTENT]] ^(<dt>SQLITE_PREPARE_PERSISTENT</dt>
+** <dd>The SQLITE_PREPARE_PERSISTENT flag is a hint to the query planner
+** that the prepared statement will be retained for a long time and
+** probably reused many times.)^ ^Without this flag, [sqlite3_prepare_v3()]
+** and [sqlite3_prepare16_v3()] assume that the prepared statement will
+** be used just once or at most a few times and then destroyed using
+** [sqlite3_finalize()] relatively soon. The current implementation acts
+** on this hint by avoiding the use of [lookaside memory] so as not to
+** deplete the limited store of lookaside memory. Future versions of
+** SQLite may act on this hint differently.
+**
+** [[SQLITE_PREPARE_NORMALIZE]] <dt>SQLITE_PREPARE_NORMALIZE</dt>
+** <dd>The SQLITE_PREPARE_NORMALIZE flag is a no-op. This flag used
+** to be required for any prepared statement that wanted to use the
+** [sqlite3_normalized_sql()] interface.  However, the
+** [sqlite3_normalized_sql()] interface is now available to all
+** prepared statements, regardless of whether or not they use this
+** flag.
+**
+** [[SQLITE_PREPARE_NO_VTAB]] <dt>SQLITE_PREPARE_NO_VTAB</dt>
+** <dd>The SQLITE_PREPARE_NO_VTAB flag causes the SQL compiler
+** to return an error (error code SQLITE_ERROR) if the statement uses
+** any virtual tables.
+**
+** [[SQLITE_PREPARE_DONT_LOG]] <dt>SQLITE_PREPARE_DONT_LOG</dt>
+** <dd>The SQLITE_PREPARE_DONT_LOG flag prevents SQL compiler
+** errors from being sent to the error log defined by
+** [SQLITE_CONFIG_LOG].  This can be used, for example, to do test
+** compiles to see if some SQL syntax is well-formed, without generating
+** messages on the global error log when it is not.  If the test compile
+** fails, the sqlite3_prepare_v3() call returns the same error indications
+** with or without this flag; it just omits the call to [sqlite3_log()] that
+** logs the error.
+** </dl>
+*/
+#define SQLITE_PREPARE_PERSISTENT              0x01
+#define SQLITE_PREPARE_NORMALIZE               0x02
+#define SQLITE_PREPARE_NO_VTAB                 0x04
+#define SQLITE_PREPARE_DONT_LOG                0x10
+
+/*
+** CAPI3REF: Compiling An SQL Statement
+** KEYWORDS: {SQL statement compiler}
+** METHOD: sqlite3
+** CONSTRUCTOR: sqlite3_stmt
+**
+** To execute an SQL statement, it must first be compiled into a byte-code
+** program using one of these routines.  Or, in other words, these routines
+** are constructors for the [prepared statement] object.
+**
+** The preferred routine to use is [sqlite3_prepare_v2()].  The
+** [sqlite3_prepare()] interface is legacy and should be avoided.
+** [sqlite3_prepare_v3()] has an extra "prepFlags" option that is used
+** for special purposes.
+**
+** The use of the UTF-8 interfaces is preferred, as SQLite currently
+** does all parsing using UTF-8.  The UTF-16 interfaces are provided
+** as a convenience.  The UTF-16 interfaces work by converting the
+** input text into UTF-8, then invoking the corresponding UTF-8 interface.
+**
+** The first argument, "db", is a [database connection] obtained from a
+** prior successful call to [sqlite3_open()], [sqlite3_open_v2()] or
+** [sqlite3_open16()].  The database connection must not have been closed.
+**
+** The second argument, "zSql", is the statement to be compiled, encoded
+** as either UTF-8 or UTF-16.  The sqlite3_prepare(), sqlite3_prepare_v2(),
+** and sqlite3_prepare_v3()
+** interfaces use UTF-8, and sqlite3_prepare16(), sqlite3_prepare16_v2(),
+** and sqlite3_prepare16_v3() use UTF-16.
+**
+** ^If the nByte argument is negative, then zSql is read up to the
+** first zero terminator. ^If nByte is positive, then it is the maximum
+** number of bytes read from zSql.  When nByte is positive, zSql is read
+** up to the first zero terminator or until the nByte bytes have been read,
+** whichever comes first.  ^If nByte is zero, then no prepared
+** statement is generated.
+** If the caller knows that the supplied string is nul-terminated, then
+** there is a small performance advantage to passing an nByte parameter that
+** is the number of bytes in the input string <i>including</i>
+** the nul-terminator.
+** Note that nByte measure the length of the input in bytes, not
+** characters, even for the UTF-16 interfaces.
+**
+** ^If pzTail is not NULL then *pzTail is made to point to the first byte
+** past the end of the first SQL statement in zSql.  These routines only
+** compile the first statement in zSql, so *pzTail is left pointing to
+** what remains uncompiled.
+**
+** ^*ppStmt is left pointing to a compiled [prepared statement] that can be
+** executed using [sqlite3_step()].  ^If there is an error, *ppStmt is set
+** to NULL.  ^If the input text contains no SQL (if the input is an empty
+** string or a comment) then *ppStmt is set to NULL.
+** The calling procedure is responsible for deleting the compiled
+** SQL statement using [sqlite3_finalize()] after it has finished with it.
+** ppStmt may not be NULL.
+**
+** ^On success, the sqlite3_prepare() family of routines return [SQLITE_OK];
+** otherwise an [error code] is returned.
+**
+** The sqlite3_prepare_v2(), sqlite3_prepare_v3(), sqlite3_prepare16_v2(),
+** and sqlite3_prepare16_v3() interfaces are recommended for all new programs.
+** The older interfaces (sqlite3_prepare() and sqlite3_prepare16())
+** are retained for backwards compatibility, but their use is discouraged.
+** ^In the "vX" interfaces, the prepared statement
+** that is returned (the [sqlite3_stmt] object) contains a copy of the
+** original SQL text. This causes the [sqlite3_step()] interface to
+** behave differently in three ways:
+**
+** <ol>
+** <li>
+** ^If the database schema changes, instead of returning [SQLITE_SCHEMA] as it
+** always used to do, [sqlite3_step()] will automatically recompile the SQL
+** statement and try to run it again. As many as [SQLITE_MAX_SCHEMA_RETRY]
+** retries will occur before sqlite3_step() gives up and returns an error.
+** </li>
+**
+** <li>
+** ^When an error occurs, [sqlite3_step()] will return one of the detailed
+** [error codes] or [extended error codes].  ^The legacy behavior was that
+** [sqlite3_step()] would only return a generic [SQLITE_ERROR] result code
+** and the application would have to make a second call to [sqlite3_reset()]
+** in order to find the underlying cause of the problem. With the "v2" prepare
+** interfaces, the underlying reason for the error is returned immediately.
+** </li>
+**
+** <li>
+** ^If the specific value bound to a [parameter | host parameter] in the
+** WHERE clause might influence the choice of query plan for a statement,
+** then the statement will be automatically recompiled, as if there had been
+** a schema change, on the first [sqlite3_step()] call following any change
+** to the [sqlite3_bind_text | bindings] of that [parameter].
+** ^The specific value of a WHERE-clause [parameter] might influence the
+** choice of query plan if the parameter is the left-hand side of a [LIKE]
+** or [GLOB] operator or if the parameter is compared to an indexed column
+** and the [SQLITE_ENABLE_STAT4] compile-time option is enabled.
+** </li>
+** </ol>
+**
+** <p>^sqlite3_prepare_v3() differs from sqlite3_prepare_v2() only in having
+** the extra prepFlags parameter, which is a bit array consisting of zero or
+** more of the [SQLITE_PREPARE_PERSISTENT|SQLITE_PREPARE_*] flags.  ^The
+** sqlite3_prepare_v2() interface works exactly the same as
+** sqlite3_prepare_v3() with a zero prepFlags parameter.
+*/
+SQLITE_API int sqlite3_prepare(
+  sqlite3 *db,            /* Database handle */
+  const char *zSql,       /* SQL statement, UTF-8 encoded */
+  int nByte,              /* Maximum length of zSql in bytes. */
+  sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
+  const char **pzTail     /* OUT: Pointer to unused portion of zSql */
+);
+SQLITE_API int sqlite3_prepare_v2(
+  sqlite3 *db,            /* Database handle */
+  const char *zSql,       /* SQL statement, UTF-8 encoded */
+  int nByte,              /* Maximum length of zSql in bytes. */
+  sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
+  const char **pzTail     /* OUT: Pointer to unused portion of zSql */
+);
+SQLITE_API int sqlite3_prepare_v3(
+  sqlite3 *db,            /* Database handle */
+  const char *zSql,       /* SQL statement, UTF-8 encoded */
+  int nByte,              /* Maximum length of zSql in bytes. */
+  unsigned int prepFlags, /* Zero or more SQLITE_PREPARE_ flags */
+  sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
+  const char **pzTail     /* OUT: Pointer to unused portion of zSql */
+);
+SQLITE_API int sqlite3_prepare16(
+  sqlite3 *db,            /* Database handle */
+  const void *zSql,       /* SQL statement, UTF-16 encoded */
+  int nByte,              /* Maximum length of zSql in bytes. */
+  sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
+  const void **pzTail     /* OUT: Pointer to unused portion of zSql */
+);
+SQLITE_API int sqlite3_prepare16_v2(
+  sqlite3 *db,            /* Database handle */
+  const void *zSql,       /* SQL statement, UTF-16 encoded */
+  int nByte,              /* Maximum length of zSql in bytes. */
+  sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
+  const void **pzTail     /* OUT: Pointer to unused portion of zSql */
+);
+SQLITE_API int sqlite3_prepare16_v3(
+  sqlite3 *db,            /* Database handle */
+  const void *zSql,       /* SQL statement, UTF-16 encoded */
+  int nByte,              /* Maximum length of zSql in bytes. */
+  unsigned int prepFlags, /* Zero or more SQLITE_PREPARE_ flags */
+  sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
+  const void **pzTail     /* OUT: Pointer to unused portion of zSql */
+);
+
+/*
+** CAPI3REF: Retrieving Statement SQL
+** METHOD: sqlite3_stmt
+**
+** ^The sqlite3_sql(P) interface returns a pointer to a copy of the UTF-8
+** SQL text used to create [prepared statement] P if P was
+** created by [sqlite3_prepare_v2()], [sqlite3_prepare_v3()],
+** [sqlite3_prepare16_v2()], or [sqlite3_prepare16_v3()].
+** ^The sqlite3_expanded_sql(P) interface returns a pointer to a UTF-8
+** string containing the SQL text of prepared statement P with
+** [bound parameters] expanded.
+** ^The sqlite3_normalized_sql(P) interface returns a pointer to a UTF-8
+** string containing the normalized SQL text of prepared statement P.  The
+** semantics used to normalize a SQL statement are unspecified and subject
+** to change.  At a minimum, literal values will be replaced with suitable
+** placeholders.
+**
+** ^(For example, if a prepared statement is created using the SQL
+** text "SELECT $abc,:xyz" and if parameter $abc is bound to integer 2345
+** and parameter :xyz is unbound, then sqlite3_sql() will return
+** the original string, "SELECT $abc,:xyz" but sqlite3_expanded_sql()
+** will return "SELECT 2345,NULL".)^
+**
+** ^The sqlite3_expanded_sql() interface returns NULL if insufficient memory
+** is available to hold the result, or if the result would exceed the
+** the maximum string length determined by the [SQLITE_LIMIT_LENGTH].
+**
+** ^The [SQLITE_TRACE_SIZE_LIMIT] compile-time option limits the size of
+** bound parameter expansions.  ^The [SQLITE_OMIT_TRACE] compile-time
+** option causes sqlite3_expanded_sql() to always return NULL.
+**
+** ^The strings returned by sqlite3_sql(P) and sqlite3_normalized_sql(P)
+** are managed by SQLite and are automatically freed when the prepared
+** statement is finalized.
+** ^The string returned by sqlite3_expanded_sql(P), on the other hand,
+** is obtained from [sqlite3_malloc()] and must be freed by the application
+** by passing it to [sqlite3_free()].
+**
+** ^The sqlite3_normalized_sql() interface is only available if
+** the [SQLITE_ENABLE_NORMALIZE] compile-time option is defined.
+*/
+SQLITE_API const char *sqlite3_sql(sqlite3_stmt *pStmt);
+SQLITE_API char *sqlite3_expanded_sql(sqlite3_stmt *pStmt);
+#ifdef SQLITE_ENABLE_NORMALIZE
+SQLITE_API const char *sqlite3_normalized_sql(sqlite3_stmt *pStmt);
+#endif
+
+/*
+** CAPI3REF: Determine If An SQL Statement Writes The Database
+** METHOD: sqlite3_stmt
+**
+** ^The sqlite3_stmt_readonly(X) interface returns true (non-zero) if
+** and only if the [prepared statement] X makes no direct changes to
+** the content of the database file.
+**
+** Note that [application-defined SQL functions] or
+** [virtual tables] might change the database indirectly as a side effect.
+** ^(For example, if an application defines a function "eval()" that
+** calls [sqlite3_exec()], then the following SQL statement would
+** change the database file through side-effects:
+**
+** <blockquote><pre>
+**    SELECT eval('DELETE FROM t1') FROM t2;
+** </pre></blockquote>
+**
+** But because the [SELECT] statement does not change the database file
+** directly, sqlite3_stmt_readonly() would still return true.)^
+**
+** ^Transaction control statements such as [BEGIN], [COMMIT], [ROLLBACK],
+** [SAVEPOINT], and [RELEASE] cause sqlite3_stmt_readonly() to return true,
+** since the statements themselves do not actually modify the database but
+** rather they control the timing of when other statements modify the
+** database.  ^The [ATTACH] and [DETACH] statements also cause
+** sqlite3_stmt_readonly() to return true since, while those statements
+** change the configuration of a database connection, they do not make
+** changes to the content of the database files on disk.
+** ^The sqlite3_stmt_readonly() interface returns true for [BEGIN] since
+** [BEGIN] merely sets internal flags, but the [BEGIN|BEGIN IMMEDIATE] and
+** [BEGIN|BEGIN EXCLUSIVE] commands do touch the database and so
+** sqlite3_stmt_readonly() returns false for those commands.
+**
+** ^This routine returns false if there is any possibility that the
+** statement might change the database file.  ^A false return does
+** not guarantee that the statement will change the database file.
+** ^For example, an UPDATE statement might have a WHERE clause that
+** makes it a no-op, but the sqlite3_stmt_readonly() result would still
+** be false.  ^Similarly, a CREATE TABLE IF NOT EXISTS statement is a
+** read-only no-op if the table already exists, but
+** sqlite3_stmt_readonly() still returns false for such a statement.
+**
+** ^If prepared statement X is an [EXPLAIN] or [EXPLAIN QUERY PLAN]
+** statement, then sqlite3_stmt_readonly(X) returns the same value as
+** if the EXPLAIN or EXPLAIN QUERY PLAN prefix were omitted.
+*/
+SQLITE_API int sqlite3_stmt_readonly(sqlite3_stmt *pStmt);
+
+/*
+** CAPI3REF: Query The EXPLAIN Setting For A Prepared Statement
+** METHOD: sqlite3_stmt
+**
+** ^The sqlite3_stmt_isexplain(S) interface returns 1 if the
+** prepared statement S is an EXPLAIN statement, or 2 if the
+** statement S is an EXPLAIN QUERY PLAN.
+** ^The sqlite3_stmt_isexplain(S) interface returns 0 if S is
+** an ordinary statement or a NULL pointer.
+*/
+SQLITE_API int sqlite3_stmt_isexplain(sqlite3_stmt *pStmt);
+
+/*
+** CAPI3REF: Change The EXPLAIN Setting For A Prepared Statement
+** METHOD: sqlite3_stmt
+**
+** The sqlite3_stmt_explain(S,E) interface changes the EXPLAIN
+** setting for [prepared statement] S.  If E is zero, then S becomes
+** a normal prepared statement.  If E is 1, then S behaves as if
+** its SQL text began with "[EXPLAIN]".  If E is 2, then S behaves as if
+** its SQL text began with "[EXPLAIN QUERY PLAN]".
+**
+** Calling sqlite3_stmt_explain(S,E) might cause S to be reprepared.
+** SQLite tries to avoid a reprepare, but a reprepare might be necessary
+** on the first transition into EXPLAIN or EXPLAIN QUERY PLAN mode.
+**
+** Because of the potential need to reprepare, a call to
+** sqlite3_stmt_explain(S,E) will fail with SQLITE_ERROR if S cannot be
+** reprepared because it was created using [sqlite3_prepare()] instead of
+** the newer [sqlite3_prepare_v2()] or [sqlite3_prepare_v3()] interfaces and
+** hence has no saved SQL text with which to reprepare.
+**
+** Changing the explain setting for a prepared statement does not change
+** the original SQL text for the statement.  Hence, if the SQL text originally
+** began with EXPLAIN or EXPLAIN QUERY PLAN, but sqlite3_stmt_explain(S,0)
+** is called to convert the statement into an ordinary statement, the EXPLAIN
+** or EXPLAIN QUERY PLAN keywords will still appear in the sqlite3_sql(S)
+** output, even though the statement now acts like a normal SQL statement.
+**
+** This routine returns SQLITE_OK if the explain mode is successfully
+** changed, or an error code if the explain mode could not be changed.
+** The explain mode cannot be changed while a statement is active.
+** Hence, it is good practice to call [sqlite3_reset(S)]
+** immediately prior to calling sqlite3_stmt_explain(S,E).
+*/
+SQLITE_API int sqlite3_stmt_explain(sqlite3_stmt *pStmt, int eMode);
+
+/*
+** CAPI3REF: Determine If A Prepared Statement Has Been Reset
+** METHOD: sqlite3_stmt
+**
+** ^The sqlite3_stmt_busy(S) interface returns true (non-zero) if the
+** [prepared statement] S has been stepped at least once using
+** [sqlite3_step(S)] but has neither run to completion (returned
+** [SQLITE_DONE] from [sqlite3_step(S)]) nor
+** been reset using [sqlite3_reset(S)].  ^The sqlite3_stmt_busy(S)
+** interface returns false if S is a NULL pointer.  If S is not a
+** NULL pointer and is not a pointer to a valid [prepared statement]
+** object, then the behavior is undefined and probably undesirable.
+**
+** This interface can be used in combination [sqlite3_next_stmt()]
+** to locate all prepared statements associated with a database
+** connection that are in need of being reset.  This can be used,
+** for example, in diagnostic routines to search for prepared
+** statements that are holding a transaction open.
+*/
+SQLITE_API int sqlite3_stmt_busy(sqlite3_stmt*);
+
+/*
+** CAPI3REF: Dynamically Typed Value Object
+** KEYWORDS: {protected sqlite3_value} {unprotected sqlite3_value}
+**
+** SQLite uses the sqlite3_value object to represent all values
+** that can be stored in a database table. SQLite uses dynamic typing
+** for the values it stores.  ^Values stored in sqlite3_value objects
+** can be integers, floating point values, strings, BLOBs, or NULL.
+**
+** An sqlite3_value object may be either "protected" or "unprotected".
+** Some interfaces require a protected sqlite3_value.  Other interfaces
+** will accept either a protected or an unprotected sqlite3_value.
+** Every interface that accepts sqlite3_value arguments specifies
+** whether or not it requires a protected sqlite3_value.  The
+** [sqlite3_value_dup()] interface can be used to construct a new
+** protected sqlite3_value from an unprotected sqlite3_value.
+**
+** The terms "protected" and "unprotected" refer to whether or not
+** a mutex is held.  An internal mutex is held for a protected
+** sqlite3_value object but no mutex is held for an unprotected
+** sqlite3_value object.  If SQLite is compiled to be single-threaded
+** (with [SQLITE_THREADSAFE=0] and with [sqlite3_threadsafe()] returning 0)
+** or if SQLite is run in one of reduced mutex modes
+** [SQLITE_CONFIG_SINGLETHREAD] or [SQLITE_CONFIG_MULTITHREAD]
+** then there is no distinction between protected and unprotected
+** sqlite3_value objects and they can be used interchangeably.  However,
+** for maximum code portability it is recommended that applications
+** still make the distinction between protected and unprotected
+** sqlite3_value objects even when not strictly required.
+**
+** ^The sqlite3_value objects that are passed as parameters into the
+** implementation of [application-defined SQL functions] are protected.
+** ^The sqlite3_value objects returned by [sqlite3_vtab_rhs_value()]
+** are protected.
+** ^The sqlite3_value object returned by
+** [sqlite3_column_value()] is unprotected.
+** Unprotected sqlite3_value objects may only be used as arguments
+** to [sqlite3_result_value()], [sqlite3_bind_value()], and
+** [sqlite3_value_dup()].
+** The [sqlite3_value_blob | sqlite3_value_type()] family of
+** interfaces require protected sqlite3_value objects.
+*/
+typedef struct sqlite3_value sqlite3_value;
+
+/*
+** CAPI3REF: SQL Function Context Object
+**
+** The context in which an SQL function executes is stored in an
+** sqlite3_context object.  ^A pointer to an sqlite3_context object
+** is always first parameter to [application-defined SQL functions].
+** The application-defined SQL function implementation will pass this
+** pointer through into calls to [sqlite3_result_int | sqlite3_result()],
+** [sqlite3_aggregate_context()], [sqlite3_user_data()],
+** [sqlite3_context_db_handle()], [sqlite3_get_auxdata()],
+** and/or [sqlite3_set_auxdata()].
+*/
+typedef struct sqlite3_context sqlite3_context;
+
+/*
+** CAPI3REF: Binding Values To Prepared Statements
+** KEYWORDS: {host parameter} {host parameters} {host parameter name}
+** KEYWORDS: {SQL parameter} {SQL parameters} {parameter binding}
+** METHOD: sqlite3_stmt
+**
+** ^(In the SQL statement text input to [sqlite3_prepare_v2()] and its variants,
+** literals may be replaced by a [parameter] that matches one of following
+** templates:
+**
+** <ul>
+** <li>  ?
+** <li>  ?NNN
+** <li>  :VVV
+** <li>  @VVV
+** <li>  $VVV
+** </ul>
+**
+** In the templates above, NNN represents an integer literal,
+** and VVV represents an alphanumeric identifier.)^  ^The values of these
+** parameters (also called "host parameter names" or "SQL parameters")
+** can be set using the sqlite3_bind_*() routines defined here.
+**
+** ^The first argument to the sqlite3_bind_*() routines is always
+** a pointer to the [sqlite3_stmt] object returned from
+** [sqlite3_prepare_v2()] or its variants.
+**
+** ^The second argument is the index of the SQL parameter to be set.
+** ^The leftmost SQL parameter has an index of 1.  ^When the same named
+** SQL parameter is used more than once, second and subsequent
+** occurrences have the same index as the first occurrence.
+** ^The index for named parameters can be looked up using the
+** [sqlite3_bind_parameter_index()] API if desired.  ^The index
+** for "?NNN" parameters is the value of NNN.
+** ^The NNN value must be between 1 and the [sqlite3_limit()]
+** parameter [SQLITE_LIMIT_VARIABLE_NUMBER] (default value: 32766).
+**
+** ^The third argument is the value to bind to the parameter.
+** ^If the third parameter to sqlite3_bind_text() or sqlite3_bind_text16()
+** or sqlite3_bind_blob() is a NULL pointer then the fourth parameter
+** is ignored and the end result is the same as sqlite3_bind_null().
+** ^If the third parameter to sqlite3_bind_text() is not NULL, then
+** it should be a pointer to well-formed UTF8 text.
+** ^If the third parameter to sqlite3_bind_text16() is not NULL, then
+** it should be a pointer to well-formed UTF16 text.
+** ^If the third parameter to sqlite3_bind_text64() is not NULL, then
+** it should be a pointer to a well-formed unicode string that is
+** either UTF8 if the sixth parameter is SQLITE_UTF8, or UTF16
+** otherwise.
+**
+** [[byte-order determination rules]] ^The byte-order of
+** UTF16 input text is determined by the byte-order mark (BOM, U+FEFF)
+** found in first character, which is removed, or in the absence of a BOM
+** the byte order is the native byte order of the host
+** machine for sqlite3_bind_text16() or the byte order specified in
+** the 6th parameter for sqlite3_bind_text64().)^
+** ^If UTF16 input text contains invalid unicode
+** characters, then SQLite might change those invalid characters
+** into the unicode replacement character: U+FFFD.
+**
+** ^(In those routines that have a fourth argument, its value is the
+** number of bytes in the parameter.  To be clear: the value is the
+** number of <u>bytes</u> in the value, not the number of characters.)^
+** ^If the fourth parameter to sqlite3_bind_text() or sqlite3_bind_text16()
+** is negative, then the length of the string is
+** the number of bytes up to the first zero terminator.
+** If the fourth parameter to sqlite3_bind_blob() is negative, then
+** the behavior is undefined.
+** If a non-negative fourth parameter is provided to sqlite3_bind_text()
+** or sqlite3_bind_text16() or sqlite3_bind_text64() then
+** that parameter must be the byte offset
+** where the NUL terminator would occur assuming the string were NUL
+** terminated.  If any NUL characters occurs at byte offsets less than
+** the value of the fourth parameter then the resulting string value will
+** contain embedded NULs.  The result of expressions involving strings
+** with embedded NULs is undefined.
+**
+** ^The fifth argument to the BLOB and string binding interfaces controls
+** or indicates the lifetime of the object referenced by the third parameter.
+** These three options exist:
+** ^ (1) A destructor to dispose of the BLOB or string after SQLite has finished
+** with it may be passed. ^It is called to dispose of the BLOB or string even
+** if the call to the bind API fails, except the destructor is not called if
+** the third parameter is a NULL pointer or the fourth parameter is negative.
+** ^ (2) The special constant, [SQLITE_STATIC], may be passed to indicate that
+** the application remains responsible for disposing of the object. ^In this
+** case, the object and the provided pointer to it must remain valid until
+** either the prepared statement is finalized or the same SQL parameter is
+** bound to something else, whichever occurs sooner.
+** ^ (3) The constant, [SQLITE_TRANSIENT], may be passed to indicate that the
+** object is to be copied prior to the return from sqlite3_bind_*(). ^The
+** object and pointer to it must remain valid until then. ^SQLite will then
+** manage the lifetime of its private copy.
+**
+** ^The sixth argument to sqlite3_bind_text64() must be one of
+** [SQLITE_UTF8], [SQLITE_UTF16], [SQLITE_UTF16BE], or [SQLITE_UTF16LE]
+** to specify the encoding of the text in the third parameter.  If
+** the sixth argument to sqlite3_bind_text64() is not one of the
+** allowed values shown above, or if the text encoding is different
+** from the encoding specified by the sixth parameter, then the behavior
+** is undefined.
+**
+** ^The sqlite3_bind_zeroblob() routine binds a BLOB of length N that
+** is filled with zeroes.  ^A zeroblob uses a fixed amount of memory
+** (just an integer to hold its size) while it is being processed.
+** Zeroblobs are intended to serve as placeholders for BLOBs whose
+** content is later written using
+** [sqlite3_blob_open | incremental BLOB I/O] routines.
+** ^A negative value for the zeroblob results in a zero-length BLOB.
+**
+** ^The sqlite3_bind_pointer(S,I,P,T,D) routine causes the I-th parameter in
+** [prepared statement] S to have an SQL value of NULL, but to also be
+** associated with the pointer P of type T.  ^D is either a NULL pointer or
+** a pointer to a destructor function for P. ^SQLite will invoke the
+** destructor D with a single argument of P when it is finished using
+** P.  The T parameter should be a static string, preferably a string
+** literal. The sqlite3_bind_pointer() routine is part of the
+** [pointer passing interface] added for SQLite 3.20.0.
+**
+** ^If any of the sqlite3_bind_*() routines are called with a NULL pointer
+** for the [prepared statement] or with a prepared statement for which
+** [sqlite3_step()] has been called more recently than [sqlite3_reset()],
+** then the call will return [SQLITE_MISUSE].  If any sqlite3_bind_()
+** routine is passed a [prepared statement] that has been finalized, the
+** result is undefined and probably harmful.
+**
+** ^Bindings are not cleared by the [sqlite3_reset()] routine.
+** ^Unbound parameters are interpreted as NULL.
+**
+** ^The sqlite3_bind_* routines return [SQLITE_OK] on success or an
+** [error code] if anything goes wrong.
+** ^[SQLITE_TOOBIG] might be returned if the size of a string or BLOB
+** exceeds limits imposed by [sqlite3_limit]([SQLITE_LIMIT_LENGTH]) or
+** [SQLITE_MAX_LENGTH].
+** ^[SQLITE_RANGE] is returned if the parameter
+** index is out of range.  ^[SQLITE_NOMEM] is returned if malloc() fails.
+**
+** See also: [sqlite3_bind_parameter_count()],
+** [sqlite3_bind_parameter_name()], and [sqlite3_bind_parameter_index()].
+*/
+SQLITE_API int sqlite3_bind_blob(sqlite3_stmt*, int, const void*, int n, void(*)(void*));
+SQLITE_API int sqlite3_bind_blob64(sqlite3_stmt*, int, const void*, sqlite3_uint64,
+                        void(*)(void*));
+SQLITE_API int sqlite3_bind_double(sqlite3_stmt*, int, double);
+SQLITE_API int sqlite3_bind_int(sqlite3_stmt*, int, int);
+SQLITE_API int sqlite3_bind_int64(sqlite3_stmt*, int, sqlite3_int64);
+SQLITE_API int sqlite3_bind_null(sqlite3_stmt*, int);
+SQLITE_API int sqlite3_bind_text(sqlite3_stmt*,int,const char*,int,void(*)(void*));
+SQLITE_API int sqlite3_bind_text16(sqlite3_stmt*, int, const void*, int, void(*)(void*));
+SQLITE_API int sqlite3_bind_text64(sqlite3_stmt*, int, const char*, sqlite3_uint64,
+                         void(*)(void*), unsigned char encoding);
+SQLITE_API int sqlite3_bind_value(sqlite3_stmt*, int, const sqlite3_value*);
+SQLITE_API int sqlite3_bind_pointer(sqlite3_stmt*, int, void*, const char*,void(*)(void*));
+SQLITE_API int sqlite3_bind_zeroblob(sqlite3_stmt*, int, int n);
+SQLITE_API int sqlite3_bind_zeroblob64(sqlite3_stmt*, int, sqlite3_uint64);
+
+/*
+** CAPI3REF: Number Of SQL Parameters
+** METHOD: sqlite3_stmt
+**
+** ^This routine can be used to find the number of [SQL parameters]
+** in a [prepared statement].  SQL parameters are tokens of the
+** form "?", "?NNN", ":AAA", "$AAA", or "@AAA" that serve as
+** placeholders for values that are [sqlite3_bind_blob | bound]
+** to the parameters at a later time.
+**
+** ^(This routine actually returns the index of the largest (rightmost)
+** parameter. For all forms except ?NNN, this will correspond to the
+** number of unique parameters.  If parameters of the ?NNN form are used,
+** there may be gaps in the list.)^
+**
+** See also: [sqlite3_bind_blob|sqlite3_bind()],
+** [sqlite3_bind_parameter_name()], and
+** [sqlite3_bind_parameter_index()].
+*/
+SQLITE_API int sqlite3_bind_parameter_count(sqlite3_stmt*);
+
+/*
+** CAPI3REF: Name Of A Host Parameter
+** METHOD: sqlite3_stmt
+**
+** ^The sqlite3_bind_parameter_name(P,N) interface returns
+** the name of the N-th [SQL parameter] in the [prepared statement] P.
+** ^(SQL parameters of the form "?NNN" or ":AAA" or "@AAA" or "$AAA"
+** have a name which is the string "?NNN" or ":AAA" or "@AAA" or "$AAA"
+** respectively.
+** In other words, the initial ":" or "$" or "@" or "?"
+** is included as part of the name.)^
+** ^Parameters of the form "?" without a following integer have no name
+** and are referred to as "nameless" or "anonymous parameters".
+**
+** ^The first host parameter has an index of 1, not 0.
+**
+** ^If the value N is out of range or if the N-th parameter is
+** nameless, then NULL is returned.  ^The returned string is
+** always in UTF-8 encoding even if the named parameter was
+** originally specified as UTF-16 in [sqlite3_prepare16()],
+** [sqlite3_prepare16_v2()], or [sqlite3_prepare16_v3()].
+**
+** See also: [sqlite3_bind_blob|sqlite3_bind()],
+** [sqlite3_bind_parameter_count()], and
+** [sqlite3_bind_parameter_index()].
+*/
+SQLITE_API const char *sqlite3_bind_parameter_name(sqlite3_stmt*, int);
+
+/*
+** CAPI3REF: Index Of A Parameter With A Given Name
+** METHOD: sqlite3_stmt
+**
+** ^Return the index of an SQL parameter given its name.  ^The
+** index value returned is suitable for use as the second
+** parameter to [sqlite3_bind_blob|sqlite3_bind()].  ^A zero
+** is returned if no matching parameter is found.  ^The parameter
+** name must be given in UTF-8 even if the original statement
+** was prepared from UTF-16 text using [sqlite3_prepare16_v2()] or
+** [sqlite3_prepare16_v3()].
+**
+** See also: [sqlite3_bind_blob|sqlite3_bind()],
+** [sqlite3_bind_parameter_count()], and
+** [sqlite3_bind_parameter_name()].
+*/
+SQLITE_API int sqlite3_bind_parameter_index(sqlite3_stmt*, const char *zName);
+
+/*
+** CAPI3REF: Reset All Bindings On A Prepared Statement
+** METHOD: sqlite3_stmt
+**
+** ^Contrary to the intuition of many, [sqlite3_reset()] does not reset
+** the [sqlite3_bind_blob | bindings] on a [prepared statement].
+** ^Use this routine to reset all host parameters to NULL.
+*/
+SQLITE_API int sqlite3_clear_bindings(sqlite3_stmt*);
+
+/*
+** CAPI3REF: Number Of Columns In A Result Set
+** METHOD: sqlite3_stmt
+**
+** ^Return the number of columns in the result set returned by the
+** [prepared statement]. ^If this routine returns 0, that means the
+** [prepared statement] returns no data (for example an [UPDATE]).
+** ^However, just because this routine returns a positive number does not
+** mean that one or more rows of data will be returned.  ^A SELECT statement
+** will always have a positive sqlite3_column_count() but depending on the
+** WHERE clause constraints and the table content, it might return no rows.
+**
+** See also: [sqlite3_data_count()]
+*/
+SQLITE_API int sqlite3_column_count(sqlite3_stmt *pStmt);
+
+/*
+** CAPI3REF: Column Names In A Result Set
+** METHOD: sqlite3_stmt
+**
+** ^These routines return the name assigned to a particular column
+** in the result set of a [SELECT] statement.  ^The sqlite3_column_name()
+** interface returns a pointer to a zero-terminated UTF-8 string
+** and sqlite3_column_name16() returns a pointer to a zero-terminated
+** UTF-16 string.  ^The first parameter is the [prepared statement]
+** that implements the [SELECT] statement. ^The second parameter is the
+** column number.  ^The leftmost column is number 0.
+**
+** ^The returned string pointer is valid until either the [prepared statement]
+** is destroyed by [sqlite3_finalize()] or until the statement is automatically
+** reprepared by the first call to [sqlite3_step()] for a particular run
+** or until the next call to
+** sqlite3_column_name() or sqlite3_column_name16() on the same column.
+**
+** ^If sqlite3_malloc() fails during the processing of either routine
+** (for example during a conversion from UTF-8 to UTF-16) then a
+** NULL pointer is returned.
+**
+** ^The name of a result column is the value of the "AS" clause for
+** that column, if there is an AS clause.  If there is no AS clause
+** then the name of the column is unspecified and may change from
+** one release of SQLite to the next.
+*/
+SQLITE_API const char *sqlite3_column_name(sqlite3_stmt*, int N);
+SQLITE_API const void *sqlite3_column_name16(sqlite3_stmt*, int N);
+
+/*
+** CAPI3REF: Source Of Data In A Query Result
+** METHOD: sqlite3_stmt
+**
+** ^These routines provide a means to determine the database, table, and
+** table column that is the origin of a particular result column in
+** [SELECT] statement.
+** ^The name of the database or table or column can be returned as
+** either a UTF-8 or UTF-16 string.  ^The _database_ routines return
+** the database name, the _table_ routines return the table name, and
+** the origin_ routines return the column name.
+** ^The returned string is valid until the [prepared statement] is destroyed
+** using [sqlite3_finalize()] or until the statement is automatically
+** reprepared by the first call to [sqlite3_step()] for a particular run
+** or until the same information is requested
+** again in a different encoding.
+**
+** ^The names returned are the original un-aliased names of the
+** database, table, and column.
+**
+** ^The first argument to these interfaces is a [prepared statement].
+** ^These functions return information about the Nth result column returned by
+** the statement, where N is the second function argument.
+** ^The left-most column is column 0 for these routines.
+**
+** ^If the Nth column returned by the statement is an expression or
+** subquery and is not a column value, then all of these functions return
+** NULL.  ^These routines might also return NULL if a memory allocation error
+** occurs.  ^Otherwise, they return the name of the attached database, table,
+** or column that query result column was extracted from.
+**
+** ^As with all other SQLite APIs, those whose names end with "16" return
+** UTF-16 encoded strings and the other functions return UTF-8.
+**
+** ^These APIs are only available if the library was compiled with the
+** [SQLITE_ENABLE_COLUMN_METADATA] C-preprocessor symbol.
+**
+** If two or more threads call one or more
+** [sqlite3_column_database_name | column metadata interfaces]
+** for the same [prepared statement] and result column
+** at the same time then the results are undefined.
+*/
+SQLITE_API const char *sqlite3_column_database_name(sqlite3_stmt*,int);
+SQLITE_API const void *sqlite3_column_database_name16(sqlite3_stmt*,int);
+SQLITE_API const char *sqlite3_column_table_name(sqlite3_stmt*,int);
+SQLITE_API const void *sqlite3_column_table_name16(sqlite3_stmt*,int);
+SQLITE_API const char *sqlite3_column_origin_name(sqlite3_stmt*,int);
+SQLITE_API const void *sqlite3_column_origin_name16(sqlite3_stmt*,int);
+
+/*
+** CAPI3REF: Declared Datatype Of A Query Result
+** METHOD: sqlite3_stmt
+**
+** ^(The first parameter is a [prepared statement].
+** If this statement is a [SELECT] statement and the Nth column of the
+** returned result set of that [SELECT] is a table column (not an
+** expression or subquery) then the declared type of the table
+** column is returned.)^  ^If the Nth column of the result set is an
+** expression or subquery, then a NULL pointer is returned.
+** ^The returned string is always UTF-8 encoded.
+**
+** ^(For example, given the database schema:
+**
+** CREATE TABLE t1(c1 VARIANT);
+**
+** and the following statement to be compiled:
+**
+** SELECT c1 + 1, c1 FROM t1;
+**
+** this routine would return the string "VARIANT" for the second result
+** column (i==1), and a NULL pointer for the first result column (i==0).)^
+**
+** ^SQLite uses dynamic run-time typing.  ^So just because a column
+** is declared to contain a particular type does not mean that the
+** data stored in that column is of the declared type.  SQLite is
+** strongly typed, but the typing is dynamic not static.  ^Type
+** is associated with individual values, not with the containers
+** used to hold those values.
+*/
+SQLITE_API const char *sqlite3_column_decltype(sqlite3_stmt*,int);
+SQLITE_API const void *sqlite3_column_decltype16(sqlite3_stmt*,int);
+
+/*
+** CAPI3REF: Evaluate An SQL Statement
+** METHOD: sqlite3_stmt
+**
+** After a [prepared statement] has been prepared using any of
+** [sqlite3_prepare_v2()], [sqlite3_prepare_v3()], [sqlite3_prepare16_v2()],
+** or [sqlite3_prepare16_v3()] or one of the legacy
+** interfaces [sqlite3_prepare()] or [sqlite3_prepare16()], this function
+** must be called one or more times to evaluate the statement.
+**
+** The details of the behavior of the sqlite3_step() interface depend
+** on whether the statement was prepared using the newer "vX" interfaces
+** [sqlite3_prepare_v3()], [sqlite3_prepare_v2()], [sqlite3_prepare16_v3()],
+** [sqlite3_prepare16_v2()] or the older legacy
+** interfaces [sqlite3_prepare()] and [sqlite3_prepare16()].  The use of the
+** new "vX" interface is recommended for new applications but the legacy
+** interface will continue to be supported.
+**
+** ^In the legacy interface, the return value will be either [SQLITE_BUSY],
+** [SQLITE_DONE], [SQLITE_ROW], [SQLITE_ERROR], or [SQLITE_MISUSE].
+** ^With the "v2" interface, any of the other [result codes] or
+** [extended result codes] might be returned as well.
+**
+** ^[SQLITE_BUSY] means that the database engine was unable to acquire the
+** database locks it needs to do its job.  ^If the statement is a [COMMIT]
+** or occurs outside of an explicit transaction, then you can retry the
+** statement.  If the statement is not a [COMMIT] and occurs within an
+** explicit transaction then you should rollback the transaction before
+** continuing.
+**
+** ^[SQLITE_DONE] means that the statement has finished executing
+** successfully.  sqlite3_step() should not be called again on this virtual
+** machine without first calling [sqlite3_reset()] to reset the virtual
+** machine back to its initial state.
+**
+** ^If the SQL statement being executed returns any data, then [SQLITE_ROW]
+** is returned each time a new row of data is ready for processing by the
+** caller. The values may be accessed using the [column access functions].
+** sqlite3_step() is called again to retrieve the next row of data.
+**
+** ^[SQLITE_ERROR] means that a run-time error (such as a constraint
+** violation) has occurred.  sqlite3_step() should not be called again on
+** the VM. More information may be found by calling [sqlite3_errmsg()].
+** ^With the legacy interface, a more specific error code (for example,
+** [SQLITE_INTERRUPT], [SQLITE_SCHEMA], [SQLITE_CORRUPT], and so forth)
+** can be obtained by calling [sqlite3_reset()] on the
+** [prepared statement].  ^In the "v2" interface,
+** the more specific error code is returned directly by sqlite3_step().
+**
+** [SQLITE_MISUSE] means that the this routine was called inappropriately.
+** Perhaps it was called on a [prepared statement] that has
+** already been [sqlite3_finalize | finalized] or on one that had
+** previously returned [SQLITE_ERROR] or [SQLITE_DONE].  Or it could
+** be the case that the same database connection is being used by two or
+** more threads at the same moment in time.
+**
+** For all versions of SQLite up to and including 3.6.23.1, a call to
+** [sqlite3_reset()] was required after sqlite3_step() returned anything
+** other than [SQLITE_ROW] before any subsequent invocation of
+** sqlite3_step().  Failure to reset the prepared statement using
+** [sqlite3_reset()] would result in an [SQLITE_MISUSE] return from
+** sqlite3_step().  But after [version 3.6.23.1] ([dateof:3.6.23.1],
+** sqlite3_step() began
+** calling [sqlite3_reset()] automatically in this circumstance rather
+** than returning [SQLITE_MISUSE].  This is not considered a compatibility
+** break because any application that ever receives an SQLITE_MISUSE error
+** is broken by definition.  The [SQLITE_OMIT_AUTORESET] compile-time option
+** can be used to restore the legacy behavior.
+**
+** <b>Goofy Interface Alert:</b> In the legacy interface, the sqlite3_step()
+** API always returns a generic error code, [SQLITE_ERROR], following any
+** error other than [SQLITE_BUSY] and [SQLITE_MISUSE].  You must call
+** [sqlite3_reset()] or [sqlite3_finalize()] in order to find one of the
+** specific [error codes] that better describes the error.
+** We admit that this is a goofy design.  The problem has been fixed
+** with the "v2" interface.  If you prepare all of your SQL statements
+** using [sqlite3_prepare_v3()] or [sqlite3_prepare_v2()]
+** or [sqlite3_prepare16_v2()] or [sqlite3_prepare16_v3()] instead
+** of the legacy [sqlite3_prepare()] and [sqlite3_prepare16()] interfaces,
+** then the more specific [error codes] are returned directly
+** by sqlite3_step().  The use of the "vX" interfaces is recommended.
+*/
+SQLITE_API int sqlite3_step(sqlite3_stmt*);
+
+/*
+** CAPI3REF: Number of columns in a result set
+** METHOD: sqlite3_stmt
+**
+** ^The sqlite3_data_count(P) interface returns the number of columns in the
+** current row of the result set of [prepared statement] P.
+** ^If prepared statement P does not have results ready to return
+** (via calls to the [sqlite3_column_int | sqlite3_column()] family of
+** interfaces) then sqlite3_data_count(P) returns 0.
+** ^The sqlite3_data_count(P) routine also returns 0 if P is a NULL pointer.
+** ^The sqlite3_data_count(P) routine returns 0 if the previous call to
+** [sqlite3_step](P) returned [SQLITE_DONE].  ^The sqlite3_data_count(P)
+** will return non-zero if previous call to [sqlite3_step](P) returned
+** [SQLITE_ROW], except in the case of the [PRAGMA incremental_vacuum]
+** where it always returns zero since each step of that multi-step
+** pragma returns 0 columns of data.
+**
+** See also: [sqlite3_column_count()]
+*/
+SQLITE_API int sqlite3_data_count(sqlite3_stmt *pStmt);
+
+/*
+** CAPI3REF: Fundamental Datatypes
+** KEYWORDS: SQLITE_TEXT
+**
+** ^(Every value in SQLite has one of five fundamental datatypes:
+**
+** <ul>
+** <li> 64-bit signed integer
+** <li> 64-bit IEEE floating point number
+** <li> string
+** <li> BLOB
+** <li> NULL
+** </ul>)^
+**
+** These constants are codes for each of those types.
+**
+** Note that the SQLITE_TEXT constant was also used in SQLite version 2
+** for a completely different meaning.  Software that links against both
+** SQLite version 2 and SQLite version 3 should use SQLITE3_TEXT, not
+** SQLITE_TEXT.
+*/
+#define SQLITE_INTEGER  1
+#define SQLITE_FLOAT    2
+#define SQLITE_BLOB     4
+#define SQLITE_NULL     5
+#ifdef SQLITE_TEXT
+# undef SQLITE_TEXT
+#else
+# define SQLITE_TEXT     3
+#endif
+#define SQLITE3_TEXT     3
+
+/*
+** CAPI3REF: Result Values From A Query
+** KEYWORDS: {column access functions}
+** METHOD: sqlite3_stmt
+**
+** <b>Summary:</b>
+** <blockquote><table border=0 cellpadding=0 cellspacing=0>
+** <tr><td><b>sqlite3_column_blob</b><td>&rarr;<td>BLOB result
+** <tr><td><b>sqlite3_column_double</b><td>&rarr;<td>REAL result
+** <tr><td><b>sqlite3_column_int</b><td>&rarr;<td>32-bit INTEGER result
+** <tr><td><b>sqlite3_column_int64</b><td>&rarr;<td>64-bit INTEGER result
+** <tr><td><b>sqlite3_column_text</b><td>&rarr;<td>UTF-8 TEXT result
+** <tr><td><b>sqlite3_column_text16</b><td>&rarr;<td>UTF-16 TEXT result
+** <tr><td><b>sqlite3_column_value</b><td>&rarr;<td>The result as an
+** [sqlite3_value|unprotected sqlite3_value] object.
+** <tr><td>&nbsp;<td>&nbsp;<td>&nbsp;
+** <tr><td><b>sqlite3_column_bytes</b><td>&rarr;<td>Size of a BLOB
+** or a UTF-8 TEXT result in bytes
+** <tr><td><b>sqlite3_column_bytes16&nbsp;&nbsp;</b>
+** <td>&rarr;&nbsp;&nbsp;<td>Size of UTF-16
+** TEXT in bytes
+** <tr><td><b>sqlite3_column_type</b><td>&rarr;<td>Default
+** datatype of the result
+** </table></blockquote>
+**
+** <b>Details:</b>
+**
+** ^These routines return information about a single column of the current
+** result row of a query.  ^In every case the first argument is a pointer
+** to the [prepared statement] that is being evaluated (the [sqlite3_stmt*]
+** that was returned from [sqlite3_prepare_v2()] or one of its variants)
+** and the second argument is the index of the column for which information
+** should be returned. ^The leftmost column of the result set has the index 0.
+** ^The number of columns in the result can be determined using
+** [sqlite3_column_count()].
+**
+** If the SQL statement does not currently point to a valid row, or if the
+** column index is out of range, the result is undefined.
+** These routines may only be called when the most recent call to
+** [sqlite3_step()] has returned [SQLITE_ROW] and neither
+** [sqlite3_reset()] nor [sqlite3_finalize()] have been called subsequently.
+** If any of these routines are called after [sqlite3_reset()] or
+** [sqlite3_finalize()] or after [sqlite3_step()] has returned
+** something other than [SQLITE_ROW], the results are undefined.
+** If [sqlite3_step()] or [sqlite3_reset()] or [sqlite3_finalize()]
+** are called from a different thread while any of these routines
+** are pending, then the results are undefined.
+**
+** The first six interfaces (_blob, _double, _int, _int64, _text, and _text16)
+** each return the value of a result column in a specific data format.  If
+** the result column is not initially in the requested format (for example,
+** if the query returns an integer but the sqlite3_column_text() interface
+** is used to extract the value) then an automatic type conversion is performed.
+**
+** ^The sqlite3_column_type() routine returns the
+** [SQLITE_INTEGER | datatype code] for the initial data type
+** of the result column.  ^The returned value is one of [SQLITE_INTEGER],
+** [SQLITE_FLOAT], [SQLITE_TEXT], [SQLITE_BLOB], or [SQLITE_NULL].
+** The return value of sqlite3_column_type() can be used to decide which
+** of the first six interface should be used to extract the column value.
+** The value returned by sqlite3_column_type() is only meaningful if no
+** automatic type conversions have occurred for the value in question.
+** After a type conversion, the result of calling sqlite3_column_type()
+** is undefined, though harmless.  Future
+** versions of SQLite may change the behavior of sqlite3_column_type()
+** following a type conversion.
+**
+** If the result is a BLOB or a TEXT string, then the sqlite3_column_bytes()
+** or sqlite3_column_bytes16() interfaces can be used to determine the size
+** of that BLOB or string.
+**
+** ^If the result is a BLOB or UTF-8 string then the sqlite3_column_bytes()
+** routine returns the number of bytes in that BLOB or string.
+** ^If the result is a UTF-16 string, then sqlite3_column_bytes() converts
+** the string to UTF-8 and then returns the number of bytes.
+** ^If the result is a numeric value then sqlite3_column_bytes() uses
+** [sqlite3_snprintf()] to convert that value to a UTF-8 string and returns
+** the number of bytes in that string.
+** ^If the result is NULL, then sqlite3_column_bytes() returns zero.
+**
+** ^If the result is a BLOB or UTF-16 string then the sqlite3_column_bytes16()
+** routine returns the number of bytes in that BLOB or string.
+** ^If the result is a UTF-8 string, then sqlite3_column_bytes16() converts
+** the string to UTF-16 and then returns the number of bytes.
+** ^If the result is a numeric value then sqlite3_column_bytes16() uses
+** [sqlite3_snprintf()] to convert that value to a UTF-16 string and returns
+** the number of bytes in that string.
+** ^If the result is NULL, then sqlite3_column_bytes16() returns zero.
+**
+** ^The values returned by [sqlite3_column_bytes()] and
+** [sqlite3_column_bytes16()] do not include the zero terminators at the end
+** of the string.  ^For clarity: the values returned by
+** [sqlite3_column_bytes()] and [sqlite3_column_bytes16()] are the number of
+** bytes in the string, not the number of characters.
+**
+** ^Strings returned by sqlite3_column_text() and sqlite3_column_text16(),
+** even empty strings, are always zero-terminated.  ^The return
+** value from sqlite3_column_blob() for a zero-length BLOB is a NULL pointer.
+**
+** ^Strings returned by sqlite3_column_text16() always have the endianness
+** which is native to the platform, regardless of the text encoding set
+** for the database.
+**
+** <b>Warning:</b> ^The object returned by [sqlite3_column_value()] is an
+** [unprotected sqlite3_value] object.  In a multithreaded environment,
+** an unprotected sqlite3_value object may only be used safely with
+** [sqlite3_bind_value()] and [sqlite3_result_value()].
+** If the [unprotected sqlite3_value] object returned by
+** [sqlite3_column_value()] is used in any other way, including calls
+** to routines like [sqlite3_value_int()], [sqlite3_value_text()],
+** or [sqlite3_value_bytes()], the behavior is not threadsafe.
+** Hence, the sqlite3_column_value() interface
+** is normally only useful within the implementation of
+** [application-defined SQL functions] or [virtual tables], not within
+** top-level application code.
+**
+** These routines may attempt to convert the datatype of the result.
+** ^For example, if the internal representation is FLOAT and a text result
+** is requested, [sqlite3_snprintf()] is used internally to perform the
+** conversion automatically.  ^(The following table details the conversions
+** that are applied:
+**
+** <blockquote>
+** <table border="1">
+** <tr><th> Internal<br>Type <th> Requested<br>Type <th>  Conversion
+**
+** <tr><td>  NULL    <td> INTEGER   <td> Result is 0
+** <tr><td>  NULL    <td>  FLOAT    <td> Result is 0.0
+** <tr><td>  NULL    <td>   TEXT    <td> Result is a NULL pointer
+** <tr><td>  NULL    <td>   BLOB    <td> Result is a NULL pointer
+** <tr><td> INTEGER  <td>  FLOAT    <td> Convert from integer to float
+** <tr><td> INTEGER  <td>   TEXT    <td> ASCII rendering of the integer
+** <tr><td> INTEGER  <td>   BLOB    <td> Same as INTEGER->TEXT
+** <tr><td>  FLOAT   <td> INTEGER   <td> [CAST] to INTEGER
+** <tr><td>  FLOAT   <td>   TEXT    <td> ASCII rendering of the float
+** <tr><td>  FLOAT   <td>   BLOB    <td> [CAST] to BLOB
+** <tr><td>  TEXT    <td> INTEGER   <td> [CAST] to INTEGER
+** <tr><td>  TEXT    <td>  FLOAT    <td> [CAST] to REAL
+** <tr><td>  TEXT    <td>   BLOB    <td> No change
+** <tr><td>  BLOB    <td> INTEGER   <td> [CAST] to INTEGER
+** <tr><td>  BLOB    <td>  FLOAT    <td> [CAST] to REAL
+** <tr><td>  BLOB    <td>   TEXT    <td> [CAST] to TEXT, ensure zero terminator
+** </table>
+** </blockquote>)^
+**
+** Note that when type conversions occur, pointers returned by prior
+** calls to sqlite3_column_blob(), sqlite3_column_text(), and/or
+** sqlite3_column_text16() may be invalidated.
+** Type conversions and pointer invalidations might occur
+** in the following cases:
+**
+** <ul>
+** <li> The initial content is a BLOB and sqlite3_column_text() or
+**      sqlite3_column_text16() is called.  A zero-terminator might
+**      need to be added to the string.</li>
+** <li> The initial content is UTF-8 text and sqlite3_column_bytes16() or
+**      sqlite3_column_text16() is called.  The content must be converted
+**      to UTF-16.</li>
+** <li> The initial content is UTF-16 text and sqlite3_column_bytes() or
+**      sqlite3_column_text() is called.  The content must be converted
+**      to UTF-8.</li>
+** </ul>
+**
+** ^Conversions between UTF-16be and UTF-16le are always done in place and do
+** not invalidate a prior pointer, though of course the content of the buffer
+** that the prior pointer references will have been modified.  Other kinds
+** of conversion are done in place when it is possible, but sometimes they
+** are not possible and in those cases prior pointers are invalidated.
+**
+** The safest policy is to invoke these routines
+** in one of the following ways:
+**
+** <ul>
+**  <li>sqlite3_column_text() followed by sqlite3_column_bytes()</li>
+**  <li>sqlite3_column_blob() followed by sqlite3_column_bytes()</li>
+**  <li>sqlite3_column_text16() followed by sqlite3_column_bytes16()</li>
+** </ul>
+**
+** In other words, you should call sqlite3_column_text(),
+** sqlite3_column_blob(), or sqlite3_column_text16() first to force the result
+** into the desired format, then invoke sqlite3_column_bytes() or
+** sqlite3_column_bytes16() to find the size of the result.  Do not mix calls
+** to sqlite3_column_text() or sqlite3_column_blob() with calls to
+** sqlite3_column_bytes16(), and do not mix calls to sqlite3_column_text16()
+** with calls to sqlite3_column_bytes().
+**
+** ^The pointers returned are valid until a type conversion occurs as
+** described above, or until [sqlite3_step()] or [sqlite3_reset()] or
+** [sqlite3_finalize()] is called.  ^The memory space used to hold strings
+** and BLOBs is freed automatically.  Do not pass the pointers returned
+** from [sqlite3_column_blob()], [sqlite3_column_text()], etc. into
+** [sqlite3_free()].
+**
+** As long as the input parameters are correct, these routines will only
+** fail if an out-of-memory error occurs during a format conversion.
+** Only the following subset of interfaces are subject to out-of-memory
+** errors:
+**
+** <ul>
+** <li> sqlite3_column_blob()
+** <li> sqlite3_column_text()
+** <li> sqlite3_column_text16()
+** <li> sqlite3_column_bytes()
+** <li> sqlite3_column_bytes16()
+** </ul>
+**
+** If an out-of-memory error occurs, then the return value from these
+** routines is the same as if the column had contained an SQL NULL value.
+** Valid SQL NULL returns can be distinguished from out-of-memory errors
+** by invoking the [sqlite3_errcode()] immediately after the suspect
+** return value is obtained and before any
+** other SQLite interface is called on the same [database connection].
+*/
+SQLITE_API const void *sqlite3_column_blob(sqlite3_stmt*, int iCol);
+SQLITE_API double sqlite3_column_double(sqlite3_stmt*, int iCol);
+SQLITE_API int sqlite3_column_int(sqlite3_stmt*, int iCol);
+SQLITE_API sqlite3_int64 sqlite3_column_int64(sqlite3_stmt*, int iCol);
+SQLITE_API const unsigned char *sqlite3_column_text(sqlite3_stmt*, int iCol);
+SQLITE_API const void *sqlite3_column_text16(sqlite3_stmt*, int iCol);
+SQLITE_API sqlite3_value *sqlite3_column_value(sqlite3_stmt*, int iCol);
+SQLITE_API int sqlite3_column_bytes(sqlite3_stmt*, int iCol);
+SQLITE_API int sqlite3_column_bytes16(sqlite3_stmt*, int iCol);
+SQLITE_API int sqlite3_column_type(sqlite3_stmt*, int iCol);
+
+/*
+** CAPI3REF: Destroy A Prepared Statement Object
+** DESTRUCTOR: sqlite3_stmt
+**
+** ^The sqlite3_finalize() function is called to delete a [prepared statement].
+** ^If the most recent evaluation of the statement encountered no errors
+** or if the statement is never been evaluated, then sqlite3_finalize() returns
+** SQLITE_OK.  ^If the most recent evaluation of statement S failed, then
+** sqlite3_finalize(S) returns the appropriate [error code] or
+** [extended error code].
+**
+** ^The sqlite3_finalize(S) routine can be called at any point during
+** the life cycle of [prepared statement] S:
+** before statement S is ever evaluated, after
+** one or more calls to [sqlite3_reset()], or after any call
+** to [sqlite3_step()] regardless of whether or not the statement has
+** completed execution.
+**
+** ^Invoking sqlite3_finalize() on a NULL pointer is a harmless no-op.
+**
+** The application must finalize every [prepared statement] in order to avoid
+** resource leaks.  It is a grievous error for the application to try to use
+** a prepared statement after it has been finalized.  Any use of a prepared
+** statement after it has been finalized can result in undefined and
+** undesirable behavior such as segfaults and heap corruption.
+*/
+SQLITE_API int sqlite3_finalize(sqlite3_stmt *pStmt);
+
+/*
+** CAPI3REF: Reset A Prepared Statement Object
+** METHOD: sqlite3_stmt
+**
+** The sqlite3_reset() function is called to reset a [prepared statement]
+** object back to its initial state, ready to be re-executed.
+** ^Any SQL statement variables that had values bound to them using
+** the [sqlite3_bind_blob | sqlite3_bind_*() API] retain their values.
+** Use [sqlite3_clear_bindings()] to reset the bindings.
+**
+** ^The [sqlite3_reset(S)] interface resets the [prepared statement] S
+** back to the beginning of its program.
+**
+** ^The return code from [sqlite3_reset(S)] indicates whether or not
+** the previous evaluation of prepared statement S completed successfully.
+** ^If [sqlite3_step(S)] has never before been called on S or if
+** [sqlite3_step(S)] has not been called since the previous call
+** to [sqlite3_reset(S)], then [sqlite3_reset(S)] will return
+** [SQLITE_OK].
+**
+** ^If the most recent call to [sqlite3_step(S)] for the
+** [prepared statement] S indicated an error, then
+** [sqlite3_reset(S)] returns an appropriate [error code].
+** ^The [sqlite3_reset(S)] interface might also return an [error code]
+** if there were no prior errors but the process of resetting
+** the prepared statement caused a new error. ^For example, if an
+** [INSERT] statement with a [RETURNING] clause is only stepped one time,
+** that one call to [sqlite3_step(S)] might return SQLITE_ROW but
+** the overall statement might still fail and the [sqlite3_reset(S)] call
+** might return SQLITE_BUSY if locking constraints prevent the
+** database change from committing.  Therefore, it is important that
+** applications check the return code from [sqlite3_reset(S)] even if
+** no prior call to [sqlite3_step(S)] indicated a problem.
+**
+** ^The [sqlite3_reset(S)] interface does not change the values
+** of any [sqlite3_bind_blob|bindings] on the [prepared statement] S.
+*/
+SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt);
+
+
+/*
+** CAPI3REF: Create Or Redefine SQL Functions
+** KEYWORDS: {function creation routines}
+** METHOD: sqlite3
+**
+** ^These functions (collectively known as "function creation routines")
+** are used to add SQL functions or aggregates or to redefine the behavior
+** of existing SQL functions or aggregates. The only differences between
+** the three "sqlite3_create_function*" routines are the text encoding
+** expected for the second parameter (the name of the function being
+** created) and the presence or absence of a destructor callback for
+** the application data pointer. Function sqlite3_create_window_function()
+** is similar, but allows the user to supply the extra callback functions
+** needed by [aggregate window functions].
+**
+** ^The first parameter is the [database connection] to which the SQL
+** function is to be added.  ^If an application uses more than one database
+** connection then application-defined SQL functions must be added
+** to each database connection separately.
+**
+** ^The second parameter is the name of the SQL function to be created or
+** redefined.  ^The length of the name is limited to 255 bytes in a UTF-8
+** representation, exclusive of the zero-terminator.  ^Note that the name
+** length limit is in UTF-8 bytes, not characters nor UTF-16 bytes.
+** ^Any attempt to create a function with a longer name
+** will result in [SQLITE_MISUSE] being returned.
+**
+** ^The third parameter (nArg)
+** is the number of arguments that the SQL function or
+** aggregate takes. ^If this parameter is -1, then the SQL function or
+** aggregate may take any number of arguments between 0 and the limit
+** set by [sqlite3_limit]([SQLITE_LIMIT_FUNCTION_ARG]).  If the third
+** parameter is less than -1 or greater than 127 then the behavior is
+** undefined.
+**
+** ^The fourth parameter, eTextRep, specifies what
+** [SQLITE_UTF8 | text encoding] this SQL function prefers for
+** its parameters.  The application should set this parameter to
+** [SQLITE_UTF16LE] if the function implementation invokes
+** [sqlite3_value_text16le()] on an input, or [SQLITE_UTF16BE] if the
+** implementation invokes [sqlite3_value_text16be()] on an input, or
+** [SQLITE_UTF16] if [sqlite3_value_text16()] is used, or [SQLITE_UTF8]
+** otherwise.  ^The same SQL function may be registered multiple times using
+** different preferred text encodings, with different implementations for
+** each encoding.
+** ^When multiple implementations of the same function are available, SQLite
+** will pick the one that involves the least amount of data conversion.
+**
+** ^The fourth parameter may optionally be ORed with [SQLITE_DETERMINISTIC]
+** to signal that the function will always return the same result given
+** the same inputs within a single SQL statement.  Most SQL functions are
+** deterministic.  The built-in [random()] SQL function is an example of a
+** function that is not deterministic.  The SQLite query planner is able to
+** perform additional optimizations on deterministic functions, so use
+** of the [SQLITE_DETERMINISTIC] flag is recommended where possible.
+**
+** ^The fourth parameter may also optionally include the [SQLITE_DIRECTONLY]
+** flag, which if present prevents the function from being invoked from
+** within VIEWs, TRIGGERs, CHECK constraints, generated column expressions,
+** index expressions, or the WHERE clause of partial indexes.
+**
+** For best security, the [SQLITE_DIRECTONLY] flag is recommended for
+** all application-defined SQL functions that do not need to be
+** used inside of triggers, view, CHECK constraints, or other elements of
+** the database schema.  This flags is especially recommended for SQL
+** functions that have side effects or reveal internal application state.
+** Without this flag, an attacker might be able to modify the schema of
+** a database file to include invocations of the function with parameters
+** chosen by the attacker, which the application will then execute when
+** the database file is opened and read.
+**
+** ^(The fifth parameter is an arbitrary pointer.  The implementation of the
+** function can gain access to this pointer using [sqlite3_user_data()].)^
+**
+** ^The sixth, seventh and eighth parameters passed to the three
+** "sqlite3_create_function*" functions, xFunc, xStep and xFinal, are
+** pointers to C-language functions that implement the SQL function or
+** aggregate. ^A scalar SQL function requires an implementation of the xFunc
+** callback only; NULL pointers must be passed as the xStep and xFinal
+** parameters. ^An aggregate SQL function requires an implementation of xStep
+** and xFinal and NULL pointer must be passed for xFunc. ^To delete an existing
+** SQL function or aggregate, pass NULL pointers for all three function
+** callbacks.
+**
+** ^The sixth, seventh, eighth and ninth parameters (xStep, xFinal, xValue
+** and xInverse) passed to sqlite3_create_window_function are pointers to
+** C-language callbacks that implement the new function. xStep and xFinal
+** must both be non-NULL. xValue and xInverse may either both be NULL, in
+** which case a regular aggregate function is created, or must both be
+** non-NULL, in which case the new function may be used as either an aggregate
+** or aggregate window function. More details regarding the implementation
+** of aggregate window functions are
+** [user-defined window functions|available here].
+**
+** ^(If the final parameter to sqlite3_create_function_v2() or
+** sqlite3_create_window_function() is not NULL, then it is destructor for
+** the application data pointer. The destructor is invoked when the function
+** is deleted, either by being overloaded or when the database connection
+** closes.)^ ^The destructor is also invoked if the call to
+** sqlite3_create_function_v2() fails.  ^When the destructor callback is
+** invoked, it is passed a single argument which is a copy of the application
+** data pointer which was the fifth parameter to sqlite3_create_function_v2().
+**
+** ^It is permitted to register multiple implementations of the same
+** functions with the same name but with either differing numbers of
+** arguments or differing preferred text encodings.  ^SQLite will use
+** the implementation that most closely matches the way in which the
+** SQL function is used.  ^A function implementation with a non-negative
+** nArg parameter is a better match than a function implementation with
+** a negative nArg.  ^A function where the preferred text encoding
+** matches the database encoding is a better
+** match than a function where the encoding is different.
+** ^A function where the encoding difference is between UTF16le and UTF16be
+** is a closer match than a function where the encoding difference is
+** between UTF8 and UTF16.
+**
+** ^Built-in functions may be overloaded by new application-defined functions.
+**
+** ^An application-defined function is permitted to call other
+** SQLite interfaces.  However, such calls must not
+** close the database connection nor finalize or reset the prepared
+** statement in which the function is running.
+*/
+SQLITE_API int sqlite3_create_function(
+  sqlite3 *db,
+  const char *zFunctionName,
+  int nArg,
+  int eTextRep,
+  void *pApp,
+  void (*xFunc)(sqlite3_context*,int,sqlite3_value**),
+  void (*xStep)(sqlite3_context*,int,sqlite3_value**),
+  void (*xFinal)(sqlite3_context*)
+);
+SQLITE_API int sqlite3_create_function16(
+  sqlite3 *db,
+  const void *zFunctionName,
+  int nArg,
+  int eTextRep,
+  void *pApp,
+  void (*xFunc)(sqlite3_context*,int,sqlite3_value**),
+  void (*xStep)(sqlite3_context*,int,sqlite3_value**),
+  void (*xFinal)(sqlite3_context*)
+);
+SQLITE_API int sqlite3_create_function_v2(
+  sqlite3 *db,
+  const char *zFunctionName,
+  int nArg,
+  int eTextRep,
+  void *pApp,
+  void (*xFunc)(sqlite3_context*,int,sqlite3_value**),
+  void (*xStep)(sqlite3_context*,int,sqlite3_value**),
+  void (*xFinal)(sqlite3_context*),
+  void(*xDestroy)(void*)
+);
+SQLITE_API int sqlite3_create_window_function(
+  sqlite3 *db,
+  const char *zFunctionName,
+  int nArg,
+  int eTextRep,
+  void *pApp,
+  void (*xStep)(sqlite3_context*,int,sqlite3_value**),
+  void (*xFinal)(sqlite3_context*),
+  void (*xValue)(sqlite3_context*),
+  void (*xInverse)(sqlite3_context*,int,sqlite3_value**),
+  void(*xDestroy)(void*)
+);
+
+/*
+** CAPI3REF: Text Encodings
+**
+** These constant define integer codes that represent the various
+** text encodings supported by SQLite.
+*/
+#define SQLITE_UTF8           1    /* IMP: R-37514-35566 */
+#define SQLITE_UTF16LE        2    /* IMP: R-03371-37637 */
+#define SQLITE_UTF16BE        3    /* IMP: R-51971-34154 */
+#define SQLITE_UTF16          4    /* Use native byte order */
+#define SQLITE_ANY            5    /* Deprecated */
+#define SQLITE_UTF16_ALIGNED  8    /* sqlite3_create_collation only */
+
+/*
+** CAPI3REF: Function Flags
+**
+** These constants may be ORed together with the
+** [SQLITE_UTF8 | preferred text encoding] as the fourth argument
+** to [sqlite3_create_function()], [sqlite3_create_function16()], or
+** [sqlite3_create_function_v2()].
+**
+** <dl>
+** [[SQLITE_DETERMINISTIC]] <dt>SQLITE_DETERMINISTIC</dt><dd>
+** The SQLITE_DETERMINISTIC flag means that the new function always gives
+** the same output when the input parameters are the same.
+** The [abs|abs() function] is deterministic, for example, but
+** [randomblob|randomblob()] is not.  Functions must
+** be deterministic in order to be used in certain contexts such as
+** with the WHERE clause of [partial indexes] or in [generated columns].
+** SQLite might also optimize deterministic functions by factoring them
+** out of inner loops.
+** </dd>
+**
+** [[SQLITE_DIRECTONLY]] <dt>SQLITE_DIRECTONLY</dt><dd>
+** The SQLITE_DIRECTONLY flag means that the function may only be invoked
+** from top-level SQL, and cannot be used in VIEWs or TRIGGERs nor in
+** schema structures such as [CHECK constraints], [DEFAULT clauses],
+** [expression indexes], [partial indexes], or [generated columns].
+** <p>
+** The SQLITE_DIRECTONLY flag is recommended for any
+** [application-defined SQL function]
+** that has side-effects or that could potentially leak sensitive information.
+** This will prevent attacks in which an application is tricked
+** into using a database file that has had its schema surreptitiously
+** modified to invoke the application-defined function in ways that are
+** harmful.
+** <p>
+** Some people say it is good practice to set SQLITE_DIRECTONLY on all
+** [application-defined SQL functions], regardless of whether or not they
+** are security sensitive, as doing so prevents those functions from being used
+** inside of the database schema, and thus ensures that the database
+** can be inspected and modified using generic tools (such as the [CLI])
+** that do not have access to the application-defined functions.
+** </dd>
+**
+** [[SQLITE_INNOCUOUS]] <dt>SQLITE_INNOCUOUS</dt><dd>
+** The SQLITE_INNOCUOUS flag means that the function is unlikely
+** to cause problems even if misused.  An innocuous function should have
+** no side effects and should not depend on any values other than its
+** input parameters. The [abs|abs() function] is an example of an
+** innocuous function.
+** The [load_extension() SQL function] is not innocuous because of its
+** side effects.
+** <p> SQLITE_INNOCUOUS is similar to SQLITE_DETERMINISTIC, but is not
+** exactly the same.  The [random|random() function] is an example of a
+** function that is innocuous but not deterministic.
+** <p>Some heightened security settings
+** ([SQLITE_DBCONFIG_TRUSTED_SCHEMA] and [PRAGMA trusted_schema=OFF])
+** disable the use of SQL functions inside views and triggers and in
+** schema structures such as [CHECK constraints], [DEFAULT clauses],
+** [expression indexes], [partial indexes], and [generated columns] unless
+** the function is tagged with SQLITE_INNOCUOUS.  Most built-in functions
+** are innocuous.  Developers are advised to avoid using the
+** SQLITE_INNOCUOUS flag for application-defined functions unless the
+** function has been carefully audited and found to be free of potentially
+** security-adverse side-effects and information-leaks.
+** </dd>
+**
+** [[SQLITE_SUBTYPE]] <dt>SQLITE_SUBTYPE</dt><dd>
+** The SQLITE_SUBTYPE flag indicates to SQLite that a function might call
+** [sqlite3_value_subtype()] to inspect the sub-types of its arguments.
+** This flag instructs SQLite to omit some corner-case optimizations that
+** might disrupt the operation of the [sqlite3_value_subtype()] function,
+** causing it to return zero rather than the correct subtype().
+** All SQL functions that invoke [sqlite3_value_subtype()] should have this
+** property.  If the SQLITE_SUBTYPE property is omitted, then the return
+** value from [sqlite3_value_subtype()] might sometimes be zero even though
+** a non-zero subtype was specified by the function argument expression.
+**
+** [[SQLITE_RESULT_SUBTYPE]] <dt>SQLITE_RESULT_SUBTYPE</dt><dd>
+** The SQLITE_RESULT_SUBTYPE flag indicates to SQLite that a function might call
+** [sqlite3_result_subtype()] to cause a sub-type to be associated with its
+** result.
+** Every function that invokes [sqlite3_result_subtype()] should have this
+** property.  If it does not, then the call to [sqlite3_result_subtype()]
+** might become a no-op if the function is used as term in an
+** [expression index].  On the other hand, SQL functions that never invoke
+** [sqlite3_result_subtype()] should avoid setting this property, as the
+** purpose of this property is to disable certain optimizations that are
+** incompatible with subtypes.
+**
+** [[SQLITE_SELFORDER1]] <dt>SQLITE_SELFORDER1</dt><dd>
+** The SQLITE_SELFORDER1 flag indicates that the function is an aggregate
+** that internally orders the values provided to the first argument.  The
+** ordered-set aggregate SQL notation with a single ORDER BY term can be
+** used to invoke this function.  If the ordered-set aggregate notation is
+** used on a function that lacks this flag, then an error is raised. Note
+** that the ordered-set aggregate syntax is only available if SQLite is
+** built using the -DSQLITE_ENABLE_ORDERED_SET_AGGREGATES compile-time option.
+** </dd>
+** </dl>
+*/
+#define SQLITE_DETERMINISTIC    0x000000800
+#define SQLITE_DIRECTONLY       0x000080000
+#define SQLITE_SUBTYPE          0x000100000
+#define SQLITE_INNOCUOUS        0x000200000
+#define SQLITE_RESULT_SUBTYPE   0x001000000
+#define SQLITE_SELFORDER1       0x002000000
+
+/*
+** CAPI3REF: Deprecated Functions
+** DEPRECATED
+**
+** These functions are [deprecated].  In order to maintain
+** backwards compatibility with older code, these functions continue
+** to be supported.  However, new applications should avoid
+** the use of these functions.  To encourage programmers to avoid
+** these functions, we will not explain what they do.
+*/
+#ifndef SQLITE_OMIT_DEPRECATED
+SQLITE_API SQLITE_DEPRECATED int sqlite3_aggregate_count(sqlite3_context*);
+SQLITE_API SQLITE_DEPRECATED int sqlite3_expired(sqlite3_stmt*);
+SQLITE_API SQLITE_DEPRECATED int sqlite3_transfer_bindings(sqlite3_stmt*, sqlite3_stmt*);
+SQLITE_API SQLITE_DEPRECATED int sqlite3_global_recover(void);
+SQLITE_API SQLITE_DEPRECATED void sqlite3_thread_cleanup(void);
+SQLITE_API SQLITE_DEPRECATED int sqlite3_memory_alarm(void(*)(void*,sqlite3_int64,int),
+                      void*,sqlite3_int64);
+#endif
+
+/*
+** CAPI3REF: Obtaining SQL Values
+** METHOD: sqlite3_value
+**
+** <b>Summary:</b>
+** <blockquote><table border=0 cellpadding=0 cellspacing=0>
+** <tr><td><b>sqlite3_value_blob</b><td>&rarr;<td>BLOB value
+** <tr><td><b>sqlite3_value_double</b><td>&rarr;<td>REAL value
+** <tr><td><b>sqlite3_value_int</b><td>&rarr;<td>32-bit INTEGER value
+** <tr><td><b>sqlite3_value_int64</b><td>&rarr;<td>64-bit INTEGER value
+** <tr><td><b>sqlite3_value_pointer</b><td>&rarr;<td>Pointer value
+** <tr><td><b>sqlite3_value_text</b><td>&rarr;<td>UTF-8 TEXT value
+** <tr><td><b>sqlite3_value_text16</b><td>&rarr;<td>UTF-16 TEXT value in
+** the native byteorder
+** <tr><td><b>sqlite3_value_text16be</b><td>&rarr;<td>UTF-16be TEXT value
+** <tr><td><b>sqlite3_value_text16le</b><td>&rarr;<td>UTF-16le TEXT value
+** <tr><td>&nbsp;<td>&nbsp;<td>&nbsp;
+** <tr><td><b>sqlite3_value_bytes</b><td>&rarr;<td>Size of a BLOB
+** or a UTF-8 TEXT in bytes
+** <tr><td><b>sqlite3_value_bytes16&nbsp;&nbsp;</b>
+** <td>&rarr;&nbsp;&nbsp;<td>Size of UTF-16
+** TEXT in bytes
+** <tr><td><b>sqlite3_value_type</b><td>&rarr;<td>Default
+** datatype of the value
+** <tr><td><b>sqlite3_value_numeric_type&nbsp;&nbsp;</b>
+** <td>&rarr;&nbsp;&nbsp;<td>Best numeric datatype of the value
+** <tr><td><b>sqlite3_value_nochange&nbsp;&nbsp;</b>
+** <td>&rarr;&nbsp;&nbsp;<td>True if the column is unchanged in an UPDATE
+** against a virtual table.
+** <tr><td><b>sqlite3_value_frombind&nbsp;&nbsp;</b>
+** <td>&rarr;&nbsp;&nbsp;<td>True if value originated from a [bound parameter]
+** </table></blockquote>
+**
+** <b>Details:</b>
+**
+** These routines extract type, size, and content information from
+** [protected sqlite3_value] objects.  Protected sqlite3_value objects
+** are used to pass parameter information into the functions that
+** implement [application-defined SQL functions] and [virtual tables].
+**
+** These routines work only with [protected sqlite3_value] objects.
+** Any attempt to use these routines on an [unprotected sqlite3_value]
+** is not threadsafe.
+**
+** ^These routines work just like the corresponding [column access functions]
+** except that these routines take a single [protected sqlite3_value] object
+** pointer instead of a [sqlite3_stmt*] pointer and an integer column number.
+**
+** ^The sqlite3_value_text16() interface extracts a UTF-16 string
+** in the native byte-order of the host machine.  ^The
+** sqlite3_value_text16be() and sqlite3_value_text16le() interfaces
+** extract UTF-16 strings as big-endian and little-endian respectively.
+**
+** ^If [sqlite3_value] object V was initialized
+** using [sqlite3_bind_pointer(S,I,P,X,D)] or [sqlite3_result_pointer(C,P,X,D)]
+** and if X and Y are strings that compare equal according to strcmp(X,Y),
+** then sqlite3_value_pointer(V,Y) will return the pointer P.  ^Otherwise,
+** sqlite3_value_pointer(V,Y) returns a NULL. The sqlite3_bind_pointer()
+** routine is part of the [pointer passing interface] added for SQLite 3.20.0.
+**
+** ^(The sqlite3_value_type(V) interface returns the
+** [SQLITE_INTEGER | datatype code] for the initial datatype of the
+** [sqlite3_value] object V. The returned value is one of [SQLITE_INTEGER],
+** [SQLITE_FLOAT], [SQLITE_TEXT], [SQLITE_BLOB], or [SQLITE_NULL].)^
+** Other interfaces might change the datatype for an sqlite3_value object.
+** For example, if the datatype is initially SQLITE_INTEGER and
+** sqlite3_value_text(V) is called to extract a text value for that
+** integer, then subsequent calls to sqlite3_value_type(V) might return
+** SQLITE_TEXT.  Whether or not a persistent internal datatype conversion
+** occurs is undefined and may change from one release of SQLite to the next.
+**
+** ^(The sqlite3_value_numeric_type() interface attempts to apply
+** numeric affinity to the value.  This means that an attempt is
+** made to convert the value to an integer or floating point.  If
+** such a conversion is possible without loss of information (in other
+** words, if the value is a string that looks like a number)
+** then the conversion is performed.  Otherwise no conversion occurs.
+** The [SQLITE_INTEGER | datatype] after conversion is returned.)^
+**
+** ^Within the [xUpdate] method of a [virtual table], the
+** sqlite3_value_nochange(X) interface returns true if and only if
+** the column corresponding to X is unchanged by the UPDATE operation
+** that the xUpdate method call was invoked to implement and if
+** and the prior [xColumn] method call that was invoked to extracted
+** the value for that column returned without setting a result (probably
+** because it queried [sqlite3_vtab_nochange()] and found that the column
+** was unchanging).  ^Within an [xUpdate] method, any value for which
+** sqlite3_value_nochange(X) is true will in all other respects appear
+** to be a NULL value.  If sqlite3_value_nochange(X) is invoked anywhere other
+** than within an [xUpdate] method call for an UPDATE statement, then
+** the return value is arbitrary and meaningless.
+**
+** ^The sqlite3_value_frombind(X) interface returns non-zero if the
+** value X originated from one of the [sqlite3_bind_int|sqlite3_bind()]
+** interfaces.  ^If X comes from an SQL literal value, or a table column,
+** or an expression, then sqlite3_value_frombind(X) returns zero.
+**
+** Please pay particular attention to the fact that the pointer returned
+** from [sqlite3_value_blob()], [sqlite3_value_text()], or
+** [sqlite3_value_text16()] can be invalidated by a subsequent call to
+** [sqlite3_value_bytes()], [sqlite3_value_bytes16()], [sqlite3_value_text()],
+** or [sqlite3_value_text16()].
+**
+** These routines must be called from the same thread as
+** the SQL function that supplied the [sqlite3_value*] parameters.
+**
+** As long as the input parameter is correct, these routines can only
+** fail if an out-of-memory error occurs during a format conversion.
+** Only the following subset of interfaces are subject to out-of-memory
+** errors:
+**
+** <ul>
+** <li> sqlite3_value_blob()
+** <li> sqlite3_value_text()
+** <li> sqlite3_value_text16()
+** <li> sqlite3_value_text16le()
+** <li> sqlite3_value_text16be()
+** <li> sqlite3_value_bytes()
+** <li> sqlite3_value_bytes16()
+** </ul>
+**
+** If an out-of-memory error occurs, then the return value from these
+** routines is the same as if the column had contained an SQL NULL value.
+** Valid SQL NULL returns can be distinguished from out-of-memory errors
+** by invoking the [sqlite3_errcode()] immediately after the suspect
+** return value is obtained and before any
+** other SQLite interface is called on the same [database connection].
+*/
+SQLITE_API const void *sqlite3_value_blob(sqlite3_value*);
+SQLITE_API double sqlite3_value_double(sqlite3_value*);
+SQLITE_API int sqlite3_value_int(sqlite3_value*);
+SQLITE_API sqlite3_int64 sqlite3_value_int64(sqlite3_value*);
+SQLITE_API void *sqlite3_value_pointer(sqlite3_value*, const char*);
+SQLITE_API const unsigned char *sqlite3_value_text(sqlite3_value*);
+SQLITE_API const void *sqlite3_value_text16(sqlite3_value*);
+SQLITE_API const void *sqlite3_value_text16le(sqlite3_value*);
+SQLITE_API const void *sqlite3_value_text16be(sqlite3_value*);
+SQLITE_API int sqlite3_value_bytes(sqlite3_value*);
+SQLITE_API int sqlite3_value_bytes16(sqlite3_value*);
+SQLITE_API int sqlite3_value_type(sqlite3_value*);
+SQLITE_API int sqlite3_value_numeric_type(sqlite3_value*);
+SQLITE_API int sqlite3_value_nochange(sqlite3_value*);
+SQLITE_API int sqlite3_value_frombind(sqlite3_value*);
+
+/*
+** CAPI3REF: Report the internal text encoding state of an sqlite3_value object
+** METHOD: sqlite3_value
+**
+** ^(The sqlite3_value_encoding(X) interface returns one of [SQLITE_UTF8],
+** [SQLITE_UTF16BE], or [SQLITE_UTF16LE] according to the current text encoding
+** of the value X, assuming that X has type TEXT.)^  If sqlite3_value_type(X)
+** returns something other than SQLITE_TEXT, then the return value from
+** sqlite3_value_encoding(X) is meaningless.  ^Calls to
+** [sqlite3_value_text(X)], [sqlite3_value_text16(X)], [sqlite3_value_text16be(X)],
+** [sqlite3_value_text16le(X)], [sqlite3_value_bytes(X)], or
+** [sqlite3_value_bytes16(X)] might change the encoding of the value X and
+** thus change the return from subsequent calls to sqlite3_value_encoding(X).
+**
+** This routine is intended for used by applications that test and validate
+** the SQLite implementation.  This routine is inquiring about the opaque
+** internal state of an [sqlite3_value] object.  Ordinary applications should
+** not need to know what the internal state of an sqlite3_value object is and
+** hence should not need to use this interface.
+*/
+SQLITE_API int sqlite3_value_encoding(sqlite3_value*);
+
+/*
+** CAPI3REF: Finding The Subtype Of SQL Values
+** METHOD: sqlite3_value
+**
+** The sqlite3_value_subtype(V) function returns the subtype for
+** an [application-defined SQL function] argument V.  The subtype
+** information can be used to pass a limited amount of context from
+** one SQL function to another.  Use the [sqlite3_result_subtype()]
+** routine to set the subtype for the return value of an SQL function.
+**
+** Every [application-defined SQL function] that invokes this interface
+** should include the [SQLITE_SUBTYPE] property in the text
+** encoding argument when the function is [sqlite3_create_function|registered].
+** If the [SQLITE_SUBTYPE] property is omitted, then sqlite3_value_subtype()
+** might return zero instead of the upstream subtype in some corner cases.
+*/
+SQLITE_API unsigned int sqlite3_value_subtype(sqlite3_value*);
+
+/*
+** CAPI3REF: Copy And Free SQL Values
+** METHOD: sqlite3_value
+**
+** ^The sqlite3_value_dup(V) interface makes a copy of the [sqlite3_value]
+** object D and returns a pointer to that copy.  ^The [sqlite3_value] returned
+** is a [protected sqlite3_value] object even if the input is not.
+** ^The sqlite3_value_dup(V) interface returns NULL if V is NULL or if a
+** memory allocation fails. ^If V is a [pointer value], then the result
+** of sqlite3_value_dup(V) is a NULL value.
+**
+** ^The sqlite3_value_free(V) interface frees an [sqlite3_value] object
+** previously obtained from [sqlite3_value_dup()].  ^If V is a NULL pointer
+** then sqlite3_value_free(V) is a harmless no-op.
+*/
+SQLITE_API sqlite3_value *sqlite3_value_dup(const sqlite3_value*);
+SQLITE_API void sqlite3_value_free(sqlite3_value*);
+
+/*
+** CAPI3REF: Obtain Aggregate Function Context
+** METHOD: sqlite3_context
+**
+** Implementations of aggregate SQL functions use this
+** routine to allocate memory for storing their state.
+**
+** ^The first time the sqlite3_aggregate_context(C,N) routine is called
+** for a particular aggregate function, SQLite allocates
+** N bytes of memory, zeroes out that memory, and returns a pointer
+** to the new memory. ^On second and subsequent calls to
+** sqlite3_aggregate_context() for the same aggregate function instance,
+** the same buffer is returned.  Sqlite3_aggregate_context() is normally
+** called once for each invocation of the xStep callback and then one
+** last time when the xFinal callback is invoked.  ^(When no rows match
+** an aggregate query, the xStep() callback of the aggregate function
+** implementation is never called and xFinal() is called exactly once.
+** In those cases, sqlite3_aggregate_context() might be called for the
+** first time from within xFinal().)^
+**
+** ^The sqlite3_aggregate_context(C,N) routine returns a NULL pointer
+** when first called if N is less than or equal to zero or if a memory
+** allocation error occurs.
+**
+** ^(The amount of space allocated by sqlite3_aggregate_context(C,N) is
+** determined by the N parameter on first successful call.  Changing the
+** value of N in any subsequent call to sqlite3_aggregate_context() within
+** the same aggregate function instance will not resize the memory
+** allocation.)^  Within the xFinal callback, it is customary to set
+** N=0 in calls to sqlite3_aggregate_context(C,N) so that no
+** pointless memory allocations occur.
+**
+** ^SQLite automatically frees the memory allocated by
+** sqlite3_aggregate_context() when the aggregate query concludes.
+**
+** The first parameter must be a copy of the
+** [sqlite3_context | SQL function context] that is the first parameter
+** to the xStep or xFinal callback routine that implements the aggregate
+** function.
+**
+** This routine must be called from the same thread in which
+** the aggregate SQL function is running.
+*/
+SQLITE_API void *sqlite3_aggregate_context(sqlite3_context*, int nBytes);
+
+/*
+** CAPI3REF: User Data For Functions
+** METHOD: sqlite3_context
+**
+** ^The sqlite3_user_data() interface returns a copy of
+** the pointer that was the pUserData parameter (the 5th parameter)
+** of the [sqlite3_create_function()]
+** and [sqlite3_create_function16()] routines that originally
+** registered the application defined function.
+**
+** This routine must be called from the same thread in which
+** the application-defined function is running.
+*/
+SQLITE_API void *sqlite3_user_data(sqlite3_context*);
+
+/*
+** CAPI3REF: Database Connection For Functions
+** METHOD: sqlite3_context
+**
+** ^The sqlite3_context_db_handle() interface returns a copy of
+** the pointer to the [database connection] (the 1st parameter)
+** of the [sqlite3_create_function()]
+** and [sqlite3_create_function16()] routines that originally
+** registered the application defined function.
+*/
+SQLITE_API sqlite3 *sqlite3_context_db_handle(sqlite3_context*);
+
+/*
+** CAPI3REF: Function Auxiliary Data
+** METHOD: sqlite3_context
+**
+** These functions may be used by (non-aggregate) SQL functions to
+** associate auxiliary data with argument values. If the same argument
+** value is passed to multiple invocations of the same SQL function during
+** query execution, under some circumstances the associated auxiliary data
+** might be preserved.  An example of where this might be useful is in a
+** regular-expression matching function. The compiled version of the regular
+** expression can be stored as auxiliary data associated with the pattern string.
+** Then as long as the pattern string remains the same,
+** the compiled regular expression can be reused on multiple
+** invocations of the same function.
+**
+** ^The sqlite3_get_auxdata(C,N) interface returns a pointer to the auxiliary data
+** associated by the sqlite3_set_auxdata(C,N,P,X) function with the Nth argument
+** value to the application-defined function.  ^N is zero for the left-most
+** function argument.  ^If there is no auxiliary data
+** associated with the function argument, the sqlite3_get_auxdata(C,N) interface
+** returns a NULL pointer.
+**
+** ^The sqlite3_set_auxdata(C,N,P,X) interface saves P as auxiliary data for the
+** N-th argument of the application-defined function.  ^Subsequent
+** calls to sqlite3_get_auxdata(C,N) return P from the most recent
+** sqlite3_set_auxdata(C,N,P,X) call if the auxiliary data is still valid or
+** NULL if the auxiliary data has been discarded.
+** ^After each call to sqlite3_set_auxdata(C,N,P,X) where X is not NULL,
+** SQLite will invoke the destructor function X with parameter P exactly
+** once, when the auxiliary data is discarded.
+** SQLite is free to discard the auxiliary data at any time, including: <ul>
+** <li> ^(when the corresponding function parameter changes)^, or
+** <li> ^(when [sqlite3_reset()] or [sqlite3_finalize()] is called for the
+**      SQL statement)^, or
+** <li> ^(when sqlite3_set_auxdata() is invoked again on the same
+**       parameter)^, or
+** <li> ^(during the original sqlite3_set_auxdata() call when a memory
+**      allocation error occurs.)^
+** <li> ^(during the original sqlite3_set_auxdata() call if the function
+**      is evaluated during query planning instead of during query execution,
+**      as sometimes happens with [SQLITE_ENABLE_STAT4].)^ </ul>
+**
+** Note the last two bullets in particular.  The destructor X in
+** sqlite3_set_auxdata(C,N,P,X) might be called immediately, before the
+** sqlite3_set_auxdata() interface even returns.  Hence sqlite3_set_auxdata()
+** should be called near the end of the function implementation and the
+** function implementation should not make any use of P after
+** sqlite3_set_auxdata() has been called.  Furthermore, a call to
+** sqlite3_get_auxdata() that occurs immediately after a corresponding call
+** to sqlite3_set_auxdata() might still return NULL if an out-of-memory
+** condition occurred during the sqlite3_set_auxdata() call or if the
+** function is being evaluated during query planning rather than during
+** query execution.
+**
+** ^(In practice, auxiliary data is preserved between function calls for
+** function parameters that are compile-time constants, including literal
+** values and [parameters] and expressions composed from the same.)^
+**
+** The value of the N parameter to these interfaces should be non-negative.
+** Future enhancements may make use of negative N values to define new
+** kinds of function caching behavior.
+**
+** These routines must be called from the same thread in which
+** the SQL function is running.
+**
+** See also: [sqlite3_get_clientdata()] and [sqlite3_set_clientdata()].
+*/
+SQLITE_API void *sqlite3_get_auxdata(sqlite3_context*, int N);
+SQLITE_API void sqlite3_set_auxdata(sqlite3_context*, int N, void*, void (*)(void*));
+
+/*
+** CAPI3REF: Database Connection Client Data
+** METHOD: sqlite3
+**
+** These functions are used to associate one or more named pointers
+** with a [database connection].
+** A call to sqlite3_set_clientdata(D,N,P,X) causes the pointer P
+** to be attached to [database connection] D using name N.  Subsequent
+** calls to sqlite3_get_clientdata(D,N) will return a copy of pointer P
+** or a NULL pointer if there were no prior calls to
+** sqlite3_set_clientdata() with the same values of D and N.
+** Names are compared using strcmp() and are thus case sensitive.
+**
+** If P and X are both non-NULL, then the destructor X is invoked with
+** argument P on the first of the following occurrences:
+** <ul>
+** <li> An out-of-memory error occurs during the call to
+**      sqlite3_set_clientdata() which attempts to register pointer P.
+** <li> A subsequent call to sqlite3_set_clientdata(D,N,P,X) is made
+**      with the same D and N parameters.
+** <li> The database connection closes.  SQLite does not make any guarantees
+**      about the order in which destructors are called, only that all
+**      destructors will be called exactly once at some point during the
+**      database connection closing process.
+** </ul>
+**
+** SQLite does not do anything with client data other than invoke
+** destructors on the client data at the appropriate time.  The intended
+** use for client data is to provide a mechanism for wrapper libraries
+** to store additional information about an SQLite database connection.
+**
+** There is no limit (other than available memory) on the number of different
+** client data pointers (with different names) that can be attached to a
+** single database connection.  However, the implementation is optimized
+** for the case of having only one or two different client data names.
+** Applications and wrapper libraries are discouraged from using more than
+** one client data name each.
+**
+** There is no way to enumerate the client data pointers
+** associated with a database connection.  The N parameter can be thought
+** of as a secret key such that only code that knows the secret key is able
+** to access the associated data.
+**
+** Security Warning:  These interfaces should not be exposed in scripting
+** languages or in other circumstances where it might be possible for an
+** an attacker to invoke them.  Any agent that can invoke these interfaces
+** can probably also take control of the process.
+**
+** Database connection client data is only available for SQLite
+** version 3.44.0 ([dateof:3.44.0]) and later.
+**
+** See also: [sqlite3_set_auxdata()] and [sqlite3_get_auxdata()].
+*/
+SQLITE_API void *sqlite3_get_clientdata(sqlite3*,const char*);
+SQLITE_API int sqlite3_set_clientdata(sqlite3*, const char*, void*, void(*)(void*));
+
+/*
+** CAPI3REF: Constants Defining Special Destructor Behavior
+**
+** These are special values for the destructor that is passed in as the
+** final argument to routines like [sqlite3_result_blob()].  ^If the destructor
+** argument is SQLITE_STATIC, it means that the content pointer is constant
+** and will never change.  It does not need to be destroyed.  ^The
+** SQLITE_TRANSIENT value means that the content will likely change in
+** the near future and that SQLite should make its own private copy of
+** the content before returning.
+**
+** The typedef is necessary to work around problems in certain
+** C++ compilers.
+*/
+typedef void (*sqlite3_destructor_type)(void*);
+#define SQLITE_STATIC      ((sqlite3_destructor_type)0)
+#define SQLITE_TRANSIENT   ((sqlite3_destructor_type)-1)
+
+/*
+** CAPI3REF: Setting The Result Of An SQL Function
+** METHOD: sqlite3_context
+**
+** These routines are used by the xFunc or xFinal callbacks that
+** implement SQL functions and aggregates.  See
+** [sqlite3_create_function()] and [sqlite3_create_function16()]
+** for additional information.
+**
+** These functions work very much like the [parameter binding] family of
+** functions used to bind values to host parameters in prepared statements.
+** Refer to the [SQL parameter] documentation for additional information.
+**
+** ^The sqlite3_result_blob() interface sets the result from
+** an application-defined function to be the BLOB whose content is pointed
+** to by the second parameter and which is N bytes long where N is the
+** third parameter.
+**
+** ^The sqlite3_result_zeroblob(C,N) and sqlite3_result_zeroblob64(C,N)
+** interfaces set the result of the application-defined function to be
+** a BLOB containing all zero bytes and N bytes in size.
+**
+** ^The sqlite3_result_double() interface sets the result from
+** an application-defined function to be a floating point value specified
+** by its 2nd argument.
+**
+** ^The sqlite3_result_error() and sqlite3_result_error16() functions
+** cause the implemented SQL function to throw an exception.
+** ^SQLite uses the string pointed to by the
+** 2nd parameter of sqlite3_result_error() or sqlite3_result_error16()
+** as the text of an error message.  ^SQLite interprets the error
+** message string from sqlite3_result_error() as UTF-8. ^SQLite
+** interprets the string from sqlite3_result_error16() as UTF-16 using
+** the same [byte-order determination rules] as [sqlite3_bind_text16()].
+** ^If the third parameter to sqlite3_result_error()
+** or sqlite3_result_error16() is negative then SQLite takes as the error
+** message all text up through the first zero character.
+** ^If the third parameter to sqlite3_result_error() or
+** sqlite3_result_error16() is non-negative then SQLite takes that many
+** bytes (not characters) from the 2nd parameter as the error message.
+** ^The sqlite3_result_error() and sqlite3_result_error16()
+** routines make a private copy of the error message text before
+** they return.  Hence, the calling function can deallocate or
+** modify the text after they return without harm.
+** ^The sqlite3_result_error_code() function changes the error code
+** returned by SQLite as a result of an error in a function.  ^By default,
+** the error code is SQLITE_ERROR.  ^A subsequent call to sqlite3_result_error()
+** or sqlite3_result_error16() resets the error code to SQLITE_ERROR.
+**
+** ^The sqlite3_result_error_toobig() interface causes SQLite to throw an
+** error indicating that a string or BLOB is too long to represent.
+**
+** ^The sqlite3_result_error_nomem() interface causes SQLite to throw an
+** error indicating that a memory allocation failed.
+**
+** ^The sqlite3_result_int() interface sets the return value
+** of the application-defined function to be the 32-bit signed integer
+** value given in the 2nd argument.
+** ^The sqlite3_result_int64() interface sets the return value
+** of the application-defined function to be the 64-bit signed integer
+** value given in the 2nd argument.
+**
+** ^The sqlite3_result_null() interface sets the return value
+** of the application-defined function to be NULL.
+**
+** ^The sqlite3_result_text(), sqlite3_result_text16(),
+** sqlite3_result_text16le(), and sqlite3_result_text16be() interfaces
+** set the return value of the application-defined function to be
+** a text string which is represented as UTF-8, UTF-16 native byte order,
+** UTF-16 little endian, or UTF-16 big endian, respectively.
+** ^The sqlite3_result_text64() interface sets the return value of an
+** application-defined function to be a text string in an encoding
+** specified by the fifth (and last) parameter, which must be one
+** of [SQLITE_UTF8], [SQLITE_UTF16], [SQLITE_UTF16BE], or [SQLITE_UTF16LE].
+** ^SQLite takes the text result from the application from
+** the 2nd parameter of the sqlite3_result_text* interfaces.
+** ^If the 3rd parameter to any of the sqlite3_result_text* interfaces
+** other than sqlite3_result_text64() is negative, then SQLite computes
+** the string length itself by searching the 2nd parameter for the first
+** zero character.
+** ^If the 3rd parameter to the sqlite3_result_text* interfaces
+** is non-negative, then as many bytes (not characters) of the text
+** pointed to by the 2nd parameter are taken as the application-defined
+** function result.  If the 3rd parameter is non-negative, then it
+** must be the byte offset into the string where the NUL terminator would
+** appear if the string where NUL terminated.  If any NUL characters occur
+** in the string at a byte offset that is less than the value of the 3rd
+** parameter, then the resulting string will contain embedded NULs and the
+** result of expressions operating on strings with embedded NULs is undefined.
+** ^If the 4th parameter to the sqlite3_result_text* interfaces
+** or sqlite3_result_blob is a non-NULL pointer, then SQLite calls that
+** function as the destructor on the text or BLOB result when it has
+** finished using that result.
+** ^If the 4th parameter to the sqlite3_result_text* interfaces or to
+** sqlite3_result_blob is the special constant SQLITE_STATIC, then SQLite
+** assumes that the text or BLOB result is in constant space and does not
+** copy the content of the parameter nor call a destructor on the content
+** when it has finished using that result.
+** ^If the 4th parameter to the sqlite3_result_text* interfaces
+** or sqlite3_result_blob is the special constant SQLITE_TRANSIENT
+** then SQLite makes a copy of the result into space obtained
+** from [sqlite3_malloc()] before it returns.
+**
+** ^For the sqlite3_result_text16(), sqlite3_result_text16le(), and
+** sqlite3_result_text16be() routines, and for sqlite3_result_text64()
+** when the encoding is not UTF8, if the input UTF16 begins with a
+** byte-order mark (BOM, U+FEFF) then the BOM is removed from the
+** string and the rest of the string is interpreted according to the
+** byte-order specified by the BOM.  ^The byte-order specified by
+** the BOM at the beginning of the text overrides the byte-order
+** specified by the interface procedure.  ^So, for example, if
+** sqlite3_result_text16le() is invoked with text that begins
+** with bytes 0xfe, 0xff (a big-endian byte-order mark) then the
+** first two bytes of input are skipped and the remaining input
+** is interpreted as UTF16BE text.
+**
+** ^For UTF16 input text to the sqlite3_result_text16(),
+** sqlite3_result_text16be(), sqlite3_result_text16le(), and
+** sqlite3_result_text64() routines, if the text contains invalid
+** UTF16 characters, the invalid characters might be converted
+** into the unicode replacement character, U+FFFD.
+**
+** ^The sqlite3_result_value() interface sets the result of
+** the application-defined function to be a copy of the
+** [unprotected sqlite3_value] object specified by the 2nd parameter.  ^The
+** sqlite3_result_value() interface makes a copy of the [sqlite3_value]
+** so that the [sqlite3_value] specified in the parameter may change or
+** be deallocated after sqlite3_result_value() returns without harm.
+** ^A [protected sqlite3_value] object may always be used where an
+** [unprotected sqlite3_value] object is required, so either
+** kind of [sqlite3_value] object can be used with this interface.
+**
+** ^The sqlite3_result_pointer(C,P,T,D) interface sets the result to an
+** SQL NULL value, just like [sqlite3_result_null(C)], except that it
+** also associates the host-language pointer P or type T with that
+** NULL value such that the pointer can be retrieved within an
+** [application-defined SQL function] using [sqlite3_value_pointer()].
+** ^If the D parameter is not NULL, then it is a pointer to a destructor
+** for the P parameter.  ^SQLite invokes D with P as its only argument
+** when SQLite is finished with P.  The T parameter should be a static
+** string and preferably a string literal. The sqlite3_result_pointer()
+** routine is part of the [pointer passing interface] added for SQLite 3.20.0.
+**
+** If these routines are called from within the different thread
+** than the one containing the application-defined function that received
+** the [sqlite3_context] pointer, the results are undefined.
+*/
+SQLITE_API void sqlite3_result_blob(sqlite3_context*, const void*, int, void(*)(void*));
+SQLITE_API void sqlite3_result_blob64(sqlite3_context*,const void*,
+                           sqlite3_uint64,void(*)(void*));
+SQLITE_API void sqlite3_result_double(sqlite3_context*, double);
+SQLITE_API void sqlite3_result_error(sqlite3_context*, const char*, int);
+SQLITE_API void sqlite3_result_error16(sqlite3_context*, const void*, int);
+SQLITE_API void sqlite3_result_error_toobig(sqlite3_context*);
+SQLITE_API void sqlite3_result_error_nomem(sqlite3_context*);
+SQLITE_API void sqlite3_result_error_code(sqlite3_context*, int);
+SQLITE_API void sqlite3_result_int(sqlite3_context*, int);
+SQLITE_API void sqlite3_result_int64(sqlite3_context*, sqlite3_int64);
+SQLITE_API void sqlite3_result_null(sqlite3_context*);
+SQLITE_API void sqlite3_result_text(sqlite3_context*, const char*, int, void(*)(void*));
+SQLITE_API void sqlite3_result_text64(sqlite3_context*, const char*,sqlite3_uint64,
+                           void(*)(void*), unsigned char encoding);
+SQLITE_API void sqlite3_result_text16(sqlite3_context*, const void*, int, void(*)(void*));
+SQLITE_API void sqlite3_result_text16le(sqlite3_context*, const void*, int,void(*)(void*));
+SQLITE_API void sqlite3_result_text16be(sqlite3_context*, const void*, int,void(*)(void*));
+SQLITE_API void sqlite3_result_value(sqlite3_context*, sqlite3_value*);
+SQLITE_API void sqlite3_result_pointer(sqlite3_context*, void*,const char*,void(*)(void*));
+SQLITE_API void sqlite3_result_zeroblob(sqlite3_context*, int n);
+SQLITE_API int sqlite3_result_zeroblob64(sqlite3_context*, sqlite3_uint64 n);
+
+
+/*
+** CAPI3REF: Setting The Subtype Of An SQL Function
+** METHOD: sqlite3_context
+**
+** The sqlite3_result_subtype(C,T) function causes the subtype of
+** the result from the [application-defined SQL function] with
+** [sqlite3_context] C to be the value T.  Only the lower 8 bits
+** of the subtype T are preserved in current versions of SQLite;
+** higher order bits are discarded.
+** The number of subtype bytes preserved by SQLite might increase
+** in future releases of SQLite.
+**
+** Every [application-defined SQL function] that invokes this interface
+** should include the [SQLITE_RESULT_SUBTYPE] property in its
+** text encoding argument when the SQL function is
+** [sqlite3_create_function|registered].  If the [SQLITE_RESULT_SUBTYPE]
+** property is omitted from the function that invokes sqlite3_result_subtype(),
+** then in some cases the sqlite3_result_subtype() might fail to set
+** the result subtype.
+**
+** If SQLite is compiled with -DSQLITE_STRICT_SUBTYPE=1, then any
+** SQL function that invokes the sqlite3_result_subtype() interface
+** and that does not have the SQLITE_RESULT_SUBTYPE property will raise
+** an error.  Future versions of SQLite might enable -DSQLITE_STRICT_SUBTYPE=1
+** by default.
+*/
+SQLITE_API void sqlite3_result_subtype(sqlite3_context*,unsigned int);
+
+/*
+** CAPI3REF: Define New Collating Sequences
+** METHOD: sqlite3
+**
+** ^These functions add, remove, or modify a [collation] associated
+** with the [database connection] specified as the first argument.
+**
+** ^The name of the collation is a UTF-8 string
+** for sqlite3_create_collation() and sqlite3_create_collation_v2()
+** and a UTF-16 string in native byte order for sqlite3_create_collation16().
+** ^Collation names that compare equal according to [sqlite3_strnicmp()] are
+** considered to be the same name.
+**
+** ^(The third argument (eTextRep) must be one of the constants:
+** <ul>
+** <li> [SQLITE_UTF8],
+** <li> [SQLITE_UTF16LE],
+** <li> [SQLITE_UTF16BE],
+** <li> [SQLITE_UTF16], or
+** <li> [SQLITE_UTF16_ALIGNED].
+** </ul>)^
+** ^The eTextRep argument determines the encoding of strings passed
+** to the collating function callback, xCompare.
+** ^The [SQLITE_UTF16] and [SQLITE_UTF16_ALIGNED] values for eTextRep
+** force strings to be UTF16 with native byte order.
+** ^The [SQLITE_UTF16_ALIGNED] value for eTextRep forces strings to begin
+** on an even byte address.
+**
+** ^The fourth argument, pArg, is an application data pointer that is passed
+** through as the first argument to the collating function callback.
+**
+** ^The fifth argument, xCompare, is a pointer to the collating function.
+** ^Multiple collating functions can be registered using the same name but
+** with different eTextRep parameters and SQLite will use whichever
+** function requires the least amount of data transformation.
+** ^If the xCompare argument is NULL then the collating function is
+** deleted.  ^When all collating functions having the same name are deleted,
+** that collation is no longer usable.
+**
+** ^The collating function callback is invoked with a copy of the pArg
+** application data pointer and with two strings in the encoding specified
+** by the eTextRep argument.  The two integer parameters to the collating
+** function callback are the length of the two strings, in bytes. The collating
+** function must return an integer that is negative, zero, or positive
+** if the first string is less than, equal to, or greater than the second,
+** respectively.  A collating function must always return the same answer
+** given the same inputs.  If two or more collating functions are registered
+** to the same collation name (using different eTextRep values) then all
+** must give an equivalent answer when invoked with equivalent strings.
+** The collating function must obey the following properties for all
+** strings A, B, and C:
+**
+** <ol>
+** <li> If A==B then B==A.
+** <li> If A==B and B==C then A==C.
+** <li> If A&lt;B THEN B&gt;A.
+** <li> If A&lt;B and B&lt;C then A&lt;C.
+** </ol>
+**
+** If a collating function fails any of the above constraints and that
+** collating function is registered and used, then the behavior of SQLite
+** is undefined.
+**
+** ^The sqlite3_create_collation_v2() works like sqlite3_create_collation()
+** with the addition that the xDestroy callback is invoked on pArg when
+** the collating function is deleted.
+** ^Collating functions are deleted when they are overridden by later
+** calls to the collation creation functions or when the
+** [database connection] is closed using [sqlite3_close()].
+**
+** ^The xDestroy callback is <u>not</u> called if the
+** sqlite3_create_collation_v2() function fails.  Applications that invoke
+** sqlite3_create_collation_v2() with a non-NULL xDestroy argument should
+** check the return code and dispose of the application data pointer
+** themselves rather than expecting SQLite to deal with it for them.
+** This is different from every other SQLite interface.  The inconsistency
+** is unfortunate but cannot be changed without breaking backwards
+** compatibility.
+**
+** See also:  [sqlite3_collation_needed()] and [sqlite3_collation_needed16()].
+*/
+SQLITE_API int sqlite3_create_collation(
+  sqlite3*,
+  const char *zName,
+  int eTextRep,
+  void *pArg,
+  int(*xCompare)(void*,int,const void*,int,const void*)
+);
+SQLITE_API int sqlite3_create_collation_v2(
+  sqlite3*,
+  const char *zName,
+  int eTextRep,
+  void *pArg,
+  int(*xCompare)(void*,int,const void*,int,const void*),
+  void(*xDestroy)(void*)
+);
+SQLITE_API int sqlite3_create_collation16(
+  sqlite3*,
+  const void *zName,
+  int eTextRep,
+  void *pArg,
+  int(*xCompare)(void*,int,const void*,int,const void*)
+);
+
+/*
+** CAPI3REF: Collation Needed Callbacks
+** METHOD: sqlite3
+**
+** ^To avoid having to register all collation sequences before a database
+** can be used, a single callback function may be registered with the
+** [database connection] to be invoked whenever an undefined collation
+** sequence is required.
+**
+** ^If the function is registered using the sqlite3_collation_needed() API,
+** then it is passed the names of undefined collation sequences as strings
+** encoded in UTF-8. ^If sqlite3_collation_needed16() is used,
+** the names are passed as UTF-16 in machine native byte order.
+** ^A call to either function replaces the existing collation-needed callback.
+**
+** ^(When the callback is invoked, the first argument passed is a copy
+** of the second argument to sqlite3_collation_needed() or
+** sqlite3_collation_needed16().  The second argument is the database
+** connection.  The third argument is one of [SQLITE_UTF8], [SQLITE_UTF16BE],
+** or [SQLITE_UTF16LE], indicating the most desirable form of the collation
+** sequence function required.  The fourth parameter is the name of the
+** required collation sequence.)^
+**
+** The callback function should register the desired collation using
+** [sqlite3_create_collation()], [sqlite3_create_collation16()], or
+** [sqlite3_create_collation_v2()].
+*/
+SQLITE_API int sqlite3_collation_needed(
+  sqlite3*,
+  void*,
+  void(*)(void*,sqlite3*,int eTextRep,const char*)
+);
+SQLITE_API int sqlite3_collation_needed16(
+  sqlite3*,
+  void*,
+  void(*)(void*,sqlite3*,int eTextRep,const void*)
+);
+
+#ifdef SQLITE_ENABLE_CEROD
+/*
+** Specify the activation key for a CEROD database.  Unless
+** activated, none of the CEROD routines will work.
+*/
+SQLITE_API void sqlite3_activate_cerod(
+  const char *zPassPhrase        /* Activation phrase */
+);
+#endif
+
+/*
+** CAPI3REF: Suspend Execution For A Short Time
+**
+** The sqlite3_sleep() function causes the current thread to suspend execution
+** for at least a number of milliseconds specified in its parameter.
+**
+** If the operating system does not support sleep requests with
+** millisecond time resolution, then the time will be rounded up to
+** the nearest second. The number of milliseconds of sleep actually
+** requested from the operating system is returned.
+**
+** ^SQLite implements this interface by calling the xSleep()
+** method of the default [sqlite3_vfs] object.  If the xSleep() method
+** of the default VFS is not implemented correctly, or not implemented at
+** all, then the behavior of sqlite3_sleep() may deviate from the description
+** in the previous paragraphs.
+**
+** If a negative argument is passed to sqlite3_sleep() the results vary by
+** VFS and operating system.  Some system treat a negative argument as an
+** instruction to sleep forever.  Others understand it to mean do not sleep
+** at all. ^In SQLite version 3.42.0 and later, a negative
+** argument passed into sqlite3_sleep() is changed to zero before it is relayed
+** down into the xSleep method of the VFS.
+*/
+SQLITE_API int sqlite3_sleep(int);
+
+/*
+** CAPI3REF: Name Of The Folder Holding Temporary Files
+**
+** ^(If this global variable is made to point to a string which is
+** the name of a folder (a.k.a. directory), then all temporary files
+** created by SQLite when using a built-in [sqlite3_vfs | VFS]
+** will be placed in that directory.)^  ^If this variable
+** is a NULL pointer, then SQLite performs a search for an appropriate
+** temporary file directory.
+**
+** Applications are strongly discouraged from using this global variable.
+** It is required to set a temporary folder on Windows Runtime (WinRT).
+** But for all other platforms, it is highly recommended that applications
+** neither read nor write this variable.  This global variable is a relic
+** that exists for backwards compatibility of legacy applications and should
+** be avoided in new projects.
+**
+** It is not safe to read or modify this variable in more than one
+** thread at a time.  It is not safe to read or modify this variable
+** if a [database connection] is being used at the same time in a separate
+** thread.
+** It is intended that this variable be set once
+** as part of process initialization and before any SQLite interface
+** routines have been called and that this variable remain unchanged
+** thereafter.
+**
+** ^The [temp_store_directory pragma] may modify this variable and cause
+** it to point to memory obtained from [sqlite3_malloc].  ^Furthermore,
+** the [temp_store_directory pragma] always assumes that any string
+** that this variable points to is held in memory obtained from
+** [sqlite3_malloc] and the pragma may attempt to free that memory
+** using [sqlite3_free].
+** Hence, if this variable is modified directly, either it should be
+** made NULL or made to point to memory obtained from [sqlite3_malloc]
+** or else the use of the [temp_store_directory pragma] should be avoided.
+** Except when requested by the [temp_store_directory pragma], SQLite
+** does not free the memory that sqlite3_temp_directory points to.  If
+** the application wants that memory to be freed, it must do
+** so itself, taking care to only do so after all [database connection]
+** objects have been destroyed.
+**
+** <b>Note to Windows Runtime users:</b>  The temporary directory must be set
+** prior to calling [sqlite3_open] or [sqlite3_open_v2].  Otherwise, various
+** features that require the use of temporary files may fail.  Here is an
+** example of how to do this using C++ with the Windows Runtime:
+**
+** <blockquote><pre>
+** LPCWSTR zPath = Windows::Storage::ApplicationData::Current->
+** &nbsp;     TemporaryFolder->Path->Data();
+** char zPathBuf&#91;MAX_PATH + 1&#93;;
+** memset(zPathBuf, 0, sizeof(zPathBuf));
+** WideCharToMultiByte(CP_UTF8, 0, zPath, -1, zPathBuf, sizeof(zPathBuf),
+** &nbsp;     NULL, NULL);
+** sqlite3_temp_directory = sqlite3_mprintf("%s", zPathBuf);
+** </pre></blockquote>
+*/
+SQLITE_API SQLITE_EXTERN char *sqlite3_temp_directory;
+
+/*
+** CAPI3REF: Name Of The Folder Holding Database Files
+**
+** ^(If this global variable is made to point to a string which is
+** the name of a folder (a.k.a. directory), then all database files
+** specified with a relative pathname and created or accessed by
+** SQLite when using a built-in windows [sqlite3_vfs | VFS] will be assumed
+** to be relative to that directory.)^ ^If this variable is a NULL
+** pointer, then SQLite assumes that all database files specified
+** with a relative pathname are relative to the current directory
+** for the process.  Only the windows VFS makes use of this global
+** variable; it is ignored by the unix VFS.
+**
+** Changing the value of this variable while a database connection is
+** open can result in a corrupt database.
+**
+** It is not safe to read or modify this variable in more than one
+** thread at a time.  It is not safe to read or modify this variable
+** if a [database connection] is being used at the same time in a separate
+** thread.
+** It is intended that this variable be set once
+** as part of process initialization and before any SQLite interface
+** routines have been called and that this variable remain unchanged
+** thereafter.
+**
+** ^The [data_store_directory pragma] may modify this variable and cause
+** it to point to memory obtained from [sqlite3_malloc].  ^Furthermore,
+** the [data_store_directory pragma] always assumes that any string
+** that this variable points to is held in memory obtained from
+** [sqlite3_malloc] and the pragma may attempt to free that memory
+** using [sqlite3_free].
+** Hence, if this variable is modified directly, either it should be
+** made NULL or made to point to memory obtained from [sqlite3_malloc]
+** or else the use of the [data_store_directory pragma] should be avoided.
+*/
+SQLITE_API SQLITE_EXTERN char *sqlite3_data_directory;
+
+/*
+** CAPI3REF: Win32 Specific Interface
+**
+** These interfaces are available only on Windows.  The
+** [sqlite3_win32_set_directory] interface is used to set the value associated
+** with the [sqlite3_temp_directory] or [sqlite3_data_directory] variable, to
+** zValue, depending on the value of the type parameter.  The zValue parameter
+** should be NULL to cause the previous value to be freed via [sqlite3_free];
+** a non-NULL value will be copied into memory obtained from [sqlite3_malloc]
+** prior to being used.  The [sqlite3_win32_set_directory] interface returns
+** [SQLITE_OK] to indicate success, [SQLITE_ERROR] if the type is unsupported,
+** or [SQLITE_NOMEM] if memory could not be allocated.  The value of the
+** [sqlite3_data_directory] variable is intended to act as a replacement for
+** the current directory on the sub-platforms of Win32 where that concept is
+** not present, e.g. WinRT and UWP.  The [sqlite3_win32_set_directory8] and
+** [sqlite3_win32_set_directory16] interfaces behave exactly the same as the
+** sqlite3_win32_set_directory interface except the string parameter must be
+** UTF-8 or UTF-16, respectively.
+*/
+SQLITE_API int sqlite3_win32_set_directory(
+  unsigned long type, /* Identifier for directory being set or reset */
+  void *zValue        /* New value for directory being set or reset */
+);
+SQLITE_API int sqlite3_win32_set_directory8(unsigned long type, const char *zValue);
+SQLITE_API int sqlite3_win32_set_directory16(unsigned long type, const void *zValue);
+
+/*
+** CAPI3REF: Win32 Directory Types
+**
+** These macros are only available on Windows.  They define the allowed values
+** for the type argument to the [sqlite3_win32_set_directory] interface.
+*/
+#define SQLITE_WIN32_DATA_DIRECTORY_TYPE  1
+#define SQLITE_WIN32_TEMP_DIRECTORY_TYPE  2
+
+/*
+** CAPI3REF: Test For Auto-Commit Mode
+** KEYWORDS: {autocommit mode}
+** METHOD: sqlite3
+**
+** ^The sqlite3_get_autocommit() interface returns non-zero or
+** zero if the given database connection is or is not in autocommit mode,
+** respectively.  ^Autocommit mode is on by default.
+** ^Autocommit mode is disabled by a [BEGIN] statement.
+** ^Autocommit mode is re-enabled by a [COMMIT] or [ROLLBACK].
+**
+** If certain kinds of errors occur on a statement within a multi-statement
+** transaction (errors including [SQLITE_FULL], [SQLITE_IOERR],
+** [SQLITE_NOMEM], [SQLITE_BUSY], and [SQLITE_INTERRUPT]) then the
+** transaction might be rolled back automatically.  The only way to
+** find out whether SQLite automatically rolled back the transaction after
+** an error is to use this function.
+**
+** If another thread changes the autocommit status of the database
+** connection while this routine is running, then the return value
+** is undefined.
+*/
+SQLITE_API int sqlite3_get_autocommit(sqlite3*);
+
+/*
+** CAPI3REF: Find The Database Handle Of A Prepared Statement
+** METHOD: sqlite3_stmt
+**
+** ^The sqlite3_db_handle interface returns the [database connection] handle
+** to which a [prepared statement] belongs.  ^The [database connection]
+** returned by sqlite3_db_handle is the same [database connection]
+** that was the first argument
+** to the [sqlite3_prepare_v2()] call (or its variants) that was used to
+** create the statement in the first place.
+*/
+SQLITE_API sqlite3 *sqlite3_db_handle(sqlite3_stmt*);
+
+/*
+** CAPI3REF: Return The Schema Name For A Database Connection
+** METHOD: sqlite3
+**
+** ^The sqlite3_db_name(D,N) interface returns a pointer to the schema name
+** for the N-th database on database connection D, or a NULL pointer of N is
+** out of range.  An N value of 0 means the main database file.  An N of 1 is
+** the "temp" schema.  Larger values of N correspond to various ATTACH-ed
+** databases.
+**
+** Space to hold the string that is returned by sqlite3_db_name() is managed
+** by SQLite itself.  The string might be deallocated by any operation that
+** changes the schema, including [ATTACH] or [DETACH] or calls to
+** [sqlite3_serialize()] or [sqlite3_deserialize()], even operations that
+** occur on a different thread.  Applications that need to
+** remember the string long-term should make their own copy.  Applications that
+** are accessing the same database connection simultaneously on multiple
+** threads should mutex-protect calls to this API and should make their own
+** private copy of the result prior to releasing the mutex.
+*/
+SQLITE_API const char *sqlite3_db_name(sqlite3 *db, int N);
+
+/*
+** CAPI3REF: Return The Filename For A Database Connection
+** METHOD: sqlite3
+**
+** ^The sqlite3_db_filename(D,N) interface returns a pointer to the filename
+** associated with database N of connection D.
+** ^If there is no attached database N on the database
+** connection D, or if database N is a temporary or in-memory database, then
+** this function will return either a NULL pointer or an empty string.
+**
+** ^The string value returned by this routine is owned and managed by
+** the database connection.  ^The value will be valid until the database N
+** is [DETACH]-ed or until the database connection closes.
+**
+** ^The filename returned by this function is the output of the
+** xFullPathname method of the [VFS].  ^In other words, the filename
+** will be an absolute pathname, even if the filename used
+** to open the database originally was a URI or relative pathname.
+**
+** If the filename pointer returned by this routine is not NULL, then it
+** can be used as the filename input parameter to these routines:
+** <ul>
+** <li> [sqlite3_uri_parameter()]
+** <li> [sqlite3_uri_boolean()]
+** <li> [sqlite3_uri_int64()]
+** <li> [sqlite3_filename_database()]
+** <li> [sqlite3_filename_journal()]
+** <li> [sqlite3_filename_wal()]
+** </ul>
+*/
+SQLITE_API sqlite3_filename sqlite3_db_filename(sqlite3 *db, const char *zDbName);
+
+/*
+** CAPI3REF: Determine if a database is read-only
+** METHOD: sqlite3
+**
+** ^The sqlite3_db_readonly(D,N) interface returns 1 if the database N
+** of connection D is read-only, 0 if it is read/write, or -1 if N is not
+** the name of a database on connection D.
+*/
+SQLITE_API int sqlite3_db_readonly(sqlite3 *db, const char *zDbName);
+
+/*
+** CAPI3REF: Determine the transaction state of a database
+** METHOD: sqlite3
+**
+** ^The sqlite3_txn_state(D,S) interface returns the current
+** [transaction state] of schema S in database connection D.  ^If S is NULL,
+** then the highest transaction state of any schema on database connection D
+** is returned.  Transaction states are (in order of lowest to highest):
+** <ol>
+** <li value="0"> SQLITE_TXN_NONE
+** <li value="1"> SQLITE_TXN_READ
+** <li value="2"> SQLITE_TXN_WRITE
+** </ol>
+** ^If the S argument to sqlite3_txn_state(D,S) is not the name of
+** a valid schema, then -1 is returned.
+*/
+SQLITE_API int sqlite3_txn_state(sqlite3*,const char *zSchema);
+
+/*
+** CAPI3REF: Allowed return values from sqlite3_txn_state()
+** KEYWORDS: {transaction state}
+**
+** These constants define the current transaction state of a database file.
+** ^The [sqlite3_txn_state(D,S)] interface returns one of these
+** constants in order to describe the transaction state of schema S
+** in [database connection] D.
+**
+** <dl>
+** [[SQLITE_TXN_NONE]] <dt>SQLITE_TXN_NONE</dt>
+** <dd>The SQLITE_TXN_NONE state means that no transaction is currently
+** pending.</dd>
+**
+** [[SQLITE_TXN_READ]] <dt>SQLITE_TXN_READ</dt>
+** <dd>The SQLITE_TXN_READ state means that the database is currently
+** in a read transaction.  Content has been read from the database file
+** but nothing in the database file has changed.  The transaction state
+** will advanced to SQLITE_TXN_WRITE if any changes occur and there are
+** no other conflicting concurrent write transactions.  The transaction
+** state will revert to SQLITE_TXN_NONE following a [ROLLBACK] or
+** [COMMIT].</dd>
+**
+** [[SQLITE_TXN_WRITE]] <dt>SQLITE_TXN_WRITE</dt>
+** <dd>The SQLITE_TXN_WRITE state means that the database is currently
+** in a write transaction.  Content has been written to the database file
+** but has not yet committed.  The transaction state will change to
+** to SQLITE_TXN_NONE at the next [ROLLBACK] or [COMMIT].</dd>
+*/
+#define SQLITE_TXN_NONE  0
+#define SQLITE_TXN_READ  1
+#define SQLITE_TXN_WRITE 2
+
+/*
+** CAPI3REF: Find the next prepared statement
+** METHOD: sqlite3
+**
+** ^This interface returns a pointer to the next [prepared statement] after
+** pStmt associated with the [database connection] pDb.  ^If pStmt is NULL
+** then this interface returns a pointer to the first prepared statement
+** associated with the database connection pDb.  ^If no prepared statement
+** satisfies the conditions of this routine, it returns NULL.
+**
+** The [database connection] pointer D in a call to
+** [sqlite3_next_stmt(D,S)] must refer to an open database
+** connection and in particular must not be a NULL pointer.
+*/
+SQLITE_API sqlite3_stmt *sqlite3_next_stmt(sqlite3 *pDb, sqlite3_stmt *pStmt);
+
+/*
+** CAPI3REF: Commit And Rollback Notification Callbacks
+** METHOD: sqlite3
+**
+** ^The sqlite3_commit_hook() interface registers a callback
+** function to be invoked whenever a transaction is [COMMIT | committed].
+** ^Any callback set by a previous call to sqlite3_commit_hook()
+** for the same database connection is overridden.
+** ^The sqlite3_rollback_hook() interface registers a callback
+** function to be invoked whenever a transaction is [ROLLBACK | rolled back].
+** ^Any callback set by a previous call to sqlite3_rollback_hook()
+** for the same database connection is overridden.
+** ^The pArg argument is passed through to the callback.
+** ^If the callback on a commit hook function returns non-zero,
+** then the commit is converted into a rollback.
+**
+** ^The sqlite3_commit_hook(D,C,P) and sqlite3_rollback_hook(D,C,P) functions
+** return the P argument from the previous call of the same function
+** on the same [database connection] D, or NULL for
+** the first call for each function on D.
+**
+** The commit and rollback hook callbacks are not reentrant.
+** The callback implementation must not do anything that will modify
+** the database connection that invoked the callback.  Any actions
+** to modify the database connection must be deferred until after the
+** completion of the [sqlite3_step()] call that triggered the commit
+** or rollback hook in the first place.
+** Note that running any other SQL statements, including SELECT statements,
+** or merely calling [sqlite3_prepare_v2()] and [sqlite3_step()] will modify
+** the database connections for the meaning of "modify" in this paragraph.
+**
+** ^Registering a NULL function disables the callback.
+**
+** ^When the commit hook callback routine returns zero, the [COMMIT]
+** operation is allowed to continue normally.  ^If the commit hook
+** returns non-zero, then the [COMMIT] is converted into a [ROLLBACK].
+** ^The rollback hook is invoked on a rollback that results from a commit
+** hook returning non-zero, just as it would be with any other rollback.
+**
+** ^For the purposes of this API, a transaction is said to have been
+** rolled back if an explicit "ROLLBACK" statement is executed, or
+** an error or constraint causes an implicit rollback to occur.
+** ^The rollback callback is not invoked if a transaction is
+** automatically rolled back because the database connection is closed.
+**
+** See also the [sqlite3_update_hook()] interface.
+*/
+SQLITE_API void *sqlite3_commit_hook(sqlite3*, int(*)(void*), void*);
+SQLITE_API void *sqlite3_rollback_hook(sqlite3*, void(*)(void *), void*);
+
+/*
+** CAPI3REF: Autovacuum Compaction Amount Callback
+** METHOD: sqlite3
+**
+** ^The sqlite3_autovacuum_pages(D,C,P,X) interface registers a callback
+** function C that is invoked prior to each autovacuum of the database
+** file.  ^The callback is passed a copy of the generic data pointer (P),
+** the schema-name of the attached database that is being autovacuumed,
+** the size of the database file in pages, the number of free pages,
+** and the number of bytes per page, respectively.  The callback should
+** return the number of free pages that should be removed by the
+** autovacuum.  ^If the callback returns zero, then no autovacuum happens.
+** ^If the value returned is greater than or equal to the number of
+** free pages, then a complete autovacuum happens.
+**
+** <p>^If there are multiple ATTACH-ed database files that are being
+** modified as part of a transaction commit, then the autovacuum pages
+** callback is invoked separately for each file.
+**
+** <p><b>The callback is not reentrant.</b> The callback function should
+** not attempt to invoke any other SQLite interface.  If it does, bad
+** things may happen, including segmentation faults and corrupt database
+** files.  The callback function should be a simple function that
+** does some arithmetic on its input parameters and returns a result.
+**
+** ^The X parameter to sqlite3_autovacuum_pages(D,C,P,X) is an optional
+** destructor for the P parameter.  ^If X is not NULL, then X(P) is
+** invoked whenever the database connection closes or when the callback
+** is overwritten by another invocation of sqlite3_autovacuum_pages().
+**
+** <p>^There is only one autovacuum pages callback per database connection.
+** ^Each call to the sqlite3_autovacuum_pages() interface overrides all
+** previous invocations for that database connection.  ^If the callback
+** argument (C) to sqlite3_autovacuum_pages(D,C,P,X) is a NULL pointer,
+** then the autovacuum steps callback is canceled.  The return value
+** from sqlite3_autovacuum_pages() is normally SQLITE_OK, but might
+** be some other error code if something goes wrong.  The current
+** implementation will only return SQLITE_OK or SQLITE_MISUSE, but other
+** return codes might be added in future releases.
+**
+** <p>If no autovacuum pages callback is specified (the usual case) or
+** a NULL pointer is provided for the callback,
+** then the default behavior is to vacuum all free pages.  So, in other
+** words, the default behavior is the same as if the callback function
+** were something like this:
+**
+** <blockquote><pre>
+** &nbsp;   unsigned int demonstration_autovac_pages_callback(
+** &nbsp;     void *pClientData,
+** &nbsp;     const char *zSchema,
+** &nbsp;     unsigned int nDbPage,
+** &nbsp;     unsigned int nFreePage,
+** &nbsp;     unsigned int nBytePerPage
+** &nbsp;   ){
+** &nbsp;     return nFreePage;
+** &nbsp;   }
+** </pre></blockquote>
+*/
+SQLITE_API int sqlite3_autovacuum_pages(
+  sqlite3 *db,
+  unsigned int(*)(void*,const char*,unsigned int,unsigned int,unsigned int),
+  void*,
+  void(*)(void*)
+);
+
+
+/*
+** CAPI3REF: Data Change Notification Callbacks
+** METHOD: sqlite3
+**
+** ^The sqlite3_update_hook() interface registers a callback function
+** with the [database connection] identified by the first argument
+** to be invoked whenever a row is updated, inserted or deleted in
+** a [rowid table].
+** ^Any callback set by a previous call to this function
+** for the same database connection is overridden.
+**
+** ^The second argument is a pointer to the function to invoke when a
+** row is updated, inserted or deleted in a rowid table.
+** ^The first argument to the callback is a copy of the third argument
+** to sqlite3_update_hook().
+** ^The second callback argument is one of [SQLITE_INSERT], [SQLITE_DELETE],
+** or [SQLITE_UPDATE], depending on the operation that caused the callback
+** to be invoked.
+** ^The third and fourth arguments to the callback contain pointers to the
+** database and table name containing the affected row.
+** ^The final callback parameter is the [rowid] of the row.
+** ^In the case of an update, this is the [rowid] after the update takes place.
+**
+** ^(The update hook is not invoked when internal system tables are
+** modified (i.e. sqlite_sequence).)^
+** ^The update hook is not invoked when [WITHOUT ROWID] tables are modified.
+**
+** ^In the current implementation, the update hook
+** is not invoked when conflicting rows are deleted because of an
+** [ON CONFLICT | ON CONFLICT REPLACE] clause.  ^Nor is the update hook
+** invoked when rows are deleted using the [truncate optimization].
+** The exceptions defined in this paragraph might change in a future
+** release of SQLite.
+**
+** Whether the update hook is invoked before or after the
+** corresponding change is currently unspecified and may differ
+** depending on the type of change. Do not rely on the order of the
+** hook call with regards to the final result of the operation which
+** triggers the hook.
+**
+** The update hook implementation must not do anything that will modify
+** the database connection that invoked the update hook.  Any actions
+** to modify the database connection must be deferred until after the
+** completion of the [sqlite3_step()] call that triggered the update hook.
+** Note that [sqlite3_prepare_v2()] and [sqlite3_step()] both modify their
+** database connections for the meaning of "modify" in this paragraph.
+**
+** ^The sqlite3_update_hook(D,C,P) function
+** returns the P argument from the previous call
+** on the same [database connection] D, or NULL for
+** the first call on D.
+**
+** See also the [sqlite3_commit_hook()], [sqlite3_rollback_hook()],
+** and [sqlite3_preupdate_hook()] interfaces.
+*/
+SQLITE_API void *sqlite3_update_hook(
+  sqlite3*,
+  void(*)(void *,int ,char const *,char const *,sqlite3_int64),
+  void*
+);
+
+/*
+** CAPI3REF: Enable Or Disable Shared Pager Cache
+**
+** ^(This routine enables or disables the sharing of the database cache
+** and schema data structures between [database connection | connections]
+** to the same database. Sharing is enabled if the argument is true
+** and disabled if the argument is false.)^
+**
+** This interface is omitted if SQLite is compiled with
+** [-DSQLITE_OMIT_SHARED_CACHE].  The [-DSQLITE_OMIT_SHARED_CACHE]
+** compile-time option is recommended because the
+** [use of shared cache mode is discouraged].
+**
+** ^Cache sharing is enabled and disabled for an entire process.
+** This is a change as of SQLite [version 3.5.0] ([dateof:3.5.0]).
+** In prior versions of SQLite,
+** sharing was enabled or disabled for each thread separately.
+**
+** ^(The cache sharing mode set by this interface effects all subsequent
+** calls to [sqlite3_open()], [sqlite3_open_v2()], and [sqlite3_open16()].
+** Existing database connections continue to use the sharing mode
+** that was in effect at the time they were opened.)^
+**
+** ^(This routine returns [SQLITE_OK] if shared cache was enabled or disabled
+** successfully.  An [error code] is returned otherwise.)^
+**
+** ^Shared cache is disabled by default. It is recommended that it stay
+** that way.  In other words, do not use this routine.  This interface
+** continues to be provided for historical compatibility, but its use is
+** discouraged.  Any use of shared cache is discouraged.  If shared cache
+** must be used, it is recommended that shared cache only be enabled for
+** individual database connections using the [sqlite3_open_v2()] interface
+** with the [SQLITE_OPEN_SHAREDCACHE] flag.
+**
+** Note: This method is disabled on MacOS X 10.7 and iOS version 5.0
+** and will always return SQLITE_MISUSE. On those systems,
+** shared cache mode should be enabled per-database connection via
+** [sqlite3_open_v2()] with [SQLITE_OPEN_SHAREDCACHE].
+**
+** This interface is threadsafe on processors where writing a
+** 32-bit integer is atomic.
+**
+** See Also:  [SQLite Shared-Cache Mode]
+*/
+SQLITE_API int sqlite3_enable_shared_cache(int);
+
+/*
+** CAPI3REF: Attempt To Free Heap Memory
+**
+** ^The sqlite3_release_memory() interface attempts to free N bytes
+** of heap memory by deallocating non-essential memory allocations
+** held by the database library.   Memory used to cache database
+** pages to improve performance is an example of non-essential memory.
+** ^sqlite3_release_memory() returns the number of bytes actually freed,
+** which might be more or less than the amount requested.
+** ^The sqlite3_release_memory() routine is a no-op returning zero
+** if SQLite is not compiled with [SQLITE_ENABLE_MEMORY_MANAGEMENT].
+**
+** See also: [sqlite3_db_release_memory()]
+*/
+SQLITE_API int sqlite3_release_memory(int);
+
+/*
+** CAPI3REF: Free Memory Used By A Database Connection
+** METHOD: sqlite3
+**
+** ^The sqlite3_db_release_memory(D) interface attempts to free as much heap
+** memory as possible from database connection D. Unlike the
+** [sqlite3_release_memory()] interface, this interface is in effect even
+** when the [SQLITE_ENABLE_MEMORY_MANAGEMENT] compile-time option is
+** omitted.
+**
+** See also: [sqlite3_release_memory()]
+*/
+SQLITE_API int sqlite3_db_release_memory(sqlite3*);
+
+/*
+** CAPI3REF: Impose A Limit On Heap Size
+**
+** These interfaces impose limits on the amount of heap memory that will be
+** by all database connections within a single process.
+**
+** ^The sqlite3_soft_heap_limit64() interface sets and/or queries the
+** soft limit on the amount of heap memory that may be allocated by SQLite.
+** ^SQLite strives to keep heap memory utilization below the soft heap
+** limit by reducing the number of pages held in the page cache
+** as heap memory usages approaches the limit.
+** ^The soft heap limit is "soft" because even though SQLite strives to stay
+** below the limit, it will exceed the limit rather than generate
+** an [SQLITE_NOMEM] error.  In other words, the soft heap limit
+** is advisory only.
+**
+** ^The sqlite3_hard_heap_limit64(N) interface sets a hard upper bound of
+** N bytes on the amount of memory that will be allocated.  ^The
+** sqlite3_hard_heap_limit64(N) interface is similar to
+** sqlite3_soft_heap_limit64(N) except that memory allocations will fail
+** when the hard heap limit is reached.
+**
+** ^The return value from both sqlite3_soft_heap_limit64() and
+** sqlite3_hard_heap_limit64() is the size of
+** the heap limit prior to the call, or negative in the case of an
+** error.  ^If the argument N is negative
+** then no change is made to the heap limit.  Hence, the current
+** size of heap limits can be determined by invoking
+** sqlite3_soft_heap_limit64(-1) or sqlite3_hard_heap_limit(-1).
+**
+** ^Setting the heap limits to zero disables the heap limiter mechanism.
+**
+** ^The soft heap limit may not be greater than the hard heap limit.
+** ^If the hard heap limit is enabled and if sqlite3_soft_heap_limit(N)
+** is invoked with a value of N that is greater than the hard heap limit,
+** the soft heap limit is set to the value of the hard heap limit.
+** ^The soft heap limit is automatically enabled whenever the hard heap
+** limit is enabled. ^When sqlite3_hard_heap_limit64(N) is invoked and
+** the soft heap limit is outside the range of 1..N, then the soft heap
+** limit is set to N.  ^Invoking sqlite3_soft_heap_limit64(0) when the
+** hard heap limit is enabled makes the soft heap limit equal to the
+** hard heap limit.
+**
+** The memory allocation limits can also be adjusted using
+** [PRAGMA soft_heap_limit] and [PRAGMA hard_heap_limit].
+**
+** ^(The heap limits are not enforced in the current implementation
+** if one or more of following conditions are true:
+**
+** <ul>
+** <li> The limit value is set to zero.
+** <li> Memory accounting is disabled using a combination of the
+**      [sqlite3_config]([SQLITE_CONFIG_MEMSTATUS],...) start-time option and
+**      the [SQLITE_DEFAULT_MEMSTATUS] compile-time option.
+** <li> An alternative page cache implementation is specified using
+**      [sqlite3_config]([SQLITE_CONFIG_PCACHE2],...).
+** <li> The page cache allocates from its own memory pool supplied
+**      by [sqlite3_config]([SQLITE_CONFIG_PAGECACHE],...) rather than
+**      from the heap.
+** </ul>)^
+**
+** The circumstances under which SQLite will enforce the heap limits may
+** changes in future releases of SQLite.
+*/
+SQLITE_API sqlite3_int64 sqlite3_soft_heap_limit64(sqlite3_int64 N);
+SQLITE_API sqlite3_int64 sqlite3_hard_heap_limit64(sqlite3_int64 N);
+
+/*
+** CAPI3REF: Deprecated Soft Heap Limit Interface
+** DEPRECATED
+**
+** This is a deprecated version of the [sqlite3_soft_heap_limit64()]
+** interface.  This routine is provided for historical compatibility
+** only.  All new applications should use the
+** [sqlite3_soft_heap_limit64()] interface rather than this one.
+*/
+SQLITE_API SQLITE_DEPRECATED void sqlite3_soft_heap_limit(int N);
+
+
+/*
+** CAPI3REF: Extract Metadata About A Column Of A Table
+** METHOD: sqlite3
+**
+** ^(The sqlite3_table_column_metadata(X,D,T,C,....) routine returns
+** information about column C of table T in database D
+** on [database connection] X.)^  ^The sqlite3_table_column_metadata()
+** interface returns SQLITE_OK and fills in the non-NULL pointers in
+** the final five arguments with appropriate values if the specified
+** column exists.  ^The sqlite3_table_column_metadata() interface returns
+** SQLITE_ERROR if the specified column does not exist.
+** ^If the column-name parameter to sqlite3_table_column_metadata() is a
+** NULL pointer, then this routine simply checks for the existence of the
+** table and returns SQLITE_OK if the table exists and SQLITE_ERROR if it
+** does not.  If the table name parameter T in a call to
+** sqlite3_table_column_metadata(X,D,T,C,...) is NULL then the result is
+** undefined behavior.
+**
+** ^The column is identified by the second, third and fourth parameters to
+** this function. ^(The second parameter is either the name of the database
+** (i.e. "main", "temp", or an attached database) containing the specified
+** table or NULL.)^ ^If it is NULL, then all attached databases are searched
+** for the table using the same algorithm used by the database engine to
+** resolve unqualified table references.
+**
+** ^The third and fourth parameters to this function are the table and column
+** name of the desired column, respectively.
+**
+** ^Metadata is returned by writing to the memory locations passed as the 5th
+** and subsequent parameters to this function. ^Any of these arguments may be
+** NULL, in which case the corresponding element of metadata is omitted.
+**
+** ^(<blockquote>
+** <table border="1">
+** <tr><th> Parameter <th> Output<br>Type <th>  Description
+**
+** <tr><td> 5th <td> const char* <td> Data type
+** <tr><td> 6th <td> const char* <td> Name of default collation sequence
+** <tr><td> 7th <td> int         <td> True if column has a NOT NULL constraint
+** <tr><td> 8th <td> int         <td> True if column is part of the PRIMARY KEY
+** <tr><td> 9th <td> int         <td> True if column is [AUTOINCREMENT]
+** </table>
+** </blockquote>)^
+**
+** ^The memory pointed to by the character pointers returned for the
+** declaration type and collation sequence is valid until the next
+** call to any SQLite API function.
+**
+** ^If the specified table is actually a view, an [error code] is returned.
+**
+** ^If the specified column is "rowid", "oid" or "_rowid_" and the table
+** is not a [WITHOUT ROWID] table and an
+** [INTEGER PRIMARY KEY] column has been explicitly declared, then the output
+** parameters are set for the explicitly declared column. ^(If there is no
+** [INTEGER PRIMARY KEY] column, then the outputs
+** for the [rowid] are set as follows:
+**
+** <pre>
+**     data type: "INTEGER"
+**     collation sequence: "BINARY"
+**     not null: 0
+**     primary key: 1
+**     auto increment: 0
+** </pre>)^
+**
+** ^This function causes all database schemas to be read from disk and
+** parsed, if that has not already been done, and returns an error if
+** any errors are encountered while loading the schema.
+*/
+SQLITE_API int sqlite3_table_column_metadata(
+  sqlite3 *db,                /* Connection handle */
+  const char *zDbName,        /* Database name or NULL */
+  const char *zTableName,     /* Table name */
+  const char *zColumnName,    /* Column name */
+  char const **pzDataType,    /* OUTPUT: Declared data type */
+  char const **pzCollSeq,     /* OUTPUT: Collation sequence name */
+  int *pNotNull,              /* OUTPUT: True if NOT NULL constraint exists */
+  int *pPrimaryKey,           /* OUTPUT: True if column part of PK */
+  int *pAutoinc               /* OUTPUT: True if column is auto-increment */
+);
+
+/*
+** CAPI3REF: Load An Extension
+** METHOD: sqlite3
+**
+** ^This interface loads an SQLite extension library from the named file.
+**
+** ^The sqlite3_load_extension() interface attempts to load an
+** [SQLite extension] library contained in the file zFile.  If
+** the file cannot be loaded directly, attempts are made to load
+** with various operating-system specific extensions added.
+** So for example, if "samplelib" cannot be loaded, then names like
+** "samplelib.so" or "samplelib.dylib" or "samplelib.dll" might
+** be tried also.
+**
+** ^The entry point is zProc.
+** ^(zProc may be 0, in which case SQLite will try to come up with an
+** entry point name on its own.  It first tries "sqlite3_extension_init".
+** If that does not work, it constructs a name "sqlite3_X_init" where the
+** X is consists of the lower-case equivalent of all ASCII alphabetic
+** characters in the filename from the last "/" to the first following
+** "." and omitting any initial "lib".)^
+** ^The sqlite3_load_extension() interface returns
+** [SQLITE_OK] on success and [SQLITE_ERROR] if something goes wrong.
+** ^If an error occurs and pzErrMsg is not 0, then the
+** [sqlite3_load_extension()] interface shall attempt to
+** fill *pzErrMsg with error message text stored in memory
+** obtained from [sqlite3_malloc()]. The calling function
+** should free this memory by calling [sqlite3_free()].
+**
+** ^Extension loading must be enabled using
+** [sqlite3_enable_load_extension()] or
+** [sqlite3_db_config](db,[SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION],1,NULL)
+** prior to calling this API,
+** otherwise an error will be returned.
+**
+** <b>Security warning:</b> It is recommended that the
+** [SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION] method be used to enable only this
+** interface.  The use of the [sqlite3_enable_load_extension()] interface
+** should be avoided.  This will keep the SQL function [load_extension()]
+** disabled and prevent SQL injections from giving attackers
+** access to extension loading capabilities.
+**
+** See also the [load_extension() SQL function].
+*/
+SQLITE_API int sqlite3_load_extension(
+  sqlite3 *db,          /* Load the extension into this database connection */
+  const char *zFile,    /* Name of the shared library containing extension */
+  const char *zProc,    /* Entry point.  Derived from zFile if 0 */
+  char **pzErrMsg       /* Put error message here if not 0 */
+);
+
+/*
+** CAPI3REF: Enable Or Disable Extension Loading
+** METHOD: sqlite3
+**
+** ^So as not to open security holes in older applications that are
+** unprepared to deal with [extension loading], and as a means of disabling
+** [extension loading] while evaluating user-entered SQL, the following API
+** is provided to turn the [sqlite3_load_extension()] mechanism on and off.
+**
+** ^Extension loading is off by default.
+** ^Call the sqlite3_enable_load_extension() routine with onoff==1
+** to turn extension loading on and call it with onoff==0 to turn
+** it back off again.
+**
+** ^This interface enables or disables both the C-API
+** [sqlite3_load_extension()] and the SQL function [load_extension()].
+** ^(Use [sqlite3_db_config](db,[SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION],..)
+** to enable or disable only the C-API.)^
+**
+** <b>Security warning:</b> It is recommended that extension loading
+** be enabled using the [SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION] method
+** rather than this interface, so the [load_extension()] SQL function
+** remains disabled. This will prevent SQL injections from giving attackers
+** access to extension loading capabilities.
+*/
+SQLITE_API int sqlite3_enable_load_extension(sqlite3 *db, int onoff);
+
+/*
+** CAPI3REF: Automatically Load Statically Linked Extensions
+**
+** ^This interface causes the xEntryPoint() function to be invoked for
+** each new [database connection] that is created.  The idea here is that
+** xEntryPoint() is the entry point for a statically linked [SQLite extension]
+** that is to be automatically loaded into all new database connections.
+**
+** ^(Even though the function prototype shows that xEntryPoint() takes
+** no arguments and returns void, SQLite invokes xEntryPoint() with three
+** arguments and expects an integer result as if the signature of the
+** entry point where as follows:
+**
+** <blockquote><pre>
+** &nbsp;  int xEntryPoint(
+** &nbsp;    sqlite3 *db,
+** &nbsp;    const char **pzErrMsg,
+** &nbsp;    const struct sqlite3_api_routines *pThunk
+** &nbsp;  );
+** </pre></blockquote>)^
+**
+** If the xEntryPoint routine encounters an error, it should make *pzErrMsg
+** point to an appropriate error message (obtained from [sqlite3_mprintf()])
+** and return an appropriate [error code].  ^SQLite ensures that *pzErrMsg
+** is NULL before calling the xEntryPoint().  ^SQLite will invoke
+** [sqlite3_free()] on *pzErrMsg after xEntryPoint() returns.  ^If any
+** xEntryPoint() returns an error, the [sqlite3_open()], [sqlite3_open16()],
+** or [sqlite3_open_v2()] call that provoked the xEntryPoint() will fail.
+**
+** ^Calling sqlite3_auto_extension(X) with an entry point X that is already
+** on the list of automatic extensions is a harmless no-op. ^No entry point
+** will be called more than once for each database connection that is opened.
+**
+** See also: [sqlite3_reset_auto_extension()]
+** and [sqlite3_cancel_auto_extension()]
+*/
+SQLITE_API int sqlite3_auto_extension(void(*xEntryPoint)(void));
+
+/*
+** CAPI3REF: Cancel Automatic Extension Loading
+**
+** ^The [sqlite3_cancel_auto_extension(X)] interface unregisters the
+** initialization routine X that was registered using a prior call to
+** [sqlite3_auto_extension(X)].  ^The [sqlite3_cancel_auto_extension(X)]
+** routine returns 1 if initialization routine X was successfully
+** unregistered and it returns 0 if X was not on the list of initialization
+** routines.
+*/
+SQLITE_API int sqlite3_cancel_auto_extension(void(*xEntryPoint)(void));
+
+/*
+** CAPI3REF: Reset Automatic Extension Loading
+**
+** ^This interface disables all automatic extensions previously
+** registered using [sqlite3_auto_extension()].
+*/
+SQLITE_API void sqlite3_reset_auto_extension(void);
+
+/*
+** Structures used by the virtual table interface
+*/
+typedef struct sqlite3_vtab sqlite3_vtab;
+typedef struct sqlite3_index_info sqlite3_index_info;
+typedef struct sqlite3_vtab_cursor sqlite3_vtab_cursor;
+typedef struct sqlite3_module sqlite3_module;
+
+/*
+** CAPI3REF: Virtual Table Object
+** KEYWORDS: sqlite3_module {virtual table module}
+**
+** This structure, sometimes called a "virtual table module",
+** defines the implementation of a [virtual table].
+** This structure consists mostly of methods for the module.
+**
+** ^A virtual table module is created by filling in a persistent
+** instance of this structure and passing a pointer to that instance
+** to [sqlite3_create_module()] or [sqlite3_create_module_v2()].
+** ^The registration remains valid until it is replaced by a different
+** module or until the [database connection] closes.  The content
+** of this structure must not change while it is registered with
+** any database connection.
+*/
+struct sqlite3_module {
+  int iVersion;
+  int (*xCreate)(sqlite3*, void *pAux,
+               int argc, const char *const*argv,
+               sqlite3_vtab **ppVTab, char**);
+  int (*xConnect)(sqlite3*, void *pAux,
+               int argc, const char *const*argv,
+               sqlite3_vtab **ppVTab, char**);
+  int (*xBestIndex)(sqlite3_vtab *pVTab, sqlite3_index_info*);
+  int (*xDisconnect)(sqlite3_vtab *pVTab);
+  int (*xDestroy)(sqlite3_vtab *pVTab);
+  int (*xOpen)(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCursor);
+  int (*xClose)(sqlite3_vtab_cursor*);
+  int (*xFilter)(sqlite3_vtab_cursor*, int idxNum, const char *idxStr,
+                int argc, sqlite3_value **argv);
+  int (*xNext)(sqlite3_vtab_cursor*);
+  int (*xEof)(sqlite3_vtab_cursor*);
+  int (*xColumn)(sqlite3_vtab_cursor*, sqlite3_context*, int);
+  int (*xRowid)(sqlite3_vtab_cursor*, sqlite3_int64 *pRowid);
+  int (*xUpdate)(sqlite3_vtab *, int, sqlite3_value **, sqlite3_int64 *);
+  int (*xBegin)(sqlite3_vtab *pVTab);
+  int (*xSync)(sqlite3_vtab *pVTab);
+  int (*xCommit)(sqlite3_vtab *pVTab);
+  int (*xRollback)(sqlite3_vtab *pVTab);
+  int (*xFindFunction)(sqlite3_vtab *pVtab, int nArg, const char *zName,
+                       void (**pxFunc)(sqlite3_context*,int,sqlite3_value**),
+                       void **ppArg);
+  int (*xRename)(sqlite3_vtab *pVtab, const char *zNew);
+  /* The methods above are in version 1 of the sqlite_module object. Those
+  ** below are for version 2 and greater. */
+  int (*xSavepoint)(sqlite3_vtab *pVTab, int);
+  int (*xRelease)(sqlite3_vtab *pVTab, int);
+  int (*xRollbackTo)(sqlite3_vtab *pVTab, int);
+  /* The methods above are in versions 1 and 2 of the sqlite_module object.
+  ** Those below are for version 3 and greater. */
+  int (*xShadowName)(const char*);
+  /* The methods above are in versions 1 through 3 of the sqlite_module object.
+  ** Those below are for version 4 and greater. */
+  int (*xIntegrity)(sqlite3_vtab *pVTab, const char *zSchema,
+                    const char *zTabName, int mFlags, char **pzErr);
+};
+
+/*
+** CAPI3REF: Virtual Table Indexing Information
+** KEYWORDS: sqlite3_index_info
+**
+** The sqlite3_index_info structure and its substructures is used as part
+** of the [virtual table] interface to
+** pass information into and receive the reply from the [xBestIndex]
+** method of a [virtual table module].  The fields under **Inputs** are the
+** inputs to xBestIndex and are read-only.  xBestIndex inserts its
+** results into the **Outputs** fields.
+**
+** ^(The aConstraint[] array records WHERE clause constraints of the form:
+**
+** <blockquote>column OP expr</blockquote>
+**
+** where OP is =, &lt;, &lt;=, &gt;, or &gt;=.)^  ^(The particular operator is
+** stored in aConstraint[].op using one of the
+** [SQLITE_INDEX_CONSTRAINT_EQ | SQLITE_INDEX_CONSTRAINT_ values].)^
+** ^(The index of the column is stored in
+** aConstraint[].iColumn.)^  ^(aConstraint[].usable is TRUE if the
+** expr on the right-hand side can be evaluated (and thus the constraint
+** is usable) and false if it cannot.)^
+**
+** ^The optimizer automatically inverts terms of the form "expr OP column"
+** and makes other simplifications to the WHERE clause in an attempt to
+** get as many WHERE clause terms into the form shown above as possible.
+** ^The aConstraint[] array only reports WHERE clause terms that are
+** relevant to the particular virtual table being queried.
+**
+** ^Information about the ORDER BY clause is stored in aOrderBy[].
+** ^Each term of aOrderBy records a column of the ORDER BY clause.
+**
+** The colUsed field indicates which columns of the virtual table may be
+** required by the current scan. Virtual table columns are numbered from
+** zero in the order in which they appear within the CREATE TABLE statement
+** passed to sqlite3_declare_vtab(). For the first 63 columns (columns 0-62),
+** the corresponding bit is set within the colUsed mask if the column may be
+** required by SQLite. If the table has at least 64 columns and any column
+** to the right of the first 63 is required, then bit 63 of colUsed is also
+** set. In other words, column iCol may be required if the expression
+** (colUsed & ((sqlite3_uint64)1 << (iCol>=63 ? 63 : iCol))) evaluates to
+** non-zero.
+**
+** The [xBestIndex] method must fill aConstraintUsage[] with information
+** about what parameters to pass to xFilter.  ^If argvIndex>0 then
+** the right-hand side of the corresponding aConstraint[] is evaluated
+** and becomes the argvIndex-th entry in argv.  ^(If aConstraintUsage[].omit
+** is true, then the constraint is assumed to be fully handled by the
+** virtual table and might not be checked again by the byte code.)^ ^(The
+** aConstraintUsage[].omit flag is an optimization hint. When the omit flag
+** is left in its default setting of false, the constraint will always be
+** checked separately in byte code.  If the omit flag is change to true, then
+** the constraint may or may not be checked in byte code.  In other words,
+** when the omit flag is true there is no guarantee that the constraint will
+** not be checked again using byte code.)^
+**
+** ^The idxNum and idxStr values are recorded and passed into the
+** [xFilter] method.
+** ^[sqlite3_free()] is used to free idxStr if and only if
+** needToFreeIdxStr is true.
+**
+** ^The orderByConsumed means that output from [xFilter]/[xNext] will occur in
+** the correct order to satisfy the ORDER BY clause so that no separate
+** sorting step is required.
+**
+** ^The estimatedCost value is an estimate of the cost of a particular
+** strategy. A cost of N indicates that the cost of the strategy is similar
+** to a linear scan of an SQLite table with N rows. A cost of log(N)
+** indicates that the expense of the operation is similar to that of a
+** binary search on a unique indexed field of an SQLite table with N rows.
+**
+** ^The estimatedRows value is an estimate of the number of rows that
+** will be returned by the strategy.
+**
+** The xBestIndex method may optionally populate the idxFlags field with a
+** mask of SQLITE_INDEX_SCAN_* flags. One such flag is
+** [SQLITE_INDEX_SCAN_HEX], which if set causes the [EXPLAIN QUERY PLAN]
+** output to show the idxNum has hex instead of as decimal.  Another flag is
+** SQLITE_INDEX_SCAN_UNIQUE, which if set indicates that the query plan will
+** return at most one row.
+**
+** Additionally, if xBestIndex sets the SQLITE_INDEX_SCAN_UNIQUE flag, then
+** SQLite also assumes that if a call to the xUpdate() method is made as
+** part of the same statement to delete or update a virtual table row and the
+** implementation returns SQLITE_CONSTRAINT, then there is no need to rollback
+** any database changes. In other words, if the xUpdate() returns
+** SQLITE_CONSTRAINT, the database contents must be exactly as they were
+** before xUpdate was called. By contrast, if SQLITE_INDEX_SCAN_UNIQUE is not
+** set and xUpdate returns SQLITE_CONSTRAINT, any database changes made by
+** the xUpdate method are automatically rolled back by SQLite.
+**
+** IMPORTANT: The estimatedRows field was added to the sqlite3_index_info
+** structure for SQLite [version 3.8.2] ([dateof:3.8.2]).
+** If a virtual table extension is
+** used with an SQLite version earlier than 3.8.2, the results of attempting
+** to read or write the estimatedRows field are undefined (but are likely
+** to include crashing the application). The estimatedRows field should
+** therefore only be used if [sqlite3_libversion_number()] returns a
+** value greater than or equal to 3008002. Similarly, the idxFlags field
+** was added for [version 3.9.0] ([dateof:3.9.0]).
+** It may therefore only be used if
+** sqlite3_libversion_number() returns a value greater than or equal to
+** 3009000.
+*/
+struct sqlite3_index_info {
+  /* Inputs */
+  int nConstraint;           /* Number of entries in aConstraint */
+  struct sqlite3_index_constraint {
+     int iColumn;              /* Column constrained.  -1 for ROWID */
+     unsigned char op;         /* Constraint operator */
+     unsigned char usable;     /* True if this constraint is usable */
+     int iTermOffset;          /* Used internally - xBestIndex should ignore */
+  } *aConstraint;            /* Table of WHERE clause constraints */
+  int nOrderBy;              /* Number of terms in the ORDER BY clause */
+  struct sqlite3_index_orderby {
+     int iColumn;              /* Column number */
+     unsigned char desc;       /* True for DESC.  False for ASC. */
+  } *aOrderBy;               /* The ORDER BY clause */
+  /* Outputs */
+  struct sqlite3_index_constraint_usage {
+    int argvIndex;           /* if >0, constraint is part of argv to xFilter */
+    unsigned char omit;      /* Do not code a test for this constraint */
+  } *aConstraintUsage;
+  int idxNum;                /* Number used to identify the index */
+  char *idxStr;              /* String, possibly obtained from sqlite3_malloc */
+  int needToFreeIdxStr;      /* Free idxStr using sqlite3_free() if true */
+  int orderByConsumed;       /* True if output is already ordered */
+  double estimatedCost;           /* Estimated cost of using this index */
+  /* Fields below are only available in SQLite 3.8.2 and later */
+  sqlite3_int64 estimatedRows;    /* Estimated number of rows returned */
+  /* Fields below are only available in SQLite 3.9.0 and later */
+  int idxFlags;              /* Mask of SQLITE_INDEX_SCAN_* flags */
+  /* Fields below are only available in SQLite 3.10.0 and later */
+  sqlite3_uint64 colUsed;    /* Input: Mask of columns used by statement */
+};
+
+/*
+** CAPI3REF: Virtual Table Scan Flags
+**
+** Virtual table implementations are allowed to set the
+** [sqlite3_index_info].idxFlags field to some combination of
+** these bits.
+*/
+#define SQLITE_INDEX_SCAN_UNIQUE 0x00000001 /* Scan visits at most 1 row */
+#define SQLITE_INDEX_SCAN_HEX    0x00000002 /* Display idxNum as hex */
+                                            /* in EXPLAIN QUERY PLAN */
+
+/*
+** CAPI3REF: Virtual Table Constraint Operator Codes
+**
+** These macros define the allowed values for the
+** [sqlite3_index_info].aConstraint[].op field.  Each value represents
+** an operator that is part of a constraint term in the WHERE clause of
+** a query that uses a [virtual table].
+**
+** ^The left-hand operand of the operator is given by the corresponding
+** aConstraint[].iColumn field.  ^An iColumn of -1 indicates the left-hand
+** operand is the rowid.
+** The SQLITE_INDEX_CONSTRAINT_LIMIT and SQLITE_INDEX_CONSTRAINT_OFFSET
+** operators have no left-hand operand, and so for those operators the
+** corresponding aConstraint[].iColumn is meaningless and should not be
+** used.
+**
+** All operator values from SQLITE_INDEX_CONSTRAINT_FUNCTION through
+** value 255 are reserved to represent functions that are overloaded
+** by the [xFindFunction|xFindFunction method] of the virtual table
+** implementation.
+**
+** The right-hand operands for each constraint might be accessible using
+** the [sqlite3_vtab_rhs_value()] interface.  Usually the right-hand
+** operand is only available if it appears as a single constant literal
+** in the input SQL.  If the right-hand operand is another column or an
+** expression (even a constant expression) or a parameter, then the
+** sqlite3_vtab_rhs_value() probably will not be able to extract it.
+** ^The SQLITE_INDEX_CONSTRAINT_ISNULL and
+** SQLITE_INDEX_CONSTRAINT_ISNOTNULL operators have no right-hand operand
+** and hence calls to sqlite3_vtab_rhs_value() for those operators will
+** always return SQLITE_NOTFOUND.
+**
+** The collating sequence to be used for comparison can be found using
+** the [sqlite3_vtab_collation()] interface.  For most real-world virtual
+** tables, the collating sequence of constraints does not matter (for example
+** because the constraints are numeric) and so the sqlite3_vtab_collation()
+** interface is not commonly needed.
+*/
+#define SQLITE_INDEX_CONSTRAINT_EQ          2
+#define SQLITE_INDEX_CONSTRAINT_GT          4
+#define SQLITE_INDEX_CONSTRAINT_LE          8
+#define SQLITE_INDEX_CONSTRAINT_LT         16
+#define SQLITE_INDEX_CONSTRAINT_GE         32
+#define SQLITE_INDEX_CONSTRAINT_MATCH      64
+#define SQLITE_INDEX_CONSTRAINT_LIKE       65
+#define SQLITE_INDEX_CONSTRAINT_GLOB       66
+#define SQLITE_INDEX_CONSTRAINT_REGEXP     67
+#define SQLITE_INDEX_CONSTRAINT_NE         68
+#define SQLITE_INDEX_CONSTRAINT_ISNOT      69
+#define SQLITE_INDEX_CONSTRAINT_ISNOTNULL  70
+#define SQLITE_INDEX_CONSTRAINT_ISNULL     71
+#define SQLITE_INDEX_CONSTRAINT_IS         72
+#define SQLITE_INDEX_CONSTRAINT_LIMIT      73
+#define SQLITE_INDEX_CONSTRAINT_OFFSET     74
+#define SQLITE_INDEX_CONSTRAINT_FUNCTION  150
+
+/*
+** CAPI3REF: Register A Virtual Table Implementation
+** METHOD: sqlite3
+**
+** ^These routines are used to register a new [virtual table module] name.
+** ^Module names must be registered before
+** creating a new [virtual table] using the module and before using a
+** preexisting [virtual table] for the module.
+**
+** ^The module name is registered on the [database connection] specified
+** by the first parameter.  ^The name of the module is given by the
+** second parameter.  ^The third parameter is a pointer to
+** the implementation of the [virtual table module].   ^The fourth
+** parameter is an arbitrary client data pointer that is passed through
+** into the [xCreate] and [xConnect] methods of the virtual table module
+** when a new virtual table is be being created or reinitialized.
+**
+** ^The sqlite3_create_module_v2() interface has a fifth parameter which
+** is a pointer to a destructor for the pClientData.  ^SQLite will
+** invoke the destructor function (if it is not NULL) when SQLite
+** no longer needs the pClientData pointer.  ^The destructor will also
+** be invoked if the call to sqlite3_create_module_v2() fails.
+** ^The sqlite3_create_module()
+** interface is equivalent to sqlite3_create_module_v2() with a NULL
+** destructor.
+**
+** ^If the third parameter (the pointer to the sqlite3_module object) is
+** NULL then no new module is created and any existing modules with the
+** same name are dropped.
+**
+** See also: [sqlite3_drop_modules()]
+*/
+SQLITE_API int sqlite3_create_module(
+  sqlite3 *db,               /* SQLite connection to register module with */
+  const char *zName,         /* Name of the module */
+  const sqlite3_module *p,   /* Methods for the module */
+  void *pClientData          /* Client data for xCreate/xConnect */
+);
+SQLITE_API int sqlite3_create_module_v2(
+  sqlite3 *db,               /* SQLite connection to register module with */
+  const char *zName,         /* Name of the module */
+  const sqlite3_module *p,   /* Methods for the module */
+  void *pClientData,         /* Client data for xCreate/xConnect */
+  void(*xDestroy)(void*)     /* Module destructor function */
+);
+
+/*
+** CAPI3REF: Remove Unnecessary Virtual Table Implementations
+** METHOD: sqlite3
+**
+** ^The sqlite3_drop_modules(D,L) interface removes all virtual
+** table modules from database connection D except those named on list L.
+** The L parameter must be either NULL or a pointer to an array of pointers
+** to strings where the array is terminated by a single NULL pointer.
+** ^If the L parameter is NULL, then all virtual table modules are removed.
+**
+** See also: [sqlite3_create_module()]
+*/
+SQLITE_API int sqlite3_drop_modules(
+  sqlite3 *db,                /* Remove modules from this connection */
+  const char **azKeep         /* Except, do not remove the ones named here */
+);
+
+/*
+** CAPI3REF: Virtual Table Instance Object
+** KEYWORDS: sqlite3_vtab
+**
+** Every [virtual table module] implementation uses a subclass
+** of this object to describe a particular instance
+** of the [virtual table].  Each subclass will
+** be tailored to the specific needs of the module implementation.
+** The purpose of this superclass is to define certain fields that are
+** common to all module implementations.
+**
+** ^Virtual tables methods can set an error message by assigning a
+** string obtained from [sqlite3_mprintf()] to zErrMsg.  The method should
+** take care that any prior string is freed by a call to [sqlite3_free()]
+** prior to assigning a new string to zErrMsg.  ^After the error message
+** is delivered up to the client application, the string will be automatically
+** freed by sqlite3_free() and the zErrMsg field will be zeroed.
+*/
+struct sqlite3_vtab {
+  const sqlite3_module *pModule;  /* The module for this virtual table */
+  int nRef;                       /* Number of open cursors */
+  char *zErrMsg;                  /* Error message from sqlite3_mprintf() */
+  /* Virtual table implementations will typically add additional fields */
+};
+
+/*
+** CAPI3REF: Virtual Table Cursor Object
+** KEYWORDS: sqlite3_vtab_cursor {virtual table cursor}
+**
+** Every [virtual table module] implementation uses a subclass of the
+** following structure to describe cursors that point into the
+** [virtual table] and are used
+** to loop through the virtual table.  Cursors are created using the
+** [sqlite3_module.xOpen | xOpen] method of the module and are destroyed
+** by the [sqlite3_module.xClose | xClose] method.  Cursors are used
+** by the [xFilter], [xNext], [xEof], [xColumn], and [xRowid] methods
+** of the module.  Each module implementation will define
+** the content of a cursor structure to suit its own needs.
+**
+** This superclass exists in order to define fields of the cursor that
+** are common to all implementations.
+*/
+struct sqlite3_vtab_cursor {
+  sqlite3_vtab *pVtab;      /* Virtual table of this cursor */
+  /* Virtual table implementations will typically add additional fields */
+};
+
+/*
+** CAPI3REF: Declare The Schema Of A Virtual Table
+**
+** ^The [xCreate] and [xConnect] methods of a
+** [virtual table module] call this interface
+** to declare the format (the names and datatypes of the columns) of
+** the virtual tables they implement.
+*/
+SQLITE_API int sqlite3_declare_vtab(sqlite3*, const char *zSQL);
+
+/*
+** CAPI3REF: Overload A Function For A Virtual Table
+** METHOD: sqlite3
+**
+** ^(Virtual tables can provide alternative implementations of functions
+** using the [xFindFunction] method of the [virtual table module].
+** But global versions of those functions
+** must exist in order to be overloaded.)^
+**
+** ^(This API makes sure a global version of a function with a particular
+** name and number of parameters exists.  If no such function exists
+** before this API is called, a new function is created.)^  ^The implementation
+** of the new function always causes an exception to be thrown.  So
+** the new function is not good for anything by itself.  Its only
+** purpose is to be a placeholder function that can be overloaded
+** by a [virtual table].
+*/
+SQLITE_API int sqlite3_overload_function(sqlite3*, const char *zFuncName, int nArg);
+
+/*
+** CAPI3REF: A Handle To An Open BLOB
+** KEYWORDS: {BLOB handle} {BLOB handles}
+**
+** An instance of this object represents an open BLOB on which
+** [sqlite3_blob_open | incremental BLOB I/O] can be performed.
+** ^Objects of this type are created by [sqlite3_blob_open()]
+** and destroyed by [sqlite3_blob_close()].
+** ^The [sqlite3_blob_read()] and [sqlite3_blob_write()] interfaces
+** can be used to read or write small subsections of the BLOB.
+** ^The [sqlite3_blob_bytes()] interface returns the size of the BLOB in bytes.
+*/
+typedef struct sqlite3_blob sqlite3_blob;
+
+/*
+** CAPI3REF: Open A BLOB For Incremental I/O
+** METHOD: sqlite3
+** CONSTRUCTOR: sqlite3_blob
+**
+** ^(This interfaces opens a [BLOB handle | handle] to the BLOB located
+** in row iRow, column zColumn, table zTable in database zDb;
+** in other words, the same BLOB that would be selected by:
+**
+** <pre>
+**     SELECT zColumn FROM zDb.zTable WHERE [rowid] = iRow;
+** </pre>)^
+**
+** ^(Parameter zDb is not the filename that contains the database, but
+** rather the symbolic name of the database. For attached databases, this is
+** the name that appears after the AS keyword in the [ATTACH] statement.
+** For the main database file, the database name is "main". For TEMP
+** tables, the database name is "temp".)^
+**
+** ^If the flags parameter is non-zero, then the BLOB is opened for read
+** and write access. ^If the flags parameter is zero, the BLOB is opened for
+** read-only access.
+**
+** ^(On success, [SQLITE_OK] is returned and the new [BLOB handle] is stored
+** in *ppBlob. Otherwise an [error code] is returned and, unless the error
+** code is SQLITE_MISUSE, *ppBlob is set to NULL.)^ ^This means that, provided
+** the API is not misused, it is always safe to call [sqlite3_blob_close()]
+** on *ppBlob after this function it returns.
+**
+** This function fails with SQLITE_ERROR if any of the following are true:
+** <ul>
+**   <li> ^(Database zDb does not exist)^,
+**   <li> ^(Table zTable does not exist within database zDb)^,
+**   <li> ^(Table zTable is a WITHOUT ROWID table)^,
+**   <li> ^(Column zColumn does not exist)^,
+**   <li> ^(Row iRow is not present in the table)^,
+**   <li> ^(The specified column of row iRow contains a value that is not
+**         a TEXT or BLOB value)^,
+**   <li> ^(Column zColumn is part of an index, PRIMARY KEY or UNIQUE
+**         constraint and the blob is being opened for read/write access)^,
+**   <li> ^([foreign key constraints | Foreign key constraints] are enabled,
+**         column zColumn is part of a [child key] definition and the blob is
+**         being opened for read/write access)^.
+** </ul>
+**
+** ^Unless it returns SQLITE_MISUSE, this function sets the
+** [database connection] error code and message accessible via
+** [sqlite3_errcode()] and [sqlite3_errmsg()] and related functions.
+**
+** A BLOB referenced by sqlite3_blob_open() may be read using the
+** [sqlite3_blob_read()] interface and modified by using
+** [sqlite3_blob_write()].  The [BLOB handle] can be moved to a
+** different row of the same table using the [sqlite3_blob_reopen()]
+** interface.  However, the column, table, or database of a [BLOB handle]
+** cannot be changed after the [BLOB handle] is opened.
+**
+** ^(If the row that a BLOB handle points to is modified by an
+** [UPDATE], [DELETE], or by [ON CONFLICT] side-effects
+** then the BLOB handle is marked as "expired".
+** This is true if any column of the row is changed, even a column
+** other than the one the BLOB handle is open on.)^
+** ^Calls to [sqlite3_blob_read()] and [sqlite3_blob_write()] for
+** an expired BLOB handle fail with a return code of [SQLITE_ABORT].
+** ^(Changes written into a BLOB prior to the BLOB expiring are not
+** rolled back by the expiration of the BLOB.  Such changes will eventually
+** commit if the transaction continues to completion.)^
+**
+** ^Use the [sqlite3_blob_bytes()] interface to determine the size of
+** the opened blob.  ^The size of a blob may not be changed by this
+** interface.  Use the [UPDATE] SQL command to change the size of a
+** blob.
+**
+** ^The [sqlite3_bind_zeroblob()] and [sqlite3_result_zeroblob()] interfaces
+** and the built-in [zeroblob] SQL function may be used to create a
+** zero-filled blob to read or write using the incremental-blob interface.
+**
+** To avoid a resource leak, every open [BLOB handle] should eventually
+** be released by a call to [sqlite3_blob_close()].
+**
+** See also: [sqlite3_blob_close()],
+** [sqlite3_blob_reopen()], [sqlite3_blob_read()],
+** [sqlite3_blob_bytes()], [sqlite3_blob_write()].
+*/
+SQLITE_API int sqlite3_blob_open(
+  sqlite3*,
+  const char *zDb,
+  const char *zTable,
+  const char *zColumn,
+  sqlite3_int64 iRow,
+  int flags,
+  sqlite3_blob **ppBlob
+);
+
+/*
+** CAPI3REF: Move a BLOB Handle to a New Row
+** METHOD: sqlite3_blob
+**
+** ^This function is used to move an existing [BLOB handle] so that it points
+** to a different row of the same database table. ^The new row is identified
+** by the rowid value passed as the second argument. Only the row can be
+** changed. ^The database, table and column on which the blob handle is open
+** remain the same. Moving an existing [BLOB handle] to a new row is
+** faster than closing the existing handle and opening a new one.
+**
+** ^(The new row must meet the same criteria as for [sqlite3_blob_open()] -
+** it must exist and there must be either a blob or text value stored in
+** the nominated column.)^ ^If the new row is not present in the table, or if
+** it does not contain a blob or text value, or if another error occurs, an
+** SQLite error code is returned and the blob handle is considered aborted.
+** ^All subsequent calls to [sqlite3_blob_read()], [sqlite3_blob_write()] or
+** [sqlite3_blob_reopen()] on an aborted blob handle immediately return
+** SQLITE_ABORT. ^Calling [sqlite3_blob_bytes()] on an aborted blob handle
+** always returns zero.
+**
+** ^This function sets the database handle error code and message.
+*/
+SQLITE_API int sqlite3_blob_reopen(sqlite3_blob *, sqlite3_int64);
+
+/*
+** CAPI3REF: Close A BLOB Handle
+** DESTRUCTOR: sqlite3_blob
+**
+** ^This function closes an open [BLOB handle]. ^(The BLOB handle is closed
+** unconditionally.  Even if this routine returns an error code, the
+** handle is still closed.)^
+**
+** ^If the blob handle being closed was opened for read-write access, and if
+** the database is in auto-commit mode and there are no other open read-write
+** blob handles or active write statements, the current transaction is
+** committed. ^If an error occurs while committing the transaction, an error
+** code is returned and the transaction rolled back.
+**
+** Calling this function with an argument that is not a NULL pointer or an
+** open blob handle results in undefined behavior. ^Calling this routine
+** with a null pointer (such as would be returned by a failed call to
+** [sqlite3_blob_open()]) is a harmless no-op. ^Otherwise, if this function
+** is passed a valid open blob handle, the values returned by the
+** sqlite3_errcode() and sqlite3_errmsg() functions are set before returning.
+*/
+SQLITE_API int sqlite3_blob_close(sqlite3_blob *);
+
+/*
+** CAPI3REF: Return The Size Of An Open BLOB
+** METHOD: sqlite3_blob
+**
+** ^Returns the size in bytes of the BLOB accessible via the
+** successfully opened [BLOB handle] in its only argument.  ^The
+** incremental blob I/O routines can only read or overwriting existing
+** blob content; they cannot change the size of a blob.
+**
+** This routine only works on a [BLOB handle] which has been created
+** by a prior successful call to [sqlite3_blob_open()] and which has not
+** been closed by [sqlite3_blob_close()].  Passing any other pointer in
+** to this routine results in undefined and probably undesirable behavior.
+*/
+SQLITE_API int sqlite3_blob_bytes(sqlite3_blob *);
+
+/*
+** CAPI3REF: Read Data From A BLOB Incrementally
+** METHOD: sqlite3_blob
+**
+** ^(This function is used to read data from an open [BLOB handle] into a
+** caller-supplied buffer. N bytes of data are copied into buffer Z
+** from the open BLOB, starting at offset iOffset.)^
+**
+** ^If offset iOffset is less than N bytes from the end of the BLOB,
+** [SQLITE_ERROR] is returned and no data is read.  ^If N or iOffset is
+** less than zero, [SQLITE_ERROR] is returned and no data is read.
+** ^The size of the blob (and hence the maximum value of N+iOffset)
+** can be determined using the [sqlite3_blob_bytes()] interface.
+**
+** ^An attempt to read from an expired [BLOB handle] fails with an
+** error code of [SQLITE_ABORT].
+**
+** ^(On success, sqlite3_blob_read() returns SQLITE_OK.
+** Otherwise, an [error code] or an [extended error code] is returned.)^
+**
+** This routine only works on a [BLOB handle] which has been created
+** by a prior successful call to [sqlite3_blob_open()] and which has not
+** been closed by [sqlite3_blob_close()].  Passing any other pointer in
+** to this routine results in undefined and probably undesirable behavior.
+**
+** See also: [sqlite3_blob_write()].
+*/
+SQLITE_API int sqlite3_blob_read(sqlite3_blob *, void *Z, int N, int iOffset);
+
+/*
+** CAPI3REF: Write Data Into A BLOB Incrementally
+** METHOD: sqlite3_blob
+**
+** ^(This function is used to write data into an open [BLOB handle] from a
+** caller-supplied buffer. N bytes of data are copied from the buffer Z
+** into the open BLOB, starting at offset iOffset.)^
+**
+** ^(On success, sqlite3_blob_write() returns SQLITE_OK.
+** Otherwise, an  [error code] or an [extended error code] is returned.)^
+** ^Unless SQLITE_MISUSE is returned, this function sets the
+** [database connection] error code and message accessible via
+** [sqlite3_errcode()] and [sqlite3_errmsg()] and related functions.
+**
+** ^If the [BLOB handle] passed as the first argument was not opened for
+** writing (the flags parameter to [sqlite3_blob_open()] was zero),
+** this function returns [SQLITE_READONLY].
+**
+** This function may only modify the contents of the BLOB; it is
+** not possible to increase the size of a BLOB using this API.
+** ^If offset iOffset is less than N bytes from the end of the BLOB,
+** [SQLITE_ERROR] is returned and no data is written. The size of the
+** BLOB (and hence the maximum value of N+iOffset) can be determined
+** using the [sqlite3_blob_bytes()] interface. ^If N or iOffset are less
+** than zero [SQLITE_ERROR] is returned and no data is written.
+**
+** ^An attempt to write to an expired [BLOB handle] fails with an
+** error code of [SQLITE_ABORT].  ^Writes to the BLOB that occurred
+** before the [BLOB handle] expired are not rolled back by the
+** expiration of the handle, though of course those changes might
+** have been overwritten by the statement that expired the BLOB handle
+** or by other independent statements.
+**
+** This routine only works on a [BLOB handle] which has been created
+** by a prior successful call to [sqlite3_blob_open()] and which has not
+** been closed by [sqlite3_blob_close()].  Passing any other pointer in
+** to this routine results in undefined and probably undesirable behavior.
+**
+** See also: [sqlite3_blob_read()].
+*/
+SQLITE_API int sqlite3_blob_write(sqlite3_blob *, const void *z, int n, int iOffset);
+
+/*
+** CAPI3REF: Virtual File System Objects
+**
+** A virtual filesystem (VFS) is an [sqlite3_vfs] object
+** that SQLite uses to interact
+** with the underlying operating system.  Most SQLite builds come with a
+** single default VFS that is appropriate for the host computer.
+** New VFSes can be registered and existing VFSes can be unregistered.
+** The following interfaces are provided.
+**
+** ^The sqlite3_vfs_find() interface returns a pointer to a VFS given its name.
+** ^Names are case sensitive.
+** ^Names are zero-terminated UTF-8 strings.
+** ^If there is no match, a NULL pointer is returned.
+** ^If zVfsName is NULL then the default VFS is returned.
+**
+** ^New VFSes are registered with sqlite3_vfs_register().
+** ^Each new VFS becomes the default VFS if the makeDflt flag is set.
+** ^The same VFS can be registered multiple times without injury.
+** ^To make an existing VFS into the default VFS, register it again
+** with the makeDflt flag set.  If two different VFSes with the
+** same name are registered, the behavior is undefined.  If a
+** VFS is registered with a name that is NULL or an empty string,
+** then the behavior is undefined.
+**
+** ^Unregister a VFS with the sqlite3_vfs_unregister() interface.
+** ^(If the default VFS is unregistered, another VFS is chosen as
+** the default.  The choice for the new VFS is arbitrary.)^
+*/
+SQLITE_API sqlite3_vfs *sqlite3_vfs_find(const char *zVfsName);
+SQLITE_API int sqlite3_vfs_register(sqlite3_vfs*, int makeDflt);
+SQLITE_API int sqlite3_vfs_unregister(sqlite3_vfs*);
+
+/*
+** CAPI3REF: Mutexes
+**
+** The SQLite core uses these routines for thread
+** synchronization. Though they are intended for internal
+** use by SQLite, code that links against SQLite is
+** permitted to use any of these routines.
+**
+** The SQLite source code contains multiple implementations
+** of these mutex routines.  An appropriate implementation
+** is selected automatically at compile-time.  The following
+** implementations are available in the SQLite core:
+**
+** <ul>
+** <li>   SQLITE_MUTEX_PTHREADS
+** <li>   SQLITE_MUTEX_W32
+** <li>   SQLITE_MUTEX_NOOP
+** </ul>
+**
+** The SQLITE_MUTEX_NOOP implementation is a set of routines
+** that does no real locking and is appropriate for use in
+** a single-threaded application.  The SQLITE_MUTEX_PTHREADS and
+** SQLITE_MUTEX_W32 implementations are appropriate for use on Unix
+** and Windows.
+**
+** If SQLite is compiled with the SQLITE_MUTEX_APPDEF preprocessor
+** macro defined (with "-DSQLITE_MUTEX_APPDEF=1"), then no mutex
+** implementation is included with the library. In this case the
+** application must supply a custom mutex implementation using the
+** [SQLITE_CONFIG_MUTEX] option of the sqlite3_config() function
+** before calling sqlite3_initialize() or any other public sqlite3_
+** function that calls sqlite3_initialize().
+**
+** ^The sqlite3_mutex_alloc() routine allocates a new
+** mutex and returns a pointer to it. ^The sqlite3_mutex_alloc()
+** routine returns NULL if it is unable to allocate the requested
+** mutex.  The argument to sqlite3_mutex_alloc() must one of these
+** integer constants:
+**
+** <ul>
+** <li>  SQLITE_MUTEX_FAST
+** <li>  SQLITE_MUTEX_RECURSIVE
+** <li>  SQLITE_MUTEX_STATIC_MAIN
+** <li>  SQLITE_MUTEX_STATIC_MEM
+** <li>  SQLITE_MUTEX_STATIC_OPEN
+** <li>  SQLITE_MUTEX_STATIC_PRNG
+** <li>  SQLITE_MUTEX_STATIC_LRU
+** <li>  SQLITE_MUTEX_STATIC_PMEM
+** <li>  SQLITE_MUTEX_STATIC_APP1
+** <li>  SQLITE_MUTEX_STATIC_APP2
+** <li>  SQLITE_MUTEX_STATIC_APP3
+** <li>  SQLITE_MUTEX_STATIC_VFS1
+** <li>  SQLITE_MUTEX_STATIC_VFS2
+** <li>  SQLITE_MUTEX_STATIC_VFS3
+** </ul>
+**
+** ^The first two constants (SQLITE_MUTEX_FAST and SQLITE_MUTEX_RECURSIVE)
+** cause sqlite3_mutex_alloc() to create
+** a new mutex.  ^The new mutex is recursive when SQLITE_MUTEX_RECURSIVE
+** is used but not necessarily so when SQLITE_MUTEX_FAST is used.
+** The mutex implementation does not need to make a distinction
+** between SQLITE_MUTEX_RECURSIVE and SQLITE_MUTEX_FAST if it does
+** not want to.  SQLite will only request a recursive mutex in
+** cases where it really needs one.  If a faster non-recursive mutex
+** implementation is available on the host platform, the mutex subsystem
+** might return such a mutex in response to SQLITE_MUTEX_FAST.
+**
+** ^The other allowed parameters to sqlite3_mutex_alloc() (anything other
+** than SQLITE_MUTEX_FAST and SQLITE_MUTEX_RECURSIVE) each return
+** a pointer to a static preexisting mutex.  ^Nine static mutexes are
+** used by the current version of SQLite.  Future versions of SQLite
+** may add additional static mutexes.  Static mutexes are for internal
+** use by SQLite only.  Applications that use SQLite mutexes should
+** use only the dynamic mutexes returned by SQLITE_MUTEX_FAST or
+** SQLITE_MUTEX_RECURSIVE.
+**
+** ^Note that if one of the dynamic mutex parameters (SQLITE_MUTEX_FAST
+** or SQLITE_MUTEX_RECURSIVE) is used then sqlite3_mutex_alloc()
+** returns a different mutex on every call.  ^For the static
+** mutex types, the same mutex is returned on every call that has
+** the same type number.
+**
+** ^The sqlite3_mutex_free() routine deallocates a previously
+** allocated dynamic mutex.  Attempting to deallocate a static
+** mutex results in undefined behavior.
+**
+** ^The sqlite3_mutex_enter() and sqlite3_mutex_try() routines attempt
+** to enter a mutex.  ^If another thread is already within the mutex,
+** sqlite3_mutex_enter() will block and sqlite3_mutex_try() will return
+** SQLITE_BUSY.  ^The sqlite3_mutex_try() interface returns [SQLITE_OK]
+** upon successful entry.  ^(Mutexes created using
+** SQLITE_MUTEX_RECURSIVE can be entered multiple times by the same thread.
+** In such cases, the
+** mutex must be exited an equal number of times before another thread
+** can enter.)^  If the same thread tries to enter any mutex other
+** than an SQLITE_MUTEX_RECURSIVE more than once, the behavior is undefined.
+**
+** ^(Some systems (for example, Windows 95) do not support the operation
+** implemented by sqlite3_mutex_try().  On those systems, sqlite3_mutex_try()
+** will always return SQLITE_BUSY. In most cases the SQLite core only uses
+** sqlite3_mutex_try() as an optimization, so this is acceptable
+** behavior. The exceptions are unix builds that set the
+** SQLITE_ENABLE_SETLK_TIMEOUT build option. In that case a working
+** sqlite3_mutex_try() is required.)^
+**
+** ^The sqlite3_mutex_leave() routine exits a mutex that was
+** previously entered by the same thread.   The behavior
+** is undefined if the mutex is not currently entered by the
+** calling thread or is not currently allocated.
+**
+** ^If the argument to sqlite3_mutex_enter(), sqlite3_mutex_try(),
+** sqlite3_mutex_leave(), or sqlite3_mutex_free() is a NULL pointer,
+** then any of the four routines behaves as a no-op.
+**
+** See also: [sqlite3_mutex_held()] and [sqlite3_mutex_notheld()].
+*/
+SQLITE_API sqlite3_mutex *sqlite3_mutex_alloc(int);
+SQLITE_API void sqlite3_mutex_free(sqlite3_mutex*);
+SQLITE_API void sqlite3_mutex_enter(sqlite3_mutex*);
+SQLITE_API int sqlite3_mutex_try(sqlite3_mutex*);
+SQLITE_API void sqlite3_mutex_leave(sqlite3_mutex*);
+
+/*
+** CAPI3REF: Mutex Methods Object
+**
+** An instance of this structure defines the low-level routines
+** used to allocate and use mutexes.
+**
+** Usually, the default mutex implementations provided by SQLite are
+** sufficient, however the application has the option of substituting a custom
+** implementation for specialized deployments or systems for which SQLite
+** does not provide a suitable implementation. In this case, the application
+** creates and populates an instance of this structure to pass
+** to sqlite3_config() along with the [SQLITE_CONFIG_MUTEX] option.
+** Additionally, an instance of this structure can be used as an
+** output variable when querying the system for the current mutex
+** implementation, using the [SQLITE_CONFIG_GETMUTEX] option.
+**
+** ^The xMutexInit method defined by this structure is invoked as
+** part of system initialization by the sqlite3_initialize() function.
+** ^The xMutexInit routine is called by SQLite exactly once for each
+** effective call to [sqlite3_initialize()].
+**
+** ^The xMutexEnd method defined by this structure is invoked as
+** part of system shutdown by the sqlite3_shutdown() function. The
+** implementation of this method is expected to release all outstanding
+** resources obtained by the mutex methods implementation, especially
+** those obtained by the xMutexInit method.  ^The xMutexEnd()
+** interface is invoked exactly once for each call to [sqlite3_shutdown()].
+**
+** ^(The remaining seven methods defined by this structure (xMutexAlloc,
+** xMutexFree, xMutexEnter, xMutexTry, xMutexLeave, xMutexHeld and
+** xMutexNotheld) implement the following interfaces (respectively):
+**
+** <ul>
+**   <li>  [sqlite3_mutex_alloc()] </li>
+**   <li>  [sqlite3_mutex_free()] </li>
+**   <li>  [sqlite3_mutex_enter()] </li>
+**   <li>  [sqlite3_mutex_try()] </li>
+**   <li>  [sqlite3_mutex_leave()] </li>
+**   <li>  [sqlite3_mutex_held()] </li>
+**   <li>  [sqlite3_mutex_notheld()] </li>
+** </ul>)^
+**
+** The only difference is that the public sqlite3_XXX functions enumerated
+** above silently ignore any invocations that pass a NULL pointer instead
+** of a valid mutex handle. The implementations of the methods defined
+** by this structure are not required to handle this case. The results
+** of passing a NULL pointer instead of a valid mutex handle are undefined
+** (i.e. it is acceptable to provide an implementation that segfaults if
+** it is passed a NULL pointer).
+**
+** The xMutexInit() method must be threadsafe.  It must be harmless to
+** invoke xMutexInit() multiple times within the same process and without
+** intervening calls to xMutexEnd().  Second and subsequent calls to
+** xMutexInit() must be no-ops.
+**
+** xMutexInit() must not use SQLite memory allocation ([sqlite3_malloc()]
+** and its associates).  Similarly, xMutexAlloc() must not use SQLite memory
+** allocation for a static mutex.  ^However xMutexAlloc() may use SQLite
+** memory allocation for a fast or recursive mutex.
+**
+** ^SQLite will invoke the xMutexEnd() method when [sqlite3_shutdown()] is
+** called, but only if the prior call to xMutexInit returned SQLITE_OK.
+** If xMutexInit fails in any way, it is expected to clean up after itself
+** prior to returning.
+*/
+typedef struct sqlite3_mutex_methods sqlite3_mutex_methods;
+struct sqlite3_mutex_methods {
+  int (*xMutexInit)(void);
+  int (*xMutexEnd)(void);
+  sqlite3_mutex *(*xMutexAlloc)(int);
+  void (*xMutexFree)(sqlite3_mutex *);
+  void (*xMutexEnter)(sqlite3_mutex *);
+  int (*xMutexTry)(sqlite3_mutex *);
+  void (*xMutexLeave)(sqlite3_mutex *);
+  int (*xMutexHeld)(sqlite3_mutex *);
+  int (*xMutexNotheld)(sqlite3_mutex *);
+};
+
+/*
+** CAPI3REF: Mutex Verification Routines
+**
+** The sqlite3_mutex_held() and sqlite3_mutex_notheld() routines
+** are intended for use inside assert() statements.  The SQLite core
+** never uses these routines except inside an assert() and applications
+** are advised to follow the lead of the core.  The SQLite core only
+** provides implementations for these routines when it is compiled
+** with the SQLITE_DEBUG flag.  External mutex implementations
+** are only required to provide these routines if SQLITE_DEBUG is
+** defined and if NDEBUG is not defined.
+**
+** These routines should return true if the mutex in their argument
+** is held or not held, respectively, by the calling thread.
+**
+** The implementation is not required to provide versions of these
+** routines that actually work. If the implementation does not provide working
+** versions of these routines, it should at least provide stubs that always
+** return true so that one does not get spurious assertion failures.
+**
+** If the argument to sqlite3_mutex_held() is a NULL pointer then
+** the routine should return 1.   This seems counter-intuitive since
+** clearly the mutex cannot be held if it does not exist.  But
+** the reason the mutex does not exist is because the build is not
+** using mutexes.  And we do not want the assert() containing the
+** call to sqlite3_mutex_held() to fail, so a non-zero return is
+** the appropriate thing to do.  The sqlite3_mutex_notheld()
+** interface should also return 1 when given a NULL pointer.
+*/
+#ifndef NDEBUG
+SQLITE_API int sqlite3_mutex_held(sqlite3_mutex*);
+SQLITE_API int sqlite3_mutex_notheld(sqlite3_mutex*);
+#endif
+
+/*
+** CAPI3REF: Mutex Types
+**
+** The [sqlite3_mutex_alloc()] interface takes a single argument
+** which is one of these integer constants.
+**
+** The set of static mutexes may change from one SQLite release to the
+** next.  Applications that override the built-in mutex logic must be
+** prepared to accommodate additional static mutexes.
+*/
+#define SQLITE_MUTEX_FAST             0
+#define SQLITE_MUTEX_RECURSIVE        1
+#define SQLITE_MUTEX_STATIC_MAIN      2
+#define SQLITE_MUTEX_STATIC_MEM       3  /* sqlite3_malloc() */
+#define SQLITE_MUTEX_STATIC_MEM2      4  /* NOT USED */
+#define SQLITE_MUTEX_STATIC_OPEN      4  /* sqlite3BtreeOpen() */
+#define SQLITE_MUTEX_STATIC_PRNG      5  /* sqlite3_randomness() */
+#define SQLITE_MUTEX_STATIC_LRU       6  /* lru page list */
+#define SQLITE_MUTEX_STATIC_LRU2      7  /* NOT USED */
+#define SQLITE_MUTEX_STATIC_PMEM      7  /* sqlite3PageMalloc() */
+#define SQLITE_MUTEX_STATIC_APP1      8  /* For use by application */
+#define SQLITE_MUTEX_STATIC_APP2      9  /* For use by application */
+#define SQLITE_MUTEX_STATIC_APP3     10  /* For use by application */
+#define SQLITE_MUTEX_STATIC_VFS1     11  /* For use by built-in VFS */
+#define SQLITE_MUTEX_STATIC_VFS2     12  /* For use by extension VFS */
+#define SQLITE_MUTEX_STATIC_VFS3     13  /* For use by application VFS */
+
+/* Legacy compatibility: */
+#define SQLITE_MUTEX_STATIC_MASTER    2
+
+
+/*
+** CAPI3REF: Retrieve the mutex for a database connection
+** METHOD: sqlite3
+**
+** ^This interface returns a pointer the [sqlite3_mutex] object that
+** serializes access to the [database connection] given in the argument
+** when the [threading mode] is Serialized.
+** ^If the [threading mode] is Single-thread or Multi-thread then this
+** routine returns a NULL pointer.
+*/
+SQLITE_API sqlite3_mutex *sqlite3_db_mutex(sqlite3*);
+
+/*
+** CAPI3REF: Low-Level Control Of Database Files
+** METHOD: sqlite3
+** KEYWORDS: {file control}
+**
+** ^The [sqlite3_file_control()] interface makes a direct call to the
+** xFileControl method for the [sqlite3_io_methods] object associated
+** with a particular database identified by the second argument. ^The
+** name of the database is "main" for the main database or "temp" for the
+** TEMP database, or the name that appears after the AS keyword for
+** databases that are added using the [ATTACH] SQL command.
+** ^A NULL pointer can be used in place of "main" to refer to the
+** main database file.
+** ^The third and fourth parameters to this routine
+** are passed directly through to the second and third parameters of
+** the xFileControl method.  ^The return value of the xFileControl
+** method becomes the return value of this routine.
+**
+** A few opcodes for [sqlite3_file_control()] are handled directly
+** by the SQLite core and never invoke the
+** sqlite3_io_methods.xFileControl method.
+** ^The [SQLITE_FCNTL_FILE_POINTER] value for the op parameter causes
+** a pointer to the underlying [sqlite3_file] object to be written into
+** the space pointed to by the 4th parameter.  The
+** [SQLITE_FCNTL_JOURNAL_POINTER] works similarly except that it returns
+** the [sqlite3_file] object associated with the journal file instead of
+** the main database.  The [SQLITE_FCNTL_VFS_POINTER] opcode returns
+** a pointer to the underlying [sqlite3_vfs] object for the file.
+** The [SQLITE_FCNTL_DATA_VERSION] returns the data version counter
+** from the pager.
+**
+** ^If the second parameter (zDbName) does not match the name of any
+** open database file, then SQLITE_ERROR is returned.  ^This error
+** code is not remembered and will not be recalled by [sqlite3_errcode()]
+** or [sqlite3_errmsg()].  The underlying xFileControl method might
+** also return SQLITE_ERROR.  There is no way to distinguish between
+** an incorrect zDbName and an SQLITE_ERROR return from the underlying
+** xFileControl method.
+**
+** See also: [file control opcodes]
+*/
+SQLITE_API int sqlite3_file_control(sqlite3*, const char *zDbName, int op, void*);
+
+/*
+** CAPI3REF: Testing Interface
+**
+** ^The sqlite3_test_control() interface is used to read out internal
+** state of SQLite and to inject faults into SQLite for testing
+** purposes.  ^The first parameter is an operation code that determines
+** the number, meaning, and operation of all subsequent parameters.
+**
+** This interface is not for use by applications.  It exists solely
+** for verifying the correct operation of the SQLite library.  Depending
+** on how the SQLite library is compiled, this interface might not exist.
+**
+** The details of the operation codes, their meanings, the parameters
+** they take, and what they do are all subject to change without notice.
+** Unlike most of the SQLite API, this function is not guaranteed to
+** operate consistently from one release to the next.
+*/
+SQLITE_API int sqlite3_test_control(int op, ...);
+
+/*
+** CAPI3REF: Testing Interface Operation Codes
+**
+** These constants are the valid operation code parameters used
+** as the first argument to [sqlite3_test_control()].
+**
+** These parameters and their meanings are subject to change
+** without notice.  These values are for testing purposes only.
+** Applications should not use any of these parameters or the
+** [sqlite3_test_control()] interface.
+*/
+#define SQLITE_TESTCTRL_FIRST                    5
+#define SQLITE_TESTCTRL_PRNG_SAVE                5
+#define SQLITE_TESTCTRL_PRNG_RESTORE             6
+#define SQLITE_TESTCTRL_PRNG_RESET               7  /* NOT USED */
+#define SQLITE_TESTCTRL_FK_NO_ACTION             7
+#define SQLITE_TESTCTRL_BITVEC_TEST              8
+#define SQLITE_TESTCTRL_FAULT_INSTALL            9
+#define SQLITE_TESTCTRL_BENIGN_MALLOC_HOOKS     10
+#define SQLITE_TESTCTRL_PENDING_BYTE            11
+#define SQLITE_TESTCTRL_ASSERT                  12
+#define SQLITE_TESTCTRL_ALWAYS                  13
+#define SQLITE_TESTCTRL_RESERVE                 14  /* NOT USED */
+#define SQLITE_TESTCTRL_JSON_SELFCHECK          14
+#define SQLITE_TESTCTRL_OPTIMIZATIONS           15
+#define SQLITE_TESTCTRL_ISKEYWORD               16  /* NOT USED */
+#define SQLITE_TESTCTRL_GETOPT                  16
+#define SQLITE_TESTCTRL_SCRATCHMALLOC           17  /* NOT USED */
+#define SQLITE_TESTCTRL_INTERNAL_FUNCTIONS      17
+#define SQLITE_TESTCTRL_LOCALTIME_FAULT         18
+#define SQLITE_TESTCTRL_EXPLAIN_STMT            19  /* NOT USED */
+#define SQLITE_TESTCTRL_ONCE_RESET_THRESHOLD    19
+#define SQLITE_TESTCTRL_NEVER_CORRUPT           20
+#define SQLITE_TESTCTRL_VDBE_COVERAGE           21
+#define SQLITE_TESTCTRL_BYTEORDER               22
+#define SQLITE_TESTCTRL_ISINIT                  23
+#define SQLITE_TESTCTRL_SORTER_MMAP             24
+#define SQLITE_TESTCTRL_IMPOSTER                25
+#define SQLITE_TESTCTRL_PARSER_COVERAGE         26
+#define SQLITE_TESTCTRL_RESULT_INTREAL          27
+#define SQLITE_TESTCTRL_PRNG_SEED               28
+#define SQLITE_TESTCTRL_EXTRA_SCHEMA_CHECKS     29
+#define SQLITE_TESTCTRL_SEEK_COUNT              30
+#define SQLITE_TESTCTRL_TRACEFLAGS              31
+#define SQLITE_TESTCTRL_TUNE                    32
+#define SQLITE_TESTCTRL_LOGEST                  33
+#define SQLITE_TESTCTRL_USELONGDOUBLE           34  /* NOT USED */
+#define SQLITE_TESTCTRL_LAST                    34  /* Largest TESTCTRL */
+
+/*
+** CAPI3REF: SQL Keyword Checking
+**
+** These routines provide access to the set of SQL language keywords
+** recognized by SQLite.  Applications can uses these routines to determine
+** whether or not a specific identifier needs to be escaped (for example,
+** by enclosing in double-quotes) so as not to confuse the parser.
+**
+** The sqlite3_keyword_count() interface returns the number of distinct
+** keywords understood by SQLite.
+**
+** The sqlite3_keyword_name(N,Z,L) interface finds the 0-based N-th keyword and
+** makes *Z point to that keyword expressed as UTF8 and writes the number
+** of bytes in the keyword into *L.  The string that *Z points to is not
+** zero-terminated.  The sqlite3_keyword_name(N,Z,L) routine returns
+** SQLITE_OK if N is within bounds and SQLITE_ERROR if not. If either Z
+** or L are NULL or invalid pointers then calls to
+** sqlite3_keyword_name(N,Z,L) result in undefined behavior.
+**
+** The sqlite3_keyword_check(Z,L) interface checks to see whether or not
+** the L-byte UTF8 identifier that Z points to is a keyword, returning non-zero
+** if it is and zero if not.
+**
+** The parser used by SQLite is forgiving.  It is often possible to use
+** a keyword as an identifier as long as such use does not result in a
+** parsing ambiguity.  For example, the statement
+** "CREATE TABLE BEGIN(REPLACE,PRAGMA,END);" is accepted by SQLite, and
+** creates a new table named "BEGIN" with three columns named
+** "REPLACE", "PRAGMA", and "END".  Nevertheless, best practice is to avoid
+** using keywords as identifiers.  Common techniques used to avoid keyword
+** name collisions include:
+** <ul>
+** <li> Put all identifier names inside double-quotes.  This is the official
+**      SQL way to escape identifier names.
+** <li> Put identifier names inside &#91;...&#93;.  This is not standard SQL,
+**      but it is what SQL Server does and so lots of programmers use this
+**      technique.
+** <li> Begin every identifier with the letter "Z" as no SQL keywords start
+**      with "Z".
+** <li> Include a digit somewhere in every identifier name.
+** </ul>
+**
+** Note that the number of keywords understood by SQLite can depend on
+** compile-time options.  For example, "VACUUM" is not a keyword if
+** SQLite is compiled with the [-DSQLITE_OMIT_VACUUM] option.  Also,
+** new keywords may be added to future releases of SQLite.
+*/
+SQLITE_API int sqlite3_keyword_count(void);
+SQLITE_API int sqlite3_keyword_name(int,const char**,int*);
+SQLITE_API int sqlite3_keyword_check(const char*,int);
+
+/*
+** CAPI3REF: Dynamic String Object
+** KEYWORDS: {dynamic string}
+**
+** An instance of the sqlite3_str object contains a dynamically-sized
+** string under construction.
+**
+** The lifecycle of an sqlite3_str object is as follows:
+** <ol>
+** <li> ^The sqlite3_str object is created using [sqlite3_str_new()].
+** <li> ^Text is appended to the sqlite3_str object using various
+** methods, such as [sqlite3_str_appendf()].
+** <li> ^The sqlite3_str object is destroyed and the string it created
+** is returned using the [sqlite3_str_finish()] interface.
+** </ol>
+*/
+typedef struct sqlite3_str sqlite3_str;
+
+/*
+** CAPI3REF: Create A New Dynamic String Object
+** CONSTRUCTOR: sqlite3_str
+**
+** ^The [sqlite3_str_new(D)] interface allocates and initializes
+** a new [sqlite3_str] object.  To avoid memory leaks, the object returned by
+** [sqlite3_str_new()] must be freed by a subsequent call to
+** [sqlite3_str_finish(X)].
+**
+** ^The [sqlite3_str_new(D)] interface always returns a pointer to a
+** valid [sqlite3_str] object, though in the event of an out-of-memory
+** error the returned object might be a special singleton that will
+** silently reject new text, always return SQLITE_NOMEM from
+** [sqlite3_str_errcode()], always return 0 for
+** [sqlite3_str_length()], and always return NULL from
+** [sqlite3_str_finish(X)].  It is always safe to use the value
+** returned by [sqlite3_str_new(D)] as the sqlite3_str parameter
+** to any of the other [sqlite3_str] methods.
+**
+** The D parameter to [sqlite3_str_new(D)] may be NULL.  If the
+** D parameter in [sqlite3_str_new(D)] is not NULL, then the maximum
+** length of the string contained in the [sqlite3_str] object will be
+** the value set for [sqlite3_limit](D,[SQLITE_LIMIT_LENGTH]) instead
+** of [SQLITE_MAX_LENGTH].
+*/
+SQLITE_API sqlite3_str *sqlite3_str_new(sqlite3*);
+
+/*
+** CAPI3REF: Finalize A Dynamic String
+** DESTRUCTOR: sqlite3_str
+**
+** ^The [sqlite3_str_finish(X)] interface destroys the sqlite3_str object X
+** and returns a pointer to a memory buffer obtained from [sqlite3_malloc64()]
+** that contains the constructed string.  The calling application should
+** pass the returned value to [sqlite3_free()] to avoid a memory leak.
+** ^The [sqlite3_str_finish(X)] interface may return a NULL pointer if any
+** errors were encountered during construction of the string.  ^The
+** [sqlite3_str_finish(X)] interface will also return a NULL pointer if the
+** string in [sqlite3_str] object X is zero bytes long.
+*/
+SQLITE_API char *sqlite3_str_finish(sqlite3_str*);
+
+/*
+** CAPI3REF: Add Content To A Dynamic String
+** METHOD: sqlite3_str
+**
+** These interfaces add content to an sqlite3_str object previously obtained
+** from [sqlite3_str_new()].
+**
+** ^The [sqlite3_str_appendf(X,F,...)] and
+** [sqlite3_str_vappendf(X,F,V)] interfaces uses the [built-in printf]
+** functionality of SQLite to append formatted text onto the end of
+** [sqlite3_str] object X.
+**
+** ^The [sqlite3_str_append(X,S,N)] method appends exactly N bytes from string S
+** onto the end of the [sqlite3_str] object X.  N must be non-negative.
+** S must contain at least N non-zero bytes of content.  To append a
+** zero-terminated string in its entirety, use the [sqlite3_str_appendall()]
+** method instead.
+**
+** ^The [sqlite3_str_appendall(X,S)] method appends the complete content of
+** zero-terminated string S onto the end of [sqlite3_str] object X.
+**
+** ^The [sqlite3_str_appendchar(X,N,C)] method appends N copies of the
+** single-byte character C onto the end of [sqlite3_str] object X.
+** ^This method can be used, for example, to add whitespace indentation.
+**
+** ^The [sqlite3_str_reset(X)] method resets the string under construction
+** inside [sqlite3_str] object X back to zero bytes in length.
+**
+** These methods do not return a result code.  ^If an error occurs, that fact
+** is recorded in the [sqlite3_str] object and can be recovered by a
+** subsequent call to [sqlite3_str_errcode(X)].
+*/
+SQLITE_API void sqlite3_str_appendf(sqlite3_str*, const char *zFormat, ...);
+SQLITE_API void sqlite3_str_vappendf(sqlite3_str*, const char *zFormat, va_list);
+SQLITE_API void sqlite3_str_append(sqlite3_str*, const char *zIn, int N);
+SQLITE_API void sqlite3_str_appendall(sqlite3_str*, const char *zIn);
+SQLITE_API void sqlite3_str_appendchar(sqlite3_str*, int N, char C);
+SQLITE_API void sqlite3_str_reset(sqlite3_str*);
+
+/*
+** CAPI3REF: Status Of A Dynamic String
+** METHOD: sqlite3_str
+**
+** These interfaces return the current status of an [sqlite3_str] object.
+**
+** ^If any prior errors have occurred while constructing the dynamic string
+** in sqlite3_str X, then the [sqlite3_str_errcode(X)] method will return
+** an appropriate error code.  ^The [sqlite3_str_errcode(X)] method returns
+** [SQLITE_NOMEM] following any out-of-memory error, or
+** [SQLITE_TOOBIG] if the size of the dynamic string exceeds
+** [SQLITE_MAX_LENGTH], or [SQLITE_OK] if there have been no errors.
+**
+** ^The [sqlite3_str_length(X)] method returns the current length, in bytes,
+** of the dynamic string under construction in [sqlite3_str] object X.
+** ^The length returned by [sqlite3_str_length(X)] does not include the
+** zero-termination byte.
+**
+** ^The [sqlite3_str_value(X)] method returns a pointer to the current
+** content of the dynamic string under construction in X.  The value
+** returned by [sqlite3_str_value(X)] is managed by the sqlite3_str object X
+** and might be freed or altered by any subsequent method on the same
+** [sqlite3_str] object.  Applications must not used the pointer returned
+** [sqlite3_str_value(X)] after any subsequent method call on the same
+** object.  ^Applications may change the content of the string returned
+** by [sqlite3_str_value(X)] as long as they do not write into any bytes
+** outside the range of 0 to [sqlite3_str_length(X)] and do not read or
+** write any byte after any subsequent sqlite3_str method call.
+*/
+SQLITE_API int sqlite3_str_errcode(sqlite3_str*);
+SQLITE_API int sqlite3_str_length(sqlite3_str*);
+SQLITE_API char *sqlite3_str_value(sqlite3_str*);
+
+/*
+** CAPI3REF: SQLite Runtime Status
+**
+** ^These interfaces are used to retrieve runtime status information
+** about the performance of SQLite, and optionally to reset various
+** highwater marks.  ^The first argument is an integer code for
+** the specific parameter to measure.  ^(Recognized integer codes
+** are of the form [status parameters | SQLITE_STATUS_...].)^
+** ^The current value of the parameter is returned into *pCurrent.
+** ^The highest recorded value is returned in *pHighwater.  ^If the
+** resetFlag is true, then the highest record value is reset after
+** *pHighwater is written.  ^(Some parameters do not record the highest
+** value.  For those parameters
+** nothing is written into *pHighwater and the resetFlag is ignored.)^
+** ^(Other parameters record only the highwater mark and not the current
+** value.  For these latter parameters nothing is written into *pCurrent.)^
+**
+** ^The sqlite3_status() and sqlite3_status64() routines return
+** SQLITE_OK on success and a non-zero [error code] on failure.
+**
+** If either the current value or the highwater mark is too large to
+** be represented by a 32-bit integer, then the values returned by
+** sqlite3_status() are undefined.
+**
+** See also: [sqlite3_db_status()]
+*/
+SQLITE_API int sqlite3_status(int op, int *pCurrent, int *pHighwater, int resetFlag);
+SQLITE_API int sqlite3_status64(
+  int op,
+  sqlite3_int64 *pCurrent,
+  sqlite3_int64 *pHighwater,
+  int resetFlag
+);
+
+
+/*
+** CAPI3REF: Status Parameters
+** KEYWORDS: {status parameters}
+**
+** These integer constants designate various run-time status parameters
+** that can be returned by [sqlite3_status()].
+**
+** <dl>
+** [[SQLITE_STATUS_MEMORY_USED]] ^(<dt>SQLITE_STATUS_MEMORY_USED</dt>
+** <dd>This parameter is the current amount of memory checked out
+** using [sqlite3_malloc()], either directly or indirectly.  The
+** figure includes calls made to [sqlite3_malloc()] by the application
+** and internal memory usage by the SQLite library.  Auxiliary page-cache
+** memory controlled by [SQLITE_CONFIG_PAGECACHE] is not included in
+** this parameter.  The amount returned is the sum of the allocation
+** sizes as reported by the xSize method in [sqlite3_mem_methods].</dd>)^
+**
+** [[SQLITE_STATUS_MALLOC_SIZE]] ^(<dt>SQLITE_STATUS_MALLOC_SIZE</dt>
+** <dd>This parameter records the largest memory allocation request
+** handed to [sqlite3_malloc()] or [sqlite3_realloc()] (or their
+** internal equivalents).  Only the value returned in the
+** *pHighwater parameter to [sqlite3_status()] is of interest.
+** The value written into the *pCurrent parameter is undefined.</dd>)^
+**
+** [[SQLITE_STATUS_MALLOC_COUNT]] ^(<dt>SQLITE_STATUS_MALLOC_COUNT</dt>
+** <dd>This parameter records the number of separate memory allocations
+** currently checked out.</dd>)^
+**
+** [[SQLITE_STATUS_PAGECACHE_USED]] ^(<dt>SQLITE_STATUS_PAGECACHE_USED</dt>
+** <dd>This parameter returns the number of pages used out of the
+** [pagecache memory allocator] that was configured using
+** [SQLITE_CONFIG_PAGECACHE].  The
+** value returned is in pages, not in bytes.</dd>)^
+**
+** [[SQLITE_STATUS_PAGECACHE_OVERFLOW]]
+** ^(<dt>SQLITE_STATUS_PAGECACHE_OVERFLOW</dt>
+** <dd>This parameter returns the number of bytes of page cache
+** allocation which could not be satisfied by the [SQLITE_CONFIG_PAGECACHE]
+** buffer and where forced to overflow to [sqlite3_malloc()].  The
+** returned value includes allocations that overflowed because they
+** where too large (they were larger than the "sz" parameter to
+** [SQLITE_CONFIG_PAGECACHE]) and allocations that overflowed because
+** no space was left in the page cache.</dd>)^
+**
+** [[SQLITE_STATUS_PAGECACHE_SIZE]] ^(<dt>SQLITE_STATUS_PAGECACHE_SIZE</dt>
+** <dd>This parameter records the largest memory allocation request
+** handed to the [pagecache memory allocator].  Only the value returned in the
+** *pHighwater parameter to [sqlite3_status()] is of interest.
+** The value written into the *pCurrent parameter is undefined.</dd>)^
+**
+** [[SQLITE_STATUS_SCRATCH_USED]] <dt>SQLITE_STATUS_SCRATCH_USED</dt>
+** <dd>No longer used.</dd>
+**
+** [[SQLITE_STATUS_SCRATCH_OVERFLOW]] ^(<dt>SQLITE_STATUS_SCRATCH_OVERFLOW</dt>
+** <dd>No longer used.</dd>
+**
+** [[SQLITE_STATUS_SCRATCH_SIZE]] <dt>SQLITE_STATUS_SCRATCH_SIZE</dt>
+** <dd>No longer used.</dd>
+**
+** [[SQLITE_STATUS_PARSER_STACK]] ^(<dt>SQLITE_STATUS_PARSER_STACK</dt>
+** <dd>The *pHighwater parameter records the deepest parser stack.
+** The *pCurrent value is undefined.  The *pHighwater value is only
+** meaningful if SQLite is compiled with [YYTRACKMAXSTACKDEPTH].</dd>)^
+** </dl>
+**
+** New status parameters may be added from time to time.
+*/
+#define SQLITE_STATUS_MEMORY_USED          0
+#define SQLITE_STATUS_PAGECACHE_USED       1
+#define SQLITE_STATUS_PAGECACHE_OVERFLOW   2
+#define SQLITE_STATUS_SCRATCH_USED         3  /* NOT USED */
+#define SQLITE_STATUS_SCRATCH_OVERFLOW     4  /* NOT USED */
+#define SQLITE_STATUS_MALLOC_SIZE          5
+#define SQLITE_STATUS_PARSER_STACK         6
+#define SQLITE_STATUS_PAGECACHE_SIZE       7
+#define SQLITE_STATUS_SCRATCH_SIZE         8  /* NOT USED */
+#define SQLITE_STATUS_MALLOC_COUNT         9
+
+/*
+** CAPI3REF: Database Connection Status
+** METHOD: sqlite3
+**
+** ^This interface is used to retrieve runtime status information
+** about a single [database connection].  ^The first argument is the
+** database connection object to be interrogated.  ^The second argument
+** is an integer constant, taken from the set of
+** [SQLITE_DBSTATUS options], that
+** determines the parameter to interrogate.  The set of
+** [SQLITE_DBSTATUS options] is likely
+** to grow in future releases of SQLite.
+**
+** ^The current value of the requested parameter is written into *pCur
+** and the highest instantaneous value is written into *pHiwtr.  ^If
+** the resetFlg is true, then the highest instantaneous value is
+** reset back down to the current value.
+**
+** ^The sqlite3_db_status() routine returns SQLITE_OK on success and a
+** non-zero [error code] on failure.
+**
+** See also: [sqlite3_status()] and [sqlite3_stmt_status()].
+*/
+SQLITE_API int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int resetFlg);
+
+/*
+** CAPI3REF: Status Parameters for database connections
+** KEYWORDS: {SQLITE_DBSTATUS options}
+**
+** These constants are the available integer "verbs" that can be passed as
+** the second argument to the [sqlite3_db_status()] interface.
+**
+** New verbs may be added in future releases of SQLite. Existing verbs
+** might be discontinued. Applications should check the return code from
+** [sqlite3_db_status()] to make sure that the call worked.
+** The [sqlite3_db_status()] interface will return a non-zero error code
+** if a discontinued or unsupported verb is invoked.
+**
+** <dl>
+** [[SQLITE_DBSTATUS_LOOKASIDE_USED]] ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_USED</dt>
+** <dd>This parameter returns the number of lookaside memory slots currently
+** checked out.</dd>)^
+**
+** [[SQLITE_DBSTATUS_LOOKASIDE_HIT]] ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_HIT</dt>
+** <dd>This parameter returns the number of malloc attempts that were
+** satisfied using lookaside memory. Only the high-water value is meaningful;
+** the current value is always zero.)^
+**
+** [[SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE]]
+** ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE</dt>
+** <dd>This parameter returns the number malloc attempts that might have
+** been satisfied using lookaside memory but failed due to the amount of
+** memory requested being larger than the lookaside slot size.
+** Only the high-water value is meaningful;
+** the current value is always zero.)^
+**
+** [[SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL]]
+** ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL</dt>
+** <dd>This parameter returns the number malloc attempts that might have
+** been satisfied using lookaside memory but failed due to all lookaside
+** memory already being in use.
+** Only the high-water value is meaningful;
+** the current value is always zero.)^
+**
+** [[SQLITE_DBSTATUS_CACHE_USED]] ^(<dt>SQLITE_DBSTATUS_CACHE_USED</dt>
+** <dd>This parameter returns the approximate number of bytes of heap
+** memory used by all pager caches associated with the database connection.)^
+** ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_USED is always 0.
+**
+** [[SQLITE_DBSTATUS_CACHE_USED_SHARED]]
+** ^(<dt>SQLITE_DBSTATUS_CACHE_USED_SHARED</dt>
+** <dd>This parameter is similar to DBSTATUS_CACHE_USED, except that if a
+** pager cache is shared between two or more connections the bytes of heap
+** memory used by that pager cache is divided evenly between the attached
+** connections.)^  In other words, if none of the pager caches associated
+** with the database connection are shared, this request returns the same
+** value as DBSTATUS_CACHE_USED. Or, if one or more or the pager caches are
+** shared, the value returned by this call will be smaller than that returned
+** by DBSTATUS_CACHE_USED. ^The highwater mark associated with
+** SQLITE_DBSTATUS_CACHE_USED_SHARED is always 0.
+**
+** [[SQLITE_DBSTATUS_SCHEMA_USED]] ^(<dt>SQLITE_DBSTATUS_SCHEMA_USED</dt>
+** <dd>This parameter returns the approximate number of bytes of heap
+** memory used to store the schema for all databases associated
+** with the connection - main, temp, and any [ATTACH]-ed databases.)^
+** ^The full amount of memory used by the schemas is reported, even if the
+** schema memory is shared with other database connections due to
+** [shared cache mode] being enabled.
+** ^The highwater mark associated with SQLITE_DBSTATUS_SCHEMA_USED is always 0.
+**
+** [[SQLITE_DBSTATUS_STMT_USED]] ^(<dt>SQLITE_DBSTATUS_STMT_USED</dt>
+** <dd>This parameter returns the approximate number of bytes of heap
+** and lookaside memory used by all prepared statements associated with
+** the database connection.)^
+** ^The highwater mark associated with SQLITE_DBSTATUS_STMT_USED is always 0.
+** </dd>
+**
+** [[SQLITE_DBSTATUS_CACHE_HIT]] ^(<dt>SQLITE_DBSTATUS_CACHE_HIT</dt>
+** <dd>This parameter returns the number of pager cache hits that have
+** occurred.)^ ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_HIT
+** is always 0.
+** </dd>
+**
+** [[SQLITE_DBSTATUS_CACHE_MISS]] ^(<dt>SQLITE_DBSTATUS_CACHE_MISS</dt>
+** <dd>This parameter returns the number of pager cache misses that have
+** occurred.)^ ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_MISS
+** is always 0.
+** </dd>
+**
+** [[SQLITE_DBSTATUS_CACHE_WRITE]] ^(<dt>SQLITE_DBSTATUS_CACHE_WRITE</dt>
+** <dd>This parameter returns the number of dirty cache entries that have
+** been written to disk. Specifically, the number of pages written to the
+** wal file in wal mode databases, or the number of pages written to the
+** database file in rollback mode databases. Any pages written as part of
+** transaction rollback or database recovery operations are not included.
+** If an IO or other error occurs while writing a page to disk, the effect
+** on subsequent SQLITE_DBSTATUS_CACHE_WRITE requests is undefined.)^ ^The
+** highwater mark associated with SQLITE_DBSTATUS_CACHE_WRITE is always 0.
+** </dd>
+**
+** [[SQLITE_DBSTATUS_CACHE_SPILL]] ^(<dt>SQLITE_DBSTATUS_CACHE_SPILL</dt>
+** <dd>This parameter returns the number of dirty cache entries that have
+** been written to disk in the middle of a transaction due to the page
+** cache overflowing. Transactions are more efficient if they are written
+** to disk all at once. When pages spill mid-transaction, that introduces
+** additional overhead. This parameter can be used help identify
+** inefficiencies that can be resolved by increasing the cache size.
+** </dd>
+**
+** [[SQLITE_DBSTATUS_DEFERRED_FKS]] ^(<dt>SQLITE_DBSTATUS_DEFERRED_FKS</dt>
+** <dd>This parameter returns zero for the current value if and only if
+** all foreign key constraints (deferred or immediate) have been
+** resolved.)^  ^The highwater mark is always 0.
+** </dd>
+** </dl>
+*/
+#define SQLITE_DBSTATUS_LOOKASIDE_USED       0
+#define SQLITE_DBSTATUS_CACHE_USED           1
+#define SQLITE_DBSTATUS_SCHEMA_USED          2
+#define SQLITE_DBSTATUS_STMT_USED            3
+#define SQLITE_DBSTATUS_LOOKASIDE_HIT        4
+#define SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE  5
+#define SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL  6
+#define SQLITE_DBSTATUS_CACHE_HIT            7
+#define SQLITE_DBSTATUS_CACHE_MISS           8
+#define SQLITE_DBSTATUS_CACHE_WRITE          9
+#define SQLITE_DBSTATUS_DEFERRED_FKS        10
+#define SQLITE_DBSTATUS_CACHE_USED_SHARED   11
+#define SQLITE_DBSTATUS_CACHE_SPILL         12
+#define SQLITE_DBSTATUS_MAX                 12   /* Largest defined DBSTATUS */
+
+
+/*
+** CAPI3REF: Prepared Statement Status
+** METHOD: sqlite3_stmt
+**
+** ^(Each prepared statement maintains various
+** [SQLITE_STMTSTATUS counters] that measure the number
+** of times it has performed specific operations.)^  These counters can
+** be used to monitor the performance characteristics of the prepared
+** statements.  For example, if the number of table steps greatly exceeds
+** the number of table searches or result rows, that would tend to indicate
+** that the prepared statement is using a full table scan rather than
+** an index.
+**
+** ^(This interface is used to retrieve and reset counter values from
+** a [prepared statement].  The first argument is the prepared statement
+** object to be interrogated.  The second argument
+** is an integer code for a specific [SQLITE_STMTSTATUS counter]
+** to be interrogated.)^
+** ^The current value of the requested counter is returned.
+** ^If the resetFlg is true, then the counter is reset to zero after this
+** interface call returns.
+**
+** See also: [sqlite3_status()] and [sqlite3_db_status()].
+*/
+SQLITE_API int sqlite3_stmt_status(sqlite3_stmt*, int op,int resetFlg);
+
+/*
+** CAPI3REF: Status Parameters for prepared statements
+** KEYWORDS: {SQLITE_STMTSTATUS counter} {SQLITE_STMTSTATUS counters}
+**
+** These preprocessor macros define integer codes that name counter
+** values associated with the [sqlite3_stmt_status()] interface.
+** The meanings of the various counters are as follows:
+**
+** <dl>
+** [[SQLITE_STMTSTATUS_FULLSCAN_STEP]] <dt>SQLITE_STMTSTATUS_FULLSCAN_STEP</dt>
+** <dd>^This is the number of times that SQLite has stepped forward in
+** a table as part of a full table scan.  Large numbers for this counter
+** may indicate opportunities for performance improvement through
+** careful use of indices.</dd>
+**
+** [[SQLITE_STMTSTATUS_SORT]] <dt>SQLITE_STMTSTATUS_SORT</dt>
+** <dd>^This is the number of sort operations that have occurred.
+** A non-zero value in this counter may indicate an opportunity to
+** improvement performance through careful use of indices.</dd>
+**
+** [[SQLITE_STMTSTATUS_AUTOINDEX]] <dt>SQLITE_STMTSTATUS_AUTOINDEX</dt>
+** <dd>^This is the number of rows inserted into transient indices that
+** were created automatically in order to help joins run faster.
+** A non-zero value in this counter may indicate an opportunity to
+** improvement performance by adding permanent indices that do not
+** need to be reinitialized each time the statement is run.</dd>
+**
+** [[SQLITE_STMTSTATUS_VM_STEP]] <dt>SQLITE_STMTSTATUS_VM_STEP</dt>
+** <dd>^This is the number of virtual machine operations executed
+** by the prepared statement if that number is less than or equal
+** to 2147483647.  The number of virtual machine operations can be
+** used as a proxy for the total work done by the prepared statement.
+** If the number of virtual machine operations exceeds 2147483647
+** then the value returned by this statement status code is undefined.
+**
+** [[SQLITE_STMTSTATUS_REPREPARE]] <dt>SQLITE_STMTSTATUS_REPREPARE</dt>
+** <dd>^This is the number of times that the prepare statement has been
+** automatically regenerated due to schema changes or changes to
+** [bound parameters] that might affect the query plan.
+**
+** [[SQLITE_STMTSTATUS_RUN]] <dt>SQLITE_STMTSTATUS_RUN</dt>
+** <dd>^This is the number of times that the prepared statement has
+** been run.  A single "run" for the purposes of this counter is one
+** or more calls to [sqlite3_step()] followed by a call to [sqlite3_reset()].
+** The counter is incremented on the first [sqlite3_step()] call of each
+** cycle.
+**
+** [[SQLITE_STMTSTATUS_FILTER_MISS]]
+** [[SQLITE_STMTSTATUS_FILTER HIT]]
+** <dt>SQLITE_STMTSTATUS_FILTER_HIT<br>
+** SQLITE_STMTSTATUS_FILTER_MISS</dt>
+** <dd>^SQLITE_STMTSTATUS_FILTER_HIT is the number of times that a join
+** step was bypassed because a Bloom filter returned not-found.  The
+** corresponding SQLITE_STMTSTATUS_FILTER_MISS value is the number of
+** times that the Bloom filter returned a find, and thus the join step
+** had to be processed as normal.
+**
+** [[SQLITE_STMTSTATUS_MEMUSED]] <dt>SQLITE_STMTSTATUS_MEMUSED</dt>
+** <dd>^This is the approximate number of bytes of heap memory
+** used to store the prepared statement.  ^This value is not actually
+** a counter, and so the resetFlg parameter to sqlite3_stmt_status()
+** is ignored when the opcode is SQLITE_STMTSTATUS_MEMUSED.
+** </dd>
+** </dl>
+*/
+#define SQLITE_STMTSTATUS_FULLSCAN_STEP     1
+#define SQLITE_STMTSTATUS_SORT              2
+#define SQLITE_STMTSTATUS_AUTOINDEX         3
+#define SQLITE_STMTSTATUS_VM_STEP           4
+#define SQLITE_STMTSTATUS_REPREPARE         5
+#define SQLITE_STMTSTATUS_RUN               6
+#define SQLITE_STMTSTATUS_FILTER_MISS       7
+#define SQLITE_STMTSTATUS_FILTER_HIT        8
+#define SQLITE_STMTSTATUS_MEMUSED           99
+
+/*
+** CAPI3REF: Custom Page Cache Object
+**
+** The sqlite3_pcache type is opaque.  It is implemented by
+** the pluggable module.  The SQLite core has no knowledge of
+** its size or internal structure and never deals with the
+** sqlite3_pcache object except by holding and passing pointers
+** to the object.
+**
+** See [sqlite3_pcache_methods2] for additional information.
+*/
+typedef struct sqlite3_pcache sqlite3_pcache;
+
+/*
+** CAPI3REF: Custom Page Cache Object
+**
+** The sqlite3_pcache_page object represents a single page in the
+** page cache.  The page cache will allocate instances of this
+** object.  Various methods of the page cache use pointers to instances
+** of this object as parameters or as their return value.
+**
+** See [sqlite3_pcache_methods2] for additional information.
+*/
+typedef struct sqlite3_pcache_page sqlite3_pcache_page;
+struct sqlite3_pcache_page {
+  void *pBuf;        /* The content of the page */
+  void *pExtra;      /* Extra information associated with the page */
+};
+
+/*
+** CAPI3REF: Application Defined Page Cache.
+** KEYWORDS: {page cache}
+**
+** ^(The [sqlite3_config]([SQLITE_CONFIG_PCACHE2], ...) interface can
+** register an alternative page cache implementation by passing in an
+** instance of the sqlite3_pcache_methods2 structure.)^
+** In many applications, most of the heap memory allocated by
+** SQLite is used for the page cache.
+** By implementing a
+** custom page cache using this API, an application can better control
+** the amount of memory consumed by SQLite, the way in which
+** that memory is allocated and released, and the policies used to
+** determine exactly which parts of a database file are cached and for
+** how long.
+**
+** The alternative page cache mechanism is an
+** extreme measure that is only needed by the most demanding applications.
+** The built-in page cache is recommended for most uses.
+**
+** ^(The contents of the sqlite3_pcache_methods2 structure are copied to an
+** internal buffer by SQLite within the call to [sqlite3_config].  Hence
+** the application may discard the parameter after the call to
+** [sqlite3_config()] returns.)^
+**
+** [[the xInit() page cache method]]
+** ^(The xInit() method is called once for each effective
+** call to [sqlite3_initialize()])^
+** (usually only once during the lifetime of the process). ^(The xInit()
+** method is passed a copy of the sqlite3_pcache_methods2.pArg value.)^
+** The intent of the xInit() method is to set up global data structures
+** required by the custom page cache implementation.
+** ^(If the xInit() method is NULL, then the
+** built-in default page cache is used instead of the application defined
+** page cache.)^
+**
+** [[the xShutdown() page cache method]]
+** ^The xShutdown() method is called by [sqlite3_shutdown()].
+** It can be used to clean up
+** any outstanding resources before process shutdown, if required.
+** ^The xShutdown() method may be NULL.
+**
+** ^SQLite automatically serializes calls to the xInit method,
+** so the xInit method need not be threadsafe.  ^The
+** xShutdown method is only called from [sqlite3_shutdown()] so it does
+** not need to be threadsafe either.  All other methods must be threadsafe
+** in multithreaded applications.
+**
+** ^SQLite will never invoke xInit() more than once without an intervening
+** call to xShutdown().
+**
+** [[the xCreate() page cache methods]]
+** ^SQLite invokes the xCreate() method to construct a new cache instance.
+** SQLite will typically create one cache instance for each open database file,
+** though this is not guaranteed. ^The
+** first parameter, szPage, is the size in bytes of the pages that must
+** be allocated by the cache.  ^szPage will always a power of two.  ^The
+** second parameter szExtra is a number of bytes of extra storage
+** associated with each page cache entry.  ^The szExtra parameter will
+** a number less than 250.  SQLite will use the
+** extra szExtra bytes on each page to store metadata about the underlying
+** database page on disk.  The value passed into szExtra depends
+** on the SQLite version, the target platform, and how SQLite was compiled.
+** ^The third argument to xCreate(), bPurgeable, is true if the cache being
+** created will be used to cache database pages of a file stored on disk, or
+** false if it is used for an in-memory database. The cache implementation
+** does not have to do anything special based with the value of bPurgeable;
+** it is purely advisory.  ^On a cache where bPurgeable is false, SQLite will
+** never invoke xUnpin() except to deliberately delete a page.
+** ^In other words, calls to xUnpin() on a cache with bPurgeable set to
+** false will always have the "discard" flag set to true.
+** ^Hence, a cache created with bPurgeable false will
+** never contain any unpinned pages.
+**
+** [[the xCachesize() page cache method]]
+** ^(The xCachesize() method may be called at any time by SQLite to set the
+** suggested maximum cache-size (number of pages stored by) the cache
+** instance passed as the first argument. This is the value configured using
+** the SQLite "[PRAGMA cache_size]" command.)^  As with the bPurgeable
+** parameter, the implementation is not required to do anything with this
+** value; it is advisory only.
+**
+** [[the xPagecount() page cache methods]]
+** The xPagecount() method must return the number of pages currently
+** stored in the cache, both pinned and unpinned.
+**
+** [[the xFetch() page cache methods]]
+** The xFetch() method locates a page in the cache and returns a pointer to
+** an sqlite3_pcache_page object associated with that page, or a NULL pointer.
+** The pBuf element of the returned sqlite3_pcache_page object will be a
+** pointer to a buffer of szPage bytes used to store the content of a
+** single database page.  The pExtra element of sqlite3_pcache_page will be
+** a pointer to the szExtra bytes of extra storage that SQLite has requested
+** for each entry in the page cache.
+**
+** The page to be fetched is determined by the key. ^The minimum key value
+** is 1.  After it has been retrieved using xFetch, the page is considered
+** to be "pinned".
+**
+** If the requested page is already in the page cache, then the page cache
+** implementation must return a pointer to the page buffer with its content
+** intact.  If the requested page is not already in the cache, then the
+** cache implementation should use the value of the createFlag
+** parameter to help it determined what action to take:
+**
+** <table border=1 width=85% align=center>
+** <tr><th> createFlag <th> Behavior when page is not already in cache
+** <tr><td> 0 <td> Do not allocate a new page.  Return NULL.
+** <tr><td> 1 <td> Allocate a new page if it easy and convenient to do so.
+**                 Otherwise return NULL.
+** <tr><td> 2 <td> Make every effort to allocate a new page.  Only return
+**                 NULL if allocating a new page is effectively impossible.
+** </table>
+**
+** ^(SQLite will normally invoke xFetch() with a createFlag of 0 or 1.  SQLite
+** will only use a createFlag of 2 after a prior call with a createFlag of 1
+** failed.)^  In between the xFetch() calls, SQLite may
+** attempt to unpin one or more cache pages by spilling the content of
+** pinned pages to disk and synching the operating system disk cache.
+**
+** [[the xUnpin() page cache method]]
+** ^xUnpin() is called by SQLite with a pointer to a currently pinned page
+** as its second argument.  If the third parameter, discard, is non-zero,
+** then the page must be evicted from the cache.
+** ^If the discard parameter is
+** zero, then the page may be discarded or retained at the discretion of
+** page cache implementation. ^The page cache implementation
+** may choose to evict unpinned pages at any time.
+**
+** The cache must not perform any reference counting. A single
+** call to xUnpin() unpins the page regardless of the number of prior calls
+** to xFetch().
+**
+** [[the xRekey() page cache methods]]
+** The xRekey() method is used to change the key value associated with the
+** page passed as the second argument. If the cache
+** previously contains an entry associated with newKey, it must be
+** discarded. ^Any prior cache entry associated with newKey is guaranteed not
+** to be pinned.
+**
+** When SQLite calls the xTruncate() method, the cache must discard all
+** existing cache entries with page numbers (keys) greater than or equal
+** to the value of the iLimit parameter passed to xTruncate(). If any
+** of these pages are pinned, they are implicitly unpinned, meaning that
+** they can be safely discarded.
+**
+** [[the xDestroy() page cache method]]
+** ^The xDestroy() method is used to delete a cache allocated by xCreate().
+** All resources associated with the specified cache should be freed. ^After
+** calling the xDestroy() method, SQLite considers the [sqlite3_pcache*]
+** handle invalid, and will not use it with any other sqlite3_pcache_methods2
+** functions.
+**
+** [[the xShrink() page cache method]]
+** ^SQLite invokes the xShrink() method when it wants the page cache to
+** free up as much of heap memory as possible.  The page cache implementation
+** is not obligated to free any memory, but well-behaved implementations should
+** do their best.
+*/
+typedef struct sqlite3_pcache_methods2 sqlite3_pcache_methods2;
+struct sqlite3_pcache_methods2 {
+  int iVersion;
+  void *pArg;
+  int (*xInit)(void*);
+  void (*xShutdown)(void*);
+  sqlite3_pcache *(*xCreate)(int szPage, int szExtra, int bPurgeable);
+  void (*xCachesize)(sqlite3_pcache*, int nCachesize);
+  int (*xPagecount)(sqlite3_pcache*);
+  sqlite3_pcache_page *(*xFetch)(sqlite3_pcache*, unsigned key, int createFlag);
+  void (*xUnpin)(sqlite3_pcache*, sqlite3_pcache_page*, int discard);
+  void (*xRekey)(sqlite3_pcache*, sqlite3_pcache_page*,
+      unsigned oldKey, unsigned newKey);
+  void (*xTruncate)(sqlite3_pcache*, unsigned iLimit);
+  void (*xDestroy)(sqlite3_pcache*);
+  void (*xShrink)(sqlite3_pcache*);
+};
+
+/*
+** This is the obsolete pcache_methods object that has now been replaced
+** by sqlite3_pcache_methods2.  This object is not used by SQLite.  It is
+** retained in the header file for backwards compatibility only.
+*/
+typedef struct sqlite3_pcache_methods sqlite3_pcache_methods;
+struct sqlite3_pcache_methods {
+  void *pArg;
+  int (*xInit)(void*);
+  void (*xShutdown)(void*);
+  sqlite3_pcache *(*xCreate)(int szPage, int bPurgeable);
+  void (*xCachesize)(sqlite3_pcache*, int nCachesize);
+  int (*xPagecount)(sqlite3_pcache*);
+  void *(*xFetch)(sqlite3_pcache*, unsigned key, int createFlag);
+  void (*xUnpin)(sqlite3_pcache*, void*, int discard);
+  void (*xRekey)(sqlite3_pcache*, void*, unsigned oldKey, unsigned newKey);
+  void (*xTruncate)(sqlite3_pcache*, unsigned iLimit);
+  void (*xDestroy)(sqlite3_pcache*);
+};
+
+
+/*
+** CAPI3REF: Online Backup Object
+**
+** The sqlite3_backup object records state information about an ongoing
+** online backup operation.  ^The sqlite3_backup object is created by
+** a call to [sqlite3_backup_init()] and is destroyed by a call to
+** [sqlite3_backup_finish()].
+**
+** See Also: [Using the SQLite Online Backup API]
+*/
+typedef struct sqlite3_backup sqlite3_backup;
+
+/*
+** CAPI3REF: Online Backup API.
+**
+** The backup API copies the content of one database into another.
+** It is useful either for creating backups of databases or
+** for copying in-memory databases to or from persistent files.
+**
+** See Also: [Using the SQLite Online Backup API]
+**
+** ^SQLite holds a write transaction open on the destination database file
+** for the duration of the backup operation.
+** ^The source database is read-locked only while it is being read;
+** it is not locked continuously for the entire backup operation.
+** ^Thus, the backup may be performed on a live source database without
+** preventing other database connections from
+** reading or writing to the source database while the backup is underway.
+**
+** ^(To perform a backup operation:
+**   <ol>
+**     <li><b>sqlite3_backup_init()</b> is called once to initialize the
+**         backup,
+**     <li><b>sqlite3_backup_step()</b> is called one or more times to transfer
+**         the data between the two databases, and finally
+**     <li><b>sqlite3_backup_finish()</b> is called to release all resources
+**         associated with the backup operation.
+**   </ol>)^
+** There should be exactly one call to sqlite3_backup_finish() for each
+** successful call to sqlite3_backup_init().
+**
+** [[sqlite3_backup_init()]] <b>sqlite3_backup_init()</b>
+**
+** ^The D and N arguments to sqlite3_backup_init(D,N,S,M) are the
+** [database connection] associated with the destination database
+** and the database name, respectively.
+** ^The database name is "main" for the main database, "temp" for the
+** temporary database, or the name specified after the AS keyword in
+** an [ATTACH] statement for an attached database.
+** ^The S and M arguments passed to
+** sqlite3_backup_init(D,N,S,M) identify the [database connection]
+** and database name of the source database, respectively.
+** ^The source and destination [database connections] (parameters S and D)
+** must be different or else sqlite3_backup_init(D,N,S,M) will fail with
+** an error.
+**
+** ^A call to sqlite3_backup_init() will fail, returning NULL, if
+** there is already a read or read-write transaction open on the
+** destination database.
+**
+** ^If an error occurs within sqlite3_backup_init(D,N,S,M), then NULL is
+** returned and an error code and error message are stored in the
+** destination [database connection] D.
+** ^The error code and message for the failed call to sqlite3_backup_init()
+** can be retrieved using the [sqlite3_errcode()], [sqlite3_errmsg()], and/or
+** [sqlite3_errmsg16()] functions.
+** ^A successful call to sqlite3_backup_init() returns a pointer to an
+** [sqlite3_backup] object.
+** ^The [sqlite3_backup] object may be used with the sqlite3_backup_step() and
+** sqlite3_backup_finish() functions to perform the specified backup
+** operation.
+**
+** [[sqlite3_backup_step()]] <b>sqlite3_backup_step()</b>
+**
+** ^Function sqlite3_backup_step(B,N) will copy up to N pages between
+** the source and destination databases specified by [sqlite3_backup] object B.
+** ^If N is negative, all remaining source pages are copied.
+** ^If sqlite3_backup_step(B,N) successfully copies N pages and there
+** are still more pages to be copied, then the function returns [SQLITE_OK].
+** ^If sqlite3_backup_step(B,N) successfully finishes copying all pages
+** from source to destination, then it returns [SQLITE_DONE].
+** ^If an error occurs while running sqlite3_backup_step(B,N),
+** then an [error code] is returned. ^As well as [SQLITE_OK] and
+** [SQLITE_DONE], a call to sqlite3_backup_step() may return [SQLITE_READONLY],
+** [SQLITE_NOMEM], [SQLITE_BUSY], [SQLITE_LOCKED], or an
+** [SQLITE_IOERR_ACCESS | SQLITE_IOERR_XXX] extended error code.
+**
+** ^(The sqlite3_backup_step() might return [SQLITE_READONLY] if
+** <ol>
+** <li> the destination database was opened read-only, or
+** <li> the destination database is using write-ahead-log journaling
+** and the destination and source page sizes differ, or
+** <li> the destination database is an in-memory database and the
+** destination and source page sizes differ.
+** </ol>)^
+**
+** ^If sqlite3_backup_step() cannot obtain a required file-system lock, then
+** the [sqlite3_busy_handler | busy-handler function]
+** is invoked (if one is specified). ^If the
+** busy-handler returns non-zero before the lock is available, then
+** [SQLITE_BUSY] is returned to the caller. ^In this case the call to
+** sqlite3_backup_step() can be retried later. ^If the source
+** [database connection]
+** is being used to write to the source database when sqlite3_backup_step()
+** is called, then [SQLITE_LOCKED] is returned immediately. ^Again, in this
+** case the call to sqlite3_backup_step() can be retried later on. ^(If
+** [SQLITE_IOERR_ACCESS | SQLITE_IOERR_XXX], [SQLITE_NOMEM], or
+** [SQLITE_READONLY] is returned, then
+** there is no point in retrying the call to sqlite3_backup_step(). These
+** errors are considered fatal.)^  The application must accept
+** that the backup operation has failed and pass the backup operation handle
+** to the sqlite3_backup_finish() to release associated resources.
+**
+** ^The first call to sqlite3_backup_step() obtains an exclusive lock
+** on the destination file. ^The exclusive lock is not released until either
+** sqlite3_backup_finish() is called or the backup operation is complete
+** and sqlite3_backup_step() returns [SQLITE_DONE].  ^Every call to
+** sqlite3_backup_step() obtains a [shared lock] on the source database that
+** lasts for the duration of the sqlite3_backup_step() call.
+** ^Because the source database is not locked between calls to
+** sqlite3_backup_step(), the source database may be modified mid-way
+** through the backup process.  ^If the source database is modified by an
+** external process or via a database connection other than the one being
+** used by the backup operation, then the backup will be automatically
+** restarted by the next call to sqlite3_backup_step(). ^If the source
+** database is modified by the using the same database connection as is used
+** by the backup operation, then the backup database is automatically
+** updated at the same time.
+**
+** [[sqlite3_backup_finish()]] <b>sqlite3_backup_finish()</b>
+**
+** When sqlite3_backup_step() has returned [SQLITE_DONE], or when the
+** application wishes to abandon the backup operation, the application
+** should destroy the [sqlite3_backup] by passing it to sqlite3_backup_finish().
+** ^The sqlite3_backup_finish() interfaces releases all
+** resources associated with the [sqlite3_backup] object.
+** ^If sqlite3_backup_step() has not yet returned [SQLITE_DONE], then any
+** active write-transaction on the destination database is rolled back.
+** The [sqlite3_backup] object is invalid
+** and may not be used following a call to sqlite3_backup_finish().
+**
+** ^The value returned by sqlite3_backup_finish is [SQLITE_OK] if no
+** sqlite3_backup_step() errors occurred, regardless or whether or not
+** sqlite3_backup_step() completed.
+** ^If an out-of-memory condition or IO error occurred during any prior
+** sqlite3_backup_step() call on the same [sqlite3_backup] object, then
+** sqlite3_backup_finish() returns the corresponding [error code].
+**
+** ^A return of [SQLITE_BUSY] or [SQLITE_LOCKED] from sqlite3_backup_step()
+** is not a permanent error and does not affect the return value of
+** sqlite3_backup_finish().
+**
+** [[sqlite3_backup_remaining()]] [[sqlite3_backup_pagecount()]]
+** <b>sqlite3_backup_remaining() and sqlite3_backup_pagecount()</b>
+**
+** ^The sqlite3_backup_remaining() routine returns the number of pages still
+** to be backed up at the conclusion of the most recent sqlite3_backup_step().
+** ^The sqlite3_backup_pagecount() routine returns the total number of pages
+** in the source database at the conclusion of the most recent
+** sqlite3_backup_step().
+** ^(The values returned by these functions are only updated by
+** sqlite3_backup_step(). If the source database is modified in a way that
+** changes the size of the source database or the number of pages remaining,
+** those changes are not reflected in the output of sqlite3_backup_pagecount()
+** and sqlite3_backup_remaining() until after the next
+** sqlite3_backup_step().)^
+**
+** <b>Concurrent Usage of Database Handles</b>
+**
+** ^The source [database connection] may be used by the application for other
+** purposes while a backup operation is underway or being initialized.
+** ^If SQLite is compiled and configured to support threadsafe database
+** connections, then the source database connection may be used concurrently
+** from within other threads.
+**
+** However, the application must guarantee that the destination
+** [database connection] is not passed to any other API (by any thread) after
+** sqlite3_backup_init() is called and before the corresponding call to
+** sqlite3_backup_finish().  SQLite does not currently check to see
+** if the application incorrectly accesses the destination [database connection]
+** and so no error code is reported, but the operations may malfunction
+** nevertheless.  Use of the destination database connection while a
+** backup is in progress might also cause a mutex deadlock.
+**
+** If running in [shared cache mode], the application must
+** guarantee that the shared cache used by the destination database
+** is not accessed while the backup is running. In practice this means
+** that the application must guarantee that the disk file being
+** backed up to is not accessed by any connection within the process,
+** not just the specific connection that was passed to sqlite3_backup_init().
+**
+** The [sqlite3_backup] object itself is partially threadsafe. Multiple
+** threads may safely make multiple concurrent calls to sqlite3_backup_step().
+** However, the sqlite3_backup_remaining() and sqlite3_backup_pagecount()
+** APIs are not strictly speaking threadsafe. If they are invoked at the
+** same time as another thread is invoking sqlite3_backup_step() it is
+** possible that they return invalid values.
+**
+** <b>Alternatives To Using The Backup API</b>
+**
+** Other techniques for safely creating a consistent backup of an SQLite
+** database include:
+**
+** <ul>
+** <li> The [VACUUM INTO] command.
+** <li> The [sqlite3_rsync] utility program.
+** </ul>
+*/
+SQLITE_API sqlite3_backup *sqlite3_backup_init(
+  sqlite3 *pDest,                        /* Destination database handle */
+  const char *zDestName,                 /* Destination database name */
+  sqlite3 *pSource,                      /* Source database handle */
+  const char *zSourceName                /* Source database name */
+);
+SQLITE_API int sqlite3_backup_step(sqlite3_backup *p, int nPage);
+SQLITE_API int sqlite3_backup_finish(sqlite3_backup *p);
+SQLITE_API int sqlite3_backup_remaining(sqlite3_backup *p);
+SQLITE_API int sqlite3_backup_pagecount(sqlite3_backup *p);
+
+/*
+** CAPI3REF: Unlock Notification
+** METHOD: sqlite3
+**
+** ^When running in shared-cache mode, a database operation may fail with
+** an [SQLITE_LOCKED] error if the required locks on the shared-cache or
+** individual tables within the shared-cache cannot be obtained. See
+** [SQLite Shared-Cache Mode] for a description of shared-cache locking.
+** ^This API may be used to register a callback that SQLite will invoke
+** when the connection currently holding the required lock relinquishes it.
+** ^This API is only available if the library was compiled with the
+** [SQLITE_ENABLE_UNLOCK_NOTIFY] C-preprocessor symbol defined.
+**
+** See Also: [Using the SQLite Unlock Notification Feature].
+**
+** ^Shared-cache locks are released when a database connection concludes
+** its current transaction, either by committing it or rolling it back.
+**
+** ^When a connection (known as the blocked connection) fails to obtain a
+** shared-cache lock and SQLITE_LOCKED is returned to the caller, the
+** identity of the database connection (the blocking connection) that
+** has locked the required resource is stored internally. ^After an
+** application receives an SQLITE_LOCKED error, it may call the
+** sqlite3_unlock_notify() method with the blocked connection handle as
+** the first argument to register for a callback that will be invoked
+** when the blocking connections current transaction is concluded. ^The
+** callback is invoked from within the [sqlite3_step] or [sqlite3_close]
+** call that concludes the blocking connection's transaction.
+**
+** ^(If sqlite3_unlock_notify() is called in a multi-threaded application,
+** there is a chance that the blocking connection will have already
+** concluded its transaction by the time sqlite3_unlock_notify() is invoked.
+** If this happens, then the specified callback is invoked immediately,
+** from within the call to sqlite3_unlock_notify().)^
+**
+** ^If the blocked connection is attempting to obtain a write-lock on a
+** shared-cache table, and more than one other connection currently holds
+** a read-lock on the same table, then SQLite arbitrarily selects one of
+** the other connections to use as the blocking connection.
+**
+** ^(There may be at most one unlock-notify callback registered by a
+** blocked connection. If sqlite3_unlock_notify() is called when the
+** blocked connection already has a registered unlock-notify callback,
+** then the new callback replaces the old.)^ ^If sqlite3_unlock_notify() is
+** called with a NULL pointer as its second argument, then any existing
+** unlock-notify callback is canceled. ^The blocked connections
+** unlock-notify callback may also be canceled by closing the blocked
+** connection using [sqlite3_close()].
+**
+** The unlock-notify callback is not reentrant. If an application invokes
+** any sqlite3_xxx API functions from within an unlock-notify callback, a
+** crash or deadlock may be the result.
+**
+** ^Unless deadlock is detected (see below), sqlite3_unlock_notify() always
+** returns SQLITE_OK.
+**
+** <b>Callback Invocation Details</b>
+**
+** When an unlock-notify callback is registered, the application provides a
+** single void* pointer that is passed to the callback when it is invoked.
+** However, the signature of the callback function allows SQLite to pass
+** it an array of void* context pointers. The first argument passed to
+** an unlock-notify callback is a pointer to an array of void* pointers,
+** and the second is the number of entries in the array.
+**
+** When a blocking connection's transaction is concluded, there may be
+** more than one blocked connection that has registered for an unlock-notify
+** callback. ^If two or more such blocked connections have specified the
+** same callback function, then instead of invoking the callback function
+** multiple times, it is invoked once with the set of void* context pointers
+** specified by the blocked connections bundled together into an array.
+** This gives the application an opportunity to prioritize any actions
+** related to the set of unblocked database connections.
+**
+** <b>Deadlock Detection</b>
+**
+** Assuming that after registering for an unlock-notify callback a
+** database waits for the callback to be issued before taking any further
+** action (a reasonable assumption), then using this API may cause the
+** application to deadlock. For example, if connection X is waiting for
+** connection Y's transaction to be concluded, and similarly connection
+** Y is waiting on connection X's transaction, then neither connection
+** will proceed and the system may remain deadlocked indefinitely.
+**
+** To avoid this scenario, the sqlite3_unlock_notify() performs deadlock
+** detection. ^If a given call to sqlite3_unlock_notify() would put the
+** system in a deadlocked state, then SQLITE_LOCKED is returned and no
+** unlock-notify callback is registered. The system is said to be in
+** a deadlocked state if connection A has registered for an unlock-notify
+** callback on the conclusion of connection B's transaction, and connection
+** B has itself registered for an unlock-notify callback when connection
+** A's transaction is concluded. ^Indirect deadlock is also detected, so
+** the system is also considered to be deadlocked if connection B has
+** registered for an unlock-notify callback on the conclusion of connection
+** C's transaction, where connection C is waiting on connection A. ^Any
+** number of levels of indirection are allowed.
+**
+** <b>The "DROP TABLE" Exception</b>
+**
+** When a call to [sqlite3_step()] returns SQLITE_LOCKED, it is almost
+** always appropriate to call sqlite3_unlock_notify(). There is however,
+** one exception. When executing a "DROP TABLE" or "DROP INDEX" statement,
+** SQLite checks if there are any currently executing SELECT statements
+** that belong to the same connection. If there are, SQLITE_LOCKED is
+** returned. In this case there is no "blocking connection", so invoking
+** sqlite3_unlock_notify() results in the unlock-notify callback being
+** invoked immediately. If the application then re-attempts the "DROP TABLE"
+** or "DROP INDEX" query, an infinite loop might be the result.
+**
+** One way around this problem is to check the extended error code returned
+** by an sqlite3_step() call. ^(If there is a blocking connection, then the
+** extended error code is set to SQLITE_LOCKED_SHAREDCACHE. Otherwise, in
+** the special "DROP TABLE/INDEX" case, the extended error code is just
+** SQLITE_LOCKED.)^
+*/
+SQLITE_API int sqlite3_unlock_notify(
+  sqlite3 *pBlocked,                          /* Waiting connection */
+  void (*xNotify)(void **apArg, int nArg),    /* Callback function to invoke */
+  void *pNotifyArg                            /* Argument to pass to xNotify */
+);
+
+
+/*
+** CAPI3REF: String Comparison
+**
+** ^The [sqlite3_stricmp()] and [sqlite3_strnicmp()] APIs allow applications
+** and extensions to compare the contents of two buffers containing UTF-8
+** strings in a case-independent fashion, using the same definition of "case
+** independence" that SQLite uses internally when comparing identifiers.
+*/
+SQLITE_API int sqlite3_stricmp(const char *, const char *);
+SQLITE_API int sqlite3_strnicmp(const char *, const char *, int);
+
+/*
+** CAPI3REF: String Globbing
+*
+** ^The [sqlite3_strglob(P,X)] interface returns zero if and only if
+** string X matches the [GLOB] pattern P.
+** ^The definition of [GLOB] pattern matching used in
+** [sqlite3_strglob(P,X)] is the same as for the "X GLOB P" operator in the
+** SQL dialect understood by SQLite.  ^The [sqlite3_strglob(P,X)] function
+** is case sensitive.
+**
+** Note that this routine returns zero on a match and non-zero if the strings
+** do not match, the same as [sqlite3_stricmp()] and [sqlite3_strnicmp()].
+**
+** See also: [sqlite3_strlike()].
+*/
+SQLITE_API int sqlite3_strglob(const char *zGlob, const char *zStr);
+
+/*
+** CAPI3REF: String LIKE Matching
+*
+** ^The [sqlite3_strlike(P,X,E)] interface returns zero if and only if
+** string X matches the [LIKE] pattern P with escape character E.
+** ^The definition of [LIKE] pattern matching used in
+** [sqlite3_strlike(P,X,E)] is the same as for the "X LIKE P ESCAPE E"
+** operator in the SQL dialect understood by SQLite.  ^For "X LIKE P" without
+** the ESCAPE clause, set the E parameter of [sqlite3_strlike(P,X,E)] to 0.
+** ^As with the LIKE operator, the [sqlite3_strlike(P,X,E)] function is case
+** insensitive - equivalent upper and lower case ASCII characters match
+** one another.
+**
+** ^The [sqlite3_strlike(P,X,E)] function matches Unicode characters, though
+** only ASCII characters are case folded.
+**
+** Note that this routine returns zero on a match and non-zero if the strings
+** do not match, the same as [sqlite3_stricmp()] and [sqlite3_strnicmp()].
+**
+** See also: [sqlite3_strglob()].
+*/
+SQLITE_API int sqlite3_strlike(const char *zGlob, const char *zStr, unsigned int cEsc);
+
+/*
+** CAPI3REF: Error Logging Interface
+**
+** ^The [sqlite3_log()] interface writes a message into the [error log]
+** established by the [SQLITE_CONFIG_LOG] option to [sqlite3_config()].
+** ^If logging is enabled, the zFormat string and subsequent arguments are
+** used with [sqlite3_snprintf()] to generate the final output string.
+**
+** The sqlite3_log() interface is intended for use by extensions such as
+** virtual tables, collating functions, and SQL functions.  While there is
+** nothing to prevent an application from calling sqlite3_log(), doing so
+** is considered bad form.
+**
+** The zFormat string must not be NULL.
+**
+** To avoid deadlocks and other threading problems, the sqlite3_log() routine
+** will not use dynamically allocated memory.  The log message is stored in
+** a fixed-length buffer on the stack.  If the log message is longer than
+** a few hundred characters, it will be truncated to the length of the
+** buffer.
+*/
+SQLITE_API void sqlite3_log(int iErrCode, const char *zFormat, ...);
+
+/*
+** CAPI3REF: Write-Ahead Log Commit Hook
+** METHOD: sqlite3
+**
+** ^The [sqlite3_wal_hook()] function is used to register a callback that
+** is invoked each time data is committed to a database in wal mode.
+**
+** ^(The callback is invoked by SQLite after the commit has taken place and
+** the associated write-lock on the database released)^, so the implementation
+** may read, write or [checkpoint] the database as required.
+**
+** ^The first parameter passed to the callback function when it is invoked
+** is a copy of the third parameter passed to sqlite3_wal_hook() when
+** registering the callback. ^The second is a copy of the database handle.
+** ^The third parameter is the name of the database that was written to -
+** either "main" or the name of an [ATTACH]-ed database. ^The fourth parameter
+** is the number of pages currently in the write-ahead log file,
+** including those that were just committed.
+**
+** The callback function should normally return [SQLITE_OK].  ^If an error
+** code is returned, that error will propagate back up through the
+** SQLite code base to cause the statement that provoked the callback
+** to report an error, though the commit will have still occurred. If the
+** callback returns [SQLITE_ROW] or [SQLITE_DONE], or if it returns a value
+** that does not correspond to any valid SQLite error code, the results
+** are undefined.
+**
+** A single database handle may have at most a single write-ahead log callback
+** registered at one time. ^Calling [sqlite3_wal_hook()] replaces any
+** previously registered write-ahead log callback. ^The return value is
+** a copy of the third parameter from the previous call, if any, or 0.
+** ^Note that the [sqlite3_wal_autocheckpoint()] interface and the
+** [wal_autocheckpoint pragma] both invoke [sqlite3_wal_hook()] and will
+** overwrite any prior [sqlite3_wal_hook()] settings.
+*/
+SQLITE_API void *sqlite3_wal_hook(
+  sqlite3*,
+  int(*)(void *,sqlite3*,const char*,int),
+  void*
+);
+
+/*
+** CAPI3REF: Configure an auto-checkpoint
+** METHOD: sqlite3
+**
+** ^The [sqlite3_wal_autocheckpoint(D,N)] is a wrapper around
+** [sqlite3_wal_hook()] that causes any database on [database connection] D
+** to automatically [checkpoint]
+** after committing a transaction if there are N or
+** more frames in the [write-ahead log] file.  ^Passing zero or
+** a negative value as the nFrame parameter disables automatic
+** checkpoints entirely.
+**
+** ^The callback registered by this function replaces any existing callback
+** registered using [sqlite3_wal_hook()].  ^Likewise, registering a callback
+** using [sqlite3_wal_hook()] disables the automatic checkpoint mechanism
+** configured by this function.
+**
+** ^The [wal_autocheckpoint pragma] can be used to invoke this interface
+** from SQL.
+**
+** ^Checkpoints initiated by this mechanism are
+** [sqlite3_wal_checkpoint_v2|PASSIVE].
+**
+** ^Every new [database connection] defaults to having the auto-checkpoint
+** enabled with a threshold of 1000 or [SQLITE_DEFAULT_WAL_AUTOCHECKPOINT]
+** pages.  The use of this interface
+** is only necessary if the default setting is found to be suboptimal
+** for a particular application.
+*/
+SQLITE_API int sqlite3_wal_autocheckpoint(sqlite3 *db, int N);
+
+/*
+** CAPI3REF: Checkpoint a database
+** METHOD: sqlite3
+**
+** ^(The sqlite3_wal_checkpoint(D,X) is equivalent to
+** [sqlite3_wal_checkpoint_v2](D,X,[SQLITE_CHECKPOINT_PASSIVE],0,0).)^
+**
+** In brief, sqlite3_wal_checkpoint(D,X) causes the content in the
+** [write-ahead log] for database X on [database connection] D to be
+** transferred into the database file and for the write-ahead log to
+** be reset.  See the [checkpointing] documentation for addition
+** information.
+**
+** This interface used to be the only way to cause a checkpoint to
+** occur.  But then the newer and more powerful [sqlite3_wal_checkpoint_v2()]
+** interface was added.  This interface is retained for backwards
+** compatibility and as a convenience for applications that need to manually
+** start a callback but which do not need the full power (and corresponding
+** complication) of [sqlite3_wal_checkpoint_v2()].
+*/
+SQLITE_API int sqlite3_wal_checkpoint(sqlite3 *db, const char *zDb);
+
+/*
+** CAPI3REF: Checkpoint a database
+** METHOD: sqlite3
+**
+** ^(The sqlite3_wal_checkpoint_v2(D,X,M,L,C) interface runs a checkpoint
+** operation on database X of [database connection] D in mode M.  Status
+** information is written back into integers pointed to by L and C.)^
+** ^(The M parameter must be a valid [checkpoint mode]:)^
+**
+** <dl>
+** <dt>SQLITE_CHECKPOINT_PASSIVE<dd>
+**   ^Checkpoint as many frames as possible without waiting for any database
+**   readers or writers to finish, then sync the database file if all frames
+**   in the log were checkpointed. ^The [busy-handler callback]
+**   is never invoked in the SQLITE_CHECKPOINT_PASSIVE mode.
+**   ^On the other hand, passive mode might leave the checkpoint unfinished
+**   if there are concurrent readers or writers.
+**
+** <dt>SQLITE_CHECKPOINT_FULL<dd>
+**   ^This mode blocks (it invokes the
+**   [sqlite3_busy_handler|busy-handler callback]) until there is no
+**   database writer and all readers are reading from the most recent database
+**   snapshot. ^It then checkpoints all frames in the log file and syncs the
+**   database file. ^This mode blocks new database writers while it is pending,
+**   but new database readers are allowed to continue unimpeded.
+**
+** <dt>SQLITE_CHECKPOINT_RESTART<dd>
+**   ^This mode works the same way as SQLITE_CHECKPOINT_FULL with the addition
+**   that after checkpointing the log file it blocks (calls the
+**   [busy-handler callback])
+**   until all readers are reading from the database file only. ^This ensures
+**   that the next writer will restart the log file from the beginning.
+**   ^Like SQLITE_CHECKPOINT_FULL, this mode blocks new
+**   database writer attempts while it is pending, but does not impede readers.
+**
+** <dt>SQLITE_CHECKPOINT_TRUNCATE<dd>
+**   ^This mode works the same way as SQLITE_CHECKPOINT_RESTART with the
+**   addition that it also truncates the log file to zero bytes just prior
+**   to a successful return.
+** </dl>
+**
+** ^If pnLog is not NULL, then *pnLog is set to the total number of frames in
+** the log file or to -1 if the checkpoint could not run because
+** of an error or because the database is not in [WAL mode]. ^If pnCkpt is not
+** NULL,then *pnCkpt is set to the total number of checkpointed frames in the
+** log file (including any that were already checkpointed before the function
+** was called) or to -1 if the checkpoint could not run due to an error or
+** because the database is not in WAL mode. ^Note that upon successful
+** completion of an SQLITE_CHECKPOINT_TRUNCATE, the log file will have been
+** truncated to zero bytes and so both *pnLog and *pnCkpt will be set to zero.
+**
+** ^All calls obtain an exclusive "checkpoint" lock on the database file. ^If
+** any other process is running a checkpoint operation at the same time, the
+** lock cannot be obtained and SQLITE_BUSY is returned. ^Even if there is a
+** busy-handler configured, it will not be invoked in this case.
+**
+** ^The SQLITE_CHECKPOINT_FULL, RESTART and TRUNCATE modes also obtain the
+** exclusive "writer" lock on the database file. ^If the writer lock cannot be
+** obtained immediately, and a busy-handler is configured, it is invoked and
+** the writer lock retried until either the busy-handler returns 0 or the lock
+** is successfully obtained. ^The busy-handler is also invoked while waiting for
+** database readers as described above. ^If the busy-handler returns 0 before
+** the writer lock is obtained or while waiting for database readers, the
+** checkpoint operation proceeds from that point in the same way as
+** SQLITE_CHECKPOINT_PASSIVE - checkpointing as many frames as possible
+** without blocking any further. ^SQLITE_BUSY is returned in this case.
+**
+** ^If parameter zDb is NULL or points to a zero length string, then the
+** specified operation is attempted on all WAL databases [attached] to
+** [database connection] db.  In this case the
+** values written to output parameters *pnLog and *pnCkpt are undefined. ^If
+** an SQLITE_BUSY error is encountered when processing one or more of the
+** attached WAL databases, the operation is still attempted on any remaining
+** attached databases and SQLITE_BUSY is returned at the end. ^If any other
+** error occurs while processing an attached database, processing is abandoned
+** and the error code is returned to the caller immediately. ^If no error
+** (SQLITE_BUSY or otherwise) is encountered while processing the attached
+** databases, SQLITE_OK is returned.
+**
+** ^If database zDb is the name of an attached database that is not in WAL
+** mode, SQLITE_OK is returned and both *pnLog and *pnCkpt set to -1. ^If
+** zDb is not NULL (or a zero length string) and is not the name of any
+** attached database, SQLITE_ERROR is returned to the caller.
+**
+** ^Unless it returns SQLITE_MISUSE,
+** the sqlite3_wal_checkpoint_v2() interface
+** sets the error information that is queried by
+** [sqlite3_errcode()] and [sqlite3_errmsg()].
+**
+** ^The [PRAGMA wal_checkpoint] command can be used to invoke this interface
+** from SQL.
+*/
+SQLITE_API int sqlite3_wal_checkpoint_v2(
+  sqlite3 *db,                    /* Database handle */
+  const char *zDb,                /* Name of attached database (or NULL) */
+  int eMode,                      /* SQLITE_CHECKPOINT_* value */
+  int *pnLog,                     /* OUT: Size of WAL log in frames */
+  int *pnCkpt                     /* OUT: Total number of frames checkpointed */
+);
+
+/*
+** CAPI3REF: Checkpoint Mode Values
+** KEYWORDS: {checkpoint mode}
+**
+** These constants define all valid values for the "checkpoint mode" passed
+** as the third parameter to the [sqlite3_wal_checkpoint_v2()] interface.
+** See the [sqlite3_wal_checkpoint_v2()] documentation for details on the
+** meaning of each of these checkpoint modes.
+*/
+#define SQLITE_CHECKPOINT_PASSIVE  0  /* Do as much as possible w/o blocking */
+#define SQLITE_CHECKPOINT_FULL     1  /* Wait for writers, then checkpoint */
+#define SQLITE_CHECKPOINT_RESTART  2  /* Like FULL but wait for readers */
+#define SQLITE_CHECKPOINT_TRUNCATE 3  /* Like RESTART but also truncate WAL */
+
+/*
+** CAPI3REF: Virtual Table Interface Configuration
+**
+** This function may be called by either the [xConnect] or [xCreate] method
+** of a [virtual table] implementation to configure
+** various facets of the virtual table interface.
+**
+** If this interface is invoked outside the context of an xConnect or
+** xCreate virtual table method then the behavior is undefined.
+**
+** In the call sqlite3_vtab_config(D,C,...) the D parameter is the
+** [database connection] in which the virtual table is being created and
+** which is passed in as the first argument to the [xConnect] or [xCreate]
+** method that is invoking sqlite3_vtab_config().  The C parameter is one
+** of the [virtual table configuration options].  The presence and meaning
+** of parameters after C depend on which [virtual table configuration option]
+** is used.
+*/
+SQLITE_API int sqlite3_vtab_config(sqlite3*, int op, ...);
+
+/*
+** CAPI3REF: Virtual Table Configuration Options
+** KEYWORDS: {virtual table configuration options}
+** KEYWORDS: {virtual table configuration option}
+**
+** These macros define the various options to the
+** [sqlite3_vtab_config()] interface that [virtual table] implementations
+** can use to customize and optimize their behavior.
+**
+** <dl>
+** [[SQLITE_VTAB_CONSTRAINT_SUPPORT]]
+** <dt>SQLITE_VTAB_CONSTRAINT_SUPPORT</dt>
+** <dd>Calls of the form
+** [sqlite3_vtab_config](db,SQLITE_VTAB_CONSTRAINT_SUPPORT,X) are supported,
+** where X is an integer.  If X is zero, then the [virtual table] whose
+** [xCreate] or [xConnect] method invoked [sqlite3_vtab_config()] does not
+** support constraints.  In this configuration (which is the default) if
+** a call to the [xUpdate] method returns [SQLITE_CONSTRAINT], then the entire
+** statement is rolled back as if [ON CONFLICT | OR ABORT] had been
+** specified as part of the users SQL statement, regardless of the actual
+** ON CONFLICT mode specified.
+**
+** If X is non-zero, then the virtual table implementation guarantees
+** that if [xUpdate] returns [SQLITE_CONSTRAINT], it will do so before
+** any modifications to internal or persistent data structures have been made.
+** If the [ON CONFLICT] mode is ABORT, FAIL, IGNORE or ROLLBACK, SQLite
+** is able to roll back a statement or database transaction, and abandon
+** or continue processing the current SQL statement as appropriate.
+** If the ON CONFLICT mode is REPLACE and the [xUpdate] method returns
+** [SQLITE_CONSTRAINT], SQLite handles this as if the ON CONFLICT mode
+** had been ABORT.
+**
+** Virtual table implementations that are required to handle OR REPLACE
+** must do so within the [xUpdate] method. If a call to the
+** [sqlite3_vtab_on_conflict()] function indicates that the current ON
+** CONFLICT policy is REPLACE, the virtual table implementation should
+** silently replace the appropriate rows within the xUpdate callback and
+** return SQLITE_OK. Or, if this is not possible, it may return
+** SQLITE_CONSTRAINT, in which case SQLite falls back to OR ABORT
+** constraint handling.
+** </dd>
+**
+** [[SQLITE_VTAB_DIRECTONLY]]<dt>SQLITE_VTAB_DIRECTONLY</dt>
+** <dd>Calls of the form
+** [sqlite3_vtab_config](db,SQLITE_VTAB_DIRECTONLY) from within the
+** the [xConnect] or [xCreate] methods of a [virtual table] implementation
+** prohibits that virtual table from being used from within triggers and
+** views.
+** </dd>
+**
+** [[SQLITE_VTAB_INNOCUOUS]]<dt>SQLITE_VTAB_INNOCUOUS</dt>
+** <dd>Calls of the form
+** [sqlite3_vtab_config](db,SQLITE_VTAB_INNOCUOUS) from within the
+** the [xConnect] or [xCreate] methods of a [virtual table] implementation
+** identify that virtual table as being safe to use from within triggers
+** and views.  Conceptually, the SQLITE_VTAB_INNOCUOUS tag means that the
+** virtual table can do no serious harm even if it is controlled by a
+** malicious hacker.  Developers should avoid setting the SQLITE_VTAB_INNOCUOUS
+** flag unless absolutely necessary.
+** </dd>
+**
+** [[SQLITE_VTAB_USES_ALL_SCHEMAS]]<dt>SQLITE_VTAB_USES_ALL_SCHEMAS</dt>
+** <dd>Calls of the form
+** [sqlite3_vtab_config](db,SQLITE_VTAB_USES_ALL_SCHEMA) from within the
+** the [xConnect] or [xCreate] methods of a [virtual table] implementation
+** instruct the query planner to begin at least a read transaction on
+** all schemas ("main", "temp", and any ATTACH-ed databases) whenever the
+** virtual table is used.
+** </dd>
+** </dl>
+*/
+#define SQLITE_VTAB_CONSTRAINT_SUPPORT 1
+#define SQLITE_VTAB_INNOCUOUS          2
+#define SQLITE_VTAB_DIRECTONLY         3
+#define SQLITE_VTAB_USES_ALL_SCHEMAS   4
+
+/*
+** CAPI3REF: Determine The Virtual Table Conflict Policy
+**
+** This function may only be called from within a call to the [xUpdate] method
+** of a [virtual table] implementation for an INSERT or UPDATE operation. ^The
+** value returned is one of [SQLITE_ROLLBACK], [SQLITE_IGNORE], [SQLITE_FAIL],
+** [SQLITE_ABORT], or [SQLITE_REPLACE], according to the [ON CONFLICT] mode
+** of the SQL statement that triggered the call to the [xUpdate] method of the
+** [virtual table].
+*/
+SQLITE_API int sqlite3_vtab_on_conflict(sqlite3 *);
+
+/*
+** CAPI3REF: Determine If Virtual Table Column Access Is For UPDATE
+**
+** If the sqlite3_vtab_nochange(X) routine is called within the [xColumn]
+** method of a [virtual table], then it might return true if the
+** column is being fetched as part of an UPDATE operation during which the
+** column value will not change.  The virtual table implementation can use
+** this hint as permission to substitute a return value that is less
+** expensive to compute and that the corresponding
+** [xUpdate] method understands as a "no-change" value.
+**
+** If the [xColumn] method calls sqlite3_vtab_nochange() and finds that
+** the column is not changed by the UPDATE statement, then the xColumn
+** method can optionally return without setting a result, without calling
+** any of the [sqlite3_result_int|sqlite3_result_xxxxx() interfaces].
+** In that case, [sqlite3_value_nochange(X)] will return true for the
+** same column in the [xUpdate] method.
+**
+** The sqlite3_vtab_nochange() routine is an optimization.  Virtual table
+** implementations should continue to give a correct answer even if the
+** sqlite3_vtab_nochange() interface were to always return false.  In the
+** current implementation, the sqlite3_vtab_nochange() interface does always
+** returns false for the enhanced [UPDATE FROM] statement.
+*/
+SQLITE_API int sqlite3_vtab_nochange(sqlite3_context*);
+
+/*
+** CAPI3REF: Determine The Collation For a Virtual Table Constraint
+** METHOD: sqlite3_index_info
+**
+** This function may only be called from within a call to the [xBestIndex]
+** method of a [virtual table].  This function returns a pointer to a string
+** that is the name of the appropriate collation sequence to use for text
+** comparisons on the constraint identified by its arguments.
+**
+** The first argument must be the pointer to the [sqlite3_index_info] object
+** that is the first parameter to the xBestIndex() method. The second argument
+** must be an index into the aConstraint[] array belonging to the
+** sqlite3_index_info structure passed to xBestIndex.
+**
+** Important:
+** The first parameter must be the same pointer that is passed into the
+** xBestMethod() method.  The first parameter may not be a pointer to a
+** different [sqlite3_index_info] object, even an exact copy.
+**
+** The return value is computed as follows:
+**
+** <ol>
+** <li><p> If the constraint comes from a WHERE clause expression that contains
+**         a [COLLATE operator], then the name of the collation specified by
+**         that COLLATE operator is returned.
+** <li><p> If there is no COLLATE operator, but the column that is the subject
+**         of the constraint specifies an alternative collating sequence via
+**         a [COLLATE clause] on the column definition within the CREATE TABLE
+**         statement that was passed into [sqlite3_declare_vtab()], then the
+**         name of that alternative collating sequence is returned.
+** <li><p> Otherwise, "BINARY" is returned.
+** </ol>
+*/
+SQLITE_API const char *sqlite3_vtab_collation(sqlite3_index_info*,int);
+
+/*
+** CAPI3REF: Determine if a virtual table query is DISTINCT
+** METHOD: sqlite3_index_info
+**
+** This API may only be used from within an [xBestIndex|xBestIndex method]
+** of a [virtual table] implementation. The result of calling this
+** interface from outside of xBestIndex() is undefined and probably harmful.
+**
+** ^The sqlite3_vtab_distinct() interface returns an integer between 0 and
+** 3.  The integer returned by sqlite3_vtab_distinct()
+** gives the virtual table additional information about how the query
+** planner wants the output to be ordered. As long as the virtual table
+** can meet the ordering requirements of the query planner, it may set
+** the "orderByConsumed" flag.
+**
+** <ol><li value="0"><p>
+** ^If the sqlite3_vtab_distinct() interface returns 0, that means
+** that the query planner needs the virtual table to return all rows in the
+** sort order defined by the "nOrderBy" and "aOrderBy" fields of the
+** [sqlite3_index_info] object.  This is the default expectation.  If the
+** virtual table outputs all rows in sorted order, then it is always safe for
+** the xBestIndex method to set the "orderByConsumed" flag, regardless of
+** the return value from sqlite3_vtab_distinct().
+** <li value="1"><p>
+** ^(If the sqlite3_vtab_distinct() interface returns 1, that means
+** that the query planner does not need the rows to be returned in sorted order
+** as long as all rows with the same values in all columns identified by the
+** "aOrderBy" field are adjacent.)^  This mode is used when the query planner
+** is doing a GROUP BY.
+** <li value="2"><p>
+** ^(If the sqlite3_vtab_distinct() interface returns 2, that means
+** that the query planner does not need the rows returned in any particular
+** order, as long as rows with the same values in all columns identified
+** by "aOrderBy" are adjacent.)^  ^(Furthermore, when two or more rows
+** contain the same values for all columns identified by "colUsed", all but
+** one such row may optionally be omitted from the result.)^
+** The virtual table is not required to omit rows that are duplicates
+** over the "colUsed" columns, but if the virtual table can do that without
+** too much extra effort, it could potentially help the query to run faster.
+** This mode is used for a DISTINCT query.
+** <li value="3"><p>
+** ^(If the sqlite3_vtab_distinct() interface returns 3, that means the
+** virtual table must return rows in the order defined by "aOrderBy" as
+** if the sqlite3_vtab_distinct() interface had returned 0.  However if
+** two or more rows in the result have the same values for all columns
+** identified by "colUsed", then all but one such row may optionally be
+** omitted.)^  Like when the return value is 2, the virtual table
+** is not required to omit rows that are duplicates over the "colUsed"
+** columns, but if the virtual table can do that without
+** too much extra effort, it could potentially help the query to run faster.
+** This mode is used for queries
+** that have both DISTINCT and ORDER BY clauses.
+** </ol>
+**
+** <p>The following table summarizes the conditions under which the
+** virtual table is allowed to set the "orderByConsumed" flag based on
+** the value returned by sqlite3_vtab_distinct().  This table is a
+** restatement of the previous four paragraphs:
+**
+** <table border=1 cellspacing=0 cellpadding=10 width="90%">
+** <tr>
+** <td valign="top">sqlite3_vtab_distinct() return value
+** <td valign="top">Rows are returned in aOrderBy order
+** <td valign="top">Rows with the same value in all aOrderBy columns are adjacent
+** <td valign="top">Duplicates over all colUsed columns may be omitted
+** <tr><td>0<td>yes<td>yes<td>no
+** <tr><td>1<td>no<td>yes<td>no
+** <tr><td>2<td>no<td>yes<td>yes
+** <tr><td>3<td>yes<td>yes<td>yes
+** </table>
+**
+** ^For the purposes of comparing virtual table output values to see if the
+** values are same value for sorting purposes, two NULL values are considered
+** to be the same.  In other words, the comparison operator is "IS"
+** (or "IS NOT DISTINCT FROM") and not "==".
+**
+** If a virtual table implementation is unable to meet the requirements
+** specified above, then it must not set the "orderByConsumed" flag in the
+** [sqlite3_index_info] object or an incorrect answer may result.
+**
+** ^A virtual table implementation is always free to return rows in any order
+** it wants, as long as the "orderByConsumed" flag is not set.  ^When the
+** the "orderByConsumed" flag is unset, the query planner will add extra
+** [bytecode] to ensure that the final results returned by the SQL query are
+** ordered correctly.  The use of the "orderByConsumed" flag and the
+** sqlite3_vtab_distinct() interface is merely an optimization.  ^Careful
+** use of the sqlite3_vtab_distinct() interface and the "orderByConsumed"
+** flag might help queries against a virtual table to run faster.  Being
+** overly aggressive and setting the "orderByConsumed" flag when it is not
+** valid to do so, on the other hand, might cause SQLite to return incorrect
+** results.
+*/
+SQLITE_API int sqlite3_vtab_distinct(sqlite3_index_info*);
+
+/*
+** CAPI3REF: Identify and handle IN constraints in xBestIndex
+**
+** This interface may only be used from within an
+** [xBestIndex|xBestIndex() method] of a [virtual table] implementation.
+** The result of invoking this interface from any other context is
+** undefined and probably harmful.
+**
+** ^(A constraint on a virtual table of the form
+** "[IN operator|column IN (...)]" is
+** communicated to the xBestIndex method as a
+** [SQLITE_INDEX_CONSTRAINT_EQ] constraint.)^  If xBestIndex wants to use
+** this constraint, it must set the corresponding
+** aConstraintUsage[].argvIndex to a positive integer.  ^(Then, under
+** the usual mode of handling IN operators, SQLite generates [bytecode]
+** that invokes the [xFilter|xFilter() method] once for each value
+** on the right-hand side of the IN operator.)^  Thus the virtual table
+** only sees a single value from the right-hand side of the IN operator
+** at a time.
+**
+** In some cases, however, it would be advantageous for the virtual
+** table to see all values on the right-hand of the IN operator all at
+** once.  The sqlite3_vtab_in() interfaces facilitates this in two ways:
+**
+** <ol>
+** <li><p>
+**   ^A call to sqlite3_vtab_in(P,N,-1) will return true (non-zero)
+**   if and only if the [sqlite3_index_info|P->aConstraint][N] constraint
+**   is an [IN operator] that can be processed all at once.  ^In other words,
+**   sqlite3_vtab_in() with -1 in the third argument is a mechanism
+**   by which the virtual table can ask SQLite if all-at-once processing
+**   of the IN operator is even possible.
+**
+** <li><p>
+**   ^A call to sqlite3_vtab_in(P,N,F) with F==1 or F==0 indicates
+**   to SQLite that the virtual table does or does not want to process
+**   the IN operator all-at-once, respectively.  ^Thus when the third
+**   parameter (F) is non-negative, this interface is the mechanism by
+**   which the virtual table tells SQLite how it wants to process the
+**   IN operator.
+** </ol>
+**
+** ^The sqlite3_vtab_in(P,N,F) interface can be invoked multiple times
+** within the same xBestIndex method call.  ^For any given P,N pair,
+** the return value from sqlite3_vtab_in(P,N,F) will always be the same
+** within the same xBestIndex call.  ^If the interface returns true
+** (non-zero), that means that the constraint is an IN operator
+** that can be processed all-at-once.  ^If the constraint is not an IN
+** operator or cannot be processed all-at-once, then the interface returns
+** false.
+**
+** ^(All-at-once processing of the IN operator is selected if both of the
+** following conditions are met:
+**
+** <ol>
+** <li><p> The P->aConstraintUsage[N].argvIndex value is set to a positive
+** integer.  This is how the virtual table tells SQLite that it wants to
+** use the N-th constraint.
+**
+** <li><p> The last call to sqlite3_vtab_in(P,N,F) for which F was
+** non-negative had F>=1.
+** </ol>)^
+**
+** ^If either or both of the conditions above are false, then SQLite uses
+** the traditional one-at-a-time processing strategy for the IN constraint.
+** ^If both conditions are true, then the argvIndex-th parameter to the
+** xFilter method will be an [sqlite3_value] that appears to be NULL,
+** but which can be passed to [sqlite3_vtab_in_first()] and
+** [sqlite3_vtab_in_next()] to find all values on the right-hand side
+** of the IN constraint.
+*/
+SQLITE_API int sqlite3_vtab_in(sqlite3_index_info*, int iCons, int bHandle);
+
+/*
+** CAPI3REF: Find all elements on the right-hand side of an IN constraint.
+**
+** These interfaces are only useful from within the
+** [xFilter|xFilter() method] of a [virtual table] implementation.
+** The result of invoking these interfaces from any other context
+** is undefined and probably harmful.
+**
+** The X parameter in a call to sqlite3_vtab_in_first(X,P) or
+** sqlite3_vtab_in_next(X,P) should be one of the parameters to the
+** xFilter method which invokes these routines, and specifically
+** a parameter that was previously selected for all-at-once IN constraint
+** processing use the [sqlite3_vtab_in()] interface in the
+** [xBestIndex|xBestIndex method].  ^(If the X parameter is not
+** an xFilter argument that was selected for all-at-once IN constraint
+** processing, then these routines return [SQLITE_ERROR].)^
+**
+** ^(Use these routines to access all values on the right-hand side
+** of the IN constraint using code like the following:
+**
+** <blockquote><pre>
+** &nbsp;  for(rc=sqlite3_vtab_in_first(pList, &pVal);
+** &nbsp;      rc==SQLITE_OK && pVal;
+** &nbsp;      rc=sqlite3_vtab_in_next(pList, &pVal)
+** &nbsp;  ){
+** &nbsp;    // do something with pVal
+** &nbsp;  }
+** &nbsp;  if( rc!=SQLITE_OK ){
+** &nbsp;    // an error has occurred
+** &nbsp;  }
+** </pre></blockquote>)^
+**
+** ^On success, the sqlite3_vtab_in_first(X,P) and sqlite3_vtab_in_next(X,P)
+** routines return SQLITE_OK and set *P to point to the first or next value
+** on the RHS of the IN constraint.  ^If there are no more values on the
+** right hand side of the IN constraint, then *P is set to NULL and these
+** routines return [SQLITE_DONE].  ^The return value might be
+** some other value, such as SQLITE_NOMEM, in the event of a malfunction.
+**
+** The *ppOut values returned by these routines are only valid until the
+** next call to either of these routines or until the end of the xFilter
+** method from which these routines were called.  If the virtual table
+** implementation needs to retain the *ppOut values for longer, it must make
+** copies.  The *ppOut values are [protected sqlite3_value|protected].
+*/
+SQLITE_API int sqlite3_vtab_in_first(sqlite3_value *pVal, sqlite3_value **ppOut);
+SQLITE_API int sqlite3_vtab_in_next(sqlite3_value *pVal, sqlite3_value **ppOut);
+
+/*
+** CAPI3REF: Constraint values in xBestIndex()
+** METHOD: sqlite3_index_info
+**
+** This API may only be used from within the [xBestIndex|xBestIndex method]
+** of a [virtual table] implementation. The result of calling this interface
+** from outside of an xBestIndex method are undefined and probably harmful.
+**
+** ^When the sqlite3_vtab_rhs_value(P,J,V) interface is invoked from within
+** the [xBestIndex] method of a [virtual table] implementation, with P being
+** a copy of the [sqlite3_index_info] object pointer passed into xBestIndex and
+** J being a 0-based index into P->aConstraint[], then this routine
+** attempts to set *V to the value of the right-hand operand of
+** that constraint if the right-hand operand is known.  ^If the
+** right-hand operand is not known, then *V is set to a NULL pointer.
+** ^The sqlite3_vtab_rhs_value(P,J,V) interface returns SQLITE_OK if
+** and only if *V is set to a value.  ^The sqlite3_vtab_rhs_value(P,J,V)
+** inteface returns SQLITE_NOTFOUND if the right-hand side of the J-th
+** constraint is not available.  ^The sqlite3_vtab_rhs_value() interface
+** can return an result code other than SQLITE_OK or SQLITE_NOTFOUND if
+** something goes wrong.
+**
+** The sqlite3_vtab_rhs_value() interface is usually only successful if
+** the right-hand operand of a constraint is a literal value in the original
+** SQL statement.  If the right-hand operand is an expression or a reference
+** to some other column or a [host parameter], then sqlite3_vtab_rhs_value()
+** will probably return [SQLITE_NOTFOUND].
+**
+** ^(Some constraints, such as [SQLITE_INDEX_CONSTRAINT_ISNULL] and
+** [SQLITE_INDEX_CONSTRAINT_ISNOTNULL], have no right-hand operand.  For such
+** constraints, sqlite3_vtab_rhs_value() always returns SQLITE_NOTFOUND.)^
+**
+** ^The [sqlite3_value] object returned in *V is a protected sqlite3_value
+** and remains valid for the duration of the xBestIndex method call.
+** ^When xBestIndex returns, the sqlite3_value object returned by
+** sqlite3_vtab_rhs_value() is automatically deallocated.
+**
+** The "_rhs_" in the name of this routine is an abbreviation for
+** "Right-Hand Side".
+*/
+SQLITE_API int sqlite3_vtab_rhs_value(sqlite3_index_info*, int, sqlite3_value **ppVal);
+
+/*
+** CAPI3REF: Conflict resolution modes
+** KEYWORDS: {conflict resolution mode}
+**
+** These constants are returned by [sqlite3_vtab_on_conflict()] to
+** inform a [virtual table] implementation what the [ON CONFLICT] mode
+** is for the SQL statement being evaluated.
+**
+** Note that the [SQLITE_IGNORE] constant is also used as a potential
+** return value from the [sqlite3_set_authorizer()] callback and that
+** [SQLITE_ABORT] is also a [result code].
+*/
+#define SQLITE_ROLLBACK 1
+/* #define SQLITE_IGNORE 2 // Also used by sqlite3_authorizer() callback */
+#define SQLITE_FAIL     3
+/* #define SQLITE_ABORT 4  // Also an error code */
+#define SQLITE_REPLACE  5
+
+/*
+** CAPI3REF: Prepared Statement Scan Status Opcodes
+** KEYWORDS: {scanstatus options}
+**
+** The following constants can be used for the T parameter to the
+** [sqlite3_stmt_scanstatus(S,X,T,V)] interface.  Each constant designates a
+** different metric for sqlite3_stmt_scanstatus() to return.
+**
+** When the value returned to V is a string, space to hold that string is
+** managed by the prepared statement S and will be automatically freed when
+** S is finalized.
+**
+** Not all values are available for all query elements. When a value is
+** not available, the output variable is set to -1 if the value is numeric,
+** or to NULL if it is a string (SQLITE_SCANSTAT_NAME).
+**
+** <dl>
+** [[SQLITE_SCANSTAT_NLOOP]] <dt>SQLITE_SCANSTAT_NLOOP</dt>
+** <dd>^The [sqlite3_int64] variable pointed to by the V parameter will be
+** set to the total number of times that the X-th loop has run.</dd>
+**
+** [[SQLITE_SCANSTAT_NVISIT]] <dt>SQLITE_SCANSTAT_NVISIT</dt>
+** <dd>^The [sqlite3_int64] variable pointed to by the V parameter will be set
+** to the total number of rows examined by all iterations of the X-th loop.</dd>
+**
+** [[SQLITE_SCANSTAT_EST]] <dt>SQLITE_SCANSTAT_EST</dt>
+** <dd>^The "double" variable pointed to by the V parameter will be set to the
+** query planner's estimate for the average number of rows output from each
+** iteration of the X-th loop.  If the query planner's estimates was accurate,
+** then this value will approximate the quotient NVISIT/NLOOP and the
+** product of this value for all prior loops with the same SELECTID will
+** be the NLOOP value for the current loop.
+**
+** [[SQLITE_SCANSTAT_NAME]] <dt>SQLITE_SCANSTAT_NAME</dt>
+** <dd>^The "const char *" variable pointed to by the V parameter will be set
+** to a zero-terminated UTF-8 string containing the name of the index or table
+** used for the X-th loop.
+**
+** [[SQLITE_SCANSTAT_EXPLAIN]] <dt>SQLITE_SCANSTAT_EXPLAIN</dt>
+** <dd>^The "const char *" variable pointed to by the V parameter will be set
+** to a zero-terminated UTF-8 string containing the [EXPLAIN QUERY PLAN]
+** description for the X-th loop.
+**
+** [[SQLITE_SCANSTAT_SELECTID]] <dt>SQLITE_SCANSTAT_SELECTID</dt>
+** <dd>^The "int" variable pointed to by the V parameter will be set to the
+** id for the X-th query plan element. The id value is unique within the
+** statement. The select-id is the same value as is output in the first
+** column of an [EXPLAIN QUERY PLAN] query.
+**
+** [[SQLITE_SCANSTAT_PARENTID]] <dt>SQLITE_SCANSTAT_PARENTID</dt>
+** <dd>The "int" variable pointed to by the V parameter will be set to the
+** the id of the parent of the current query element, if applicable, or
+** to zero if the query element has no parent. This is the same value as
+** returned in the second column of an [EXPLAIN QUERY PLAN] query.
+**
+** [[SQLITE_SCANSTAT_NCYCLE]] <dt>SQLITE_SCANSTAT_NCYCLE</dt>
+** <dd>The sqlite3_int64 output value is set to the number of cycles,
+** according to the processor time-stamp counter, that elapsed while the
+** query element was being processed. This value is not available for
+** all query elements - if it is unavailable the output variable is
+** set to -1.
+** </dl>
+*/
+#define SQLITE_SCANSTAT_NLOOP    0
+#define SQLITE_SCANSTAT_NVISIT   1
+#define SQLITE_SCANSTAT_EST      2
+#define SQLITE_SCANSTAT_NAME     3
+#define SQLITE_SCANSTAT_EXPLAIN  4
+#define SQLITE_SCANSTAT_SELECTID 5
+#define SQLITE_SCANSTAT_PARENTID 6
+#define SQLITE_SCANSTAT_NCYCLE   7
+
+/*
+** CAPI3REF: Prepared Statement Scan Status
+** METHOD: sqlite3_stmt
+**
+** These interfaces return information about the predicted and measured
+** performance for pStmt.  Advanced applications can use this
+** interface to compare the predicted and the measured performance and
+** issue warnings and/or rerun [ANALYZE] if discrepancies are found.
+**
+** Since this interface is expected to be rarely used, it is only
+** available if SQLite is compiled using the [SQLITE_ENABLE_STMT_SCANSTATUS]
+** compile-time option.
+**
+** The "iScanStatusOp" parameter determines which status information to return.
+** The "iScanStatusOp" must be one of the [scanstatus options] or the behavior
+** of this interface is undefined. ^The requested measurement is written into
+** a variable pointed to by the "pOut" parameter.
+**
+** The "flags" parameter must be passed a mask of flags. At present only
+** one flag is defined - SQLITE_SCANSTAT_COMPLEX. If SQLITE_SCANSTAT_COMPLEX
+** is specified, then status information is available for all elements
+** of a query plan that are reported by "EXPLAIN QUERY PLAN" output. If
+** SQLITE_SCANSTAT_COMPLEX is not specified, then only query plan elements
+** that correspond to query loops (the "SCAN..." and "SEARCH..." elements of
+** the EXPLAIN QUERY PLAN output) are available. Invoking API
+** sqlite3_stmt_scanstatus() is equivalent to calling
+** sqlite3_stmt_scanstatus_v2() with a zeroed flags parameter.
+**
+** Parameter "idx" identifies the specific query element to retrieve statistics
+** for. Query elements are numbered starting from zero. A value of -1 may be
+** to query for statistics regarding the entire query. ^If idx is out of range
+** - less than -1 or greater than or equal to the total number of query
+** elements used to implement the statement - a non-zero value is returned and
+** the variable that pOut points to is unchanged.
+**
+** See also: [sqlite3_stmt_scanstatus_reset()]
+*/
+SQLITE_API int sqlite3_stmt_scanstatus(
+  sqlite3_stmt *pStmt,      /* Prepared statement for which info desired */
+  int idx,                  /* Index of loop to report on */
+  int iScanStatusOp,        /* Information desired.  SQLITE_SCANSTAT_* */
+  void *pOut                /* Result written here */
+);
+SQLITE_API int sqlite3_stmt_scanstatus_v2(
+  sqlite3_stmt *pStmt,      /* Prepared statement for which info desired */
+  int idx,                  /* Index of loop to report on */
+  int iScanStatusOp,        /* Information desired.  SQLITE_SCANSTAT_* */
+  int flags,                /* Mask of flags defined below */
+  void *pOut                /* Result written here */
+);
+
+/*
+** CAPI3REF: Prepared Statement Scan Status
+** KEYWORDS: {scan status flags}
+*/
+#define SQLITE_SCANSTAT_COMPLEX 0x0001
+
+/*
+** CAPI3REF: Zero Scan-Status Counters
+** METHOD: sqlite3_stmt
+**
+** ^Zero all [sqlite3_stmt_scanstatus()] related event counters.
+**
+** This API is only available if the library is built with pre-processor
+** symbol [SQLITE_ENABLE_STMT_SCANSTATUS] defined.
+*/
+SQLITE_API void sqlite3_stmt_scanstatus_reset(sqlite3_stmt*);
+
+/*
+** CAPI3REF: Flush caches to disk mid-transaction
+** METHOD: sqlite3
+**
+** ^If a write-transaction is open on [database connection] D when the
+** [sqlite3_db_cacheflush(D)] interface invoked, any dirty
+** pages in the pager-cache that are not currently in use are written out
+** to disk. A dirty page may be in use if a database cursor created by an
+** active SQL statement is reading from it, or if it is page 1 of a database
+** file (page 1 is always "in use").  ^The [sqlite3_db_cacheflush(D)]
+** interface flushes caches for all schemas - "main", "temp", and
+** any [attached] databases.
+**
+** ^If this function needs to obtain extra database locks before dirty pages
+** can be flushed to disk, it does so. ^If those locks cannot be obtained
+** immediately and there is a busy-handler callback configured, it is invoked
+** in the usual manner. ^If the required lock still cannot be obtained, then
+** the database is skipped and an attempt made to flush any dirty pages
+** belonging to the next (if any) database. ^If any databases are skipped
+** because locks cannot be obtained, but no other error occurs, this
+** function returns SQLITE_BUSY.
+**
+** ^If any other error occurs while flushing dirty pages to disk (for
+** example an IO error or out-of-memory condition), then processing is
+** abandoned and an SQLite [error code] is returned to the caller immediately.
+**
+** ^Otherwise, if no error occurs, [sqlite3_db_cacheflush()] returns SQLITE_OK.
+**
+** ^This function does not set the database handle error code or message
+** returned by the [sqlite3_errcode()] and [sqlite3_errmsg()] functions.
+*/
+SQLITE_API int sqlite3_db_cacheflush(sqlite3*);
+
+/*
+** CAPI3REF: The pre-update hook.
+** METHOD: sqlite3
+**
+** ^These interfaces are only available if SQLite is compiled using the
+** [SQLITE_ENABLE_PREUPDATE_HOOK] compile-time option.
+**
+** ^The [sqlite3_preupdate_hook()] interface registers a callback function
+** that is invoked prior to each [INSERT], [UPDATE], and [DELETE] operation
+** on a database table.
+** ^At most one preupdate hook may be registered at a time on a single
+** [database connection]; each call to [sqlite3_preupdate_hook()] overrides
+** the previous setting.
+** ^The preupdate hook is disabled by invoking [sqlite3_preupdate_hook()]
+** with a NULL pointer as the second parameter.
+** ^The third parameter to [sqlite3_preupdate_hook()] is passed through as
+** the first parameter to callbacks.
+**
+** ^The preupdate hook only fires for changes to real database tables; the
+** preupdate hook is not invoked for changes to [virtual tables] or to
+** system tables like sqlite_sequence or sqlite_stat1.
+**
+** ^The second parameter to the preupdate callback is a pointer to
+** the [database connection] that registered the preupdate hook.
+** ^The third parameter to the preupdate callback is one of the constants
+** [SQLITE_INSERT], [SQLITE_DELETE], or [SQLITE_UPDATE] to identify the
+** kind of update operation that is about to occur.
+** ^(The fourth parameter to the preupdate callback is the name of the
+** database within the database connection that is being modified.  This
+** will be "main" for the main database or "temp" for TEMP tables or
+** the name given after the AS keyword in the [ATTACH] statement for attached
+** databases.)^
+** ^The fifth parameter to the preupdate callback is the name of the
+** table that is being modified.
+**
+** For an UPDATE or DELETE operation on a [rowid table], the sixth
+** parameter passed to the preupdate callback is the initial [rowid] of the
+** row being modified or deleted. For an INSERT operation on a rowid table,
+** or any operation on a WITHOUT ROWID table, the value of the sixth
+** parameter is undefined. For an INSERT or UPDATE on a rowid table the
+** seventh parameter is the final rowid value of the row being inserted
+** or updated. The value of the seventh parameter passed to the callback
+** function is not defined for operations on WITHOUT ROWID tables, or for
+** DELETE operations on rowid tables.
+**
+** ^The sqlite3_preupdate_hook(D,C,P) function returns the P argument from
+** the previous call on the same [database connection] D, or NULL for
+** the first call on D.
+**
+** The [sqlite3_preupdate_old()], [sqlite3_preupdate_new()],
+** [sqlite3_preupdate_count()], and [sqlite3_preupdate_depth()] interfaces
+** provide additional information about a preupdate event. These routines
+** may only be called from within a preupdate callback.  Invoking any of
+** these routines from outside of a preupdate callback or with a
+** [database connection] pointer that is different from the one supplied
+** to the preupdate callback results in undefined and probably undesirable
+** behavior.
+**
+** ^The [sqlite3_preupdate_count(D)] interface returns the number of columns
+** in the row that is being inserted, updated, or deleted.
+**
+** ^The [sqlite3_preupdate_old(D,N,P)] interface writes into P a pointer to
+** a [protected sqlite3_value] that contains the value of the Nth column of
+** the table row before it is updated.  The N parameter must be between 0
+** and one less than the number of columns or the behavior will be
+** undefined. This must only be used within SQLITE_UPDATE and SQLITE_DELETE
+** preupdate callbacks; if it is used by an SQLITE_INSERT callback then the
+** behavior is undefined.  The [sqlite3_value] that P points to
+** will be destroyed when the preupdate callback returns.
+**
+** ^The [sqlite3_preupdate_new(D,N,P)] interface writes into P a pointer to
+** a [protected sqlite3_value] that contains the value of the Nth column of
+** the table row after it is updated.  The N parameter must be between 0
+** and one less than the number of columns or the behavior will be
+** undefined. This must only be used within SQLITE_INSERT and SQLITE_UPDATE
+** preupdate callbacks; if it is used by an SQLITE_DELETE callback then the
+** behavior is undefined.  The [sqlite3_value] that P points to
+** will be destroyed when the preupdate callback returns.
+**
+** ^The [sqlite3_preupdate_depth(D)] interface returns 0 if the preupdate
+** callback was invoked as a result of a direct insert, update, or delete
+** operation; or 1 for inserts, updates, or deletes invoked by top-level
+** triggers; or 2 for changes resulting from triggers called by top-level
+** triggers; and so forth.
+**
+** When the [sqlite3_blob_write()] API is used to update a blob column,
+** the pre-update hook is invoked with SQLITE_DELETE. This is because the
+** in this case the new values are not available. In this case, when a
+** callback made with op==SQLITE_DELETE is actually a write using the
+** sqlite3_blob_write() API, the [sqlite3_preupdate_blobwrite()] returns
+** the index of the column being written. In other cases, where the
+** pre-update hook is being invoked for some other reason, including a
+** regular DELETE, sqlite3_preupdate_blobwrite() returns -1.
+**
+** See also:  [sqlite3_update_hook()]
+*/
+#if defined(SQLITE_ENABLE_PREUPDATE_HOOK)
+SQLITE_API void *sqlite3_preupdate_hook(
+  sqlite3 *db,
+  void(*xPreUpdate)(
+    void *pCtx,                   /* Copy of third arg to preupdate_hook() */
+    sqlite3 *db,                  /* Database handle */
+    int op,                       /* SQLITE_UPDATE, DELETE or INSERT */
+    char const *zDb,              /* Database name */
+    char const *zName,            /* Table name */
+    sqlite3_int64 iKey1,          /* Rowid of row about to be deleted/updated */
+    sqlite3_int64 iKey2           /* New rowid value (for a rowid UPDATE) */
+  ),
+  void*
+);
+SQLITE_API int sqlite3_preupdate_old(sqlite3 *, int, sqlite3_value **);
+SQLITE_API int sqlite3_preupdate_count(sqlite3 *);
+SQLITE_API int sqlite3_preupdate_depth(sqlite3 *);
+SQLITE_API int sqlite3_preupdate_new(sqlite3 *, int, sqlite3_value **);
+SQLITE_API int sqlite3_preupdate_blobwrite(sqlite3 *);
+#endif
+
+/*
+** CAPI3REF: Low-level system error code
+** METHOD: sqlite3
+**
+** ^Attempt to return the underlying operating system error code or error
+** number that caused the most recent I/O error or failure to open a file.
+** The return value is OS-dependent.  For example, on unix systems, after
+** [sqlite3_open_v2()] returns [SQLITE_CANTOPEN], this interface could be
+** called to get back the underlying "errno" that caused the problem, such
+** as ENOSPC, EAUTH, EISDIR, and so forth.
+*/
+SQLITE_API int sqlite3_system_errno(sqlite3*);
+
+/*
+** CAPI3REF: Database Snapshot
+** KEYWORDS: {snapshot} {sqlite3_snapshot}
+**
+** An instance of the snapshot object records the state of a [WAL mode]
+** database for some specific point in history.
+**
+** In [WAL mode], multiple [database connections] that are open on the
+** same database file can each be reading a different historical version
+** of the database file.  When a [database connection] begins a read
+** transaction, that connection sees an unchanging copy of the database
+** as it existed for the point in time when the transaction first started.
+** Subsequent changes to the database from other connections are not seen
+** by the reader until a new read transaction is started.
+**
+** The sqlite3_snapshot object records state information about an historical
+** version of the database file so that it is possible to later open a new read
+** transaction that sees that historical version of the database rather than
+** the most recent version.
+*/
+typedef struct sqlite3_snapshot {
+  unsigned char hidden[48];
+} sqlite3_snapshot;
+
+/*
+** CAPI3REF: Record A Database Snapshot
+** CONSTRUCTOR: sqlite3_snapshot
+**
+** ^The [sqlite3_snapshot_get(D,S,P)] interface attempts to make a
+** new [sqlite3_snapshot] object that records the current state of
+** schema S in database connection D.  ^On success, the
+** [sqlite3_snapshot_get(D,S,P)] interface writes a pointer to the newly
+** created [sqlite3_snapshot] object into *P and returns SQLITE_OK.
+** If there is not already a read-transaction open on schema S when
+** this function is called, one is opened automatically.
+**
+** If a read-transaction is opened by this function, then it is guaranteed
+** that the returned snapshot object may not be invalidated by a database
+** writer or checkpointer until after the read-transaction is closed. This
+** is not guaranteed if a read-transaction is already open when this
+** function is called. In that case, any subsequent write or checkpoint
+** operation on the database may invalidate the returned snapshot handle,
+** even while the read-transaction remains open.
+**
+** The following must be true for this function to succeed. If any of
+** the following statements are false when sqlite3_snapshot_get() is
+** called, SQLITE_ERROR is returned. The final value of *P is undefined
+** in this case.
+**
+** <ul>
+**   <li> The database handle must not be in [autocommit mode].
+**
+**   <li> Schema S of [database connection] D must be a [WAL mode] database.
+**
+**   <li> There must not be a write transaction open on schema S of database
+**        connection D.
+**
+**   <li> One or more transactions must have been written to the current wal
+**        file since it was created on disk (by any connection). This means
+**        that a snapshot cannot be taken on a wal mode database with no wal
+**        file immediately after it is first opened. At least one transaction
+**        must be written to it first.
+** </ul>
+**
+** This function may also return SQLITE_NOMEM.  If it is called with the
+** database handle in autocommit mode but fails for some other reason,
+** whether or not a read transaction is opened on schema S is undefined.
+**
+** The [sqlite3_snapshot] object returned from a successful call to
+** [sqlite3_snapshot_get()] must be freed using [sqlite3_snapshot_free()]
+** to avoid a memory leak.
+**
+** The [sqlite3_snapshot_get()] interface is only available when the
+** [SQLITE_ENABLE_SNAPSHOT] compile-time option is used.
+*/
+SQLITE_API SQLITE_EXPERIMENTAL int sqlite3_snapshot_get(
+  sqlite3 *db,
+  const char *zSchema,
+  sqlite3_snapshot **ppSnapshot
+);
+
+/*
+** CAPI3REF: Start a read transaction on an historical snapshot
+** METHOD: sqlite3_snapshot
+**
+** ^The [sqlite3_snapshot_open(D,S,P)] interface either starts a new read
+** transaction or upgrades an existing one for schema S of
+** [database connection] D such that the read transaction refers to
+** historical [snapshot] P, rather than the most recent change to the
+** database. ^The [sqlite3_snapshot_open()] interface returns SQLITE_OK
+** on success or an appropriate [error code] if it fails.
+**
+** ^In order to succeed, the database connection must not be in
+** [autocommit mode] when [sqlite3_snapshot_open(D,S,P)] is called. If there
+** is already a read transaction open on schema S, then the database handle
+** must have no active statements (SELECT statements that have been passed
+** to sqlite3_step() but not sqlite3_reset() or sqlite3_finalize()).
+** SQLITE_ERROR is returned if either of these conditions is violated, or
+** if schema S does not exist, or if the snapshot object is invalid.
+**
+** ^A call to sqlite3_snapshot_open() will fail to open if the specified
+** snapshot has been overwritten by a [checkpoint]. In this case
+** SQLITE_ERROR_SNAPSHOT is returned.
+**
+** If there is already a read transaction open when this function is
+** invoked, then the same read transaction remains open (on the same
+** database snapshot) if SQLITE_ERROR, SQLITE_BUSY or SQLITE_ERROR_SNAPSHOT
+** is returned. If another error code - for example SQLITE_PROTOCOL or an
+** SQLITE_IOERR error code - is returned, then the final state of the
+** read transaction is undefined. If SQLITE_OK is returned, then the
+** read transaction is now open on database snapshot P.
+**
+** ^(A call to [sqlite3_snapshot_open(D,S,P)] will fail if the
+** database connection D does not know that the database file for
+** schema S is in [WAL mode].  A database connection might not know
+** that the database file is in [WAL mode] if there has been no prior
+** I/O on that database connection, or if the database entered [WAL mode]
+** after the most recent I/O on the database connection.)^
+** (Hint: Run "[PRAGMA application_id]" against a newly opened
+** database connection in order to make it ready to use snapshots.)
+**
+** The [sqlite3_snapshot_open()] interface is only available when the
+** [SQLITE_ENABLE_SNAPSHOT] compile-time option is used.
+*/
+SQLITE_API SQLITE_EXPERIMENTAL int sqlite3_snapshot_open(
+  sqlite3 *db,
+  const char *zSchema,
+  sqlite3_snapshot *pSnapshot
+);
+
+/*
+** CAPI3REF: Destroy a snapshot
+** DESTRUCTOR: sqlite3_snapshot
+**
+** ^The [sqlite3_snapshot_free(P)] interface destroys [sqlite3_snapshot] P.
+** The application must eventually free every [sqlite3_snapshot] object
+** using this routine to avoid a memory leak.
+**
+** The [sqlite3_snapshot_free()] interface is only available when the
+** [SQLITE_ENABLE_SNAPSHOT] compile-time option is used.
+*/
+SQLITE_API SQLITE_EXPERIMENTAL void sqlite3_snapshot_free(sqlite3_snapshot*);
+
+/*
+** CAPI3REF: Compare the ages of two snapshot handles.
+** METHOD: sqlite3_snapshot
+**
+** The sqlite3_snapshot_cmp(P1, P2) interface is used to compare the ages
+** of two valid snapshot handles.
+**
+** If the two snapshot handles are not associated with the same database
+** file, the result of the comparison is undefined.
+**
+** Additionally, the result of the comparison is only valid if both of the
+** snapshot handles were obtained by calling sqlite3_snapshot_get() since the
+** last time the wal file was deleted. The wal file is deleted when the
+** database is changed back to rollback mode or when the number of database
+** clients drops to zero. If either snapshot handle was obtained before the
+** wal file was last deleted, the value returned by this function
+** is undefined.
+**
+** Otherwise, this API returns a negative value if P1 refers to an older
+** snapshot than P2, zero if the two handles refer to the same database
+** snapshot, and a positive value if P1 is a newer snapshot than P2.
+**
+** This interface is only available if SQLite is compiled with the
+** [SQLITE_ENABLE_SNAPSHOT] option.
+*/
+SQLITE_API SQLITE_EXPERIMENTAL int sqlite3_snapshot_cmp(
+  sqlite3_snapshot *p1,
+  sqlite3_snapshot *p2
+);
+
+/*
+** CAPI3REF: Recover snapshots from a wal file
+** METHOD: sqlite3_snapshot
+**
+** If a [WAL file] remains on disk after all database connections close
+** (either through the use of the [SQLITE_FCNTL_PERSIST_WAL] [file control]
+** or because the last process to have the database opened exited without
+** calling [sqlite3_close()]) and a new connection is subsequently opened
+** on that database and [WAL file], the [sqlite3_snapshot_open()] interface
+** will only be able to open the last transaction added to the WAL file
+** even though the WAL file contains other valid transactions.
+**
+** This function attempts to scan the WAL file associated with database zDb
+** of database handle db and make all valid snapshots available to
+** sqlite3_snapshot_open(). It is an error if there is already a read
+** transaction open on the database, or if the database is not a WAL mode
+** database.
+**
+** SQLITE_OK is returned if successful, or an SQLite error code otherwise.
+**
+** This interface is only available if SQLite is compiled with the
+** [SQLITE_ENABLE_SNAPSHOT] option.
+*/
+SQLITE_API SQLITE_EXPERIMENTAL int sqlite3_snapshot_recover(sqlite3 *db, const char *zDb);
+
+/*
+** CAPI3REF: Serialize a database
+**
+** The sqlite3_serialize(D,S,P,F) interface returns a pointer to
+** memory that is a serialization of the S database on
+** [database connection] D.  If S is a NULL pointer, the main database is used.
+** If P is not a NULL pointer, then the size of the database in bytes
+** is written into *P.
+**
+** For an ordinary on-disk database file, the serialization is just a
+** copy of the disk file.  For an in-memory database or a "TEMP" database,
+** the serialization is the same sequence of bytes which would be written
+** to disk if that database where backed up to disk.
+**
+** The usual case is that sqlite3_serialize() copies the serialization of
+** the database into memory obtained from [sqlite3_malloc64()] and returns
+** a pointer to that memory.  The caller is responsible for freeing the
+** returned value to avoid a memory leak.  However, if the F argument
+** contains the SQLITE_SERIALIZE_NOCOPY bit, then no memory allocations
+** are made, and the sqlite3_serialize() function will return a pointer
+** to the contiguous memory representation of the database that SQLite
+** is currently using for that database, or NULL if the no such contiguous
+** memory representation of the database exists.  A contiguous memory
+** representation of the database will usually only exist if there has
+** been a prior call to [sqlite3_deserialize(D,S,...)] with the same
+** values of D and S.
+** The size of the database is written into *P even if the
+** SQLITE_SERIALIZE_NOCOPY bit is set but no contiguous copy
+** of the database exists.
+**
+** After the call, if the SQLITE_SERIALIZE_NOCOPY bit had been set,
+** the returned buffer content will remain accessible and unchanged
+** until either the next write operation on the connection or when
+** the connection is closed, and applications must not modify the
+** buffer. If the bit had been clear, the returned buffer will not
+** be accessed by SQLite after the call.
+**
+** A call to sqlite3_serialize(D,S,P,F) might return NULL even if the
+** SQLITE_SERIALIZE_NOCOPY bit is omitted from argument F if a memory
+** allocation error occurs.
+**
+** This interface is omitted if SQLite is compiled with the
+** [SQLITE_OMIT_DESERIALIZE] option.
+*/
+SQLITE_API unsigned char *sqlite3_serialize(
+  sqlite3 *db,           /* The database connection */
+  const char *zSchema,   /* Which DB to serialize. ex: "main", "temp", ... */
+  sqlite3_int64 *piSize, /* Write size of the DB here, if not NULL */
+  unsigned int mFlags    /* Zero or more SQLITE_SERIALIZE_* flags */
+);
+
+/*
+** CAPI3REF: Flags for sqlite3_serialize
+**
+** Zero or more of the following constants can be OR-ed together for
+** the F argument to [sqlite3_serialize(D,S,P,F)].
+**
+** SQLITE_SERIALIZE_NOCOPY means that [sqlite3_serialize()] will return
+** a pointer to contiguous in-memory database that it is currently using,
+** without making a copy of the database.  If SQLite is not currently using
+** a contiguous in-memory database, then this option causes
+** [sqlite3_serialize()] to return a NULL pointer.  SQLite will only be
+** using a contiguous in-memory database if it has been initialized by a
+** prior call to [sqlite3_deserialize()].
+*/
+#define SQLITE_SERIALIZE_NOCOPY 0x001   /* Do no memory allocations */
+
+/*
+** CAPI3REF: Deserialize a database
+**
+** The sqlite3_deserialize(D,S,P,N,M,F) interface causes the
+** [database connection] D to disconnect from database S and then
+** reopen S as an in-memory database based on the serialization contained
+** in P.  The serialized database P is N bytes in size.  M is the size of
+** the buffer P, which might be larger than N.  If M is larger than N, and
+** the SQLITE_DESERIALIZE_READONLY bit is not set in F, then SQLite is
+** permitted to add content to the in-memory database as long as the total
+** size does not exceed M bytes.
+**
+** If the SQLITE_DESERIALIZE_FREEONCLOSE bit is set in F, then SQLite will
+** invoke sqlite3_free() on the serialization buffer when the database
+** connection closes.  If the SQLITE_DESERIALIZE_RESIZEABLE bit is set, then
+** SQLite will try to increase the buffer size using sqlite3_realloc64()
+** if writes on the database cause it to grow larger than M bytes.
+**
+** Applications must not modify the buffer P or invalidate it before
+** the database connection D is closed.
+**
+** The sqlite3_deserialize() interface will fail with SQLITE_BUSY if the
+** database is currently in a read transaction or is involved in a backup
+** operation.
+**
+** It is not possible to deserialized into the TEMP database.  If the
+** S argument to sqlite3_deserialize(D,S,P,N,M,F) is "temp" then the
+** function returns SQLITE_ERROR.
+**
+** The deserialized database should not be in [WAL mode].  If the database
+** is in WAL mode, then any attempt to use the database file will result
+** in an [SQLITE_CANTOPEN] error.  The application can set the
+** [file format version numbers] (bytes 18 and 19) of the input database P
+** to 0x01 prior to invoking sqlite3_deserialize(D,S,P,N,M,F) to force the
+** database file into rollback mode and work around this limitation.
+**
+** If sqlite3_deserialize(D,S,P,N,M,F) fails for any reason and if the
+** SQLITE_DESERIALIZE_FREEONCLOSE bit is set in argument F, then
+** [sqlite3_free()] is invoked on argument P prior to returning.
+**
+** This interface is omitted if SQLite is compiled with the
+** [SQLITE_OMIT_DESERIALIZE] option.
+*/
+SQLITE_API int sqlite3_deserialize(
+  sqlite3 *db,            /* The database connection */
+  const char *zSchema,    /* Which DB to reopen with the deserialization */
+  unsigned char *pData,   /* The serialized database content */
+  sqlite3_int64 szDb,     /* Number bytes in the deserialization */
+  sqlite3_int64 szBuf,    /* Total size of buffer pData[] */
+  unsigned mFlags         /* Zero or more SQLITE_DESERIALIZE_* flags */
+);
+
+/*
+** CAPI3REF: Flags for sqlite3_deserialize()
+**
+** The following are allowed values for 6th argument (the F argument) to
+** the [sqlite3_deserialize(D,S,P,N,M,F)] interface.
+**
+** The SQLITE_DESERIALIZE_FREEONCLOSE means that the database serialization
+** in the P argument is held in memory obtained from [sqlite3_malloc64()]
+** and that SQLite should take ownership of this memory and automatically
+** free it when it has finished using it.  Without this flag, the caller
+** is responsible for freeing any dynamically allocated memory.
+**
+** The SQLITE_DESERIALIZE_RESIZEABLE flag means that SQLite is allowed to
+** grow the size of the database using calls to [sqlite3_realloc64()].  This
+** flag should only be used if SQLITE_DESERIALIZE_FREEONCLOSE is also used.
+** Without this flag, the deserialized database cannot increase in size beyond
+** the number of bytes specified by the M parameter.
+**
+** The SQLITE_DESERIALIZE_READONLY flag means that the deserialized database
+** should be treated as read-only.
+*/
+#define SQLITE_DESERIALIZE_FREEONCLOSE 1 /* Call sqlite3_free() on close */
+#define SQLITE_DESERIALIZE_RESIZEABLE  2 /* Resize using sqlite3_realloc64() */
+#define SQLITE_DESERIALIZE_READONLY    4 /* Database is read-only */
+
+/*
+** Undo the hack that converts floating point types to integer for
+** builds on processors without floating point support.
+*/
+#ifdef SQLITE_OMIT_FLOATING_POINT
+# undef double
+#endif
+
+#if defined(__wasi__)
+# undef SQLITE_WASI
+# define SQLITE_WASI 1
+# ifndef SQLITE_OMIT_LOAD_EXTENSION
+#  define SQLITE_OMIT_LOAD_EXTENSION
+# endif
+# ifndef SQLITE_THREADSAFE
+#  define SQLITE_THREADSAFE 0
+# endif
+#endif
+
+#ifdef __cplusplus
+}  /* End of the 'extern "C"' block */
+#endif
+/* #endif for SQLITE3_H will be added by mksqlite3.tcl */
+
+/******** Begin file sqlite3rtree.h *********/
+/*
+** 2010 August 30
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+*/
+
+#ifndef _SQLITE3RTREE_H_
+#define _SQLITE3RTREE_H_
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct sqlite3_rtree_geometry sqlite3_rtree_geometry;
+typedef struct sqlite3_rtree_query_info sqlite3_rtree_query_info;
+
+/* The double-precision datatype used by RTree depends on the
+** SQLITE_RTREE_INT_ONLY compile-time option.
+*/
+#ifdef SQLITE_RTREE_INT_ONLY
+  typedef sqlite3_int64 sqlite3_rtree_dbl;
+#else
+  typedef double sqlite3_rtree_dbl;
+#endif
+
+/*
+** Register a geometry callback named zGeom that can be used as part of an
+** R-Tree geometry query as follows:
+**
+**   SELECT ... FROM <rtree> WHERE <rtree col> MATCH $zGeom(... params ...)
+*/
+SQLITE_API int sqlite3_rtree_geometry_callback(
+  sqlite3 *db,
+  const char *zGeom,
+  int (*xGeom)(sqlite3_rtree_geometry*, int, sqlite3_rtree_dbl*,int*),
+  void *pContext
+);
+
+
+/*
+** A pointer to a structure of the following type is passed as the first
+** argument to callbacks registered using rtree_geometry_callback().
+*/
+struct sqlite3_rtree_geometry {
+  void *pContext;                 /* Copy of pContext passed to s_r_g_c() */
+  int nParam;                     /* Size of array aParam[] */
+  sqlite3_rtree_dbl *aParam;      /* Parameters passed to SQL geom function */
+  void *pUser;                    /* Callback implementation user data */
+  void (*xDelUser)(void *);       /* Called by SQLite to clean up pUser */
+};
+
+/*
+** Register a 2nd-generation geometry callback named zScore that can be
+** used as part of an R-Tree geometry query as follows:
+**
+**   SELECT ... FROM <rtree> WHERE <rtree col> MATCH $zQueryFunc(... params ...)
+*/
+SQLITE_API int sqlite3_rtree_query_callback(
+  sqlite3 *db,
+  const char *zQueryFunc,
+  int (*xQueryFunc)(sqlite3_rtree_query_info*),
+  void *pContext,
+  void (*xDestructor)(void*)
+);
+
+
+/*
+** A pointer to a structure of the following type is passed as the
+** argument to scored geometry callback registered using
+** sqlite3_rtree_query_callback().
+**
+** Note that the first 5 fields of this structure are identical to
+** sqlite3_rtree_geometry.  This structure is a subclass of
+** sqlite3_rtree_geometry.
+*/
+struct sqlite3_rtree_query_info {
+  void *pContext;                   /* pContext from when function registered */
+  int nParam;                       /* Number of function parameters */
+  sqlite3_rtree_dbl *aParam;        /* value of function parameters */
+  void *pUser;                      /* callback can use this, if desired */
+  void (*xDelUser)(void*);          /* function to free pUser */
+  sqlite3_rtree_dbl *aCoord;        /* Coordinates of node or entry to check */
+  unsigned int *anQueue;            /* Number of pending entries in the queue */
+  int nCoord;                       /* Number of coordinates */
+  int iLevel;                       /* Level of current node or entry */
+  int mxLevel;                      /* The largest iLevel value in the tree */
+  sqlite3_int64 iRowid;             /* Rowid for current entry */
+  sqlite3_rtree_dbl rParentScore;   /* Score of parent node */
+  int eParentWithin;                /* Visibility of parent node */
+  int eWithin;                      /* OUT: Visibility */
+  sqlite3_rtree_dbl rScore;         /* OUT: Write the score here */
+  /* The following fields are only available in 3.8.11 and later */
+  sqlite3_value **apSqlParam;       /* Original SQL values of parameters */
+};
+
+/*
+** Allowed values for sqlite3_rtree_query.eWithin and .eParentWithin.
+*/
+#define NOT_WITHIN       0   /* Object completely outside of query region */
+#define PARTLY_WITHIN    1   /* Object partially overlaps query region */
+#define FULLY_WITHIN     2   /* Object fully contained within query region */
+
+
+#ifdef __cplusplus
+}  /* end of the 'extern "C"' block */
+#endif
+
+#endif  /* ifndef _SQLITE3RTREE_H_ */
+
+/******** End of sqlite3rtree.h *********/
+/******** Begin file sqlite3session.h *********/
+
+#if !defined(__SQLITESESSION_H_) && defined(SQLITE_ENABLE_SESSION)
+#define __SQLITESESSION_H_ 1
+
+/*
+** Make sure we can call this stuff from C++.
+*/
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*
+** CAPI3REF: Session Object Handle
+**
+** An instance of this object is a [session] that can be used to
+** record changes to a database.
+*/
+typedef struct sqlite3_session sqlite3_session;
+
+/*
+** CAPI3REF: Changeset Iterator Handle
+**
+** An instance of this object acts as a cursor for iterating
+** over the elements of a [changeset] or [patchset].
+*/
+typedef struct sqlite3_changeset_iter sqlite3_changeset_iter;
+
+/*
+** CAPI3REF: Create A New Session Object
+** CONSTRUCTOR: sqlite3_session
+**
+** Create a new session object attached to database handle db. If successful,
+** a pointer to the new object is written to *ppSession and SQLITE_OK is
+** returned. If an error occurs, *ppSession is set to NULL and an SQLite
+** error code (e.g. SQLITE_NOMEM) is returned.
+**
+** It is possible to create multiple session objects attached to a single
+** database handle.
+**
+** Session objects created using this function should be deleted using the
+** [sqlite3session_delete()] function before the database handle that they
+** are attached to is itself closed. If the database handle is closed before
+** the session object is deleted, then the results of calling any session
+** module function, including [sqlite3session_delete()] on the session object
+** are undefined.
+**
+** Because the session module uses the [sqlite3_preupdate_hook()] API, it
+** is not possible for an application to register a pre-update hook on a
+** database handle that has one or more session objects attached. Nor is
+** it possible to create a session object attached to a database handle for
+** which a pre-update hook is already defined. The results of attempting
+** either of these things are undefined.
+**
+** The session object will be used to create changesets for tables in
+** database zDb, where zDb is either "main", or "temp", or the name of an
+** attached database. It is not an error if database zDb is not attached
+** to the database when the session object is created.
+*/
+SQLITE_API int sqlite3session_create(
+  sqlite3 *db,                    /* Database handle */
+  const char *zDb,                /* Name of db (e.g. "main") */
+  sqlite3_session **ppSession     /* OUT: New session object */
+);
+
+/*
+** CAPI3REF: Delete A Session Object
+** DESTRUCTOR: sqlite3_session
+**
+** Delete a session object previously allocated using
+** [sqlite3session_create()]. Once a session object has been deleted, the
+** results of attempting to use pSession with any other session module
+** function are undefined.
+**
+** Session objects must be deleted before the database handle to which they
+** are attached is closed. Refer to the documentation for
+** [sqlite3session_create()] for details.
+*/
+SQLITE_API void sqlite3session_delete(sqlite3_session *pSession);
+
+/*
+** CAPI3REF: Configure a Session Object
+** METHOD: sqlite3_session
+**
+** This method is used to configure a session object after it has been
+** created. At present the only valid values for the second parameter are
+** [SQLITE_SESSION_OBJCONFIG_SIZE] and [SQLITE_SESSION_OBJCONFIG_ROWID].
+**
+*/
+SQLITE_API int sqlite3session_object_config(sqlite3_session*, int op, void *pArg);
+
+/*
+** CAPI3REF: Options for sqlite3session_object_config
+**
+** The following values may passed as the the 2nd parameter to
+** sqlite3session_object_config().
+**
+** <dt>SQLITE_SESSION_OBJCONFIG_SIZE <dd>
+**   This option is used to set, clear or query the flag that enables
+**   the [sqlite3session_changeset_size()] API. Because it imposes some
+**   computational overhead, this API is disabled by default. Argument
+**   pArg must point to a value of type (int). If the value is initially
+**   0, then the sqlite3session_changeset_size() API is disabled. If it
+**   is greater than 0, then the same API is enabled. Or, if the initial
+**   value is less than zero, no change is made. In all cases the (int)
+**   variable is set to 1 if the sqlite3session_changeset_size() API is
+**   enabled following the current call, or 0 otherwise.
+**
+**   It is an error (SQLITE_MISUSE) to attempt to modify this setting after
+**   the first table has been attached to the session object.
+**
+** <dt>SQLITE_SESSION_OBJCONFIG_ROWID <dd>
+**   This option is used to set, clear or query the flag that enables
+**   collection of data for tables with no explicit PRIMARY KEY.
+**
+**   Normally, tables with no explicit PRIMARY KEY are simply ignored
+**   by the sessions module. However, if this flag is set, it behaves
+**   as if such tables have a column "_rowid_ INTEGER PRIMARY KEY" inserted
+**   as their leftmost columns.
+**
+**   It is an error (SQLITE_MISUSE) to attempt to modify this setting after
+**   the first table has been attached to the session object.
+*/
+#define SQLITE_SESSION_OBJCONFIG_SIZE  1
+#define SQLITE_SESSION_OBJCONFIG_ROWID 2
+
+/*
+** CAPI3REF: Enable Or Disable A Session Object
+** METHOD: sqlite3_session
+**
+** Enable or disable the recording of changes by a session object. When
+** enabled, a session object records changes made to the database. When
+** disabled - it does not. A newly created session object is enabled.
+** Refer to the documentation for [sqlite3session_changeset()] for further
+** details regarding how enabling and disabling a session object affects
+** the eventual changesets.
+**
+** Passing zero to this function disables the session. Passing a value
+** greater than zero enables it. Passing a value less than zero is a
+** no-op, and may be used to query the current state of the session.
+**
+** The return value indicates the final state of the session object: 0 if
+** the session is disabled, or 1 if it is enabled.
+*/
+SQLITE_API int sqlite3session_enable(sqlite3_session *pSession, int bEnable);
+
+/*
+** CAPI3REF: Set Or Clear the Indirect Change Flag
+** METHOD: sqlite3_session
+**
+** Each change recorded by a session object is marked as either direct or
+** indirect. A change is marked as indirect if either:
+**
+** <ul>
+**   <li> The session object "indirect" flag is set when the change is
+**        made, or
+**   <li> The change is made by an SQL trigger or foreign key action
+**        instead of directly as a result of a users SQL statement.
+** </ul>
+**
+** If a single row is affected by more than one operation within a session,
+** then the change is considered indirect if all operations meet the criteria
+** for an indirect change above, or direct otherwise.
+**
+** This function is used to set, clear or query the session object indirect
+** flag.  If the second argument passed to this function is zero, then the
+** indirect flag is cleared. If it is greater than zero, the indirect flag
+** is set. Passing a value less than zero does not modify the current value
+** of the indirect flag, and may be used to query the current state of the
+** indirect flag for the specified session object.
+**
+** The return value indicates the final state of the indirect flag: 0 if
+** it is clear, or 1 if it is set.
+*/
+SQLITE_API int sqlite3session_indirect(sqlite3_session *pSession, int bIndirect);
+
+/*
+** CAPI3REF: Attach A Table To A Session Object
+** METHOD: sqlite3_session
+**
+** If argument zTab is not NULL, then it is the name of a table to attach
+** to the session object passed as the first argument. All subsequent changes
+** made to the table while the session object is enabled will be recorded. See
+** documentation for [sqlite3session_changeset()] for further details.
+**
+** Or, if argument zTab is NULL, then changes are recorded for all tables
+** in the database. If additional tables are added to the database (by
+** executing "CREATE TABLE" statements) after this call is made, changes for
+** the new tables are also recorded.
+**
+** Changes can only be recorded for tables that have a PRIMARY KEY explicitly
+** defined as part of their CREATE TABLE statement. It does not matter if the
+** PRIMARY KEY is an "INTEGER PRIMARY KEY" (rowid alias) or not. The PRIMARY
+** KEY may consist of a single column, or may be a composite key.
+**
+** It is not an error if the named table does not exist in the database. Nor
+** is it an error if the named table does not have a PRIMARY KEY. However,
+** no changes will be recorded in either of these scenarios.
+**
+** Changes are not recorded for individual rows that have NULL values stored
+** in one or more of their PRIMARY KEY columns.
+**
+** SQLITE_OK is returned if the call completes without error. Or, if an error
+** occurs, an SQLite error code (e.g. SQLITE_NOMEM) is returned.
+**
+** <h3>Special sqlite_stat1 Handling</h3>
+**
+** As of SQLite version 3.22.0, the "sqlite_stat1" table is an exception to
+** some of the rules above. In SQLite, the schema of sqlite_stat1 is:
+**  <pre>
+**  &nbsp;     CREATE TABLE sqlite_stat1(tbl,idx,stat)
+**  </pre>
+**
+** Even though sqlite_stat1 does not have a PRIMARY KEY, changes are
+** recorded for it as if the PRIMARY KEY is (tbl,idx). Additionally, changes
+** are recorded for rows for which (idx IS NULL) is true. However, for such
+** rows a zero-length blob (SQL value X'') is stored in the changeset or
+** patchset instead of a NULL value. This allows such changesets to be
+** manipulated by legacy implementations of sqlite3changeset_invert(),
+** concat() and similar.
+**
+** The sqlite3changeset_apply() function automatically converts the
+** zero-length blob back to a NULL value when updating the sqlite_stat1
+** table. However, if the application calls sqlite3changeset_new(),
+** sqlite3changeset_old() or sqlite3changeset_conflict on a changeset
+** iterator directly (including on a changeset iterator passed to a
+** conflict-handler callback) then the X'' value is returned. The application
+** must translate X'' to NULL itself if required.
+**
+** Legacy (older than 3.22.0) versions of the sessions module cannot capture
+** changes made to the sqlite_stat1 table. Legacy versions of the
+** sqlite3changeset_apply() function silently ignore any modifications to the
+** sqlite_stat1 table that are part of a changeset or patchset.
+*/
+SQLITE_API int sqlite3session_attach(
+  sqlite3_session *pSession,      /* Session object */
+  const char *zTab                /* Table name */
+);
+
+/*
+** CAPI3REF: Set a table filter on a Session Object.
+** METHOD: sqlite3_session
+**
+** The second argument (xFilter) is the "filter callback". For changes to rows
+** in tables that are not attached to the Session object, the filter is called
+** to determine whether changes to the table's rows should be tracked or not.
+** If xFilter returns 0, changes are not tracked. Note that once a table is
+** attached, xFilter will not be called again.
+*/
+SQLITE_API void sqlite3session_table_filter(
+  sqlite3_session *pSession,      /* Session object */
+  int(*xFilter)(
+    void *pCtx,                   /* Copy of third arg to _filter_table() */
+    const char *zTab              /* Table name */
+  ),
+  void *pCtx                      /* First argument passed to xFilter */
+);
+
+/*
+** CAPI3REF: Generate A Changeset From A Session Object
+** METHOD: sqlite3_session
+**
+** Obtain a changeset containing changes to the tables attached to the
+** session object passed as the first argument. If successful,
+** set *ppChangeset to point to a buffer containing the changeset
+** and *pnChangeset to the size of the changeset in bytes before returning
+** SQLITE_OK. If an error occurs, set both *ppChangeset and *pnChangeset to
+** zero and return an SQLite error code.
+**
+** A changeset consists of zero or more INSERT, UPDATE and/or DELETE changes,
+** each representing a change to a single row of an attached table. An INSERT
+** change contains the values of each field of a new database row. A DELETE
+** contains the original values of each field of a deleted database row. An
+** UPDATE change contains the original values of each field of an updated
+** database row along with the updated values for each updated non-primary-key
+** column. It is not possible for an UPDATE change to represent a change that
+** modifies the values of primary key columns. If such a change is made, it
+** is represented in a changeset as a DELETE followed by an INSERT.
+**
+** Changes are not recorded for rows that have NULL values stored in one or
+** more of their PRIMARY KEY columns. If such a row is inserted or deleted,
+** no corresponding change is present in the changesets returned by this
+** function. If an existing row with one or more NULL values stored in
+** PRIMARY KEY columns is updated so that all PRIMARY KEY columns are non-NULL,
+** only an INSERT is appears in the changeset. Similarly, if an existing row
+** with non-NULL PRIMARY KEY values is updated so that one or more of its
+** PRIMARY KEY columns are set to NULL, the resulting changeset contains a
+** DELETE change only.
+**
+** The contents of a changeset may be traversed using an iterator created
+** using the [sqlite3changeset_start()] API. A changeset may be applied to
+** a database with a compatible schema using the [sqlite3changeset_apply()]
+** API.
+**
+** Within a changeset generated by this function, all changes related to a
+** single table are grouped together. In other words, when iterating through
+** a changeset or when applying a changeset to a database, all changes related
+** to a single table are processed before moving on to the next table. Tables
+** are sorted in the same order in which they were attached (or auto-attached)
+** to the sqlite3_session object. The order in which the changes related to
+** a single table are stored is undefined.
+**
+** Following a successful call to this function, it is the responsibility of
+** the caller to eventually free the buffer that *ppChangeset points to using
+** [sqlite3_free()].
+**
+** <h3>Changeset Generation</h3>
+**
+** Once a table has been attached to a session object, the session object
+** records the primary key values of all new rows inserted into the table.
+** It also records the original primary key and other column values of any
+** deleted or updated rows. For each unique primary key value, data is only
+** recorded once - the first time a row with said primary key is inserted,
+** updated or deleted in the lifetime of the session.
+**
+** There is one exception to the previous paragraph: when a row is inserted,
+** updated or deleted, if one or more of its primary key columns contain a
+** NULL value, no record of the change is made.
+**
+** The session object therefore accumulates two types of records - those
+** that consist of primary key values only (created when the user inserts
+** a new record) and those that consist of the primary key values and the
+** original values of other table columns (created when the users deletes
+** or updates a record).
+**
+** When this function is called, the requested changeset is created using
+** both the accumulated records and the current contents of the database
+** file. Specifically:
+**
+** <ul>
+**   <li> For each record generated by an insert, the database is queried
+**        for a row with a matching primary key. If one is found, an INSERT
+**        change is added to the changeset. If no such row is found, no change
+**        is added to the changeset.
+**
+**   <li> For each record generated by an update or delete, the database is
+**        queried for a row with a matching primary key. If such a row is
+**        found and one or more of the non-primary key fields have been
+**        modified from their original values, an UPDATE change is added to
+**        the changeset. Or, if no such row is found in the table, a DELETE
+**        change is added to the changeset. If there is a row with a matching
+**        primary key in the database, but all fields contain their original
+**        values, no change is added to the changeset.
+** </ul>
+**
+** This means, amongst other things, that if a row is inserted and then later
+** deleted while a session object is active, neither the insert nor the delete
+** will be present in the changeset. Or if a row is deleted and then later a
+** row with the same primary key values inserted while a session object is
+** active, the resulting changeset will contain an UPDATE change instead of
+** a DELETE and an INSERT.
+**
+** When a session object is disabled (see the [sqlite3session_enable()] API),
+** it does not accumulate records when rows are inserted, updated or deleted.
+** This may appear to have some counter-intuitive effects if a single row
+** is written to more than once during a session. For example, if a row
+** is inserted while a session object is enabled, then later deleted while
+** the same session object is disabled, no INSERT record will appear in the
+** changeset, even though the delete took place while the session was disabled.
+** Or, if one field of a row is updated while a session is disabled, and
+** another field of the same row is updated while the session is enabled, the
+** resulting changeset will contain an UPDATE change that updates both fields.
+*/
+SQLITE_API int sqlite3session_changeset(
+  sqlite3_session *pSession,      /* Session object */
+  int *pnChangeset,               /* OUT: Size of buffer at *ppChangeset */
+  void **ppChangeset              /* OUT: Buffer containing changeset */
+);
+
+/*
+** CAPI3REF: Return An Upper-limit For The Size Of The Changeset
+** METHOD: sqlite3_session
+**
+** By default, this function always returns 0. For it to return
+** a useful result, the sqlite3_session object must have been configured
+** to enable this API using sqlite3session_object_config() with the
+** SQLITE_SESSION_OBJCONFIG_SIZE verb.
+**
+** When enabled, this function returns an upper limit, in bytes, for the size
+** of the changeset that might be produced if sqlite3session_changeset() were
+** called. The final changeset size might be equal to or smaller than the
+** size in bytes returned by this function.
+*/
+SQLITE_API sqlite3_int64 sqlite3session_changeset_size(sqlite3_session *pSession);
+
+/*
+** CAPI3REF: Load The Difference Between Tables Into A Session
+** METHOD: sqlite3_session
+**
+** If it is not already attached to the session object passed as the first
+** argument, this function attaches table zTbl in the same manner as the
+** [sqlite3session_attach()] function. If zTbl does not exist, or if it
+** does not have a primary key, this function is a no-op (but does not return
+** an error).
+**
+** Argument zFromDb must be the name of a database ("main", "temp" etc.)
+** attached to the same database handle as the session object that contains
+** a table compatible with the table attached to the session by this function.
+** A table is considered compatible if it:
+**
+** <ul>
+**   <li> Has the same name,
+**   <li> Has the same set of columns declared in the same order, and
+**   <li> Has the same PRIMARY KEY definition.
+** </ul>
+**
+** If the tables are not compatible, SQLITE_SCHEMA is returned. If the tables
+** are compatible but do not have any PRIMARY KEY columns, it is not an error
+** but no changes are added to the session object. As with other session
+** APIs, tables without PRIMARY KEYs are simply ignored.
+**
+** This function adds a set of changes to the session object that could be
+** used to update the table in database zFrom (call this the "from-table")
+** so that its content is the same as the table attached to the session
+** object (call this the "to-table"). Specifically:
+**
+** <ul>
+**   <li> For each row (primary key) that exists in the to-table but not in
+**     the from-table, an INSERT record is added to the session object.
+**
+**   <li> For each row (primary key) that exists in the to-table but not in
+**     the from-table, a DELETE record is added to the session object.
+**
+**   <li> For each row (primary key) that exists in both tables, but features
+**     different non-PK values in each, an UPDATE record is added to the
+**     session.
+** </ul>
+**
+** To clarify, if this function is called and then a changeset constructed
+** using [sqlite3session_changeset()], then after applying that changeset to
+** database zFrom the contents of the two compatible tables would be
+** identical.
+**
+** It an error if database zFrom does not exist or does not contain the
+** required compatible table.
+**
+** If the operation is successful, SQLITE_OK is returned. Otherwise, an SQLite
+** error code. In this case, if argument pzErrMsg is not NULL, *pzErrMsg
+** may be set to point to a buffer containing an English language error
+** message. It is the responsibility of the caller to free this buffer using
+** sqlite3_free().
+*/
+SQLITE_API int sqlite3session_diff(
+  sqlite3_session *pSession,
+  const char *zFromDb,
+  const char *zTbl,
+  char **pzErrMsg
+);
+
+
+/*
+** CAPI3REF: Generate A Patchset From A Session Object
+** METHOD: sqlite3_session
+**
+** The differences between a patchset and a changeset are that:
+**
+** <ul>
+**   <li> DELETE records consist of the primary key fields only. The
+**        original values of other fields are omitted.
+**   <li> The original values of any modified fields are omitted from
+**        UPDATE records.
+** </ul>
+**
+** A patchset blob may be used with up to date versions of all
+** sqlite3changeset_xxx API functions except for sqlite3changeset_invert(),
+** which returns SQLITE_CORRUPT if it is passed a patchset. Similarly,
+** attempting to use a patchset blob with old versions of the
+** sqlite3changeset_xxx APIs also provokes an SQLITE_CORRUPT error.
+**
+** Because the non-primary key "old.*" fields are omitted, no
+** SQLITE_CHANGESET_DATA conflicts can be detected or reported if a patchset
+** is passed to the sqlite3changeset_apply() API. Other conflict types work
+** in the same way as for changesets.
+**
+** Changes within a patchset are ordered in the same way as for changesets
+** generated by the sqlite3session_changeset() function (i.e. all changes for
+** a single table are grouped together, tables appear in the order in which
+** they were attached to the session object).
+*/
+SQLITE_API int sqlite3session_patchset(
+  sqlite3_session *pSession,      /* Session object */
+  int *pnPatchset,                /* OUT: Size of buffer at *ppPatchset */
+  void **ppPatchset               /* OUT: Buffer containing patchset */
+);
+
+/*
+** CAPI3REF: Test if a changeset has recorded any changes.
+**
+** Return non-zero if no changes to attached tables have been recorded by
+** the session object passed as the first argument. Otherwise, if one or
+** more changes have been recorded, return zero.
+**
+** Even if this function returns zero, it is possible that calling
+** [sqlite3session_changeset()] on the session handle may still return a
+** changeset that contains no changes. This can happen when a row in
+** an attached table is modified and then later on the original values
+** are restored. However, if this function returns non-zero, then it is
+** guaranteed that a call to sqlite3session_changeset() will return a
+** changeset containing zero changes.
+*/
+SQLITE_API int sqlite3session_isempty(sqlite3_session *pSession);
+
+/*
+** CAPI3REF: Query for the amount of heap memory used by a session object.
+**
+** This API returns the total amount of heap memory in bytes currently
+** used by the session object passed as the only argument.
+*/
+SQLITE_API sqlite3_int64 sqlite3session_memory_used(sqlite3_session *pSession);
+
+/*
+** CAPI3REF: Create An Iterator To Traverse A Changeset
+** CONSTRUCTOR: sqlite3_changeset_iter
+**
+** Create an iterator used to iterate through the contents of a changeset.
+** If successful, *pp is set to point to the iterator handle and SQLITE_OK
+** is returned. Otherwise, if an error occurs, *pp is set to zero and an
+** SQLite error code is returned.
+**
+** The following functions can be used to advance and query a changeset
+** iterator created by this function:
+**
+** <ul>
+**   <li> [sqlite3changeset_next()]
+**   <li> [sqlite3changeset_op()]
+**   <li> [sqlite3changeset_new()]
+**   <li> [sqlite3changeset_old()]
+** </ul>
+**
+** It is the responsibility of the caller to eventually destroy the iterator
+** by passing it to [sqlite3changeset_finalize()]. The buffer containing the
+** changeset (pChangeset) must remain valid until after the iterator is
+** destroyed.
+**
+** Assuming the changeset blob was created by one of the
+** [sqlite3session_changeset()], [sqlite3changeset_concat()] or
+** [sqlite3changeset_invert()] functions, all changes within the changeset
+** that apply to a single table are grouped together. This means that when
+** an application iterates through a changeset using an iterator created by
+** this function, all changes that relate to a single table are visited
+** consecutively. There is no chance that the iterator will visit a change
+** the applies to table X, then one for table Y, and then later on visit
+** another change for table X.
+**
+** The behavior of sqlite3changeset_start_v2() and its streaming equivalent
+** may be modified by passing a combination of
+** [SQLITE_CHANGESETSTART_INVERT | supported flags] as the 4th parameter.
+**
+** Note that the sqlite3changeset_start_v2() API is still <b>experimental</b>
+** and therefore subject to change.
+*/
+SQLITE_API int sqlite3changeset_start(
+  sqlite3_changeset_iter **pp,    /* OUT: New changeset iterator handle */
+  int nChangeset,                 /* Size of changeset blob in bytes */
+  void *pChangeset                /* Pointer to blob containing changeset */
+);
+SQLITE_API int sqlite3changeset_start_v2(
+  sqlite3_changeset_iter **pp,    /* OUT: New changeset iterator handle */
+  int nChangeset,                 /* Size of changeset blob in bytes */
+  void *pChangeset,               /* Pointer to blob containing changeset */
+  int flags                       /* SESSION_CHANGESETSTART_* flags */
+);
+
+/*
+** CAPI3REF: Flags for sqlite3changeset_start_v2
+**
+** The following flags may passed via the 4th parameter to
+** [sqlite3changeset_start_v2] and [sqlite3changeset_start_v2_strm]:
+**
+** <dt>SQLITE_CHANGESETAPPLY_INVERT <dd>
+**   Invert the changeset while iterating through it. This is equivalent to
+**   inverting a changeset using sqlite3changeset_invert() before applying it.
+**   It is an error to specify this flag with a patchset.
+*/
+#define SQLITE_CHANGESETSTART_INVERT        0x0002
+
+
+/*
+** CAPI3REF: Advance A Changeset Iterator
+** METHOD: sqlite3_changeset_iter
+**
+** This function may only be used with iterators created by the function
+** [sqlite3changeset_start()]. If it is called on an iterator passed to
+** a conflict-handler callback by [sqlite3changeset_apply()], SQLITE_MISUSE
+** is returned and the call has no effect.
+**
+** Immediately after an iterator is created by sqlite3changeset_start(), it
+** does not point to any change in the changeset. Assuming the changeset
+** is not empty, the first call to this function advances the iterator to
+** point to the first change in the changeset. Each subsequent call advances
+** the iterator to point to the next change in the changeset (if any). If
+** no error occurs and the iterator points to a valid change after a call
+** to sqlite3changeset_next() has advanced it, SQLITE_ROW is returned.
+** Otherwise, if all changes in the changeset have already been visited,
+** SQLITE_DONE is returned.
+**
+** If an error occurs, an SQLite error code is returned. Possible error
+** codes include SQLITE_CORRUPT (if the changeset buffer is corrupt) or
+** SQLITE_NOMEM.
+*/
+SQLITE_API int sqlite3changeset_next(sqlite3_changeset_iter *pIter);
+
+/*
+** CAPI3REF: Obtain The Current Operation From A Changeset Iterator
+** METHOD: sqlite3_changeset_iter
+**
+** The pIter argument passed to this function may either be an iterator
+** passed to a conflict-handler by [sqlite3changeset_apply()], or an iterator
+** created by [sqlite3changeset_start()]. In the latter case, the most recent
+** call to [sqlite3changeset_next()] must have returned [SQLITE_ROW]. If this
+** is not the case, this function returns [SQLITE_MISUSE].
+**
+** Arguments pOp, pnCol and pzTab may not be NULL. Upon return, three
+** outputs are set through these pointers:
+**
+** *pOp is set to one of [SQLITE_INSERT], [SQLITE_DELETE] or [SQLITE_UPDATE],
+** depending on the type of change that the iterator currently points to;
+**
+** *pnCol is set to the number of columns in the table affected by the change; and
+**
+** *pzTab is set to point to a nul-terminated utf-8 encoded string containing
+** the name of the table affected by the current change. The buffer remains
+** valid until either sqlite3changeset_next() is called on the iterator
+** or until the conflict-handler function returns.
+**
+** If pbIndirect is not NULL, then *pbIndirect is set to true (1) if the change
+** is an indirect change, or false (0) otherwise. See the documentation for
+** [sqlite3session_indirect()] for a description of direct and indirect
+** changes.
+**
+** If no error occurs, SQLITE_OK is returned. If an error does occur, an
+** SQLite error code is returned. The values of the output variables may not
+** be trusted in this case.
+*/
+SQLITE_API int sqlite3changeset_op(
+  sqlite3_changeset_iter *pIter,  /* Iterator object */
+  const char **pzTab,             /* OUT: Pointer to table name */
+  int *pnCol,                     /* OUT: Number of columns in table */
+  int *pOp,                       /* OUT: SQLITE_INSERT, DELETE or UPDATE */
+  int *pbIndirect                 /* OUT: True for an 'indirect' change */
+);
+
+/*
+** CAPI3REF: Obtain The Primary Key Definition Of A Table
+** METHOD: sqlite3_changeset_iter
+**
+** For each modified table, a changeset includes the following:
+**
+** <ul>
+**   <li> The number of columns in the table, and
+**   <li> Which of those columns make up the tables PRIMARY KEY.
+** </ul>
+**
+** This function is used to find which columns comprise the PRIMARY KEY of
+** the table modified by the change that iterator pIter currently points to.
+** If successful, *pabPK is set to point to an array of nCol entries, where
+** nCol is the number of columns in the table. Elements of *pabPK are set to
+** 0x01 if the corresponding column is part of the tables primary key, or
+** 0x00 if it is not.
+**
+** If argument pnCol is not NULL, then *pnCol is set to the number of columns
+** in the table.
+**
+** If this function is called when the iterator does not point to a valid
+** entry, SQLITE_MISUSE is returned and the output variables zeroed. Otherwise,
+** SQLITE_OK is returned and the output variables populated as described
+** above.
+*/
+SQLITE_API int sqlite3changeset_pk(
+  sqlite3_changeset_iter *pIter,  /* Iterator object */
+  unsigned char **pabPK,          /* OUT: Array of boolean - true for PK cols */
+  int *pnCol                      /* OUT: Number of entries in output array */
+);
+
+/*
+** CAPI3REF: Obtain old.* Values From A Changeset Iterator
+** METHOD: sqlite3_changeset_iter
+**
+** The pIter argument passed to this function may either be an iterator
+** passed to a conflict-handler by [sqlite3changeset_apply()], or an iterator
+** created by [sqlite3changeset_start()]. In the latter case, the most recent
+** call to [sqlite3changeset_next()] must have returned SQLITE_ROW.
+** Furthermore, it may only be called if the type of change that the iterator
+** currently points to is either [SQLITE_DELETE] or [SQLITE_UPDATE]. Otherwise,
+** this function returns [SQLITE_MISUSE] and sets *ppValue to NULL.
+**
+** Argument iVal must be greater than or equal to 0, and less than the number
+** of columns in the table affected by the current change. Otherwise,
+** [SQLITE_RANGE] is returned and *ppValue is set to NULL.
+**
+** If successful, this function sets *ppValue to point to a protected
+** sqlite3_value object containing the iVal'th value from the vector of
+** original row values stored as part of the UPDATE or DELETE change and
+** returns SQLITE_OK. The name of the function comes from the fact that this
+** is similar to the "old.*" columns available to update or delete triggers.
+**
+** If some other error occurs (e.g. an OOM condition), an SQLite error code
+** is returned and *ppValue is set to NULL.
+*/
+SQLITE_API int sqlite3changeset_old(
+  sqlite3_changeset_iter *pIter,  /* Changeset iterator */
+  int iVal,                       /* Column number */
+  sqlite3_value **ppValue         /* OUT: Old value (or NULL pointer) */
+);
+
+/*
+** CAPI3REF: Obtain new.* Values From A Changeset Iterator
+** METHOD: sqlite3_changeset_iter
+**
+** The pIter argument passed to this function may either be an iterator
+** passed to a conflict-handler by [sqlite3changeset_apply()], or an iterator
+** created by [sqlite3changeset_start()]. In the latter case, the most recent
+** call to [sqlite3changeset_next()] must have returned SQLITE_ROW.
+** Furthermore, it may only be called if the type of change that the iterator
+** currently points to is either [SQLITE_UPDATE] or [SQLITE_INSERT]. Otherwise,
+** this function returns [SQLITE_MISUSE] and sets *ppValue to NULL.
+**
+** Argument iVal must be greater than or equal to 0, and less than the number
+** of columns in the table affected by the current change. Otherwise,
+** [SQLITE_RANGE] is returned and *ppValue is set to NULL.
+**
+** If successful, this function sets *ppValue to point to a protected
+** sqlite3_value object containing the iVal'th value from the vector of
+** new row values stored as part of the UPDATE or INSERT change and
+** returns SQLITE_OK. If the change is an UPDATE and does not include
+** a new value for the requested column, *ppValue is set to NULL and
+** SQLITE_OK returned. The name of the function comes from the fact that
+** this is similar to the "new.*" columns available to update or delete
+** triggers.
+**
+** If some other error occurs (e.g. an OOM condition), an SQLite error code
+** is returned and *ppValue is set to NULL.
+*/
+SQLITE_API int sqlite3changeset_new(
+  sqlite3_changeset_iter *pIter,  /* Changeset iterator */
+  int iVal,                       /* Column number */
+  sqlite3_value **ppValue         /* OUT: New value (or NULL pointer) */
+);
+
+/*
+** CAPI3REF: Obtain Conflicting Row Values From A Changeset Iterator
+** METHOD: sqlite3_changeset_iter
+**
+** This function should only be used with iterator objects passed to a
+** conflict-handler callback by [sqlite3changeset_apply()] with either
+** [SQLITE_CHANGESET_DATA] or [SQLITE_CHANGESET_CONFLICT]. If this function
+** is called on any other iterator, [SQLITE_MISUSE] is returned and *ppValue
+** is set to NULL.
+**
+** Argument iVal must be greater than or equal to 0, and less than the number
+** of columns in the table affected by the current change. Otherwise,
+** [SQLITE_RANGE] is returned and *ppValue is set to NULL.
+**
+** If successful, this function sets *ppValue to point to a protected
+** sqlite3_value object containing the iVal'th value from the
+** "conflicting row" associated with the current conflict-handler callback
+** and returns SQLITE_OK.
+**
+** If some other error occurs (e.g. an OOM condition), an SQLite error code
+** is returned and *ppValue is set to NULL.
+*/
+SQLITE_API int sqlite3changeset_conflict(
+  sqlite3_changeset_iter *pIter,  /* Changeset iterator */
+  int iVal,                       /* Column number */
+  sqlite3_value **ppValue         /* OUT: Value from conflicting row */
+);
+
+/*
+** CAPI3REF: Determine The Number Of Foreign Key Constraint Violations
+** METHOD: sqlite3_changeset_iter
+**
+** This function may only be called with an iterator passed to an
+** SQLITE_CHANGESET_FOREIGN_KEY conflict handler callback. In this case
+** it sets the output variable to the total number of known foreign key
+** violations in the destination database and returns SQLITE_OK.
+**
+** In all other cases this function returns SQLITE_MISUSE.
+*/
+SQLITE_API int sqlite3changeset_fk_conflicts(
+  sqlite3_changeset_iter *pIter,  /* Changeset iterator */
+  int *pnOut                      /* OUT: Number of FK violations */
+);
+
+
+/*
+** CAPI3REF: Finalize A Changeset Iterator
+** METHOD: sqlite3_changeset_iter
+**
+** This function is used to finalize an iterator allocated with
+** [sqlite3changeset_start()].
+**
+** This function should only be called on iterators created using the
+** [sqlite3changeset_start()] function. If an application calls this
+** function with an iterator passed to a conflict-handler by
+** [sqlite3changeset_apply()], [SQLITE_MISUSE] is immediately returned and the
+** call has no effect.
+**
+** If an error was encountered within a call to an sqlite3changeset_xxx()
+** function (for example an [SQLITE_CORRUPT] in [sqlite3changeset_next()] or an
+** [SQLITE_NOMEM] in [sqlite3changeset_new()]) then an error code corresponding
+** to that error is returned by this function. Otherwise, SQLITE_OK is
+** returned. This is to allow the following pattern (pseudo-code):
+**
+** <pre>
+**   sqlite3changeset_start();
+**   while( SQLITE_ROW==sqlite3changeset_next() ){
+**     // Do something with change.
+**   }
+**   rc = sqlite3changeset_finalize();
+**   if( rc!=SQLITE_OK ){
+**     // An error has occurred
+**   }
+** </pre>
+*/
+SQLITE_API int sqlite3changeset_finalize(sqlite3_changeset_iter *pIter);
+
+/*
+** CAPI3REF: Invert A Changeset
+**
+** This function is used to "invert" a changeset object. Applying an inverted
+** changeset to a database reverses the effects of applying the uninverted
+** changeset. Specifically:
+**
+** <ul>
+**   <li> Each DELETE change is changed to an INSERT, and
+**   <li> Each INSERT change is changed to a DELETE, and
+**   <li> For each UPDATE change, the old.* and new.* values are exchanged.
+** </ul>
+**
+** This function does not change the order in which changes appear within
+** the changeset. It merely reverses the sense of each individual change.
+**
+** If successful, a pointer to a buffer containing the inverted changeset
+** is stored in *ppOut, the size of the same buffer is stored in *pnOut, and
+** SQLITE_OK is returned. If an error occurs, both *pnOut and *ppOut are
+** zeroed and an SQLite error code returned.
+**
+** It is the responsibility of the caller to eventually call sqlite3_free()
+** on the *ppOut pointer to free the buffer allocation following a successful
+** call to this function.
+**
+** WARNING/TODO: This function currently assumes that the input is a valid
+** changeset. If it is not, the results are undefined.
+*/
+SQLITE_API int sqlite3changeset_invert(
+  int nIn, const void *pIn,       /* Input changeset */
+  int *pnOut, void **ppOut        /* OUT: Inverse of input */
+);
+
+/*
+** CAPI3REF: Concatenate Two Changeset Objects
+**
+** This function is used to concatenate two changesets, A and B, into a
+** single changeset. The result is a changeset equivalent to applying
+** changeset A followed by changeset B.
+**
+** This function combines the two input changesets using an
+** sqlite3_changegroup object. Calling it produces similar results as the
+** following code fragment:
+**
+** <pre>
+**   sqlite3_changegroup *pGrp;
+**   rc = sqlite3_changegroup_new(&pGrp);
+**   if( rc==SQLITE_OK ) rc = sqlite3changegroup_add(pGrp, nA, pA);
+**   if( rc==SQLITE_OK ) rc = sqlite3changegroup_add(pGrp, nB, pB);
+**   if( rc==SQLITE_OK ){
+**     rc = sqlite3changegroup_output(pGrp, pnOut, ppOut);
+**   }else{
+**     *ppOut = 0;
+**     *pnOut = 0;
+**   }
+** </pre>
+**
+** Refer to the sqlite3_changegroup documentation below for details.
+*/
+SQLITE_API int sqlite3changeset_concat(
+  int nA,                         /* Number of bytes in buffer pA */
+  void *pA,                       /* Pointer to buffer containing changeset A */
+  int nB,                         /* Number of bytes in buffer pB */
+  void *pB,                       /* Pointer to buffer containing changeset B */
+  int *pnOut,                     /* OUT: Number of bytes in output changeset */
+  void **ppOut                    /* OUT: Buffer containing output changeset */
+);
+
+
+/*
+** CAPI3REF: Upgrade the Schema of a Changeset/Patchset
+*/
+SQLITE_API int sqlite3changeset_upgrade(
+  sqlite3 *db,
+  const char *zDb,
+  int nIn, const void *pIn,       /* Input changeset */
+  int *pnOut, void **ppOut        /* OUT: Inverse of input */
+);
+
+
+
+/*
+** CAPI3REF: Changegroup Handle
+**
+** A changegroup is an object used to combine two or more
+** [changesets] or [patchsets]
+*/
+typedef struct sqlite3_changegroup sqlite3_changegroup;
+
+/*
+** CAPI3REF: Create A New Changegroup Object
+** CONSTRUCTOR: sqlite3_changegroup
+**
+** An sqlite3_changegroup object is used to combine two or more changesets
+** (or patchsets) into a single changeset (or patchset). A single changegroup
+** object may combine changesets or patchsets, but not both. The output is
+** always in the same format as the input.
+**
+** If successful, this function returns SQLITE_OK and populates (*pp) with
+** a pointer to a new sqlite3_changegroup object before returning. The caller
+** should eventually free the returned object using a call to
+** sqlite3changegroup_delete(). If an error occurs, an SQLite error code
+** (i.e. SQLITE_NOMEM) is returned and *pp is set to NULL.
+**
+** The usual usage pattern for an sqlite3_changegroup object is as follows:
+**
+** <ul>
+**   <li> It is created using a call to sqlite3changegroup_new().
+**
+**   <li> Zero or more changesets (or patchsets) are added to the object
+**        by calling sqlite3changegroup_add().
+**
+**   <li> The result of combining all input changesets together is obtained
+**        by the application via a call to sqlite3changegroup_output().
+**
+**   <li> The object is deleted using a call to sqlite3changegroup_delete().
+** </ul>
+**
+** Any number of calls to add() and output() may be made between the calls to
+** new() and delete(), and in any order.
+**
+** As well as the regular sqlite3changegroup_add() and
+** sqlite3changegroup_output() functions, also available are the streaming
+** versions sqlite3changegroup_add_strm() and sqlite3changegroup_output_strm().
+*/
+SQLITE_API int sqlite3changegroup_new(sqlite3_changegroup **pp);
+
+/*
+** CAPI3REF: Add a Schema to a Changegroup
+** METHOD: sqlite3_changegroup_schema
+**
+** This method may be used to optionally enforce the rule that the changesets
+** added to the changegroup handle must match the schema of database zDb
+** ("main", "temp", or the name of an attached database). If
+** sqlite3changegroup_add() is called to add a changeset that is not compatible
+** with the configured schema, SQLITE_SCHEMA is returned and the changegroup
+** object is left in an undefined state.
+**
+** A changeset schema is considered compatible with the database schema in
+** the same way as for sqlite3changeset_apply(). Specifically, for each
+** table in the changeset, there exists a database table with:
+**
+** <ul>
+**   <li> The name identified by the changeset, and
+**   <li> at least as many columns as recorded in the changeset, and
+**   <li> the primary key columns in the same position as recorded in
+**        the changeset.
+** </ul>
+**
+** The output of the changegroup object always has the same schema as the
+** database nominated using this function. In cases where changesets passed
+** to sqlite3changegroup_add() have fewer columns than the corresponding table
+** in the database schema, these are filled in using the default column
+** values from the database schema. This makes it possible to combined
+** changesets that have different numbers of columns for a single table
+** within a changegroup, provided that they are otherwise compatible.
+*/
+SQLITE_API int sqlite3changegroup_schema(sqlite3_changegroup*, sqlite3*, const char *zDb);
+
+/*
+** CAPI3REF: Add A Changeset To A Changegroup
+** METHOD: sqlite3_changegroup
+**
+** Add all changes within the changeset (or patchset) in buffer pData (size
+** nData bytes) to the changegroup.
+**
+** If the buffer contains a patchset, then all prior calls to this function
+** on the same changegroup object must also have specified patchsets. Or, if
+** the buffer contains a changeset, so must have the earlier calls to this
+** function. Otherwise, SQLITE_ERROR is returned and no changes are added
+** to the changegroup.
+**
+** Rows within the changeset and changegroup are identified by the values in
+** their PRIMARY KEY columns. A change in the changeset is considered to
+** apply to the same row as a change already present in the changegroup if
+** the two rows have the same primary key.
+**
+** Changes to rows that do not already appear in the changegroup are
+** simply copied into it. Or, if both the new changeset and the changegroup
+** contain changes that apply to a single row, the final contents of the
+** changegroup depends on the type of each change, as follows:
+**
+** <table border=1 style="margin-left:8ex;margin-right:8ex">
+**   <tr><th style="white-space:pre">Existing Change  </th>
+**       <th style="white-space:pre">New Change       </th>
+**       <th>Output Change
+**   <tr><td>INSERT <td>INSERT <td>
+**       The new change is ignored. This case does not occur if the new
+**       changeset was recorded immediately after the changesets already
+**       added to the changegroup.
+**   <tr><td>INSERT <td>UPDATE <td>
+**       The INSERT change remains in the changegroup. The values in the
+**       INSERT change are modified as if the row was inserted by the
+**       existing change and then updated according to the new change.
+**   <tr><td>INSERT <td>DELETE <td>
+**       The existing INSERT is removed from the changegroup. The DELETE is
+**       not added.
+**   <tr><td>UPDATE <td>INSERT <td>
+**       The new change is ignored. This case does not occur if the new
+**       changeset was recorded immediately after the changesets already
+**       added to the changegroup.
+**   <tr><td>UPDATE <td>UPDATE <td>
+**       The existing UPDATE remains within the changegroup. It is amended
+**       so that the accompanying values are as if the row was updated once
+**       by the existing change and then again by the new change.
+**   <tr><td>UPDATE <td>DELETE <td>
+**       The existing UPDATE is replaced by the new DELETE within the
+**       changegroup.
+**   <tr><td>DELETE <td>INSERT <td>
+**       If one or more of the column values in the row inserted by the
+**       new change differ from those in the row deleted by the existing
+**       change, the existing DELETE is replaced by an UPDATE within the
+**       changegroup. Otherwise, if the inserted row is exactly the same
+**       as the deleted row, the existing DELETE is simply discarded.
+**   <tr><td>DELETE <td>UPDATE <td>
+**       The new change is ignored. This case does not occur if the new
+**       changeset was recorded immediately after the changesets already
+**       added to the changegroup.
+**   <tr><td>DELETE <td>DELETE <td>
+**       The new change is ignored. This case does not occur if the new
+**       changeset was recorded immediately after the changesets already
+**       added to the changegroup.
+** </table>
+**
+** If the new changeset contains changes to a table that is already present
+** in the changegroup, then the number of columns and the position of the
+** primary key columns for the table must be consistent. If this is not the
+** case, this function fails with SQLITE_SCHEMA. Except, if the changegroup
+** object has been configured with a database schema using the
+** sqlite3changegroup_schema() API, then it is possible to combine changesets
+** with different numbers of columns for a single table, provided that
+** they are otherwise compatible.
+**
+** If the input changeset appears to be corrupt and the corruption is
+** detected, SQLITE_CORRUPT is returned. Or, if an out-of-memory condition
+** occurs during processing, this function returns SQLITE_NOMEM.
+**
+** In all cases, if an error occurs the state of the final contents of the
+** changegroup is undefined. If no error occurs, SQLITE_OK is returned.
+*/
+SQLITE_API int sqlite3changegroup_add(sqlite3_changegroup*, int nData, void *pData);
+
+/*
+** CAPI3REF: Add A Single Change To A Changegroup
+** METHOD: sqlite3_changegroup
+**
+** This function adds the single change currently indicated by the iterator
+** passed as the second argument to the changegroup object. The rules for
+** adding the change are just as described for [sqlite3changegroup_add()].
+**
+** If the change is successfully added to the changegroup, SQLITE_OK is
+** returned. Otherwise, an SQLite error code is returned.
+**
+** The iterator must point to a valid entry when this function is called.
+** If it does not, SQLITE_ERROR is returned and no change is added to the
+** changegroup. Additionally, the iterator must not have been opened with
+** the SQLITE_CHANGESETAPPLY_INVERT flag. In this case SQLITE_ERROR is also
+** returned.
+*/
+SQLITE_API int sqlite3changegroup_add_change(
+  sqlite3_changegroup*,
+  sqlite3_changeset_iter*
+);
+
+
+
+/*
+** CAPI3REF: Obtain A Composite Changeset From A Changegroup
+** METHOD: sqlite3_changegroup
+**
+** Obtain a buffer containing a changeset (or patchset) representing the
+** current contents of the changegroup. If the inputs to the changegroup
+** were themselves changesets, the output is a changeset. Or, if the
+** inputs were patchsets, the output is also a patchset.
+**
+** As with the output of the sqlite3session_changeset() and
+** sqlite3session_patchset() functions, all changes related to a single
+** table are grouped together in the output of this function. Tables appear
+** in the same order as for the very first changeset added to the changegroup.
+** If the second or subsequent changesets added to the changegroup contain
+** changes for tables that do not appear in the first changeset, they are
+** appended onto the end of the output changeset, again in the order in
+** which they are first encountered.
+**
+** If an error occurs, an SQLite error code is returned and the output
+** variables (*pnData) and (*ppData) are set to 0. Otherwise, SQLITE_OK
+** is returned and the output variables are set to the size of and a
+** pointer to the output buffer, respectively. In this case it is the
+** responsibility of the caller to eventually free the buffer using a
+** call to sqlite3_free().
+*/
+SQLITE_API int sqlite3changegroup_output(
+  sqlite3_changegroup*,
+  int *pnData,                    /* OUT: Size of output buffer in bytes */
+  void **ppData                   /* OUT: Pointer to output buffer */
+);
+
+/*
+** CAPI3REF: Delete A Changegroup Object
+** DESTRUCTOR: sqlite3_changegroup
+*/
+SQLITE_API void sqlite3changegroup_delete(sqlite3_changegroup*);
+
+/*
+** CAPI3REF: Apply A Changeset To A Database
+**
+** Apply a changeset or patchset to a database. These functions attempt to
+** update the "main" database attached to handle db with the changes found in
+** the changeset passed via the second and third arguments.
+**
+** The fourth argument (xFilter) passed to these functions is the "filter
+** callback". If it is not NULL, then for each table affected by at least one
+** change in the changeset, the filter callback is invoked with
+** the table name as the second argument, and a copy of the context pointer
+** passed as the sixth argument as the first. If the "filter callback"
+** returns zero, then no attempt is made to apply any changes to the table.
+** Otherwise, if the return value is non-zero or the xFilter argument to
+** is NULL, all changes related to the table are attempted.
+**
+** For each table that is not excluded by the filter callback, this function
+** tests that the target database contains a compatible table. A table is
+** considered compatible if all of the following are true:
+**
+** <ul>
+**   <li> The table has the same name as the name recorded in the
+**        changeset, and
+**   <li> The table has at least as many columns as recorded in the
+**        changeset, and
+**   <li> The table has primary key columns in the same position as
+**        recorded in the changeset.
+** </ul>
+**
+** If there is no compatible table, it is not an error, but none of the
+** changes associated with the table are applied. A warning message is issued
+** via the sqlite3_log() mechanism with the error code SQLITE_SCHEMA. At most
+** one such warning is issued for each table in the changeset.
+**
+** For each change for which there is a compatible table, an attempt is made
+** to modify the table contents according to the UPDATE, INSERT or DELETE
+** change. If a change cannot be applied cleanly, the conflict handler
+** function passed as the fifth argument to sqlite3changeset_apply() may be
+** invoked. A description of exactly when the conflict handler is invoked for
+** each type of change is below.
+**
+** Unlike the xFilter argument, xConflict may not be passed NULL. The results
+** of passing anything other than a valid function pointer as the xConflict
+** argument are undefined.
+**
+** Each time the conflict handler function is invoked, it must return one
+** of [SQLITE_CHANGESET_OMIT], [SQLITE_CHANGESET_ABORT] or
+** [SQLITE_CHANGESET_REPLACE]. SQLITE_CHANGESET_REPLACE may only be returned
+** if the second argument passed to the conflict handler is either
+** SQLITE_CHANGESET_DATA or SQLITE_CHANGESET_CONFLICT. If the conflict-handler
+** returns an illegal value, any changes already made are rolled back and
+** the call to sqlite3changeset_apply() returns SQLITE_MISUSE. Different
+** actions are taken by sqlite3changeset_apply() depending on the value
+** returned by each invocation of the conflict-handler function. Refer to
+** the documentation for the three
+** [SQLITE_CHANGESET_OMIT|available return values] for details.
+**
+** <dl>
+** <dt>DELETE Changes<dd>
+**   For each DELETE change, the function checks if the target database
+**   contains a row with the same primary key value (or values) as the
+**   original row values stored in the changeset. If it does, and the values
+**   stored in all non-primary key columns also match the values stored in
+**   the changeset the row is deleted from the target database.
+**
+**   If a row with matching primary key values is found, but one or more of
+**   the non-primary key fields contains a value different from the original
+**   row value stored in the changeset, the conflict-handler function is
+**   invoked with [SQLITE_CHANGESET_DATA] as the second argument. If the
+**   database table has more columns than are recorded in the changeset,
+**   only the values of those non-primary key fields are compared against
+**   the current database contents - any trailing database table columns
+**   are ignored.
+**
+**   If no row with matching primary key values is found in the database,
+**   the conflict-handler function is invoked with [SQLITE_CHANGESET_NOTFOUND]
+**   passed as the second argument.
+**
+**   If the DELETE operation is attempted, but SQLite returns SQLITE_CONSTRAINT
+**   (which can only happen if a foreign key constraint is violated), the
+**   conflict-handler function is invoked with [SQLITE_CHANGESET_CONSTRAINT]
+**   passed as the second argument. This includes the case where the DELETE
+**   operation is attempted because an earlier call to the conflict handler
+**   function returned [SQLITE_CHANGESET_REPLACE].
+**
+** <dt>INSERT Changes<dd>
+**   For each INSERT change, an attempt is made to insert the new row into
+**   the database. If the changeset row contains fewer fields than the
+**   database table, the trailing fields are populated with their default
+**   values.
+**
+**   If the attempt to insert the row fails because the database already
+**   contains a row with the same primary key values, the conflict handler
+**   function is invoked with the second argument set to
+**   [SQLITE_CHANGESET_CONFLICT].
+**
+**   If the attempt to insert the row fails because of some other constraint
+**   violation (e.g. NOT NULL or UNIQUE), the conflict handler function is
+**   invoked with the second argument set to [SQLITE_CHANGESET_CONSTRAINT].
+**   This includes the case where the INSERT operation is re-attempted because
+**   an earlier call to the conflict handler function returned
+**   [SQLITE_CHANGESET_REPLACE].
+**
+** <dt>UPDATE Changes<dd>
+**   For each UPDATE change, the function checks if the target database
+**   contains a row with the same primary key value (or values) as the
+**   original row values stored in the changeset. If it does, and the values
+**   stored in all modified non-primary key columns also match the values
+**   stored in the changeset the row is updated within the target database.
+**
+**   If a row with matching primary key values is found, but one or more of
+**   the modified non-primary key fields contains a value different from an
+**   original row value stored in the changeset, the conflict-handler function
+**   is invoked with [SQLITE_CHANGESET_DATA] as the second argument. Since
+**   UPDATE changes only contain values for non-primary key fields that are
+**   to be modified, only those fields need to match the original values to
+**   avoid the SQLITE_CHANGESET_DATA conflict-handler callback.
+**
+**   If no row with matching primary key values is found in the database,
+**   the conflict-handler function is invoked with [SQLITE_CHANGESET_NOTFOUND]
+**   passed as the second argument.
+**
+**   If the UPDATE operation is attempted, but SQLite returns
+**   SQLITE_CONSTRAINT, the conflict-handler function is invoked with
+**   [SQLITE_CHANGESET_CONSTRAINT] passed as the second argument.
+**   This includes the case where the UPDATE operation is attempted after
+**   an earlier call to the conflict handler function returned
+**   [SQLITE_CHANGESET_REPLACE].
+** </dl>
+**
+** It is safe to execute SQL statements, including those that write to the
+** table that the callback related to, from within the xConflict callback.
+** This can be used to further customize the application's conflict
+** resolution strategy.
+**
+** All changes made by these functions are enclosed in a savepoint transaction.
+** If any other error (aside from a constraint failure when attempting to
+** write to the target database) occurs, then the savepoint transaction is
+** rolled back, restoring the target database to its original state, and an
+** SQLite error code returned.
+**
+** If the output parameters (ppRebase) and (pnRebase) are non-NULL and
+** the input is a changeset (not a patchset), then sqlite3changeset_apply_v2()
+** may set (*ppRebase) to point to a "rebase" that may be used with the
+** sqlite3_rebaser APIs buffer before returning. In this case (*pnRebase)
+** is set to the size of the buffer in bytes. It is the responsibility of the
+** caller to eventually free any such buffer using sqlite3_free(). The buffer
+** is only allocated and populated if one or more conflicts were encountered
+** while applying the patchset. See comments surrounding the sqlite3_rebaser
+** APIs for further details.
+**
+** The behavior of sqlite3changeset_apply_v2() and its streaming equivalent
+** may be modified by passing a combination of
+** [SQLITE_CHANGESETAPPLY_NOSAVEPOINT | supported flags] as the 9th parameter.
+**
+** Note that the sqlite3changeset_apply_v2() API is still <b>experimental</b>
+** and therefore subject to change.
+*/
+SQLITE_API int sqlite3changeset_apply(
+  sqlite3 *db,                    /* Apply change to "main" db of this handle */
+  int nChangeset,                 /* Size of changeset in bytes */
+  void *pChangeset,               /* Changeset blob */
+  int(*xFilter)(
+    void *pCtx,                   /* Copy of sixth arg to _apply() */
+    const char *zTab              /* Table name */
+  ),
+  int(*xConflict)(
+    void *pCtx,                   /* Copy of sixth arg to _apply() */
+    int eConflict,                /* DATA, MISSING, CONFLICT, CONSTRAINT */
+    sqlite3_changeset_iter *p     /* Handle describing change and conflict */
+  ),
+  void *pCtx                      /* First argument passed to xConflict */
+);
+SQLITE_API int sqlite3changeset_apply_v2(
+  sqlite3 *db,                    /* Apply change to "main" db of this handle */
+  int nChangeset,                 /* Size of changeset in bytes */
+  void *pChangeset,               /* Changeset blob */
+  int(*xFilter)(
+    void *pCtx,                   /* Copy of sixth arg to _apply() */
+    const char *zTab              /* Table name */
+  ),
+  int(*xConflict)(
+    void *pCtx,                   /* Copy of sixth arg to _apply() */
+    int eConflict,                /* DATA, MISSING, CONFLICT, CONSTRAINT */
+    sqlite3_changeset_iter *p     /* Handle describing change and conflict */
+  ),
+  void *pCtx,                     /* First argument passed to xConflict */
+  void **ppRebase, int *pnRebase, /* OUT: Rebase data */
+  int flags                       /* SESSION_CHANGESETAPPLY_* flags */
+);
+
+/*
+** CAPI3REF: Flags for sqlite3changeset_apply_v2
+**
+** The following flags may passed via the 9th parameter to
+** [sqlite3changeset_apply_v2] and [sqlite3changeset_apply_v2_strm]:
+**
+** <dl>
+** <dt>SQLITE_CHANGESETAPPLY_NOSAVEPOINT <dd>
+**   Usually, the sessions module encloses all operations performed by
+**   a single call to apply_v2() or apply_v2_strm() in a [SAVEPOINT]. The
+**   SAVEPOINT is committed if the changeset or patchset is successfully
+**   applied, or rolled back if an error occurs. Specifying this flag
+**   causes the sessions module to omit this savepoint. In this case, if the
+**   caller has an open transaction or savepoint when apply_v2() is called,
+**   it may revert the partially applied changeset by rolling it back.
+**
+** <dt>SQLITE_CHANGESETAPPLY_INVERT <dd>
+**   Invert the changeset before applying it. This is equivalent to inverting
+**   a changeset using sqlite3changeset_invert() before applying it. It is
+**   an error to specify this flag with a patchset.
+**
+** <dt>SQLITE_CHANGESETAPPLY_IGNORENOOP <dd>
+**   Do not invoke the conflict handler callback for any changes that
+**   would not actually modify the database even if they were applied.
+**   Specifically, this means that the conflict handler is not invoked
+**   for:
+**    <ul>
+**    <li>a delete change if the row being deleted cannot be found,
+**    <li>an update change if the modified fields are already set to
+**        their new values in the conflicting row, or
+**    <li>an insert change if all fields of the conflicting row match
+**        the row being inserted.
+**    </ul>
+**
+** <dt>SQLITE_CHANGESETAPPLY_FKNOACTION <dd>
+**   If this flag it set, then all foreign key constraints in the target
+**   database behave as if they were declared with "ON UPDATE NO ACTION ON
+**   DELETE NO ACTION", even if they are actually CASCADE, RESTRICT, SET NULL
+**   or SET DEFAULT.
+*/
+#define SQLITE_CHANGESETAPPLY_NOSAVEPOINT   0x0001
+#define SQLITE_CHANGESETAPPLY_INVERT        0x0002
+#define SQLITE_CHANGESETAPPLY_IGNORENOOP    0x0004
+#define SQLITE_CHANGESETAPPLY_FKNOACTION    0x0008
+
+/*
+** CAPI3REF: Constants Passed To The Conflict Handler
+**
+** Values that may be passed as the second argument to a conflict-handler.
+**
+** <dl>
+** <dt>SQLITE_CHANGESET_DATA<dd>
+**   The conflict handler is invoked with CHANGESET_DATA as the second argument
+**   when processing a DELETE or UPDATE change if a row with the required
+**   PRIMARY KEY fields is present in the database, but one or more other
+**   (non primary-key) fields modified by the update do not contain the
+**   expected "before" values.
+**
+**   The conflicting row, in this case, is the database row with the matching
+**   primary key.
+**
+** <dt>SQLITE_CHANGESET_NOTFOUND<dd>
+**   The conflict handler is invoked with CHANGESET_NOTFOUND as the second
+**   argument when processing a DELETE or UPDATE change if a row with the
+**   required PRIMARY KEY fields is not present in the database.
+**
+**   There is no conflicting row in this case. The results of invoking the
+**   sqlite3changeset_conflict() API are undefined.
+**
+** <dt>SQLITE_CHANGESET_CONFLICT<dd>
+**   CHANGESET_CONFLICT is passed as the second argument to the conflict
+**   handler while processing an INSERT change if the operation would result
+**   in duplicate primary key values.
+**
+**   The conflicting row in this case is the database row with the matching
+**   primary key.
+**
+** <dt>SQLITE_CHANGESET_FOREIGN_KEY<dd>
+**   If foreign key handling is enabled, and applying a changeset leaves the
+**   database in a state containing foreign key violations, the conflict
+**   handler is invoked with CHANGESET_FOREIGN_KEY as the second argument
+**   exactly once before the changeset is committed. If the conflict handler
+**   returns CHANGESET_OMIT, the changes, including those that caused the
+**   foreign key constraint violation, are committed. Or, if it returns
+**   CHANGESET_ABORT, the changeset is rolled back.
+**
+**   No current or conflicting row information is provided. The only function
+**   it is possible to call on the supplied sqlite3_changeset_iter handle
+**   is sqlite3changeset_fk_conflicts().
+**
+** <dt>SQLITE_CHANGESET_CONSTRAINT<dd>
+**   If any other constraint violation occurs while applying a change (i.e.
+**   a UNIQUE, CHECK or NOT NULL constraint), the conflict handler is
+**   invoked with CHANGESET_CONSTRAINT as the second argument.
+**
+**   There is no conflicting row in this case. The results of invoking the
+**   sqlite3changeset_conflict() API are undefined.
+**
+** </dl>
+*/
+#define SQLITE_CHANGESET_DATA        1
+#define SQLITE_CHANGESET_NOTFOUND    2
+#define SQLITE_CHANGESET_CONFLICT    3
+#define SQLITE_CHANGESET_CONSTRAINT  4
+#define SQLITE_CHANGESET_FOREIGN_KEY 5
+
+/*
+** CAPI3REF: Constants Returned By The Conflict Handler
+**
+** A conflict handler callback must return one of the following three values.
+**
+** <dl>
+** <dt>SQLITE_CHANGESET_OMIT<dd>
+**   If a conflict handler returns this value no special action is taken. The
+**   change that caused the conflict is not applied. The session module
+**   continues to the next change in the changeset.
+**
+** <dt>SQLITE_CHANGESET_REPLACE<dd>
+**   This value may only be returned if the second argument to the conflict
+**   handler was SQLITE_CHANGESET_DATA or SQLITE_CHANGESET_CONFLICT. If this
+**   is not the case, any changes applied so far are rolled back and the
+**   call to sqlite3changeset_apply() returns SQLITE_MISUSE.
+**
+**   If CHANGESET_REPLACE is returned by an SQLITE_CHANGESET_DATA conflict
+**   handler, then the conflicting row is either updated or deleted, depending
+**   on the type of change.
+**
+**   If CHANGESET_REPLACE is returned by an SQLITE_CHANGESET_CONFLICT conflict
+**   handler, then the conflicting row is removed from the database and a
+**   second attempt to apply the change is made. If this second attempt fails,
+**   the original row is restored to the database before continuing.
+**
+** <dt>SQLITE_CHANGESET_ABORT<dd>
+**   If this value is returned, any changes applied so far are rolled back
+**   and the call to sqlite3changeset_apply() returns SQLITE_ABORT.
+** </dl>
+*/
+#define SQLITE_CHANGESET_OMIT       0
+#define SQLITE_CHANGESET_REPLACE    1
+#define SQLITE_CHANGESET_ABORT      2
+
+/*
+** CAPI3REF: Rebasing changesets
+** EXPERIMENTAL
+**
+** Suppose there is a site hosting a database in state S0. And that
+** modifications are made that move that database to state S1 and a
+** changeset recorded (the "local" changeset). Then, a changeset based
+** on S0 is received from another site (the "remote" changeset) and
+** applied to the database. The database is then in state
+** (S1+"remote"), where the exact state depends on any conflict
+** resolution decisions (OMIT or REPLACE) made while applying "remote".
+** Rebasing a changeset is to update it to take those conflict
+** resolution decisions into account, so that the same conflicts
+** do not have to be resolved elsewhere in the network.
+**
+** For example, if both the local and remote changesets contain an
+** INSERT of the same key on "CREATE TABLE t1(a PRIMARY KEY, b)":
+**
+**   local:  INSERT INTO t1 VALUES(1, 'v1');
+**   remote: INSERT INTO t1 VALUES(1, 'v2');
+**
+** and the conflict resolution is REPLACE, then the INSERT change is
+** removed from the local changeset (it was overridden). Or, if the
+** conflict resolution was "OMIT", then the local changeset is modified
+** to instead contain:
+**
+**           UPDATE t1 SET b = 'v2' WHERE a=1;
+**
+** Changes within the local changeset are rebased as follows:
+**
+** <dl>
+** <dt>Local INSERT<dd>
+**   This may only conflict with a remote INSERT. If the conflict
+**   resolution was OMIT, then add an UPDATE change to the rebased
+**   changeset. Or, if the conflict resolution was REPLACE, add
+**   nothing to the rebased changeset.
+**
+** <dt>Local DELETE<dd>
+**   This may conflict with a remote UPDATE or DELETE. In both cases the
+**   only possible resolution is OMIT. If the remote operation was a
+**   DELETE, then add no change to the rebased changeset. If the remote
+**   operation was an UPDATE, then the old.* fields of change are updated
+**   to reflect the new.* values in the UPDATE.
+**
+** <dt>Local UPDATE<dd>
+**   This may conflict with a remote UPDATE or DELETE. If it conflicts
+**   with a DELETE, and the conflict resolution was OMIT, then the update
+**   is changed into an INSERT. Any undefined values in the new.* record
+**   from the update change are filled in using the old.* values from
+**   the conflicting DELETE. Or, if the conflict resolution was REPLACE,
+**   the UPDATE change is simply omitted from the rebased changeset.
+**
+**   If conflict is with a remote UPDATE and the resolution is OMIT, then
+**   the old.* values are rebased using the new.* values in the remote
+**   change. Or, if the resolution is REPLACE, then the change is copied
+**   into the rebased changeset with updates to columns also updated by
+**   the conflicting remote UPDATE removed. If this means no columns would
+**   be updated, the change is omitted.
+** </dl>
+**
+** A local change may be rebased against multiple remote changes
+** simultaneously. If a single key is modified by multiple remote
+** changesets, they are combined as follows before the local changeset
+** is rebased:
+**
+** <ul>
+**    <li> If there has been one or more REPLACE resolutions on a
+**         key, it is rebased according to a REPLACE.
+**
+**    <li> If there have been no REPLACE resolutions on a key, then
+**         the local changeset is rebased according to the most recent
+**         of the OMIT resolutions.
+** </ul>
+**
+** Note that conflict resolutions from multiple remote changesets are
+** combined on a per-field basis, not per-row. This means that in the
+** case of multiple remote UPDATE operations, some fields of a single
+** local change may be rebased for REPLACE while others are rebased for
+** OMIT.
+**
+** In order to rebase a local changeset, the remote changeset must first
+** be applied to the local database using sqlite3changeset_apply_v2() and
+** the buffer of rebase information captured. Then:
+**
+** <ol>
+**   <li> An sqlite3_rebaser object is created by calling
+**        sqlite3rebaser_create().
+**   <li> The new object is configured with the rebase buffer obtained from
+**        sqlite3changeset_apply_v2() by calling sqlite3rebaser_configure().
+**        If the local changeset is to be rebased against multiple remote
+**        changesets, then sqlite3rebaser_configure() should be called
+**        multiple times, in the same order that the multiple
+**        sqlite3changeset_apply_v2() calls were made.
+**   <li> Each local changeset is rebased by calling sqlite3rebaser_rebase().
+**   <li> The sqlite3_rebaser object is deleted by calling
+**        sqlite3rebaser_delete().
+** </ol>
+*/
+typedef struct sqlite3_rebaser sqlite3_rebaser;
+
+/*
+** CAPI3REF: Create a changeset rebaser object.
+** EXPERIMENTAL
+**
+** Allocate a new changeset rebaser object. If successful, set (*ppNew) to
+** point to the new object and return SQLITE_OK. Otherwise, if an error
+** occurs, return an SQLite error code (e.g. SQLITE_NOMEM) and set (*ppNew)
+** to NULL.
+*/
+SQLITE_API int sqlite3rebaser_create(sqlite3_rebaser **ppNew);
+
+/*
+** CAPI3REF: Configure a changeset rebaser object.
+** EXPERIMENTAL
+**
+** Configure the changeset rebaser object to rebase changesets according
+** to the conflict resolutions described by buffer pRebase (size nRebase
+** bytes), which must have been obtained from a previous call to
+** sqlite3changeset_apply_v2().
+*/
+SQLITE_API int sqlite3rebaser_configure(
+  sqlite3_rebaser*,
+  int nRebase, const void *pRebase
+);
+
+/*
+** CAPI3REF: Rebase a changeset
+** EXPERIMENTAL
+**
+** Argument pIn must point to a buffer containing a changeset nIn bytes
+** in size. This function allocates and populates a buffer with a copy
+** of the changeset rebased according to the configuration of the
+** rebaser object passed as the first argument. If successful, (*ppOut)
+** is set to point to the new buffer containing the rebased changeset and
+** (*pnOut) to its size in bytes and SQLITE_OK returned. It is the
+** responsibility of the caller to eventually free the new buffer using
+** sqlite3_free(). Otherwise, if an error occurs, (*ppOut) and (*pnOut)
+** are set to zero and an SQLite error code returned.
+*/
+SQLITE_API int sqlite3rebaser_rebase(
+  sqlite3_rebaser*,
+  int nIn, const void *pIn,
+  int *pnOut, void **ppOut
+);
+
+/*
+** CAPI3REF: Delete a changeset rebaser object.
+** EXPERIMENTAL
+**
+** Delete the changeset rebaser object and all associated resources. There
+** should be one call to this function for each successful invocation
+** of sqlite3rebaser_create().
+*/
+SQLITE_API void sqlite3rebaser_delete(sqlite3_rebaser *p);
+
+/*
+** CAPI3REF: Streaming Versions of API functions.
+**
+** The six streaming API xxx_strm() functions serve similar purposes to the
+** corresponding non-streaming API functions:
+**
+** <table border=1 style="margin-left:8ex;margin-right:8ex">
+**   <tr><th>Streaming function<th>Non-streaming equivalent</th>
+**   <tr><td>sqlite3changeset_apply_strm<td>[sqlite3changeset_apply]
+**   <tr><td>sqlite3changeset_apply_strm_v2<td>[sqlite3changeset_apply_v2]
+**   <tr><td>sqlite3changeset_concat_strm<td>[sqlite3changeset_concat]
+**   <tr><td>sqlite3changeset_invert_strm<td>[sqlite3changeset_invert]
+**   <tr><td>sqlite3changeset_start_strm<td>[sqlite3changeset_start]
+**   <tr><td>sqlite3session_changeset_strm<td>[sqlite3session_changeset]
+**   <tr><td>sqlite3session_patchset_strm<td>[sqlite3session_patchset]
+** </table>
+**
+** Non-streaming functions that accept changesets (or patchsets) as input
+** require that the entire changeset be stored in a single buffer in memory.
+** Similarly, those that return a changeset or patchset do so by returning
+** a pointer to a single large buffer allocated using sqlite3_malloc().
+** Normally this is convenient. However, if an application running in a
+** low-memory environment is required to handle very large changesets, the
+** large contiguous memory allocations required can become onerous.
+**
+** In order to avoid this problem, instead of a single large buffer, input
+** is passed to a streaming API functions by way of a callback function that
+** the sessions module invokes to incrementally request input data as it is
+** required. In all cases, a pair of API function parameters such as
+**
+**  <pre>
+**  &nbsp;     int nChangeset,
+**  &nbsp;     void *pChangeset,
+**  </pre>
+**
+** Is replaced by:
+**
+**  <pre>
+**  &nbsp;     int (*xInput)(void *pIn, void *pData, int *pnData),
+**  &nbsp;     void *pIn,
+**  </pre>
+**
+** Each time the xInput callback is invoked by the sessions module, the first
+** argument passed is a copy of the supplied pIn context pointer. The second
+** argument, pData, points to a buffer (*pnData) bytes in size. Assuming no
+** error occurs the xInput method should copy up to (*pnData) bytes of data
+** into the buffer and set (*pnData) to the actual number of bytes copied
+** before returning SQLITE_OK. If the input is completely exhausted, (*pnData)
+** should be set to zero to indicate this. Or, if an error occurs, an SQLite
+** error code should be returned. In all cases, if an xInput callback returns
+** an error, all processing is abandoned and the streaming API function
+** returns a copy of the error code to the caller.
+**
+** In the case of sqlite3changeset_start_strm(), the xInput callback may be
+** invoked by the sessions module at any point during the lifetime of the
+** iterator. If such an xInput callback returns an error, the iterator enters
+** an error state, whereby all subsequent calls to iterator functions
+** immediately fail with the same error code as returned by xInput.
+**
+** Similarly, streaming API functions that return changesets (or patchsets)
+** return them in chunks by way of a callback function instead of via a
+** pointer to a single large buffer. In this case, a pair of parameters such
+** as:
+**
+**  <pre>
+**  &nbsp;     int *pnChangeset,
+**  &nbsp;     void **ppChangeset,
+**  </pre>
+**
+** Is replaced by:
+**
+**  <pre>
+**  &nbsp;     int (*xOutput)(void *pOut, const void *pData, int nData),
+**  &nbsp;     void *pOut
+**  </pre>
+**
+** The xOutput callback is invoked zero or more times to return data to
+** the application. The first parameter passed to each call is a copy of the
+** pOut pointer supplied by the application. The second parameter, pData,
+** points to a buffer nData bytes in size containing the chunk of output
+** data being returned. If the xOutput callback successfully processes the
+** supplied data, it should return SQLITE_OK to indicate success. Otherwise,
+** it should return some other SQLite error code. In this case processing
+** is immediately abandoned and the streaming API function returns a copy
+** of the xOutput error code to the application.
+**
+** The sessions module never invokes an xOutput callback with the third
+** parameter set to a value less than or equal to zero. Other than this,
+** no guarantees are made as to the size of the chunks of data returned.
+*/
+SQLITE_API int sqlite3changeset_apply_strm(
+  sqlite3 *db,                    /* Apply change to "main" db of this handle */
+  int (*xInput)(void *pIn, void *pData, int *pnData), /* Input function */
+  void *pIn,                                          /* First arg for xInput */
+  int(*xFilter)(
+    void *pCtx,                   /* Copy of sixth arg to _apply() */
+    const char *zTab              /* Table name */
+  ),
+  int(*xConflict)(
+    void *pCtx,                   /* Copy of sixth arg to _apply() */
+    int eConflict,                /* DATA, MISSING, CONFLICT, CONSTRAINT */
+    sqlite3_changeset_iter *p     /* Handle describing change and conflict */
+  ),
+  void *pCtx                      /* First argument passed to xConflict */
+);
+SQLITE_API int sqlite3changeset_apply_v2_strm(
+  sqlite3 *db,                    /* Apply change to "main" db of this handle */
+  int (*xInput)(void *pIn, void *pData, int *pnData), /* Input function */
+  void *pIn,                                          /* First arg for xInput */
+  int(*xFilter)(
+    void *pCtx,                   /* Copy of sixth arg to _apply() */
+    const char *zTab              /* Table name */
+  ),
+  int(*xConflict)(
+    void *pCtx,                   /* Copy of sixth arg to _apply() */
+    int eConflict,                /* DATA, MISSING, CONFLICT, CONSTRAINT */
+    sqlite3_changeset_iter *p     /* Handle describing change and conflict */
+  ),
+  void *pCtx,                     /* First argument passed to xConflict */
+  void **ppRebase, int *pnRebase,
+  int flags
+);
+SQLITE_API int sqlite3changeset_concat_strm(
+  int (*xInputA)(void *pIn, void *pData, int *pnData),
+  void *pInA,
+  int (*xInputB)(void *pIn, void *pData, int *pnData),
+  void *pInB,
+  int (*xOutput)(void *pOut, const void *pData, int nData),
+  void *pOut
+);
+SQLITE_API int sqlite3changeset_invert_strm(
+  int (*xInput)(void *pIn, void *pData, int *pnData),
+  void *pIn,
+  int (*xOutput)(void *pOut, const void *pData, int nData),
+  void *pOut
+);
+SQLITE_API int sqlite3changeset_start_strm(
+  sqlite3_changeset_iter **pp,
+  int (*xInput)(void *pIn, void *pData, int *pnData),
+  void *pIn
+);
+SQLITE_API int sqlite3changeset_start_v2_strm(
+  sqlite3_changeset_iter **pp,
+  int (*xInput)(void *pIn, void *pData, int *pnData),
+  void *pIn,
+  int flags
+);
+SQLITE_API int sqlite3session_changeset_strm(
+  sqlite3_session *pSession,
+  int (*xOutput)(void *pOut, const void *pData, int nData),
+  void *pOut
+);
+SQLITE_API int sqlite3session_patchset_strm(
+  sqlite3_session *pSession,
+  int (*xOutput)(void *pOut, const void *pData, int nData),
+  void *pOut
+);
+SQLITE_API int sqlite3changegroup_add_strm(sqlite3_changegroup*,
+    int (*xInput)(void *pIn, void *pData, int *pnData),
+    void *pIn
+);
+SQLITE_API int sqlite3changegroup_output_strm(sqlite3_changegroup*,
+    int (*xOutput)(void *pOut, const void *pData, int nData),
+    void *pOut
+);
+SQLITE_API int sqlite3rebaser_rebase_strm(
+  sqlite3_rebaser *pRebaser,
+  int (*xInput)(void *pIn, void *pData, int *pnData),
+  void *pIn,
+  int (*xOutput)(void *pOut, const void *pData, int nData),
+  void *pOut
+);
+
+/*
+** CAPI3REF: Configure global parameters
+**
+** The sqlite3session_config() interface is used to make global configuration
+** changes to the sessions module in order to tune it to the specific needs
+** of the application.
+**
+** The sqlite3session_config() interface is not threadsafe. If it is invoked
+** while any other thread is inside any other sessions method then the
+** results are undefined. Furthermore, if it is invoked after any sessions
+** related objects have been created, the results are also undefined.
+**
+** The first argument to the sqlite3session_config() function must be one
+** of the SQLITE_SESSION_CONFIG_XXX constants defined below. The
+** interpretation of the (void*) value passed as the second parameter and
+** the effect of calling this function depends on the value of the first
+** parameter.
+**
+** <dl>
+** <dt>SQLITE_SESSION_CONFIG_STRMSIZE<dd>
+**    By default, the sessions module streaming interfaces attempt to input
+**    and output data in approximately 1 KiB chunks. This operand may be used
+**    to set and query the value of this configuration setting. The pointer
+**    passed as the second argument must point to a value of type (int).
+**    If this value is greater than 0, it is used as the new streaming data
+**    chunk size for both input and output. Before returning, the (int) value
+**    pointed to by pArg is set to the final value of the streaming interface
+**    chunk size.
+** </dl>
+**
+** This function returns SQLITE_OK if successful, or an SQLite error code
+** otherwise.
+*/
+SQLITE_API int sqlite3session_config(int op, void *pArg);
+
+/*
+** CAPI3REF: Values for sqlite3session_config().
+*/
+#define SQLITE_SESSION_CONFIG_STRMSIZE 1
+
+/*
+** Make sure we can call this stuff from C++.
+*/
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* !defined(__SQLITESESSION_H_) && defined(SQLITE_ENABLE_SESSION) */
+
+/******** End of sqlite3session.h *********/
+/******** Begin file fts5.h *********/
+/*
+** 2014 May 31
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+******************************************************************************
+**
+** Interfaces to extend FTS5. Using the interfaces defined in this file,
+** FTS5 may be extended with:
+**
+**     * custom tokenizers, and
+**     * custom auxiliary functions.
+*/
+
+
+#ifndef _FTS5_H
+#define _FTS5_H
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*************************************************************************
+** CUSTOM AUXILIARY FUNCTIONS
+**
+** Virtual table implementations may overload SQL functions by implementing
+** the sqlite3_module.xFindFunction() method.
+*/
+
+typedef struct Fts5ExtensionApi Fts5ExtensionApi;
+typedef struct Fts5Context Fts5Context;
+typedef struct Fts5PhraseIter Fts5PhraseIter;
+
+typedef void (*fts5_extension_function)(
+  const Fts5ExtensionApi *pApi,   /* API offered by current FTS version */
+  Fts5Context *pFts,              /* First arg to pass to pApi functions */
+  sqlite3_context *pCtx,          /* Context for returning result/error */
+  int nVal,                       /* Number of values in apVal[] array */
+  sqlite3_value **apVal           /* Array of trailing arguments */
+);
+
+struct Fts5PhraseIter {
+  const unsigned char *a;
+  const unsigned char *b;
+};
+
+/*
+** EXTENSION API FUNCTIONS
+**
+** xUserData(pFts):
+**   Return a copy of the pUserData pointer passed to the xCreateFunction()
+**   API when the extension function was registered.
+**
+** xColumnTotalSize(pFts, iCol, pnToken):
+**   If parameter iCol is less than zero, set output variable *pnToken
+**   to the total number of tokens in the FTS5 table. Or, if iCol is
+**   non-negative but less than the number of columns in the table, return
+**   the total number of tokens in column iCol, considering all rows in
+**   the FTS5 table.
+**
+**   If parameter iCol is greater than or equal to the number of columns
+**   in the table, SQLITE_RANGE is returned. Or, if an error occurs (e.g.
+**   an OOM condition or IO error), an appropriate SQLite error code is
+**   returned.
+**
+** xColumnCount(pFts):
+**   Return the number of columns in the table.
+**
+** xColumnSize(pFts, iCol, pnToken):
+**   If parameter iCol is less than zero, set output variable *pnToken
+**   to the total number of tokens in the current row. Or, if iCol is
+**   non-negative but less than the number of columns in the table, set
+**   *pnToken to the number of tokens in column iCol of the current row.
+**
+**   If parameter iCol is greater than or equal to the number of columns
+**   in the table, SQLITE_RANGE is returned. Or, if an error occurs (e.g.
+**   an OOM condition or IO error), an appropriate SQLite error code is
+**   returned.
+**
+**   This function may be quite inefficient if used with an FTS5 table
+**   created with the "columnsize=0" option.
+**
+** xColumnText:
+**   If parameter iCol is less than zero, or greater than or equal to the
+**   number of columns in the table, SQLITE_RANGE is returned.
+**
+**   Otherwise, this function attempts to retrieve the text of column iCol of
+**   the current document. If successful, (*pz) is set to point to a buffer
+**   containing the text in utf-8 encoding, (*pn) is set to the size in bytes
+**   (not characters) of the buffer and SQLITE_OK is returned. Otherwise,
+**   if an error occurs, an SQLite error code is returned and the final values
+**   of (*pz) and (*pn) are undefined.
+**
+** xPhraseCount:
+**   Returns the number of phrases in the current query expression.
+**
+** xPhraseSize:
+**   If parameter iCol is less than zero, or greater than or equal to the
+**   number of phrases in the current query, as returned by xPhraseCount,
+**   0 is returned. Otherwise, this function returns the number of tokens in
+**   phrase iPhrase of the query. Phrases are numbered starting from zero.
+**
+** xInstCount:
+**   Set *pnInst to the total number of occurrences of all phrases within
+**   the query within the current row. Return SQLITE_OK if successful, or
+**   an error code (i.e. SQLITE_NOMEM) if an error occurs.
+**
+**   This API can be quite slow if used with an FTS5 table created with the
+**   "detail=none" or "detail=column" option. If the FTS5 table is created
+**   with either "detail=none" or "detail=column" and "content=" option
+**   (i.e. if it is a contentless table), then this API always returns 0.
+**
+** xInst:
+**   Query for the details of phrase match iIdx within the current row.
+**   Phrase matches are numbered starting from zero, so the iIdx argument
+**   should be greater than or equal to zero and smaller than the value
+**   output by xInstCount(). If iIdx is less than zero or greater than
+**   or equal to the value returned by xInstCount(), SQLITE_RANGE is returned.
+**
+**   Otherwise, output parameter *piPhrase is set to the phrase number, *piCol
+**   to the column in which it occurs and *piOff the token offset of the
+**   first token of the phrase. SQLITE_OK is returned if successful, or an
+**   error code (i.e. SQLITE_NOMEM) if an error occurs.
+**
+**   This API can be quite slow if used with an FTS5 table created with the
+**   "detail=none" or "detail=column" option.
+**
+** xRowid:
+**   Returns the rowid of the current row.
+**
+** xTokenize:
+**   Tokenize text using the tokenizer belonging to the FTS5 table.
+**
+** xQueryPhrase(pFts5, iPhrase, pUserData, xCallback):
+**   This API function is used to query the FTS table for phrase iPhrase
+**   of the current query. Specifically, a query equivalent to:
+**
+**       ... FROM ftstable WHERE ftstable MATCH $p ORDER BY rowid
+**
+**   with $p set to a phrase equivalent to the phrase iPhrase of the
+**   current query is executed. Any column filter that applies to
+**   phrase iPhrase of the current query is included in $p. For each
+**   row visited, the callback function passed as the fourth argument
+**   is invoked. The context and API objects passed to the callback
+**   function may be used to access the properties of each matched row.
+**   Invoking Api.xUserData() returns a copy of the pointer passed as
+**   the third argument to pUserData.
+**
+**   If parameter iPhrase is less than zero, or greater than or equal to
+**   the number of phrases in the query, as returned by xPhraseCount(),
+**   this function returns SQLITE_RANGE.
+**
+**   If the callback function returns any value other than SQLITE_OK, the
+**   query is abandoned and the xQueryPhrase function returns immediately.
+**   If the returned value is SQLITE_DONE, xQueryPhrase returns SQLITE_OK.
+**   Otherwise, the error code is propagated upwards.
+**
+**   If the query runs to completion without incident, SQLITE_OK is returned.
+**   Or, if some error occurs before the query completes or is aborted by
+**   the callback, an SQLite error code is returned.
+**
+**
+** xSetAuxdata(pFts5, pAux, xDelete)
+**
+**   Save the pointer passed as the second argument as the extension function's
+**   "auxiliary data". The pointer may then be retrieved by the current or any
+**   future invocation of the same fts5 extension function made as part of
+**   the same MATCH query using the xGetAuxdata() API.
+**
+**   Each extension function is allocated a single auxiliary data slot for
+**   each FTS query (MATCH expression). If the extension function is invoked
+**   more than once for a single FTS query, then all invocations share a
+**   single auxiliary data context.
+**
+**   If there is already an auxiliary data pointer when this function is
+**   invoked, then it is replaced by the new pointer. If an xDelete callback
+**   was specified along with the original pointer, it is invoked at this
+**   point.
+**
+**   The xDelete callback, if one is specified, is also invoked on the
+**   auxiliary data pointer after the FTS5 query has finished.
+**
+**   If an error (e.g. an OOM condition) occurs within this function,
+**   the auxiliary data is set to NULL and an error code returned. If the
+**   xDelete parameter was not NULL, it is invoked on the auxiliary data
+**   pointer before returning.
+**
+**
+** xGetAuxdata(pFts5, bClear)
+**
+**   Returns the current auxiliary data pointer for the fts5 extension
+**   function. See the xSetAuxdata() method for details.
+**
+**   If the bClear argument is non-zero, then the auxiliary data is cleared
+**   (set to NULL) before this function returns. In this case the xDelete,
+**   if any, is not invoked.
+**
+**
+** xRowCount(pFts5, pnRow)
+**
+**   This function is used to retrieve the total number of rows in the table.
+**   In other words, the same value that would be returned by:
+**
+**        SELECT count(*) FROM ftstable;
+**
+** xPhraseFirst()
+**   This function is used, along with type Fts5PhraseIter and the xPhraseNext
+**   method, to iterate through all instances of a single query phrase within
+**   the current row. This is the same information as is accessible via the
+**   xInstCount/xInst APIs. While the xInstCount/xInst APIs are more convenient
+**   to use, this API may be faster under some circumstances. To iterate
+**   through instances of phrase iPhrase, use the following code:
+**
+**       Fts5PhraseIter iter;
+**       int iCol, iOff;
+**       for(pApi->xPhraseFirst(pFts, iPhrase, &iter, &iCol, &iOff);
+**           iCol>=0;
+**           pApi->xPhraseNext(pFts, &iter, &iCol, &iOff)
+**       ){
+**         // An instance of phrase iPhrase at offset iOff of column iCol
+**       }
+**
+**   The Fts5PhraseIter structure is defined above. Applications should not
+**   modify this structure directly - it should only be used as shown above
+**   with the xPhraseFirst() and xPhraseNext() API methods (and by
+**   xPhraseFirstColumn() and xPhraseNextColumn() as illustrated below).
+**
+**   This API can be quite slow if used with an FTS5 table created with the
+**   "detail=none" or "detail=column" option. If the FTS5 table is created
+**   with either "detail=none" or "detail=column" and "content=" option
+**   (i.e. if it is a contentless table), then this API always iterates
+**   through an empty set (all calls to xPhraseFirst() set iCol to -1).
+**
+**   In all cases, matches are visited in (column ASC, offset ASC) order.
+**   i.e. all those in column 0, sorted by offset, followed by those in
+**   column 1, etc.
+**
+** xPhraseNext()
+**   See xPhraseFirst above.
+**
+** xPhraseFirstColumn()
+**   This function and xPhraseNextColumn() are similar to the xPhraseFirst()
+**   and xPhraseNext() APIs described above. The difference is that instead
+**   of iterating through all instances of a phrase in the current row, these
+**   APIs are used to iterate through the set of columns in the current row
+**   that contain one or more instances of a specified phrase. For example:
+**
+**       Fts5PhraseIter iter;
+**       int iCol;
+**       for(pApi->xPhraseFirstColumn(pFts, iPhrase, &iter, &iCol);
+**           iCol>=0;
+**           pApi->xPhraseNextColumn(pFts, &iter, &iCol)
+**       ){
+**         // Column iCol contains at least one instance of phrase iPhrase
+**       }
+**
+**   This API can be quite slow if used with an FTS5 table created with the
+**   "detail=none" option. If the FTS5 table is created with either
+**   "detail=none" "content=" option (i.e. if it is a contentless table),
+**   then this API always iterates through an empty set (all calls to
+**   xPhraseFirstColumn() set iCol to -1).
+**
+**   The information accessed using this API and its companion
+**   xPhraseFirstColumn() may also be obtained using xPhraseFirst/xPhraseNext
+**   (or xInst/xInstCount). The chief advantage of this API is that it is
+**   significantly more efficient than those alternatives when used with
+**   "detail=column" tables.
+**
+** xPhraseNextColumn()
+**   See xPhraseFirstColumn above.
+**
+** xQueryToken(pFts5, iPhrase, iToken, ppToken, pnToken)
+**   This is used to access token iToken of phrase iPhrase of the current
+**   query. Before returning, output parameter *ppToken is set to point
+**   to a buffer containing the requested token, and *pnToken to the
+**   size of this buffer in bytes.
+**
+**   If iPhrase or iToken are less than zero, or if iPhrase is greater than
+**   or equal to the number of phrases in the query as reported by
+**   xPhraseCount(), or if iToken is equal to or greater than the number of
+**   tokens in the phrase, SQLITE_RANGE is returned and *ppToken and *pnToken
+     are both zeroed.
+**
+**   The output text is not a copy of the query text that specified the
+**   token. It is the output of the tokenizer module. For tokendata=1
+**   tables, this includes any embedded 0x00 and trailing data.
+**
+** xInstToken(pFts5, iIdx, iToken, ppToken, pnToken)
+**   This is used to access token iToken of phrase hit iIdx within the
+**   current row. If iIdx is less than zero or greater than or equal to the
+**   value returned by xInstCount(), SQLITE_RANGE is returned.  Otherwise,
+**   output variable (*ppToken) is set to point to a buffer containing the
+**   matching document token, and (*pnToken) to the size of that buffer in
+**   bytes.
+**
+**   The output text is not a copy of the document text that was tokenized.
+**   It is the output of the tokenizer module. For tokendata=1 tables, this
+**   includes any embedded 0x00 and trailing data.
+**
+**   This API may be slow in some cases if the token identified by parameters
+**   iIdx and iToken matched a prefix token in the query. In most cases, the
+**   first call to this API for each prefix token in the query is forced
+**   to scan the portion of the full-text index that matches the prefix
+**   token to collect the extra data required by this API. If the prefix
+**   token matches a large number of token instances in the document set,
+**   this may be a performance problem.
+**
+**   If the user knows in advance that a query may use this API for a
+**   prefix token, FTS5 may be configured to collect all required data as part
+**   of the initial querying of the full-text index, avoiding the second scan
+**   entirely. This also causes prefix queries that do not use this API to
+**   run more slowly and use more memory. FTS5 may be configured in this way
+**   either on a per-table basis using the [FTS5 insttoken | 'insttoken']
+**   option, or on a per-query basis using the
+**   [fts5_insttoken | fts5_insttoken()] user function.
+**
+**   This API can be quite slow if used with an FTS5 table created with the
+**   "detail=none" or "detail=column" option.
+**
+** xColumnLocale(pFts5, iIdx, pzLocale, pnLocale)
+**   If parameter iCol is less than zero, or greater than or equal to the
+**   number of columns in the table, SQLITE_RANGE is returned.
+**
+**   Otherwise, this function attempts to retrieve the locale associated
+**   with column iCol of the current row. Usually, there is no associated
+**   locale, and output parameters (*pzLocale) and (*pnLocale) are set
+**   to NULL and 0, respectively. However, if the fts5_locale() function
+**   was used to associate a locale with the value when it was inserted
+**   into the fts5 table, then (*pzLocale) is set to point to a nul-terminated
+**   buffer containing the name of the locale in utf-8 encoding. (*pnLocale)
+**   is set to the size in bytes of the buffer, not including the
+**   nul-terminator.
+**
+**   If successful, SQLITE_OK is returned. Or, if an error occurs, an
+**   SQLite error code is returned. The final value of the output parameters
+**   is undefined in this case.
+**
+** xTokenize_v2:
+**   Tokenize text using the tokenizer belonging to the FTS5 table. This
+**   API is the same as the xTokenize() API, except that it allows a tokenizer
+**   locale to be specified.
+*/
+struct Fts5ExtensionApi {
+  int iVersion;                   /* Currently always set to 4 */
+
+  void *(*xUserData)(Fts5Context*);
+
+  int (*xColumnCount)(Fts5Context*);
+  int (*xRowCount)(Fts5Context*, sqlite3_int64 *pnRow);
+  int (*xColumnTotalSize)(Fts5Context*, int iCol, sqlite3_int64 *pnToken);
+
+  int (*xTokenize)(Fts5Context*,
+    const char *pText, int nText, /* Text to tokenize */
+    void *pCtx,                   /* Context passed to xToken() */
+    int (*xToken)(void*, int, const char*, int, int, int)       /* Callback */
+  );
+
+  int (*xPhraseCount)(Fts5Context*);
+  int (*xPhraseSize)(Fts5Context*, int iPhrase);
+
+  int (*xInstCount)(Fts5Context*, int *pnInst);
+  int (*xInst)(Fts5Context*, int iIdx, int *piPhrase, int *piCol, int *piOff);
+
+  sqlite3_int64 (*xRowid)(Fts5Context*);
+  int (*xColumnText)(Fts5Context*, int iCol, const char **pz, int *pn);
+  int (*xColumnSize)(Fts5Context*, int iCol, int *pnToken);
+
+  int (*xQueryPhrase)(Fts5Context*, int iPhrase, void *pUserData,
+    int(*)(const Fts5ExtensionApi*,Fts5Context*,void*)
+  );
+  int (*xSetAuxdata)(Fts5Context*, void *pAux, void(*xDelete)(void*));
+  void *(*xGetAuxdata)(Fts5Context*, int bClear);
+
+  int (*xPhraseFirst)(Fts5Context*, int iPhrase, Fts5PhraseIter*, int*, int*);
+  void (*xPhraseNext)(Fts5Context*, Fts5PhraseIter*, int *piCol, int *piOff);
+
+  int (*xPhraseFirstColumn)(Fts5Context*, int iPhrase, Fts5PhraseIter*, int*);
+  void (*xPhraseNextColumn)(Fts5Context*, Fts5PhraseIter*, int *piCol);
+
+  /* Below this point are iVersion>=3 only */
+  int (*xQueryToken)(Fts5Context*,
+      int iPhrase, int iToken,
+      const char **ppToken, int *pnToken
+  );
+  int (*xInstToken)(Fts5Context*, int iIdx, int iToken, const char**, int*);
+
+  /* Below this point are iVersion>=4 only */
+  int (*xColumnLocale)(Fts5Context*, int iCol, const char **pz, int *pn);
+  int (*xTokenize_v2)(Fts5Context*,
+    const char *pText, int nText,      /* Text to tokenize */
+    const char *pLocale, int nLocale,  /* Locale to pass to tokenizer */
+    void *pCtx,                        /* Context passed to xToken() */
+    int (*xToken)(void*, int, const char*, int, int, int)       /* Callback */
+  );
+};
+
+/*
+** CUSTOM AUXILIARY FUNCTIONS
+*************************************************************************/
+
+/*************************************************************************
+** CUSTOM TOKENIZERS
+**
+** Applications may also register custom tokenizer types. A tokenizer
+** is registered by providing fts5 with a populated instance of the
+** following structure. All structure methods must be defined, setting
+** any member of the fts5_tokenizer struct to NULL leads to undefined
+** behaviour. The structure methods are expected to function as follows:
+**
+** xCreate:
+**   This function is used to allocate and initialize a tokenizer instance.
+**   A tokenizer instance is required to actually tokenize text.
+**
+**   The first argument passed to this function is a copy of the (void*)
+**   pointer provided by the application when the fts5_tokenizer_v2 object
+**   was registered with FTS5 (the third argument to xCreateTokenizer()).
+**   The second and third arguments are an array of nul-terminated strings
+**   containing the tokenizer arguments, if any, specified following the
+**   tokenizer name as part of the CREATE VIRTUAL TABLE statement used
+**   to create the FTS5 table.
+**
+**   The final argument is an output variable. If successful, (*ppOut)
+**   should be set to point to the new tokenizer handle and SQLITE_OK
+**   returned. If an error occurs, some value other than SQLITE_OK should
+**   be returned. In this case, fts5 assumes that the final value of *ppOut
+**   is undefined.
+**
+** xDelete:
+**   This function is invoked to delete a tokenizer handle previously
+**   allocated using xCreate(). Fts5 guarantees that this function will
+**   be invoked exactly once for each successful call to xCreate().
+**
+** xTokenize:
+**   This function is expected to tokenize the nText byte string indicated
+**   by argument pText. pText may or may not be nul-terminated. The first
+**   argument passed to this function is a pointer to an Fts5Tokenizer object
+**   returned by an earlier call to xCreate().
+**
+**   The third argument indicates the reason that FTS5 is requesting
+**   tokenization of the supplied text. This is always one of the following
+**   four values:
+**
+**   <ul><li> <b>FTS5_TOKENIZE_DOCUMENT</b> - A document is being inserted into
+**            or removed from the FTS table. The tokenizer is being invoked to
+**            determine the set of tokens to add to (or delete from) the
+**            FTS index.
+**
+**       <li> <b>FTS5_TOKENIZE_QUERY</b> - A MATCH query is being executed
+**            against the FTS index. The tokenizer is being called to tokenize
+**            a bareword or quoted string specified as part of the query.
+**
+**       <li> <b>(FTS5_TOKENIZE_QUERY | FTS5_TOKENIZE_PREFIX)</b> - Same as
+**            FTS5_TOKENIZE_QUERY, except that the bareword or quoted string is
+**            followed by a "*" character, indicating that the last token
+**            returned by the tokenizer will be treated as a token prefix.
+**
+**       <li> <b>FTS5_TOKENIZE_AUX</b> - The tokenizer is being invoked to
+**            satisfy an fts5_api.xTokenize() request made by an auxiliary
+**            function. Or an fts5_api.xColumnSize() request made by the same
+**            on a columnsize=0 database.
+**   </ul>
+**
+**   The sixth and seventh arguments passed to xTokenize() - pLocale and
+**   nLocale - are a pointer to a buffer containing the locale to use for
+**   tokenization (e.g. "en_US") and its size in bytes, respectively. The
+**   pLocale buffer is not nul-terminated. pLocale may be passed NULL (in
+**   which case nLocale is always 0) to indicate that the tokenizer should
+**   use its default locale.
+**
+**   For each token in the input string, the supplied callback xToken() must
+**   be invoked. The first argument to it should be a copy of the pointer
+**   passed as the second argument to xTokenize(). The third and fourth
+**   arguments are a pointer to a buffer containing the token text, and the
+**   size of the token in bytes. The 4th and 5th arguments are the byte offsets
+**   of the first byte of and first byte immediately following the text from
+**   which the token is derived within the input.
+**
+**   The second argument passed to the xToken() callback ("tflags") should
+**   normally be set to 0. The exception is if the tokenizer supports
+**   synonyms. In this case see the discussion below for details.
+**
+**   FTS5 assumes the xToken() callback is invoked for each token in the
+**   order that they occur within the input text.
+**
+**   If an xToken() callback returns any value other than SQLITE_OK, then
+**   the tokenization should be abandoned and the xTokenize() method should
+**   immediately return a copy of the xToken() return value. Or, if the
+**   input buffer is exhausted, xTokenize() should return SQLITE_OK. Finally,
+**   if an error occurs with the xTokenize() implementation itself, it
+**   may abandon the tokenization and return any error code other than
+**   SQLITE_OK or SQLITE_DONE.
+**
+**   If the tokenizer is registered using an fts5_tokenizer_v2 object,
+**   then the xTokenize() method has two additional arguments - pLocale
+**   and nLocale. These specify the locale that the tokenizer should use
+**   for the current request. If pLocale and nLocale are both 0, then the
+**   tokenizer should use its default locale. Otherwise, pLocale points to
+**   an nLocale byte buffer containing the name of the locale to use as utf-8
+**   text. pLocale is not nul-terminated.
+**
+** FTS5_TOKENIZER
+**
+** There is also an fts5_tokenizer object. This is an older, deprecated,
+** version of fts5_tokenizer_v2. It is similar except that:
+**
+**  <ul>
+**    <li> There is no "iVersion" field, and
+**    <li> The xTokenize() method does not take a locale argument.
+**  </ul>
+**
+** Legacy fts5_tokenizer tokenizers must be registered using the
+** legacy xCreateTokenizer() function, instead of xCreateTokenizer_v2().
+**
+** Tokenizer implementations registered using either API may be retrieved
+** using both xFindTokenizer() and xFindTokenizer_v2().
+**
+** SYNONYM SUPPORT
+**
+**   Custom tokenizers may also support synonyms. Consider a case in which a
+**   user wishes to query for a phrase such as "first place". Using the
+**   built-in tokenizers, the FTS5 query 'first + place' will match instances
+**   of "first place" within the document set, but not alternative forms
+**   such as "1st place". In some applications, it would be better to match
+**   all instances of "first place" or "1st place" regardless of which form
+**   the user specified in the MATCH query text.
+**
+**   There are several ways to approach this in FTS5:
+**
+**   <ol><li> By mapping all synonyms to a single token. In this case, using
+**            the above example, this means that the tokenizer returns the
+**            same token for inputs "first" and "1st". Say that token is in
+**            fact "first", so that when the user inserts the document "I won
+**            1st place" entries are added to the index for tokens "i", "won",
+**            "first" and "place". If the user then queries for '1st + place',
+**            the tokenizer substitutes "first" for "1st" and the query works
+**            as expected.
+**
+**       <li> By querying the index for all synonyms of each query term
+**            separately. In this case, when tokenizing query text, the
+**            tokenizer may provide multiple synonyms for a single term
+**            within the document. FTS5 then queries the index for each
+**            synonym individually. For example, faced with the query:
+**
+**   <codeblock>
+**     ... MATCH 'first place'</codeblock>
+**
+**            the tokenizer offers both "1st" and "first" as synonyms for the
+**            first token in the MATCH query and FTS5 effectively runs a query
+**            similar to:
+**
+**   <codeblock>
+**     ... MATCH '(first OR 1st) place'</codeblock>
+**
+**            except that, for the purposes of auxiliary functions, the query
+**            still appears to contain just two phrases - "(first OR 1st)"
+**            being treated as a single phrase.
+**
+**       <li> By adding multiple synonyms for a single term to the FTS index.
+**            Using this method, when tokenizing document text, the tokenizer
+**            provides multiple synonyms for each token. So that when a
+**            document such as "I won first place" is tokenized, entries are
+**            added to the FTS index for "i", "won", "first", "1st" and
+**            "place".
+**
+**            This way, even if the tokenizer does not provide synonyms
+**            when tokenizing query text (it should not - to do so would be
+**            inefficient), it doesn't matter if the user queries for
+**            'first + place' or '1st + place', as there are entries in the
+**            FTS index corresponding to both forms of the first token.
+**   </ol>
+**
+**   Whether it is parsing document or query text, any call to xToken that
+**   specifies a <i>tflags</i> argument with the FTS5_TOKEN_COLOCATED bit
+**   is considered to supply a synonym for the previous token. For example,
+**   when parsing the document "I won first place", a tokenizer that supports
+**   synonyms would call xToken() 5 times, as follows:
+**
+**   <codeblock>
+**       xToken(pCtx, 0, "i",                      1,  0,  1);
+**       xToken(pCtx, 0, "won",                    3,  2,  5);
+**       xToken(pCtx, 0, "first",                  5,  6, 11);
+**       xToken(pCtx, FTS5_TOKEN_COLOCATED, "1st", 3,  6, 11);
+**       xToken(pCtx, 0, "place",                  5, 12, 17);
+**</codeblock>
+**
+**   It is an error to specify the FTS5_TOKEN_COLOCATED flag the first time
+**   xToken() is called. Multiple synonyms may be specified for a single token
+**   by making multiple calls to xToken(FTS5_TOKEN_COLOCATED) in sequence.
+**   There is no limit to the number of synonyms that may be provided for a
+**   single token.
+**
+**   In many cases, method (1) above is the best approach. It does not add
+**   extra data to the FTS index or require FTS5 to query for multiple terms,
+**   so it is efficient in terms of disk space and query speed. However, it
+**   does not support prefix queries very well. If, as suggested above, the
+**   token "first" is substituted for "1st" by the tokenizer, then the query:
+**
+**   <codeblock>
+**     ... MATCH '1s*'</codeblock>
+**
+**   will not match documents that contain the token "1st" (as the tokenizer
+**   will probably not map "1s" to any prefix of "first").
+**
+**   For full prefix support, method (3) may be preferred. In this case,
+**   because the index contains entries for both "first" and "1st", prefix
+**   queries such as 'fi*' or '1s*' will match correctly. However, because
+**   extra entries are added to the FTS index, this method uses more space
+**   within the database.
+**
+**   Method (2) offers a midpoint between (1) and (3). Using this method,
+**   a query such as '1s*' will match documents that contain the literal
+**   token "1st", but not "first" (assuming the tokenizer is not able to
+**   provide synonyms for prefixes). However, a non-prefix query like '1st'
+**   will match against "1st" and "first". This method does not require
+**   extra disk space, as no extra entries are added to the FTS index.
+**   On the other hand, it may require more CPU cycles to run MATCH queries,
+**   as separate queries of the FTS index are required for each synonym.
+**
+**   When using methods (2) or (3), it is important that the tokenizer only
+**   provide synonyms when tokenizing document text (method (3)) or query
+**   text (method (2)), not both. Doing so will not cause any errors, but is
+**   inefficient.
+*/
+typedef struct Fts5Tokenizer Fts5Tokenizer;
+typedef struct fts5_tokenizer_v2 fts5_tokenizer_v2;
+struct fts5_tokenizer_v2 {
+  int iVersion;             /* Currently always 2 */
+
+  int (*xCreate)(void*, const char **azArg, int nArg, Fts5Tokenizer **ppOut);
+  void (*xDelete)(Fts5Tokenizer*);
+  int (*xTokenize)(Fts5Tokenizer*,
+      void *pCtx,
+      int flags,            /* Mask of FTS5_TOKENIZE_* flags */
+      const char *pText, int nText,
+      const char *pLocale, int nLocale,
+      int (*xToken)(
+        void *pCtx,         /* Copy of 2nd argument to xTokenize() */
+        int tflags,         /* Mask of FTS5_TOKEN_* flags */
+        const char *pToken, /* Pointer to buffer containing token */
+        int nToken,         /* Size of token in bytes */
+        int iStart,         /* Byte offset of token within input text */
+        int iEnd            /* Byte offset of end of token within input text */
+      )
+  );
+};
+
+/*
+** New code should use the fts5_tokenizer_v2 type to define tokenizer
+** implementations. The following type is included for legacy applications
+** that still use it.
+*/
+typedef struct fts5_tokenizer fts5_tokenizer;
+struct fts5_tokenizer {
+  int (*xCreate)(void*, const char **azArg, int nArg, Fts5Tokenizer **ppOut);
+  void (*xDelete)(Fts5Tokenizer*);
+  int (*xTokenize)(Fts5Tokenizer*,
+      void *pCtx,
+      int flags,            /* Mask of FTS5_TOKENIZE_* flags */
+      const char *pText, int nText,
+      int (*xToken)(
+        void *pCtx,         /* Copy of 2nd argument to xTokenize() */
+        int tflags,         /* Mask of FTS5_TOKEN_* flags */
+        const char *pToken, /* Pointer to buffer containing token */
+        int nToken,         /* Size of token in bytes */
+        int iStart,         /* Byte offset of token within input text */
+        int iEnd            /* Byte offset of end of token within input text */
+      )
+  );
+};
+
+
+/* Flags that may be passed as the third argument to xTokenize() */
+#define FTS5_TOKENIZE_QUERY     0x0001
+#define FTS5_TOKENIZE_PREFIX    0x0002
+#define FTS5_TOKENIZE_DOCUMENT  0x0004
+#define FTS5_TOKENIZE_AUX       0x0008
+
+/* Flags that may be passed by the tokenizer implementation back to FTS5
+** as the third argument to the supplied xToken callback. */
+#define FTS5_TOKEN_COLOCATED    0x0001      /* Same position as prev. token */
+
+/*
+** END OF CUSTOM TOKENIZERS
+*************************************************************************/
+
+/*************************************************************************
+** FTS5 EXTENSION REGISTRATION API
+*/
+typedef struct fts5_api fts5_api;
+struct fts5_api {
+  int iVersion;                   /* Currently always set to 3 */
+
+  /* Create a new tokenizer */
+  int (*xCreateTokenizer)(
+    fts5_api *pApi,
+    const char *zName,
+    void *pUserData,
+    fts5_tokenizer *pTokenizer,
+    void (*xDestroy)(void*)
+  );
+
+  /* Find an existing tokenizer */
+  int (*xFindTokenizer)(
+    fts5_api *pApi,
+    const char *zName,
+    void **ppUserData,
+    fts5_tokenizer *pTokenizer
+  );
+
+  /* Create a new auxiliary function */
+  int (*xCreateFunction)(
+    fts5_api *pApi,
+    const char *zName,
+    void *pUserData,
+    fts5_extension_function xFunction,
+    void (*xDestroy)(void*)
+  );
+
+  /* APIs below this point are only available if iVersion>=3 */
+
+  /* Create a new tokenizer */
+  int (*xCreateTokenizer_v2)(
+    fts5_api *pApi,
+    const char *zName,
+    void *pUserData,
+    fts5_tokenizer_v2 *pTokenizer,
+    void (*xDestroy)(void*)
+  );
+
+  /* Find an existing tokenizer */
+  int (*xFindTokenizer_v2)(
+    fts5_api *pApi,
+    const char *zName,
+    void **ppUserData,
+    fts5_tokenizer_v2 **ppTokenizer
+  );
+};
+
+/*
+** END OF REGISTRATION API
+*************************************************************************/
+
+#ifdef __cplusplus
+}  /* end of the 'extern "C"' block */
+#endif
+
+#endif /* _FTS5_H */
+
+/******** End of fts5.h *********/
+#endif /* SQLITE3_H */
diff --git a/Sources/c_snikket/iinclude/sys/thread/Deque.h b/Sources/c_snikket/iinclude/sys/thread/Deque.h
new file mode 100644
index 0000000..a5db252
--- /dev/null
+++ b/Sources/c_snikket/iinclude/sys/thread/Deque.h
@@ -0,0 +1,79 @@
+// Generated by Haxe 4.3.3
+#ifndef INCLUDED_sys_thread_Deque
+#define INCLUDED_sys_thread_Deque
+
+#ifndef HXCPP_H
+#include <hxcpp.h>
+#endif
+
+HX_DECLARE_STACK_FRAME(_hx_pos_2beacc257f186a5f_30_new)
+HX_DECLARE_CLASS2(sys,thread,Deque)
+
+namespace sys{
+namespace thread{
+
+
+class HXCPP_CLASS_ATTRIBUTES Deque_obj : public ::hx::Object
+{
+	public:
+		typedef ::hx::Object super;
+		typedef Deque_obj OBJ_;
+		Deque_obj();
+
+	public:
+		enum { _hx_ClassId = 0x1b43d7ad };
+
+		void __construct();
+		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.thread.Deque")
+			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
+		inline void *operator new(size_t inSize, int extra)
+			{ return ::hx::Object::operator new(inSize+extra,true,"sys.thread.Deque"); }
+
+		inline static ::hx::ObjectPtr< Deque_obj > __new() {
+			::hx::ObjectPtr< Deque_obj > __this = new Deque_obj();
+			__this->__construct();
+			return __this;
+		}
+
+		inline static ::hx::ObjectPtr< Deque_obj > __alloc(::hx::Ctx *_hx_ctx) {
+			Deque_obj *__this = (Deque_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Deque_obj), true, "sys.thread.Deque"));
+			*(void **)__this = Deque_obj::_hx_vtable;
+{
+            	HX_STACKFRAME(&_hx_pos_2beacc257f186a5f_30_new)
+HXDLIN(  30)		( ( ::sys::thread::Deque)(__this) )->q =  ::__hxcpp_deque_create();
+            	}
+		
+			return __this;
+		}
+
+		static void * _hx_vtable;
+		static Dynamic __CreateEmpty();
+		static Dynamic __Create(::hx::DynamicArray inArgs);
+		//~Deque_obj();
+
+		HX_DO_RTTI_ALL;
+		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
+		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
+		void __GetFields(Array< ::String> &outFields);
+		static void __register();
+		void __Mark(HX_MARK_PARAMS);
+		void __Visit(HX_VISIT_PARAMS);
+		bool _hx_isInstanceOf(int inClassId);
+		::String __ToString() const { return HX_("Deque",00,24,58,6a); }
+
+		 ::Dynamic q;
+		void add( ::Dynamic i);
+		::Dynamic add_dyn();
+
+		void push( ::Dynamic i);
+		::Dynamic push_dyn();
+
+		 ::Dynamic pop(bool block);
+		::Dynamic pop_dyn();
+
+};
+
+} // end namespace sys
+} // end namespace thread
+
+#endif /* INCLUDED_sys_thread_Deque */ 
diff --git a/Sources/c_snikket/iinclude/sys/thread/ElasticThreadPool.h b/Sources/c_snikket/iinclude/sys/thread/ElasticThreadPool.h
new file mode 100644
index 0000000..0cc5e03
--- /dev/null
+++ b/Sources/c_snikket/iinclude/sys/thread/ElasticThreadPool.h
@@ -0,0 +1,69 @@
+// Generated by Haxe 4.3.3
+#ifndef INCLUDED_sys_thread_ElasticThreadPool
+#define INCLUDED_sys_thread_ElasticThreadPool
+
+#ifndef HXCPP_H
+#include <hxcpp.h>
+#endif
+
+#ifndef INCLUDED_sys_thread_IThreadPool
+#include <sys/thread/IThreadPool.h>
+#endif
+HX_DECLARE_CLASS2(sys,thread,Deque)
+HX_DECLARE_CLASS2(sys,thread,ElasticThreadPool)
+HX_DECLARE_CLASS2(sys,thread,IThreadPool)
+HX_DECLARE_CLASS2(sys,thread,Mutex)
+HX_DECLARE_CLASS3(sys,thread,_ElasticThreadPool,Worker)
+
+namespace sys{
+namespace thread{
+
+
+class HXCPP_CLASS_ATTRIBUTES ElasticThreadPool_obj : public ::hx::Object
+{
+	public:
+		typedef ::hx::Object super;
+		typedef ElasticThreadPool_obj OBJ_;
+		ElasticThreadPool_obj();
+
+	public:
+		enum { _hx_ClassId = 0x4a20aa6c };
+
+		void __construct(int maxThreadsCount,::hx::Null< Float >  __o_threadTimeout);
+		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.thread.ElasticThreadPool")
+			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
+		inline void *operator new(size_t inSize, int extra)
+			{ return ::hx::Object::operator new(inSize+extra,true,"sys.thread.ElasticThreadPool"); }
+		static ::hx::ObjectPtr< ElasticThreadPool_obj > __new(int maxThreadsCount,::hx::Null< Float >  __o_threadTimeout);
+		static ::hx::ObjectPtr< ElasticThreadPool_obj > __alloc(::hx::Ctx *_hx_ctx,int maxThreadsCount,::hx::Null< Float >  __o_threadTimeout);
+		static void * _hx_vtable;
+		static Dynamic __CreateEmpty();
+		static Dynamic __Create(::hx::DynamicArray inArgs);
+		//~ElasticThreadPool_obj();
+
+		HX_DO_RTTI_ALL;
+		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
+		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
+		void __GetFields(Array< ::String> &outFields);
+		static void __register();
+		void __Mark(HX_MARK_PARAMS);
+		void __Visit(HX_VISIT_PARAMS);
+		bool _hx_isInstanceOf(int inClassId);
+		void *_hx_getInterface(int inHash);
+		::String __ToString() const { return HX_("ElasticThreadPool",db,96,d3,e0); }
+
+		int maxThreadsCount;
+		bool _isShutdown;
+		::Array< ::Dynamic> pool;
+		 ::sys::thread::Deque queue;
+		 ::sys::thread::Mutex mutex;
+		Float threadTimeout;
+		void run( ::Dynamic task);
+		::Dynamic run_dyn();
+
+};
+
+} // end namespace sys
+} // end namespace thread
+
+#endif /* INCLUDED_sys_thread_ElasticThreadPool */ 
diff --git a/Sources/c_snikket/iinclude/sys/thread/FixedThreadPool.h b/Sources/c_snikket/iinclude/sys/thread/FixedThreadPool.h
new file mode 100644
index 0000000..8d8401b
--- /dev/null
+++ b/Sources/c_snikket/iinclude/sys/thread/FixedThreadPool.h
@@ -0,0 +1,66 @@
+// Generated by Haxe 4.3.3
+#ifndef INCLUDED_sys_thread_FixedThreadPool
+#define INCLUDED_sys_thread_FixedThreadPool
+
+#ifndef HXCPP_H
+#include <hxcpp.h>
+#endif
+
+#ifndef INCLUDED_sys_thread_IThreadPool
+#include <sys/thread/IThreadPool.h>
+#endif
+HX_DECLARE_CLASS2(sys,thread,Deque)
+HX_DECLARE_CLASS2(sys,thread,FixedThreadPool)
+HX_DECLARE_CLASS2(sys,thread,IThreadPool)
+HX_DECLARE_CLASS3(sys,thread,_FixedThreadPool,Worker)
+
+namespace sys{
+namespace thread{
+
+
+class HXCPP_CLASS_ATTRIBUTES FixedThreadPool_obj : public ::hx::Object
+{
+	public:
+		typedef ::hx::Object super;
+		typedef FixedThreadPool_obj OBJ_;
+		FixedThreadPool_obj();
+
+	public:
+		enum { _hx_ClassId = 0x654fb1c3 };
+
+		void __construct(int threadsCount);
+		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.thread.FixedThreadPool")
+			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
+		inline void *operator new(size_t inSize, int extra)
+			{ return ::hx::Object::operator new(inSize+extra,true,"sys.thread.FixedThreadPool"); }
+		static ::hx::ObjectPtr< FixedThreadPool_obj > __new(int threadsCount);
+		static ::hx::ObjectPtr< FixedThreadPool_obj > __alloc(::hx::Ctx *_hx_ctx,int threadsCount);
+		static void * _hx_vtable;
+		static Dynamic __CreateEmpty();
+		static Dynamic __Create(::hx::DynamicArray inArgs);
+		//~FixedThreadPool_obj();
+
+		HX_DO_RTTI_ALL;
+		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
+		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
+		void __GetFields(Array< ::String> &outFields);
+		static void __register();
+		void __Mark(HX_MARK_PARAMS);
+		void __Visit(HX_VISIT_PARAMS);
+		bool _hx_isInstanceOf(int inClassId);
+		void *_hx_getInterface(int inHash);
+		::String __ToString() const { return HX_("FixedThreadPool",3a,33,5e,cc); }
+
+		int threadsCount;
+		bool _isShutdown;
+		::Array< ::Dynamic> pool;
+		 ::sys::thread::Deque queue;
+		void run( ::Dynamic task);
+		::Dynamic run_dyn();
+
+};
+
+} // end namespace sys
+} // end namespace thread
+
+#endif /* INCLUDED_sys_thread_FixedThreadPool */ 
diff --git a/Sources/c_snikket/iinclude/sys/thread/IThreadPool.h b/Sources/c_snikket/iinclude/sys/thread/IThreadPool.h
new file mode 100644
index 0000000..1c9ed1c
--- /dev/null
+++ b/Sources/c_snikket/iinclude/sys/thread/IThreadPool.h
@@ -0,0 +1,29 @@
+// Generated by Haxe 4.3.3
+#ifndef INCLUDED_sys_thread_IThreadPool
+#define INCLUDED_sys_thread_IThreadPool
+
+#ifndef HXCPP_H
+#include <hxcpp.h>
+#endif
+
+HX_DECLARE_CLASS2(sys,thread,IThreadPool)
+
+namespace sys{
+namespace thread{
+
+
+class HXCPP_CLASS_ATTRIBUTES IThreadPool_obj {
+	public:
+		typedef ::hx::Object super;
+		HX_DO_INTERFACE_RTTI;
+
+		void (::hx::Object :: *_hx_run)( ::Dynamic task); 
+		static inline void run( ::Dynamic _hx_, ::Dynamic task) {
+			(_hx_.mPtr->*( ::hx::interface_cast< ::sys::thread::IThreadPool_obj *>(_hx_.mPtr->_hx_getInterface(0xf18bc1b8)))->_hx_run)(task);
+		}
+};
+
+} // end namespace sys
+} // end namespace thread
+
+#endif /* INCLUDED_sys_thread_IThreadPool */ 
diff --git a/Sources/c_snikket/iinclude/sys/thread/NextEventTime.h b/Sources/c_snikket/iinclude/sys/thread/NextEventTime.h
new file mode 100644
index 0000000..735a071
--- /dev/null
+++ b/Sources/c_snikket/iinclude/sys/thread/NextEventTime.h
@@ -0,0 +1,41 @@
+// Generated by Haxe 4.3.3
+#ifndef INCLUDED_sys_thread_NextEventTime
+#define INCLUDED_sys_thread_NextEventTime
+
+#ifndef HXCPP_H
+#include <hxcpp.h>
+#endif
+
+HX_DECLARE_CLASS2(sys,thread,NextEventTime)
+namespace sys{
+namespace thread{
+
+
+class NextEventTime_obj : public ::hx::EnumBase_obj
+{
+	typedef ::hx::EnumBase_obj super;
+		typedef NextEventTime_obj OBJ_;
+
+	public:
+		NextEventTime_obj() {};
+		HX_DO_ENUM_RTTI;
+		static void __boot();
+		static void __register();
+		static bool __GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp);
+		::String GetEnumName( ) const { return HX_("sys.thread.NextEventTime",11,32,a7,e0); }
+		::String __ToString() const { return HX_("NextEventTime.",fa,b3,86,8f) + _hx_tag; }
+
+		static ::sys::thread::NextEventTime AnyTime( ::Dynamic time);
+		static ::Dynamic AnyTime_dyn();
+		static ::sys::thread::NextEventTime At(Float time);
+		static ::Dynamic At_dyn();
+		static ::sys::thread::NextEventTime Never;
+		static inline ::sys::thread::NextEventTime Never_dyn() { return Never; }
+		static ::sys::thread::NextEventTime Now;
+		static inline ::sys::thread::NextEventTime Now_dyn() { return Now; }
+};
+
+} // end namespace sys
+} // end namespace thread
+
+#endif /* INCLUDED_sys_thread_NextEventTime */ 
diff --git a/Sources/c_snikket/iinclude/sys/thread/ThreadPoolException.h b/Sources/c_snikket/iinclude/sys/thread/ThreadPoolException.h
new file mode 100644
index 0000000..770a5db
--- /dev/null
+++ b/Sources/c_snikket/iinclude/sys/thread/ThreadPoolException.h
@@ -0,0 +1,68 @@
+// Generated by Haxe 4.3.3
+#ifndef INCLUDED_sys_thread_ThreadPoolException
+#define INCLUDED_sys_thread_ThreadPoolException
+
+#ifndef HXCPP_H
+#include <hxcpp.h>
+#endif
+
+#ifndef INCLUDED_haxe_Exception
+#include <haxe/Exception.h>
+#endif
+HX_DECLARE_STACK_FRAME(_hx_pos_198c3f4b2c534790_5_new)
+HX_DECLARE_CLASS1(haxe,Exception)
+HX_DECLARE_CLASS2(sys,thread,ThreadPoolException)
+
+namespace sys{
+namespace thread{
+
+
+class HXCPP_CLASS_ATTRIBUTES ThreadPoolException_obj : public  ::haxe::Exception_obj
+{
+	public:
+		typedef  ::haxe::Exception_obj super;
+		typedef ThreadPoolException_obj OBJ_;
+		ThreadPoolException_obj();
+
+	public:
+		enum { _hx_ClassId = 0x15d515be };
+
+		void __construct(::String message, ::haxe::Exception previous, ::Dynamic native);
+		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.thread.ThreadPoolException")
+			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
+		inline void *operator new(size_t inSize, int extra)
+			{ return ::hx::Object::operator new(inSize+extra,true,"sys.thread.ThreadPoolException"); }
+
+		inline static ::hx::ObjectPtr< ThreadPoolException_obj > __new(::String message, ::haxe::Exception previous, ::Dynamic native) {
+			::hx::ObjectPtr< ThreadPoolException_obj > __this = new ThreadPoolException_obj();
+			__this->__construct(message,previous,native);
+			return __this;
+		}
+
+		inline static ::hx::ObjectPtr< ThreadPoolException_obj > __alloc(::hx::Ctx *_hx_ctx,::String message, ::haxe::Exception previous, ::Dynamic native) {
+			ThreadPoolException_obj *__this = (ThreadPoolException_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(ThreadPoolException_obj), true, "sys.thread.ThreadPoolException"));
+			*(void **)__this = ThreadPoolException_obj::_hx_vtable;
+{
+            	HX_STACKFRAME(&_hx_pos_198c3f4b2c534790_5_new)
+HXDLIN(   5)		__this->super::__construct(message,previous,native);
+            	}
+		
+			return __this;
+		}
+
+		static void * _hx_vtable;
+		static Dynamic __CreateEmpty();
+		static Dynamic __Create(::hx::DynamicArray inArgs);
+		//~ThreadPoolException_obj();
+
+		HX_DO_RTTI_ALL;
+		static void __register();
+		bool _hx_isInstanceOf(int inClassId);
+		::String __ToString() const { return HX_("ThreadPoolException",89,4a,f3,bf); }
+
+};
+
+} // end namespace sys
+} // end namespace thread
+
+#endif /* INCLUDED_sys_thread_ThreadPoolException */ 
diff --git a/Sources/c_snikket/iinclude/sys/thread/_ElasticThreadPool/Worker.h b/Sources/c_snikket/iinclude/sys/thread/_ElasticThreadPool/Worker.h
new file mode 100644
index 0000000..ed967c9
--- /dev/null
+++ b/Sources/c_snikket/iinclude/sys/thread/_ElasticThreadPool/Worker.h
@@ -0,0 +1,76 @@
+// Generated by Haxe 4.3.3
+#ifndef INCLUDED_sys_thread__ElasticThreadPool_Worker
+#define INCLUDED_sys_thread__ElasticThreadPool_Worker
+
+#ifndef HXCPP_H
+#include <hxcpp.h>
+#endif
+
+HX_DECLARE_CLASS2(sys,thread,Deque)
+HX_DECLARE_CLASS2(sys,thread,Lock)
+HX_DECLARE_CLASS2(sys,thread,Mutex)
+HX_DECLARE_CLASS3(sys,thread,_ElasticThreadPool,Worker)
+HX_DECLARE_CLASS3(sys,thread,_Thread,HaxeThread)
+
+namespace sys{
+namespace thread{
+namespace _ElasticThreadPool{
+
+
+class HXCPP_CLASS_ATTRIBUTES Worker_obj : public ::hx::Object
+{
+	public:
+		typedef ::hx::Object super;
+		typedef Worker_obj OBJ_;
+		Worker_obj();
+
+	public:
+		enum { _hx_ClassId = 0x4ed34e2d };
+
+		void __construct( ::sys::thread::Deque queue,Float timeout);
+		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.thread._ElasticThreadPool.Worker")
+			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
+		inline void *operator new(size_t inSize, int extra)
+			{ return ::hx::Object::operator new(inSize+extra,true,"sys.thread._ElasticThreadPool.Worker"); }
+		static ::hx::ObjectPtr< Worker_obj > __new( ::sys::thread::Deque queue,Float timeout);
+		static ::hx::ObjectPtr< Worker_obj > __alloc(::hx::Ctx *_hx_ctx, ::sys::thread::Deque queue,Float timeout);
+		static void * _hx_vtable;
+		static Dynamic __CreateEmpty();
+		static Dynamic __Create(::hx::DynamicArray inArgs);
+		//~Worker_obj();
+
+		HX_DO_RTTI_ALL;
+		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
+		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
+		void __GetFields(Array< ::String> &outFields);
+		static void __register();
+		void __Mark(HX_MARK_PARAMS);
+		void __Visit(HX_VISIT_PARAMS);
+		bool _hx_isInstanceOf(int inClassId);
+		::String __ToString() const { return HX_("Worker",9e,a4,32,fe); }
+
+		 ::Dynamic task;
+		Dynamic task_dyn() { return task;}
+		bool dead;
+		 ::sys::thread::Mutex deathMutex;
+		 ::sys::thread::Lock waiter;
+		 ::sys::thread::Deque queue;
+		Float timeout;
+		 ::sys::thread::_Thread::HaxeThread thread;
+		bool isShutdown;
+		void wakeup( ::Dynamic task);
+		::Dynamic wakeup_dyn();
+
+		void start();
+		::Dynamic start_dyn();
+
+		void loop();
+		::Dynamic loop_dyn();
+
+};
+
+} // end namespace sys
+} // end namespace thread
+} // end namespace _ElasticThreadPool
+
+#endif /* INCLUDED_sys_thread__ElasticThreadPool_Worker */ 
diff --git a/Sources/c_snikket/iinclude/sys/thread/_FixedThreadPool/ShutdownException.h b/Sources/c_snikket/iinclude/sys/thread/_FixedThreadPool/ShutdownException.h
new file mode 100644
index 0000000..7453677
--- /dev/null
+++ b/Sources/c_snikket/iinclude/sys/thread/_FixedThreadPool/ShutdownException.h
@@ -0,0 +1,70 @@
+// Generated by Haxe 4.3.3
+#ifndef INCLUDED_sys_thread__FixedThreadPool_ShutdownException
+#define INCLUDED_sys_thread__FixedThreadPool_ShutdownException
+
+#ifndef HXCPP_H
+#include <hxcpp.h>
+#endif
+
+#ifndef INCLUDED_haxe_Exception
+#include <haxe/Exception.h>
+#endif
+HX_DECLARE_STACK_FRAME(_hx_pos_3d4aac51d93fb9ec_93_new)
+HX_DECLARE_CLASS1(haxe,Exception)
+HX_DECLARE_CLASS3(sys,thread,_FixedThreadPool,ShutdownException)
+
+namespace sys{
+namespace thread{
+namespace _FixedThreadPool{
+
+
+class HXCPP_CLASS_ATTRIBUTES ShutdownException_obj : public  ::haxe::Exception_obj
+{
+	public:
+		typedef  ::haxe::Exception_obj super;
+		typedef ShutdownException_obj OBJ_;
+		ShutdownException_obj();
+
+	public:
+		enum { _hx_ClassId = 0x74de5cef };
+
+		void __construct(::String message, ::haxe::Exception previous, ::Dynamic native);
+		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.thread._FixedThreadPool.ShutdownException")
+			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
+		inline void *operator new(size_t inSize, int extra)
+			{ return ::hx::Object::operator new(inSize+extra,true,"sys.thread._FixedThreadPool.ShutdownException"); }
+
+		inline static ::hx::ObjectPtr< ShutdownException_obj > __new(::String message, ::haxe::Exception previous, ::Dynamic native) {
+			::hx::ObjectPtr< ShutdownException_obj > __this = new ShutdownException_obj();
+			__this->__construct(message,previous,native);
+			return __this;
+		}
+
+		inline static ::hx::ObjectPtr< ShutdownException_obj > __alloc(::hx::Ctx *_hx_ctx,::String message, ::haxe::Exception previous, ::Dynamic native) {
+			ShutdownException_obj *__this = (ShutdownException_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(ShutdownException_obj), true, "sys.thread._FixedThreadPool.ShutdownException"));
+			*(void **)__this = ShutdownException_obj::_hx_vtable;
+{
+            	HX_STACKFRAME(&_hx_pos_3d4aac51d93fb9ec_93_new)
+HXDLIN(  93)		__this->super::__construct(message,previous,native);
+            	}
+		
+			return __this;
+		}
+
+		static void * _hx_vtable;
+		static Dynamic __CreateEmpty();
+		static Dynamic __Create(::hx::DynamicArray inArgs);
+		//~ShutdownException_obj();
+
+		HX_DO_RTTI_ALL;
+		static void __register();
+		bool _hx_isInstanceOf(int inClassId);
+		::String __ToString() const { return HX_("ShutdownException",b9,70,29,e2); }
+
+};
+
+} // end namespace sys
+} // end namespace thread
+} // end namespace _FixedThreadPool
+
+#endif /* INCLUDED_sys_thread__FixedThreadPool_ShutdownException */ 
diff --git a/Sources/c_snikket/iinclude/sys/thread/_FixedThreadPool/Worker.h b/Sources/c_snikket/iinclude/sys/thread/_FixedThreadPool/Worker.h
new file mode 100644
index 0000000..06edd3f
--- /dev/null
+++ b/Sources/c_snikket/iinclude/sys/thread/_FixedThreadPool/Worker.h
@@ -0,0 +1,61 @@
+// Generated by Haxe 4.3.3
+#ifndef INCLUDED_sys_thread__FixedThreadPool_Worker
+#define INCLUDED_sys_thread__FixedThreadPool_Worker
+
+#ifndef HXCPP_H
+#include <hxcpp.h>
+#endif
+
+HX_DECLARE_CLASS2(sys,thread,Deque)
+HX_DECLARE_CLASS3(sys,thread,_FixedThreadPool,Worker)
+HX_DECLARE_CLASS3(sys,thread,_Thread,HaxeThread)
+
+namespace sys{
+namespace thread{
+namespace _FixedThreadPool{
+
+
+class HXCPP_CLASS_ATTRIBUTES Worker_obj : public ::hx::Object
+{
+	public:
+		typedef ::hx::Object super;
+		typedef Worker_obj OBJ_;
+		Worker_obj();
+
+	public:
+		enum { _hx_ClassId = 0x56d87870 };
+
+		void __construct( ::sys::thread::Deque queue);
+		inline void *operator new(size_t inSize, bool inContainer=true,const char *inName="sys.thread._FixedThreadPool.Worker")
+			{ return ::hx::Object::operator new(inSize,inContainer,inName); }
+		inline void *operator new(size_t inSize, int extra)
+			{ return ::hx::Object::operator new(inSize+extra,true,"sys.thread._FixedThreadPool.Worker"); }
+		static ::hx::ObjectPtr< Worker_obj > __new( ::sys::thread::Deque queue);
+		static ::hx::ObjectPtr< Worker_obj > __alloc(::hx::Ctx *_hx_ctx, ::sys::thread::Deque queue);
+		static void * _hx_vtable;
+		static Dynamic __CreateEmpty();
+		static Dynamic __Create(::hx::DynamicArray inArgs);
+		//~Worker_obj();
+
+		HX_DO_RTTI_ALL;
+		::hx::Val __Field(const ::String &inString, ::hx::PropertyAccess inCallProp);
+		::hx::Val __SetField(const ::String &inString,const ::hx::Val &inValue, ::hx::PropertyAccess inCallProp);
+		void __GetFields(Array< ::String> &outFields);
+		static void __register();
+		void __Mark(HX_MARK_PARAMS);
+		void __Visit(HX_VISIT_PARAMS);
+		bool _hx_isInstanceOf(int inClassId);
+		::String __ToString() const { return HX_("Worker",9e,a4,32,fe); }
+
+		 ::sys::thread::_Thread::HaxeThread thread;
+		 ::sys::thread::Deque queue;
+		void loop();
+		::Dynamic loop_dyn();
+
+};
+
+} // end namespace sys
+} // end namespace thread
+} // end namespace _FixedThreadPool
+
+#endif /* INCLUDED_sys_thread__FixedThreadPool_Worker */ 
diff --git a/Sources/c_snikket/include/snikket.h b/Sources/c_snikket/include/snikket.h
index 8352253..7a79ce5 100644
--- a/Sources/c_snikket/include/snikket.h
+++ b/Sources/c_snikket/include/snikket.h
@@ -466,6 +466,8 @@ API_PREFIX const char *snikket_notification_account_id(void *notification);
 
 API_PREFIX const char *snikket_notification_chat_id(void *notification);
 
+API_PREFIX const char *snikket_notification_sender_id(void *notification);
+
 API_PREFIX const char *snikket_notification_message_id(void *notification);
 
 API_PREFIX enum snikket_message_type snikket_notification_type(void *notification);
@@ -638,23 +640,23 @@ API_PREFIX void snikket_client_add_chats_updated_listener(void *client, void (*h
 /**
  * Event fired when a new call comes in
  * 
- * @param handler takes two arguments, the call Session and the associated Chat ID
+ * @param handler takes one argument, the call Session
  */
-API_PREFIX void snikket_client_add_call_ring_listener(void *client, void (*handler) (void*, const char*, void*), void *handler__context);
+API_PREFIX void snikket_client_add_call_ring_listener(void *client, void (*handler) (void*, void*), void *handler__context);
 
 /**
  * Event fired when a call is retracted or hung up
  * 
  * @param handler takes one argument, the associated Chat ID
  */
-API_PREFIX void snikket_client_add_call_retract_listener(void *client, void (*handler) (const char*, void*), void *handler__context);
+API_PREFIX void snikket_client_add_call_retract_listener(void *client, void (*handler) (const char*, const char*, void*), void *handler__context);
 
 /**
  * Event fired when an outgoing call starts ringing
  * 
  * @param handler takes one argument, the associated Chat ID
  */
-API_PREFIX void snikket_client_add_call_ringing_listener(void *client, void (*handler) (const char*, void*), void *handler__context);
+API_PREFIX void snikket_client_add_call_ringing_listener(void *client, void (*handler) (const char*, const char*, void*), void *handler__context);
 
 /**
  * Event fired when a call is asking for media to send
@@ -996,6 +998,8 @@ API_PREFIX bool snikket_available_chat_is_channel(void *available_chat);
 
 API_PREFIX const char *snikket_jingle_initiated_session_sid(void *initiated_session);
 
+API_PREFIX const char *snikket_jingle_initiated_session_chat_id(void *initiated_session);
+
 API_PREFIX void snikket_jingle_initiated_session_accept(void *initiated_session);
 
 API_PREFIX void snikket_jingle_initiated_session_hangup(void *initiated_session);
@@ -1043,6 +1047,29 @@ API_PREFIX bool snikket_channel_is_private(void *channel);
 
 API_PREFIX const char *snikket_custom_emoji_reaction_uri(void *custom_emoji_reaction);
 
+API_PREFIX const char *snikket_identicon_svg(const char *source);
+
+/**
+ * Produce /.well-known/ni/ paths instead of ni:/// URIs
+ * for referencing media by hash.
+ * 
+ * This can be useful eg for intercepting with a Service Worker.
+ */
+API_PREFIX bool snikket_config_relative_hash_uri();
+
+/**
+ * Produce /.well-known/ni/ paths instead of ni:/// URIs
+ * for referencing media by hash.
+ * 
+ * This can be useful eg for intercepting with a Service Worker.
+ */
+API_PREFIX void snikket_config_set_relative_hash_uri(bool value);
+
+/**
+ * Trades off some performance for lower / more consistent memory usage
+ */
+API_PREFIX void snikket_config_enable_constrained_memory_mode();
+
 /**
  * Schedule DTMF events to be sent
  * 
diff --git a/Sources/c_snikket/src/Reflect.cpp b/Sources/c_snikket/src/Reflect.cpp
index 415f3f9..1c4eb10 100644
--- a/Sources/c_snikket/src/Reflect.cpp
+++ b/Sources/c_snikket/src/Reflect.cpp
@@ -16,6 +16,7 @@ HX_LOCAL_STACK_FRAME(_hx_pos_7b3988d9963d5a21_81_compare,"Reflect","compare",0xa
 HX_LOCAL_STACK_FRAME(_hx_pos_7b3988d9963d5a21_84_compareMethods,"Reflect","compareMethods",0x8b8ddd7e,"Reflect.compareMethods","/usr/local/lib/haxe/std/cpp/_std/Reflect.hx",84,0x1c2422c3)
 HX_LOCAL_STACK_FRAME(_hx_pos_7b3988d9963d5a21_93_isObject,"Reflect","isObject",0xd04960ba,"Reflect.isObject","/usr/local/lib/haxe/std/cpp/_std/Reflect.hx",93,0x1c2422c3)
 HX_LOCAL_STACK_FRAME(_hx_pos_7b3988d9963d5a21_102_isEnumValue,"Reflect","isEnumValue",0x97884d95,"Reflect.isEnumValue","/usr/local/lib/haxe/std/cpp/_std/Reflect.hx",102,0x1c2422c3)
+HX_LOCAL_STACK_FRAME(_hx_pos_7b3988d9963d5a21_106_deleteField,"Reflect","deleteField",0x21895ebe,"Reflect.deleteField","/usr/local/lib/haxe/std/cpp/_std/Reflect.hx",106,0x1c2422c3)
 HX_LOCAL_STACK_FRAME(_hx_pos_7b3988d9963d5a21_112_copy,"Reflect","copy",0x47e2b5a6,"Reflect.copy","/usr/local/lib/haxe/std/cpp/_std/Reflect.hx",112,0x1c2422c3)
 
 void Reflect_obj::__construct() { }
@@ -150,6 +151,17 @@ HXDLIN( 102)		return (::hx::IsNotNull( v ) && ::hx::IsEq( v->__GetType(),7 ));
 
 STATIC_HX_DEFINE_DYNAMIC_FUNC1(Reflect_obj,isEnumValue,return )
 
+bool Reflect_obj::deleteField( ::Dynamic o,::String field){
+            	HX_STACKFRAME(&_hx_pos_7b3988d9963d5a21_106_deleteField)
+HXLINE( 107)		if (::hx::IsNull( o )) {
+HXLINE( 108)			return false;
+            		}
+HXLINE( 109)		return  ::__hxcpp_anon_remove(o,field);
+            	}
+
+
+STATIC_HX_DEFINE_DYNAMIC_FUNC2(Reflect_obj,deleteField,return )
+
  ::Dynamic Reflect_obj::copy( ::Dynamic o){
             	HX_STACKFRAME(&_hx_pos_7b3988d9963d5a21_112_copy)
 HXLINE( 113)		if (::hx::IsNull( o )) {
@@ -209,6 +221,7 @@ bool Reflect_obj::__GetStatic(const ::String &inName, Dynamic &outValue, ::hx::P
 	case 11:
 		if (HX_FIELD_EQ(inName,"getProperty") ) { outValue = getProperty_dyn(); return true; }
 		if (HX_FIELD_EQ(inName,"isEnumValue") ) { outValue = isEnumValue_dyn(); return true; }
+		if (HX_FIELD_EQ(inName,"deleteField") ) { outValue = deleteField_dyn(); return true; }
 		break;
 	case 14:
 		if (HX_FIELD_EQ(inName,"compareMethods") ) { outValue = compareMethods_dyn(); return true; }
@@ -235,6 +248,7 @@ static ::String Reflect_obj_sStaticFields[] = {
 	HX_("compareMethods",4d,ac,7b,37),
 	HX_("isObject",49,1a,a9,6d),
 	HX_("isEnumValue",66,b7,87,06),
+	HX_("deleteField",8f,c8,88,90),
 	HX_("copy",b5,bb,c4,41),
 	::String(null())
 };
diff --git a/Sources/c_snikket/src/Xml.cpp b/Sources/c_snikket/src/Xml.cpp
index 38309a3..e9a0b7e 100644
--- a/Sources/c_snikket/src/Xml.cpp
+++ b/Sources/c_snikket/src/Xml.cpp
@@ -13,9 +13,6 @@
 #ifndef INCLUDED_haxe_ds_StringMap
 #include <haxe/ds/StringMap.h>
 #endif
-#ifndef INCLUDED_haxe_xml_Parser
-#include <haxe/xml/Parser.h>
-#endif
 #ifndef INCLUDED_haxe_xml_Printer
 #include <haxe/xml/Printer.h>
 #endif
@@ -23,26 +20,11 @@
 HX_DEFINE_STACK_FRAME(_hx_pos_7e4d842269e66db1_397_new,"Xml","new",0x2e496e29,"Xml.new","/usr/local/lib/haxe/std/Xml.hx",397,0x5c1024e4)
 HX_LOCAL_STACK_FRAME(_hx_pos_7e4d842269e66db1_244_get,"Xml","get",0x2e441e5f,"Xml.get","/usr/local/lib/haxe/std/Xml.hx",244,0x5c1024e4)
 HX_LOCAL_STACK_FRAME(_hx_pos_7e4d842269e66db1_255_set,"Xml","set",0x2e4d396b,"Xml.set","/usr/local/lib/haxe/std/Xml.hx",255,0x5c1024e4)
-HX_LOCAL_STACK_FRAME(_hx_pos_7e4d842269e66db1_277_exists,"Xml","exists",0x446683b3,"Xml.exists","/usr/local/lib/haxe/std/Xml.hx",277,0x5c1024e4)
 HX_LOCAL_STACK_FRAME(_hx_pos_7e4d842269e66db1_287_attributes,"Xml","attributes",0x1ab5462e,"Xml.attributes","/usr/local/lib/haxe/std/Xml.hx",287,0x5c1024e4)
 HX_LOCAL_STACK_FRAME(_hx_pos_7e4d842269e66db1_337_firstElement,"Xml","firstElement",0xc103a583,"Xml.firstElement","/usr/local/lib/haxe/std/Xml.hx",337,0x5c1024e4)
-HX_LOCAL_STACK_FRAME(_hx_pos_7e4d842269e66db1_353_addChild,"Xml","addChild",0x3e639952,"Xml.addChild","/usr/local/lib/haxe/std/Xml.hx",353,0x5c1024e4)
-HX_LOCAL_STACK_FRAME(_hx_pos_7e4d842269e66db1_366_removeChild,"Xml","removeChild",0x9bd39581,"Xml.removeChild","/usr/local/lib/haxe/std/Xml.hx",366,0x5c1024e4)
 HX_LOCAL_STACK_FRAME(_hx_pos_7e4d842269e66db1_394_toString,"Xml","toString",0xb7bb9a43,"Xml.toString","/usr/local/lib/haxe/std/Xml.hx",394,0x5c1024e4)
-HX_LOCAL_STACK_FRAME(_hx_pos_7e4d842269e66db1_122_parse,"Xml","parse",0x8a44f23c,"Xml.parse","/usr/local/lib/haxe/std/Xml.hx",122,0x5c1024e4)
 HX_LOCAL_STACK_FRAME(_hx_pos_7e4d842269e66db1_182_createElement,"Xml","createElement",0x97359a29,"Xml.createElement","/usr/local/lib/haxe/std/Xml.hx",182,0x5c1024e4)
-HX_LOCAL_STACK_FRAME(_hx_pos_7e4d842269e66db1_191_createPCData,"Xml","createPCData",0x3cc9ead0,"Xml.createPCData","/usr/local/lib/haxe/std/Xml.hx",191,0x5c1024e4)
-HX_LOCAL_STACK_FRAME(_hx_pos_7e4d842269e66db1_200_createCData,"Xml","createCData",0xaf49365a,"Xml.createCData","/usr/local/lib/haxe/std/Xml.hx",200,0x5c1024e4)
-HX_LOCAL_STACK_FRAME(_hx_pos_7e4d842269e66db1_209_createComment,"Xml","createComment",0x125165cc,"Xml.createComment","/usr/local/lib/haxe/std/Xml.hx",209,0x5c1024e4)
-HX_LOCAL_STACK_FRAME(_hx_pos_7e4d842269e66db1_218_createDocType,"Xml","createDocType",0x696de8bf,"Xml.createDocType","/usr/local/lib/haxe/std/Xml.hx",218,0x5c1024e4)
-HX_LOCAL_STACK_FRAME(_hx_pos_7e4d842269e66db1_227_createProcessingInstruction,"Xml","createProcessingInstruction",0x632a1f28,"Xml.createProcessingInstruction","/usr/local/lib/haxe/std/Xml.hx",227,0x5c1024e4)
-HX_LOCAL_STACK_FRAME(_hx_pos_7e4d842269e66db1_237_createDocument,"Xml","createDocument",0xcf00030e,"Xml.createDocument","/usr/local/lib/haxe/std/Xml.hx",237,0x5c1024e4)
 HX_LOCAL_STACK_FRAME(_hx_pos_7e4d842269e66db1_86_boot,"Xml","boot",0x4a0ff649,"Xml.boot","/usr/local/lib/haxe/std/Xml.hx",86,0x5c1024e4)
-HX_LOCAL_STACK_FRAME(_hx_pos_7e4d842269e66db1_91_boot,"Xml","boot",0x4a0ff649,"Xml.boot","/usr/local/lib/haxe/std/Xml.hx",91,0x5c1024e4)
-HX_LOCAL_STACK_FRAME(_hx_pos_7e4d842269e66db1_96_boot,"Xml","boot",0x4a0ff649,"Xml.boot","/usr/local/lib/haxe/std/Xml.hx",96,0x5c1024e4)
-HX_LOCAL_STACK_FRAME(_hx_pos_7e4d842269e66db1_101_boot,"Xml","boot",0x4a0ff649,"Xml.boot","/usr/local/lib/haxe/std/Xml.hx",101,0x5c1024e4)
-HX_LOCAL_STACK_FRAME(_hx_pos_7e4d842269e66db1_106_boot,"Xml","boot",0x4a0ff649,"Xml.boot","/usr/local/lib/haxe/std/Xml.hx",106,0x5c1024e4)
-HX_LOCAL_STACK_FRAME(_hx_pos_7e4d842269e66db1_111_boot,"Xml","boot",0x4a0ff649,"Xml.boot","/usr/local/lib/haxe/std/Xml.hx",111,0x5c1024e4)
 HX_LOCAL_STACK_FRAME(_hx_pos_7e4d842269e66db1_116_boot,"Xml","boot",0x4a0ff649,"Xml.boot","/usr/local/lib/haxe/std/Xml.hx",116,0x5c1024e4)
 
 void Xml_obj::__construct(int nodeType){
@@ -89,17 +71,6 @@ HXLINE( 259)		this->attributeMap->set(att,value);
 
 HX_DEFINE_DYNAMIC_FUNC2(Xml_obj,set,(void))
 
-bool Xml_obj::exists(::String att){
-            	HX_STACKFRAME(&_hx_pos_7e4d842269e66db1_277_exists)
-HXLINE( 278)		if ((this->nodeType != ::Xml_obj::Element)) {
-HXLINE( 279)			HX_STACK_DO_THROW((HX_("Bad node type, expected Element but found ",d8,90,8b,bb) + ::_Xml::XmlType_Impl__obj::toString(this->nodeType)));
-            		}
-HXLINE( 281)		return this->attributeMap->exists(att);
-            	}
-
-
-HX_DEFINE_DYNAMIC_FUNC1(Xml_obj,exists,return )
-
  ::Dynamic Xml_obj::attributes(){
             	HX_STACKFRAME(&_hx_pos_7e4d842269e66db1_287_attributes)
 HXLINE( 288)		if ((this->nodeType != ::Xml_obj::Element)) {
@@ -140,50 +111,6 @@ HXLINE( 344)		return null();
 
 HX_DEFINE_DYNAMIC_FUNC0(Xml_obj,firstElement,return )
 
-void Xml_obj::addChild( ::Xml x){
-            	HX_STACKFRAME(&_hx_pos_7e4d842269e66db1_353_addChild)
-HXLINE( 354)		bool _hx_tmp;
-HXDLIN( 354)		if ((this->nodeType != ::Xml_obj::Document)) {
-HXLINE( 354)			_hx_tmp = (this->nodeType != ::Xml_obj::Element);
-            		}
-            		else {
-HXLINE( 354)			_hx_tmp = false;
-            		}
-HXDLIN( 354)		if (_hx_tmp) {
-HXLINE( 354)			HX_STACK_DO_THROW((HX_("Bad node type, expected Element or Document but found ",a0,d6,ba,79) + ::_Xml::XmlType_Impl__obj::toString(this->nodeType)));
-            		}
-HXLINE( 355)		if (::hx::IsNotNull( x->parent )) {
-HXLINE( 356)			x->parent->removeChild(x);
-            		}
-HXLINE( 358)		this->children->push(x);
-HXLINE( 359)		x->parent = ::hx::ObjectPtr<OBJ_>(this);
-            	}
-
-
-HX_DEFINE_DYNAMIC_FUNC1(Xml_obj,addChild,(void))
-
-bool Xml_obj::removeChild( ::Xml x){
-            	HX_STACKFRAME(&_hx_pos_7e4d842269e66db1_366_removeChild)
-HXLINE( 367)		bool _hx_tmp;
-HXDLIN( 367)		if ((this->nodeType != ::Xml_obj::Document)) {
-HXLINE( 367)			_hx_tmp = (this->nodeType != ::Xml_obj::Element);
-            		}
-            		else {
-HXLINE( 367)			_hx_tmp = false;
-            		}
-HXDLIN( 367)		if (_hx_tmp) {
-HXLINE( 367)			HX_STACK_DO_THROW((HX_("Bad node type, expected Element or Document but found ",a0,d6,ba,79) + ::_Xml::XmlType_Impl__obj::toString(this->nodeType)));
-            		}
-HXLINE( 368)		if (this->children->remove(x)) {
-HXLINE( 369)			x->parent = null();
-HXLINE( 370)			return true;
-            		}
-HXLINE( 372)		return false;
-            	}
-
-
-HX_DEFINE_DYNAMIC_FUNC1(Xml_obj,removeChild,return )
-
 ::String Xml_obj::toString(){
             	HX_STACKFRAME(&_hx_pos_7e4d842269e66db1_394_toString)
 HXDLIN( 394)		return ::haxe::xml::Printer_obj::print(::hx::ObjectPtr<OBJ_>(this),null());
@@ -194,26 +121,8 @@ HX_DEFINE_DYNAMIC_FUNC0(Xml_obj,toString,return )
 
 int Xml_obj::Element;
 
-int Xml_obj::PCData;
-
-int Xml_obj::CData;
-
-int Xml_obj::Comment;
-
-int Xml_obj::DocType;
-
-int Xml_obj::ProcessingInstruction;
-
 int Xml_obj::Document;
 
- ::Xml Xml_obj::parse(::String str){
-            	HX_STACKFRAME(&_hx_pos_7e4d842269e66db1_122_parse)
-HXDLIN( 122)		return ::haxe::xml::Parser_obj::parse(str,null());
-            	}
-
-
-STATIC_HX_DEFINE_DYNAMIC_FUNC1(Xml_obj,parse,return )
-
  ::Xml Xml_obj::createElement(::String name){
             	HX_GC_STACKFRAME(&_hx_pos_7e4d842269e66db1_182_createElement)
 HXLINE( 183)		 ::Xml xml =  ::Xml_obj::__alloc( HX_CTX ,::Xml_obj::Element);
@@ -229,124 +138,6 @@ HXLINE( 185)		return xml;
 
 STATIC_HX_DEFINE_DYNAMIC_FUNC1(Xml_obj,createElement,return )
 
- ::Xml Xml_obj::createPCData(::String data){
-            	HX_GC_STACKFRAME(&_hx_pos_7e4d842269e66db1_191_createPCData)
-HXLINE( 192)		 ::Xml xml =  ::Xml_obj::__alloc( HX_CTX ,::Xml_obj::PCData);
-HXLINE( 193)		{
-HXLINE( 193)			bool _hx_tmp;
-HXDLIN( 193)			if ((xml->nodeType != ::Xml_obj::Document)) {
-HXLINE( 193)				_hx_tmp = (xml->nodeType == ::Xml_obj::Element);
-            			}
-            			else {
-HXLINE( 193)				_hx_tmp = true;
-            			}
-HXDLIN( 193)			if (_hx_tmp) {
-HXLINE( 193)				HX_STACK_DO_THROW((HX_("Bad node type, unexpected ",be,79,d5,11) + ::_Xml::XmlType_Impl__obj::toString(xml->nodeType)));
-            			}
-HXDLIN( 193)			xml->nodeValue = data;
-            		}
-HXLINE( 194)		return xml;
-            	}
-
-
-STATIC_HX_DEFINE_DYNAMIC_FUNC1(Xml_obj,createPCData,return )
-
- ::Xml Xml_obj::createCData(::String data){
-            	HX_GC_STACKFRAME(&_hx_pos_7e4d842269e66db1_200_createCData)
-HXLINE( 201)		 ::Xml xml =  ::Xml_obj::__alloc( HX_CTX ,::Xml_obj::CData);
-HXLINE( 202)		{
-HXLINE( 202)			bool _hx_tmp;
-HXDLIN( 202)			if ((xml->nodeType != ::Xml_obj::Document)) {
-HXLINE( 202)				_hx_tmp = (xml->nodeType == ::Xml_obj::Element);
-            			}
-            			else {
-HXLINE( 202)				_hx_tmp = true;
-            			}
-HXDLIN( 202)			if (_hx_tmp) {
-HXLINE( 202)				HX_STACK_DO_THROW((HX_("Bad node type, unexpected ",be,79,d5,11) + ::_Xml::XmlType_Impl__obj::toString(xml->nodeType)));
-            			}
-HXDLIN( 202)			xml->nodeValue = data;
-            		}
-HXLINE( 203)		return xml;
-            	}
-
-
-STATIC_HX_DEFINE_DYNAMIC_FUNC1(Xml_obj,createCData,return )
-
- ::Xml Xml_obj::createComment(::String data){
-            	HX_GC_STACKFRAME(&_hx_pos_7e4d842269e66db1_209_createComment)
-HXLINE( 210)		 ::Xml xml =  ::Xml_obj::__alloc( HX_CTX ,::Xml_obj::Comment);
-HXLINE( 211)		{
-HXLINE( 211)			bool _hx_tmp;
-HXDLIN( 211)			if ((xml->nodeType != ::Xml_obj::Document)) {
-HXLINE( 211)				_hx_tmp = (xml->nodeType == ::Xml_obj::Element);
-            			}
-            			else {
-HXLINE( 211)				_hx_tmp = true;
-            			}
-HXDLIN( 211)			if (_hx_tmp) {
-HXLINE( 211)				HX_STACK_DO_THROW((HX_("Bad node type, unexpected ",be,79,d5,11) + ::_Xml::XmlType_Impl__obj::toString(xml->nodeType)));
-            			}
-HXDLIN( 211)			xml->nodeValue = data;
-            		}
-HXLINE( 212)		return xml;
-            	}
-
-
-STATIC_HX_DEFINE_DYNAMIC_FUNC1(Xml_obj,createComment,return )
-
- ::Xml Xml_obj::createDocType(::String data){
-            	HX_GC_STACKFRAME(&_hx_pos_7e4d842269e66db1_218_createDocType)
-HXLINE( 219)		 ::Xml xml =  ::Xml_obj::__alloc( HX_CTX ,::Xml_obj::DocType);
-HXLINE( 220)		{
-HXLINE( 220)			bool _hx_tmp;
-HXDLIN( 220)			if ((xml->nodeType != ::Xml_obj::Document)) {
-HXLINE( 220)				_hx_tmp = (xml->nodeType == ::Xml_obj::Element);
-            			}
-            			else {
-HXLINE( 220)				_hx_tmp = true;
-            			}
-HXDLIN( 220)			if (_hx_tmp) {
-HXLINE( 220)				HX_STACK_DO_THROW((HX_("Bad node type, unexpected ",be,79,d5,11) + ::_Xml::XmlType_Impl__obj::toString(xml->nodeType)));
-            			}
-HXDLIN( 220)			xml->nodeValue = data;
-            		}
-HXLINE( 221)		return xml;
-            	}
-
-
-STATIC_HX_DEFINE_DYNAMIC_FUNC1(Xml_obj,createDocType,return )
-
- ::Xml Xml_obj::createProcessingInstruction(::String data){
-            	HX_GC_STACKFRAME(&_hx_pos_7e4d842269e66db1_227_createProcessingInstruction)
-HXLINE( 228)		 ::Xml xml =  ::Xml_obj::__alloc( HX_CTX ,::Xml_obj::ProcessingInstruction);
-HXLINE( 229)		{
-HXLINE( 229)			bool _hx_tmp;
-HXDLIN( 229)			if ((xml->nodeType != ::Xml_obj::Document)) {
-HXLINE( 229)				_hx_tmp = (xml->nodeType == ::Xml_obj::Element);
-            			}
-            			else {
-HXLINE( 229)				_hx_tmp = true;
-            			}
-HXDLIN( 229)			if (_hx_tmp) {
-HXLINE( 229)				HX_STACK_DO_THROW((HX_("Bad node type, unexpected ",be,79,d5,11) + ::_Xml::XmlType_Impl__obj::toString(xml->nodeType)));
-            			}
-HXDLIN( 229)			xml->nodeValue = data;
-            		}
-HXLINE( 230)		return xml;
-            	}
-
-
-STATIC_HX_DEFINE_DYNAMIC_FUNC1(Xml_obj,createProcessingInstruction,return )
-
- ::Xml Xml_obj::createDocument(){
-            	HX_GC_STACKFRAME(&_hx_pos_7e4d842269e66db1_237_createDocument)
-HXDLIN( 237)		return  ::Xml_obj::__alloc( HX_CTX ,::Xml_obj::Document);
-            	}
-
-
-STATIC_HX_DEFINE_DYNAMIC_FUNC0(Xml_obj,createDocument,return )
-
 
 ::hx::ObjectPtr< Xml_obj > Xml_obj::__new(int nodeType) {
 	::hx::ObjectPtr< Xml_obj > __this = new Xml_obj();
@@ -371,7 +162,6 @@ void Xml_obj::__Mark(HX_MARK_PARAMS)
 	HX_MARK_MEMBER_NAME(nodeType,"nodeType");
 	HX_MARK_MEMBER_NAME(nodeName,"nodeName");
 	HX_MARK_MEMBER_NAME(nodeValue,"nodeValue");
-	HX_MARK_MEMBER_NAME(parent,"parent");
 	HX_MARK_MEMBER_NAME(children,"children");
 	HX_MARK_MEMBER_NAME(attributeMap,"attributeMap");
 	HX_MARK_END_CLASS();
@@ -382,7 +172,6 @@ void Xml_obj::__Visit(HX_VISIT_PARAMS)
 	HX_VISIT_MEMBER_NAME(nodeType,"nodeType");
 	HX_VISIT_MEMBER_NAME(nodeName,"nodeName");
 	HX_VISIT_MEMBER_NAME(nodeValue,"nodeValue");
-	HX_VISIT_MEMBER_NAME(parent,"parent");
 	HX_VISIT_MEMBER_NAME(children,"children");
 	HX_VISIT_MEMBER_NAME(attributeMap,"attributeMap");
 }
@@ -394,15 +183,10 @@ void Xml_obj::__Visit(HX_VISIT_PARAMS)
 		if (HX_FIELD_EQ(inName,"get") ) { return ::hx::Val( get_dyn() ); }
 		if (HX_FIELD_EQ(inName,"set") ) { return ::hx::Val( set_dyn() ); }
 		break;
-	case 6:
-		if (HX_FIELD_EQ(inName,"parent") ) { return ::hx::Val( parent ); }
-		if (HX_FIELD_EQ(inName,"exists") ) { return ::hx::Val( exists_dyn() ); }
-		break;
 	case 8:
 		if (HX_FIELD_EQ(inName,"nodeType") ) { return ::hx::Val( nodeType ); }
 		if (HX_FIELD_EQ(inName,"nodeName") ) { return ::hx::Val( nodeName ); }
 		if (HX_FIELD_EQ(inName,"children") ) { return ::hx::Val( children ); }
-		if (HX_FIELD_EQ(inName,"addChild") ) { return ::hx::Val( addChild_dyn() ); }
 		if (HX_FIELD_EQ(inName,"toString") ) { return ::hx::Val( toString_dyn() ); }
 		break;
 	case 9:
@@ -411,9 +195,6 @@ void Xml_obj::__Visit(HX_VISIT_PARAMS)
 	case 10:
 		if (HX_FIELD_EQ(inName,"attributes") ) { return ::hx::Val( attributes_dyn() ); }
 		break;
-	case 11:
-		if (HX_FIELD_EQ(inName,"removeChild") ) { return ::hx::Val( removeChild_dyn() ); }
-		break;
 	case 12:
 		if (HX_FIELD_EQ(inName,"attributeMap") ) { return ::hx::Val( attributeMap ); }
 		if (HX_FIELD_EQ(inName,"firstElement") ) { return ::hx::Val( firstElement_dyn() ); }
@@ -424,40 +205,14 @@ void Xml_obj::__Visit(HX_VISIT_PARAMS)
 bool Xml_obj::__GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp)
 {
 	switch(inName.length) {
-	case 5:
-		if (HX_FIELD_EQ(inName,"CData") ) { outValue = ( CData ); return true; }
-		if (HX_FIELD_EQ(inName,"parse") ) { outValue = parse_dyn(); return true; }
-		break;
-	case 6:
-		if (HX_FIELD_EQ(inName,"PCData") ) { outValue = ( PCData ); return true; }
-		break;
 	case 7:
 		if (HX_FIELD_EQ(inName,"Element") ) { outValue = ( Element ); return true; }
-		if (HX_FIELD_EQ(inName,"Comment") ) { outValue = ( Comment ); return true; }
-		if (HX_FIELD_EQ(inName,"DocType") ) { outValue = ( DocType ); return true; }
 		break;
 	case 8:
 		if (HX_FIELD_EQ(inName,"Document") ) { outValue = ( Document ); return true; }
 		break;
-	case 11:
-		if (HX_FIELD_EQ(inName,"createCData") ) { outValue = createCData_dyn(); return true; }
-		break;
-	case 12:
-		if (HX_FIELD_EQ(inName,"createPCData") ) { outValue = createPCData_dyn(); return true; }
-		break;
 	case 13:
 		if (HX_FIELD_EQ(inName,"createElement") ) { outValue = createElement_dyn(); return true; }
-		if (HX_FIELD_EQ(inName,"createComment") ) { outValue = createComment_dyn(); return true; }
-		if (HX_FIELD_EQ(inName,"createDocType") ) { outValue = createDocType_dyn(); return true; }
-		break;
-	case 14:
-		if (HX_FIELD_EQ(inName,"createDocument") ) { outValue = createDocument_dyn(); return true; }
-		break;
-	case 21:
-		if (HX_FIELD_EQ(inName,"ProcessingInstruction") ) { outValue = ( ProcessingInstruction ); return true; }
-		break;
-	case 27:
-		if (HX_FIELD_EQ(inName,"createProcessingInstruction") ) { outValue = createProcessingInstruction_dyn(); return true; }
 	}
 	return false;
 }
@@ -465,9 +220,6 @@ bool Xml_obj::__GetStatic(const ::String &inName, Dynamic &outValue, ::hx::Prope
 ::hx::Val Xml_obj::__SetField(const ::String &inName,const ::hx::Val &inValue,::hx::PropertyAccess inCallProp)
 {
 	switch(inName.length) {
-	case 6:
-		if (HX_FIELD_EQ(inName,"parent") ) { parent=inValue.Cast<  ::Xml >(); return inValue; }
-		break;
 	case 8:
 		if (HX_FIELD_EQ(inName,"nodeType") ) { nodeType=inValue.Cast< int >(); return inValue; }
 		if (HX_FIELD_EQ(inName,"nodeName") ) { nodeName=inValue.Cast< ::String >(); return inValue; }
@@ -485,22 +237,11 @@ bool Xml_obj::__GetStatic(const ::String &inName, Dynamic &outValue, ::hx::Prope
 bool Xml_obj::__SetStatic(const ::String &inName,Dynamic &ioValue,::hx::PropertyAccess inCallProp)
 {
 	switch(inName.length) {
-	case 5:
-		if (HX_FIELD_EQ(inName,"CData") ) { CData=ioValue.Cast< int >(); return true; }
-		break;
-	case 6:
-		if (HX_FIELD_EQ(inName,"PCData") ) { PCData=ioValue.Cast< int >(); return true; }
-		break;
 	case 7:
 		if (HX_FIELD_EQ(inName,"Element") ) { Element=ioValue.Cast< int >(); return true; }
-		if (HX_FIELD_EQ(inName,"Comment") ) { Comment=ioValue.Cast< int >(); return true; }
-		if (HX_FIELD_EQ(inName,"DocType") ) { DocType=ioValue.Cast< int >(); return true; }
 		break;
 	case 8:
 		if (HX_FIELD_EQ(inName,"Document") ) { Document=ioValue.Cast< int >(); return true; }
-		break;
-	case 21:
-		if (HX_FIELD_EQ(inName,"ProcessingInstruction") ) { ProcessingInstruction=ioValue.Cast< int >(); return true; }
 	}
 	return false;
 }
@@ -510,7 +251,6 @@ void Xml_obj::__GetFields(Array< ::String> &outFields)
 	outFields->push(HX_("nodeType",dc,51,86,f6));
 	outFields->push(HX_("nodeName",6d,d1,7c,f2));
 	outFields->push(HX_("nodeValue",0f,5e,ee,d5));
-	outFields->push(HX_("parent",2a,05,7e,ed));
 	outFields->push(HX_("children",3f,19,6a,70));
 	outFields->push(HX_("attributeMap",e0,4b,b2,95));
 	super::__GetFields(outFields);
@@ -521,18 +261,12 @@ static ::hx::StorageInfo Xml_obj_sMemberStorageInfo[] = {
 	{::hx::fsInt,(int)offsetof(Xml_obj,nodeType),HX_("nodeType",dc,51,86,f6)},
 	{::hx::fsString,(int)offsetof(Xml_obj,nodeName),HX_("nodeName",6d,d1,7c,f2)},
 	{::hx::fsString,(int)offsetof(Xml_obj,nodeValue),HX_("nodeValue",0f,5e,ee,d5)},
-	{::hx::fsObject /*  ::Xml */ ,(int)offsetof(Xml_obj,parent),HX_("parent",2a,05,7e,ed)},
 	{::hx::fsObject /* ::Array< ::Dynamic> */ ,(int)offsetof(Xml_obj,children),HX_("children",3f,19,6a,70)},
 	{::hx::fsObject /*  ::haxe::ds::StringMap */ ,(int)offsetof(Xml_obj,attributeMap),HX_("attributeMap",e0,4b,b2,95)},
 	{ ::hx::fsUnknown, 0, null()}
 };
 static ::hx::StaticInfo Xml_obj_sStaticStorageInfo[] = {
 	{::hx::fsInt,(void *) &Xml_obj::Element,HX_("Element",9c,d6,a5,d3)},
-	{::hx::fsInt,(void *) &Xml_obj::PCData,HX_("PCData",bd,3d,a2,bd)},
-	{::hx::fsInt,(void *) &Xml_obj::CData,HX_("CData",0d,60,15,c1)},
-	{::hx::fsInt,(void *) &Xml_obj::Comment,HX_("Comment",3f,a2,c1,4e)},
-	{::hx::fsInt,(void *) &Xml_obj::DocType,HX_("DocType",32,25,de,a5)},
-	{::hx::fsInt,(void *) &Xml_obj::ProcessingInstruction,HX_("ProcessingInstruction",db,1e,14,6a)},
 	{::hx::fsInt,(void *) &Xml_obj::Document,HX_("Document",3b,ab,c4,74)},
 	{ ::hx::fsUnknown, 0, null()}
 };
@@ -542,37 +276,23 @@ static ::String Xml_obj_sMemberFields[] = {
 	HX_("nodeType",dc,51,86,f6),
 	HX_("nodeName",6d,d1,7c,f2),
 	HX_("nodeValue",0f,5e,ee,d5),
-	HX_("parent",2a,05,7e,ed),
 	HX_("children",3f,19,6a,70),
 	HX_("attributeMap",e0,4b,b2,95),
 	HX_("get",96,80,4e,00),
 	HX_("set",a2,9b,57,00),
-	HX_("exists",dc,1d,e0,bf),
 	HX_("attributes",d7,a8,71,97),
 	HX_("firstElement",6c,c4,9c,2f),
-	HX_("addChild",bb,cf,16,bf),
-	HX_("removeChild",b8,86,ed,43),
 	HX_("toString",ac,d0,6e,38),
 	::String(null()) };
 
 static void Xml_obj_sMarkStatics(HX_MARK_PARAMS) {
 	HX_MARK_MEMBER_NAME(Xml_obj::Element,"Element");
-	HX_MARK_MEMBER_NAME(Xml_obj::PCData,"PCData");
-	HX_MARK_MEMBER_NAME(Xml_obj::CData,"CData");
-	HX_MARK_MEMBER_NAME(Xml_obj::Comment,"Comment");
-	HX_MARK_MEMBER_NAME(Xml_obj::DocType,"DocType");
-	HX_MARK_MEMBER_NAME(Xml_obj::ProcessingInstruction,"ProcessingInstruction");
 	HX_MARK_MEMBER_NAME(Xml_obj::Document,"Document");
 };
 
 #ifdef HXCPP_VISIT_ALLOCS
 static void Xml_obj_sVisitStatics(HX_VISIT_PARAMS) {
 	HX_VISIT_MEMBER_NAME(Xml_obj::Element,"Element");
-	HX_VISIT_MEMBER_NAME(Xml_obj::PCData,"PCData");
-	HX_VISIT_MEMBER_NAME(Xml_obj::CData,"CData");
-	HX_VISIT_MEMBER_NAME(Xml_obj::Comment,"Comment");
-	HX_VISIT_MEMBER_NAME(Xml_obj::DocType,"DocType");
-	HX_VISIT_MEMBER_NAME(Xml_obj::ProcessingInstruction,"ProcessingInstruction");
 	HX_VISIT_MEMBER_NAME(Xml_obj::Document,"Document");
 };
 
@@ -582,20 +302,8 @@ static void Xml_obj_sVisitStatics(HX_VISIT_PARAMS) {
 
 static ::String Xml_obj_sStaticFields[] = {
 	HX_("Element",9c,d6,a5,d3),
-	HX_("PCData",bd,3d,a2,bd),
-	HX_("CData",0d,60,15,c1),
-	HX_("Comment",3f,a2,c1,4e),
-	HX_("DocType",32,25,de,a5),
-	HX_("ProcessingInstruction",db,1e,14,6a),
 	HX_("Document",3b,ab,c4,74),
-	HX_("parse",33,90,55,bd),
 	HX_("createElement",20,87,97,ee),
-	HX_("createPCData",b9,09,63,ab),
-	HX_("createCData",91,27,63,57),
-	HX_("createComment",c3,52,b3,69),
-	HX_("createDocType",b6,d5,cf,c0),
-	HX_("createProcessingInstruction",5f,2e,58,38),
-	HX_("createDocument",37,6e,4d,ed),
 	::String(null())
 };
 
@@ -632,26 +340,6 @@ void Xml_obj::__boot()
             	HX_STACKFRAME(&_hx_pos_7e4d842269e66db1_86_boot)
 HXDLIN(  86)		Element = 0;
             	}
-{
-            	HX_STACKFRAME(&_hx_pos_7e4d842269e66db1_91_boot)
-HXDLIN(  91)		PCData = 1;
-            	}
-{
-            	HX_STACKFRAME(&_hx_pos_7e4d842269e66db1_96_boot)
-HXDLIN(  96)		CData = 2;
-            	}
-{
-            	HX_STACKFRAME(&_hx_pos_7e4d842269e66db1_101_boot)
-HXDLIN( 101)		Comment = 3;
-            	}
-{
-            	HX_STACKFRAME(&_hx_pos_7e4d842269e66db1_106_boot)
-HXDLIN( 106)		DocType = 4;
-            	}
-{
-            	HX_STACKFRAME(&_hx_pos_7e4d842269e66db1_111_boot)
-HXDLIN( 111)		ProcessingInstruction = 5;
-            	}
 {
             	HX_STACKFRAME(&_hx_pos_7e4d842269e66db1_116_boot)
 HXDLIN( 116)		Document = 6;
diff --git a/Sources/c_snikket/src/__HaxeCBridgeBindings__.cpp b/Sources/c_snikket/src/__HaxeCBridgeBindings__.cpp
index 88b3cf0..f9ea9c0 100644
--- a/Sources/c_snikket/src/__HaxeCBridgeBindings__.cpp
+++ b/Sources/c_snikket/src/__HaxeCBridgeBindings__.cpp
@@ -46,6 +46,8 @@
 #include <snikket/Channel.h>
 #include <snikket/DirectChat.h>
 #include <snikket/CustomEmojiReaction.h>
+#include <snikket/Identicon.h>
+#include <snikket/Config.h>
 
 namespace HaxeCBridgeInternal {
 
@@ -3473,6 +3475,42 @@ const char *snikket_notification_chat_id(void *a0) {
 	return data.ret;
 }
 
+HAXE_C_BRIDGE_LINKAGE
+const char *snikket_notification_sender_id(void *a0) {
+	if (HaxeCBridgeInternal::isHaxeMainThread()) {
+		return HaxeCBridge::retainHaxeString((snikket::Notification((hx::Object *)a0, true))->senderId__fromC());
+	}
+	struct Data {
+		struct {void * a0;} args;
+		HxSemaphore lock;
+		const char * ret;
+	};
+	struct Callback {
+		static void run(void* p) {
+			// executed within the haxe main thread
+			Data* data = (Data*) p;
+			try {
+				data->ret = HaxeCBridge::retainHaxeString((snikket::Notification((hx::Object *)data->args.a0, true))->senderId__fromC());
+				data->lock.Set();
+			} catch(Dynamic runtimeException) {
+				data->lock.Set();
+				throw runtimeException;
+			}
+		}
+	};
+
+	#ifdef HXCPP_DEBUG
+	assert(HaxeCBridgeInternal::threadRunning && "haxe thread not running, use snikket_initializeHaxeThread() to activate the haxe thread");
+	#endif
+
+	Data data = { {a0} };
+
+	// queue a callback to execute senderId__fromC() on the main thread and wait until execution completes
+	HaxeCBridgeInternal::runInMainThread(Callback::run, &data);
+	data.lock.Wait();
+	return data.ret;
+}
+
 HAXE_C_BRIDGE_LINKAGE
 const char *snikket_notification_message_id(void *a0) {
 	if (HaxeCBridgeInternal::isHaxeMainThread()) {
@@ -4486,12 +4524,12 @@ void snikket_client_add_chats_updated_listener(void *a0, void (*a1) (void**, siz
 }
 
 HAXE_C_BRIDGE_LINKAGE
-void snikket_client_add_call_ring_listener(void *a0, void (*a1) (void*, const char*, void*), void *a2) {
+void snikket_client_add_call_ring_listener(void *a0, void (*a1) (void*, void*), void *a2) {
 	if (HaxeCBridgeInternal::isHaxeMainThread()) {
-		return (snikket::Client((hx::Object *)a0, true))->addCallRingListener__fromC(cpp::Function<void(void*, const char*, void*)>(a1), a2);
+		return (snikket::Client((hx::Object *)a0, true))->addCallRingListener__fromC(cpp::Function<void(void*, void*)>(a1), a2);
 	}
 	struct Data {
-		struct {void * a0; void (* a1) (void*, const char*, void*); void* a2;} args;
+		struct {void * a0; void (* a1) (void*, void*); void* a2;} args;
 		HxSemaphore lock;
 	};
 	struct Callback {
@@ -4499,7 +4537,7 @@ void snikket_client_add_call_ring_listener(void *a0, void (*a1) (void*, const ch
 			// executed within the haxe main thread
 			Data* data = (Data*) p;
 			try {
-				(snikket::Client((hx::Object *)data->args.a0, true))->addCallRingListener__fromC(cpp::Function<void(void*, const char*, void*)>(data->args.a1), data->args.a2);
+				(snikket::Client((hx::Object *)data->args.a0, true))->addCallRingListener__fromC(cpp::Function<void(void*, void*)>(data->args.a1), data->args.a2);
 				data->lock.Set();
 			} catch(Dynamic runtimeException) {
 				data->lock.Set();
@@ -4520,12 +4558,12 @@ void snikket_client_add_call_ring_listener(void *a0, void (*a1) (void*, const ch
 }
 
 HAXE_C_BRIDGE_LINKAGE
-void snikket_client_add_call_retract_listener(void *a0, void (*a1) (const char*, void*), void *a2) {
+void snikket_client_add_call_retract_listener(void *a0, void (*a1) (const char*, const char*, void*), void *a2) {
 	if (HaxeCBridgeInternal::isHaxeMainThread()) {
-		return (snikket::Client((hx::Object *)a0, true))->addCallRetractListener__fromC(cpp::Function<void(const char*, void*)>(a1), a2);
+		return (snikket::Client((hx::Object *)a0, true))->addCallRetractListener__fromC(cpp::Function<void(const char*, const char*, void*)>(a1), a2);
 	}
 	struct Data {
-		struct {void * a0; void (* a1) (const char*, void*); void* a2;} args;
+		struct {void * a0; void (* a1) (const char*, const char*, void*); void* a2;} args;
 		HxSemaphore lock;
 	};
 	struct Callback {
@@ -4533,7 +4571,7 @@ void snikket_client_add_call_retract_listener(void *a0, void (*a1) (const char*,
 			// executed within the haxe main thread
 			Data* data = (Data*) p;
 			try {
-				(snikket::Client((hx::Object *)data->args.a0, true))->addCallRetractListener__fromC(cpp::Function<void(const char*, void*)>(data->args.a1), data->args.a2);
+				(snikket::Client((hx::Object *)data->args.a0, true))->addCallRetractListener__fromC(cpp::Function<void(const char*, const char*, void*)>(data->args.a1), data->args.a2);
 				data->lock.Set();
 			} catch(Dynamic runtimeException) {
 				data->lock.Set();
@@ -4554,12 +4592,12 @@ void snikket_client_add_call_retract_listener(void *a0, void (*a1) (const char*,
 }
 
 HAXE_C_BRIDGE_LINKAGE
-void snikket_client_add_call_ringing_listener(void *a0, void (*a1) (const char*, void*), void *a2) {
+void snikket_client_add_call_ringing_listener(void *a0, void (*a1) (const char*, const char*, void*), void *a2) {
 	if (HaxeCBridgeInternal::isHaxeMainThread()) {
-		return (snikket::Client((hx::Object *)a0, true))->addCallRingingListener__fromC(cpp::Function<void(const char*, void*)>(a1), a2);
+		return (snikket::Client((hx::Object *)a0, true))->addCallRingingListener__fromC(cpp::Function<void(const char*, const char*, void*)>(a1), a2);
 	}
 	struct Data {
-		struct {void * a0; void (* a1) (const char*, void*); void* a2;} args;
+		struct {void * a0; void (* a1) (const char*, const char*, void*); void* a2;} args;
 		HxSemaphore lock;
 	};
 	struct Callback {
@@ -4567,7 +4605,7 @@ void snikket_client_add_call_ringing_listener(void *a0, void (*a1) (const char*,
 			// executed within the haxe main thread
 			Data* data = (Data*) p;
 			try {
-				(snikket::Client((hx::Object *)data->args.a0, true))->addCallRingingListener__fromC(cpp::Function<void(const char*, void*)>(data->args.a1), data->args.a2);
+				(snikket::Client((hx::Object *)data->args.a0, true))->addCallRingingListener__fromC(cpp::Function<void(const char*, const char*, void*)>(data->args.a1), data->args.a2);
 				data->lock.Set();
 			} catch(Dynamic runtimeException) {
 				data->lock.Set();
@@ -6833,6 +6871,42 @@ const char *snikket_jingle_initiated_session_sid(void *a0) {
 	return data.ret;
 }
 
+HAXE_C_BRIDGE_LINKAGE
+const char *snikket_jingle_initiated_session_chat_id(void *a0) {
+	if (HaxeCBridgeInternal::isHaxeMainThread()) {
+		return HaxeCBridge::retainHaxeString((snikket::jingle::InitiatedSession((hx::Object *)a0, true))->chatId__fromC());
+	}
+	struct Data {
+		struct {void * a0;} args;
+		HxSemaphore lock;
+		const char * ret;
+	};
+	struct Callback {
+		static void run(void* p) {
+			// executed within the haxe main thread
+			Data* data = (Data*) p;
+			try {
+				data->ret = HaxeCBridge::retainHaxeString((snikket::jingle::InitiatedSession((hx::Object *)data->args.a0, true))->chatId__fromC());
+				data->lock.Set();
+			} catch(Dynamic runtimeException) {
+				data->lock.Set();
+				throw runtimeException;
+			}
+		}
+	};
+
+	#ifdef HXCPP_DEBUG
+	assert(HaxeCBridgeInternal::threadRunning && "haxe thread not running, use snikket_initializeHaxeThread() to activate the haxe thread");
+	#endif
+
+	Data data = { {a0} };
+
+	// queue a callback to execute chatId__fromC() on the main thread and wait until execution completes
+	HaxeCBridgeInternal::runInMainThread(Callback::run, &data);
+	data.lock.Wait();
+	return data.ret;
+}
+
 HAXE_C_BRIDGE_LINKAGE
 void snikket_jingle_initiated_session_accept(void *a0) {
 	if (HaxeCBridgeInternal::isHaxeMainThread()) {
@@ -7615,6 +7689,146 @@ const char *snikket_custom_emoji_reaction_uri(void *a0) {
 	return data.ret;
 }
 
+HAXE_C_BRIDGE_LINKAGE
+const char *snikket_identicon_svg(const char *a0) {
+	if (HaxeCBridgeInternal::isHaxeMainThread()) {
+		return HaxeCBridge::retainHaxeString(snikket::Identicon_obj::svg(a0));
+	}
+	struct Data {
+		struct {const char * a0;} args;
+		HxSemaphore lock;
+		const char * ret;
+	};
+	struct Callback {
+		static void run(void* p) {
+			// executed within the haxe main thread
+			Data* data = (Data*) p;
+			try {
+				data->ret = HaxeCBridge::retainHaxeString(snikket::Identicon_obj::svg(data->args.a0));
+				data->lock.Set();
+			} catch(Dynamic runtimeException) {
+				data->lock.Set();
+				throw runtimeException;
+			}
+		}
+	};
+
+	#ifdef HXCPP_DEBUG
+	assert(HaxeCBridgeInternal::threadRunning && "haxe thread not running, use snikket_initializeHaxeThread() to activate the haxe thread");
+	#endif
+
+	Data data = { {a0} };
+
+	// queue a callback to execute svg() on the main thread and wait until execution completes
+	HaxeCBridgeInternal::runInMainThread(Callback::run, &data);
+	data.lock.Wait();
+	return data.ret;
+}
+
+HAXE_C_BRIDGE_LINKAGE
+bool snikket_config_relative_hash_uri() {
+	if (HaxeCBridgeInternal::isHaxeMainThread()) {
+		return snikket::Config_obj::relativeHashUri__fromC();
+	}
+	struct Data {
+		struct {} args;
+		HxSemaphore lock;
+		bool ret;
+	};
+	struct Callback {
+		static void run(void* p) {
+			// executed within the haxe main thread
+			Data* data = (Data*) p;
+			try {
+				data->ret = snikket::Config_obj::relativeHashUri__fromC();
+				data->lock.Set();
+			} catch(Dynamic runtimeException) {
+				data->lock.Set();
+				throw runtimeException;
+			}
+		}
+	};
+
+	#ifdef HXCPP_DEBUG
+	assert(HaxeCBridgeInternal::threadRunning && "haxe thread not running, use snikket_initializeHaxeThread() to activate the haxe thread");
+	#endif
+
+	Data data = { {} };
+
+	// queue a callback to execute relativeHashUri__fromC() on the main thread and wait until execution completes
+	HaxeCBridgeInternal::runInMainThread(Callback::run, &data);
+	data.lock.Wait();
+	return data.ret;
+}
+
+HAXE_C_BRIDGE_LINKAGE
+void snikket_config_set_relative_hash_uri(bool a0) {
+	if (HaxeCBridgeInternal::isHaxeMainThread()) {
+		return snikket::Config_obj::set_relativeHashUri__fromC(a0);
+	}
+	struct Data {
+		struct {bool a0;} args;
+		HxSemaphore lock;
+	};
+	struct Callback {
+		static void run(void* p) {
+			// executed within the haxe main thread
+			Data* data = (Data*) p;
+			try {
+				snikket::Config_obj::set_relativeHashUri__fromC(data->args.a0);
+				data->lock.Set();
+			} catch(Dynamic runtimeException) {
+				data->lock.Set();
+				throw runtimeException;
+			}
+		}
+	};
+
+	#ifdef HXCPP_DEBUG
+	assert(HaxeCBridgeInternal::threadRunning && "haxe thread not running, use snikket_initializeHaxeThread() to activate the haxe thread");
+	#endif
+
+	Data data = { {a0} };
+
+	// queue a callback to execute set_relativeHashUri__fromC() on the main thread and wait until execution completes
+	HaxeCBridgeInternal::runInMainThread(Callback::run, &data);
+	data.lock.Wait();
+}
+
+HAXE_C_BRIDGE_LINKAGE
+void snikket_config_enable_constrained_memory_mode() {
+	if (HaxeCBridgeInternal::isHaxeMainThread()) {
+		return snikket::Config_obj::enableConstrainedMemoryMode();
+	}
+	struct Data {
+		struct {} args;
+		HxSemaphore lock;
+	};
+	struct Callback {
+		static void run(void* p) {
+			// executed within the haxe main thread
+			Data* data = (Data*) p;
+			try {
+				snikket::Config_obj::enableConstrainedMemoryMode();
+				data->lock.Set();
+			} catch(Dynamic runtimeException) {
+				data->lock.Set();
+				throw runtimeException;
+			}
+		}
+	};
+
+	#ifdef HXCPP_DEBUG
+	assert(HaxeCBridgeInternal::threadRunning && "haxe thread not running, use snikket_initializeHaxeThread() to activate the haxe thread");
+	#endif
+
+	Data data = { {} };
+
+	// queue a callback to execute enableConstrainedMemoryMode() on the main thread and wait until execution completes
+	HaxeCBridgeInternal::runInMainThread(Callback::run, &data);
+	data.lock.Wait();
+}
+
 HAXE_C_BRIDGE_LINKAGE
 void snikket_jingle_dtmf_sender_insert_dtmf(void *a0, const char *a1) {
 	if (HaxeCBridgeInternal::isHaxeMainThread()) {
diff --git a/Sources/c_snikket/src/__boot__.cpp b/Sources/c_snikket/src/__boot__.cpp
index 44ea6f5..1d38ec6 100644
--- a/Sources/c_snikket/src/__boot__.cpp
+++ b/Sources/c_snikket/src/__boot__.cpp
@@ -220,9 +220,6 @@
 #ifndef INCLUDED_hsluv_Hsluv
 #include <hsluv/Hsluv.h>
 #endif
-#ifndef INCLUDED_haxe_xml_Parser
-#include <haxe/xml/Parser.h>
-#endif
 #ifndef INCLUDED_haxe_crypto_Base64
 #include <haxe/crypto/Base64.h>
 #endif
@@ -496,6 +493,9 @@
 #ifndef INCLUDED_thenshim_PromiseFactory
 #include <thenshim/PromiseFactory.h>
 #endif
+#ifndef INCLUDED_sys_thread_ThreadPoolException
+#include <sys/thread/ThreadPoolException.h>
+#endif
 #ifndef INCLUDED_sys_thread__Thread_Thread_Impl_
 #include <sys/thread/_Thread/Thread_Impl_.h>
 #endif
@@ -505,9 +505,30 @@
 #ifndef INCLUDED_sys_thread_Lock
 #include <sys/thread/Lock.h>
 #endif
+#ifndef INCLUDED_sys_thread__FixedThreadPool_Worker
+#include <sys/thread/_FixedThreadPool/Worker.h>
+#endif
+#ifndef INCLUDED_sys_thread__FixedThreadPool_ShutdownException
+#include <sys/thread/_FixedThreadPool/ShutdownException.h>
+#endif
+#ifndef INCLUDED_sys_thread_FixedThreadPool
+#include <sys/thread/FixedThreadPool.h>
+#endif
 #ifndef INCLUDED_sys_thread__EventLoop_RegularEvent
 #include <sys/thread/_EventLoop/RegularEvent.h>
 #endif
+#ifndef INCLUDED_sys_thread__ElasticThreadPool_Worker
+#include <sys/thread/_ElasticThreadPool/Worker.h>
+#endif
+#ifndef INCLUDED_sys_thread_ElasticThreadPool
+#include <sys/thread/ElasticThreadPool.h>
+#endif
+#ifndef INCLUDED_sys_thread_IThreadPool
+#include <sys/thread/IThreadPool.h>
+#endif
+#ifndef INCLUDED_sys_thread_Deque
+#include <sys/thread/Deque.h>
+#endif
 #ifndef INCLUDED_sys_ssl__Socket_SocketOutput
 #include <sys/ssl/_Socket/SocketOutput.h>
 #endif
@@ -664,8 +685,8 @@
 #ifndef INCLUDED_snikket_StanzaError
 #include <snikket/StanzaError.h>
 #endif
-#ifndef INCLUDED_snikket_TextNode
-#include <snikket/TextNode.h>
+#ifndef INCLUDED_snikket_TextNodeClass
+#include <snikket/TextNodeClass.h>
 #endif
 #ifndef INCLUDED_snikket__Stanza_NodeInterface
 #include <snikket/_Stanza/NodeInterface.h>
@@ -784,9 +805,6 @@
 #ifndef INCLUDED_haxe_xml_Printer
 #include <haxe/xml/Printer.h>
 #endif
-#ifndef INCLUDED_haxe_xml_XmlParserException
-#include <haxe/xml/XmlParserException.h>
-#endif
 #ifndef INCLUDED_haxe_iterators_MapKeyValueIterator
 #include <haxe/iterators/MapKeyValueIterator.h>
 #endif
@@ -1035,7 +1053,6 @@ __files__boot();
 ::hx::strings::RandomStrings_obj::__register();
 ::htmlparser::HtmlParser_obj::__register();
 ::hsluv::Hsluv_obj::__register();
-::haxe::xml::Parser_obj::__register();
 ::haxe::crypto::Base64_obj::__register();
 ::haxe::Log_obj::__register();
 ::sys::thread::_Thread::HaxeThread_obj::__register();
@@ -1127,10 +1144,18 @@ __files__boot();
 ::thenshim::fallback::TaskScheduler_obj::__register();
 ::thenshim::fallback::FallbackPromiseFactory_obj::__register();
 ::thenshim::PromiseFactory_obj::__register();
+::sys::thread::ThreadPoolException_obj::__register();
 ::sys::thread::_Thread::Thread_Impl__obj::__register();
 ::sys::thread::NoEventLoopException_obj::__register();
 ::sys::thread::Lock_obj::__register();
+::sys::thread::_FixedThreadPool::Worker_obj::__register();
+::sys::thread::_FixedThreadPool::ShutdownException_obj::__register();
+::sys::thread::FixedThreadPool_obj::__register();
 ::sys::thread::_EventLoop::RegularEvent_obj::__register();
+::sys::thread::_ElasticThreadPool::Worker_obj::__register();
+::sys::thread::ElasticThreadPool_obj::__register();
+::sys::thread::IThreadPool_obj::__register();
+::sys::thread::Deque_obj::__register();
 ::sys::ssl::_Socket::SocketOutput_obj::__register();
 ::sys::ssl::_Socket::SocketInput_obj::__register();
 ::sys::net::Socket_obj::__register();
@@ -1183,7 +1208,7 @@ __files__boot();
 ::snikket::StringUtil_obj::__register();
 ::snikket::Stanza_obj::__register();
 ::snikket::StanzaError_obj::__register();
-::snikket::TextNode_obj::__register();
+::snikket::TextNodeClass_obj::__register();
 ::snikket::_Stanza::NodeInterface_obj::__register();
 ::snikket::ReactionUpdate_obj::__register();
 ::snikket::Push_obj::__register();
@@ -1223,7 +1248,6 @@ __files__boot();
 ::htmlparser::HtmlNode_obj::__register();
 ::htmlparser::HtmlAttribute_obj::__register();
 ::haxe::xml::Printer_obj::__register();
-::haxe::xml::XmlParserException_obj::__register();
 ::haxe::iterators::MapKeyValueIterator_obj::__register();
 ::haxe::iterators::ArrayIterator_obj::__register();
 ::haxe::io::Path_obj::__register();
@@ -1318,7 +1342,6 @@ __files__boot();
 ::Xml_obj::__boot();
 ::sys::thread::_Thread::HaxeThread_obj::__boot();
 ::haxe::crypto::Base64_obj::__boot();
-::haxe::xml::Parser_obj::__boot();
 ::hsluv::Hsluv_obj::__boot();
 ::htmlparser::HtmlParser_obj::__boot();
 ::hx::strings::RandomStrings_obj::__boot();
diff --git a/Sources/c_snikket/src/__files__.cpp b/Sources/c_snikket/src/__files__.cpp
index a3961b8..ae3b24f 100644
--- a/Sources/c_snikket/src/__files__.cpp
+++ b/Sources/c_snikket/src/__files__.cpp
@@ -33,6 +33,7 @@ const char *__hxcpp_all_files[] = {
 "/usr/local/lib/haxe/std/cpp/_std/sys/ssl/Certificate.hx",
 "/usr/local/lib/haxe/std/cpp/_std/sys/ssl/Key.hx",
 "/usr/local/lib/haxe/std/cpp/_std/sys/ssl/Socket.hx",
+"/usr/local/lib/haxe/std/cpp/_std/sys/thread/Deque.hx",
 "/usr/local/lib/haxe/std/cpp/_std/sys/thread/Lock.hx",
 "/usr/local/lib/haxe/std/cpp/_std/sys/thread/Mutex.hx",
 "/usr/local/lib/haxe/std/cpp/_std/sys/thread/Thread.hx",
@@ -62,11 +63,13 @@ const char *__hxcpp_all_files[] = {
 "/usr/local/lib/haxe/std/haxe/io/Path.hx",
 "/usr/local/lib/haxe/std/haxe/iterators/ArrayIterator.hx",
 "/usr/local/lib/haxe/std/haxe/iterators/MapKeyValueIterator.hx",
-"/usr/local/lib/haxe/std/haxe/xml/Parser.hx",
 "/usr/local/lib/haxe/std/haxe/xml/Printer.hx",
 "/usr/local/lib/haxe/std/sys/Http.hx",
+"/usr/local/lib/haxe/std/sys/thread/ElasticThreadPool.hx",
 "/usr/local/lib/haxe/std/sys/thread/EventLoop.hx",
+"/usr/local/lib/haxe/std/sys/thread/FixedThreadPool.hx",
 "/usr/local/lib/haxe/std/sys/thread/NoEventLoopException.hx",
+"/usr/local/lib/haxe/std/sys/thread/ThreadPoolException.hx",
 "HaxeCBridge.hx",
 "datetime/DateTime.hx",
 "datetime/DateTimeInterval.hx",
@@ -221,6 +224,7 @@ const char *__hxcpp_all_files_fullpath[] = {
 "/usr/local/lib/haxe/std/cpp/_std/sys/ssl/Certificate.hx",
 "/usr/local/lib/haxe/std/cpp/_std/sys/ssl/Key.hx",
 "/usr/local/lib/haxe/std/cpp/_std/sys/ssl/Socket.hx",
+"/usr/local/lib/haxe/std/cpp/_std/sys/thread/Deque.hx",
 "/usr/local/lib/haxe/std/cpp/_std/sys/thread/Lock.hx",
 "/usr/local/lib/haxe/std/cpp/_std/sys/thread/Mutex.hx",
 "/usr/local/lib/haxe/std/cpp/_std/sys/thread/Thread.hx",
@@ -250,11 +254,13 @@ const char *__hxcpp_all_files_fullpath[] = {
 "/usr/local/lib/haxe/std/haxe/io/Path.hx",
 "/usr/local/lib/haxe/std/haxe/iterators/ArrayIterator.hx",
 "/usr/local/lib/haxe/std/haxe/iterators/MapKeyValueIterator.hx",
-"/usr/local/lib/haxe/std/haxe/xml/Parser.hx",
 "/usr/local/lib/haxe/std/haxe/xml/Printer.hx",
 "/usr/local/lib/haxe/std/sys/Http.hx",
+"/usr/local/lib/haxe/std/sys/thread/ElasticThreadPool.hx",
 "/usr/local/lib/haxe/std/sys/thread/EventLoop.hx",
+"/usr/local/lib/haxe/std/sys/thread/FixedThreadPool.hx",
 "/usr/local/lib/haxe/std/sys/thread/NoEventLoopException.hx",
+"/usr/local/lib/haxe/std/sys/thread/ThreadPoolException.hx",
 "/Users/singpolyma/src/snikket-sdk/HaxeCBridge.hx",
 "/Users/singpolyma/.local/lib/haxe/lib/datetime/3,1,4/src/datetime/DateTime.hx",
 "/Users/singpolyma/.local/lib/haxe/lib/datetime/3,1,4/src/datetime/DateTimeInterval.hx",
@@ -441,8 +447,6 @@ const char *__hxcpp_all_classes[] = {
 "haxe.io.Path",
 "haxe.iterators.ArrayIterator",
 "haxe.iterators.MapKeyValueIterator",
-"haxe.xml.XmlParserException",
-"haxe.xml.Parser",
 "haxe.xml.Printer",
 "hsluv.Hsluv",
 "htmlparser.HtmlAttribute",
@@ -502,7 +506,7 @@ const char *__hxcpp_all_classes[] = {
 "snikket.Reaction",
 "snikket.CustomEmojiReaction",
 "snikket.ReactionUpdate",
-"snikket.TextNode",
+"snikket.TextNodeClass",
 "snikket.StanzaError",
 "snikket.Stanza",
 "snikket.StringUtil",
@@ -563,10 +567,17 @@ const char *__hxcpp_all_classes[] = {
 "sys.ssl._Socket.SocketInput",
 "sys.ssl._Socket.SocketOutput",
 "sys.ssl.Socket",
+"sys.thread.Deque",
+"sys.thread.ElasticThreadPool",
+"sys.thread._ElasticThreadPool.Worker",
 "sys.thread._EventLoop.RegularEvent",
+"sys.thread.FixedThreadPool",
+"sys.thread._FixedThreadPool.ShutdownException",
+"sys.thread._FixedThreadPool.Worker",
 "sys.thread.Lock",
 "sys.thread.NoEventLoopException",
 "sys.thread._Thread.Thread_Impl_",
+"sys.thread.ThreadPoolException",
 "thenshim.fallback.FallbackPromiseFactory",
 "thenshim.fallback.TaskScheduler",
 "thenshim._Promise.Promise_Impl_",
diff --git a/Sources/c_snikket/src/haxe/ds/_List/ListIterator.cpp b/Sources/c_snikket/src/haxe/ds/_List/ListIterator.cpp
new file mode 100644
index 0000000..8daf465
--- /dev/null
+++ b/Sources/c_snikket/src/haxe/ds/_List/ListIterator.cpp
@@ -0,0 +1,155 @@
+// Generated by Haxe 4.3.3
+#include <hxcpp.h>
+
+#ifndef INCLUDED_haxe_ds__List_ListIterator
+#include <haxe/ds/_List/ListIterator.h>
+#endif
+#ifndef INCLUDED_haxe_ds__List_ListNode
+#include <haxe/ds/_List/ListNode.h>
+#endif
+
+HX_DEFINE_STACK_FRAME(_hx_pos_cf70c3c8515bddec_281_new,"haxe.ds._List.ListIterator","new",0x2a47d966,"haxe.ds._List.ListIterator.new","/usr/local/lib/haxe/std/haxe/ds/List.hx",281,0x54f95eac)
+HX_LOCAL_STACK_FRAME(_hx_pos_cf70c3c8515bddec_285_hasNext,"haxe.ds._List.ListIterator","hasNext",0x5bdaa973,"haxe.ds._List.ListIterator.hasNext","/usr/local/lib/haxe/std/haxe/ds/List.hx",285,0x54f95eac)
+HX_LOCAL_STACK_FRAME(_hx_pos_cf70c3c8515bddec_288_next,"haxe.ds._List.ListIterator","next",0xd496612d,"haxe.ds._List.ListIterator.next","/usr/local/lib/haxe/std/haxe/ds/List.hx",288,0x54f95eac)
+namespace haxe{
+namespace ds{
+namespace _List{
+
+void ListIterator_obj::__construct( ::haxe::ds::_List::ListNode head){
+            	HX_STACKFRAME(&_hx_pos_cf70c3c8515bddec_281_new)
+HXDLIN( 281)		this->head = head;
+            	}
+
+Dynamic ListIterator_obj::__CreateEmpty() { return new ListIterator_obj; }
+
+void *ListIterator_obj::_hx_vtable = 0;
+
+Dynamic ListIterator_obj::__Create(::hx::DynamicArray inArgs)
+{
+	::hx::ObjectPtr< ListIterator_obj > _hx_result = new ListIterator_obj();
+	_hx_result->__construct(inArgs[0]);
+	return _hx_result;
+}
+
+bool ListIterator_obj::_hx_isInstanceOf(int inClassId) {
+	return inClassId==(int)0x00000001 || inClassId==(int)0x7cc93b54;
+}
+
+bool ListIterator_obj::hasNext(){
+            	HX_STACKFRAME(&_hx_pos_cf70c3c8515bddec_285_hasNext)
+HXDLIN( 285)		return ::hx::IsNotNull( this->head );
+            	}
+
+
+HX_DEFINE_DYNAMIC_FUNC0(ListIterator_obj,hasNext,return )
+
+ ::Dynamic ListIterator_obj::next(){
+            	HX_STACKFRAME(&_hx_pos_cf70c3c8515bddec_288_next)
+HXLINE( 289)		 ::Dynamic val = this->head->item;
+HXLINE( 290)		this->head = this->head->next;
+HXLINE( 291)		return val;
+            	}
+
+
+HX_DEFINE_DYNAMIC_FUNC0(ListIterator_obj,next,return )
+
+
+::hx::ObjectPtr< ListIterator_obj > ListIterator_obj::__new( ::haxe::ds::_List::ListNode head) {
+	::hx::ObjectPtr< ListIterator_obj > __this = new ListIterator_obj();
+	__this->__construct(head);
+	return __this;
+}
+
+::hx::ObjectPtr< ListIterator_obj > ListIterator_obj::__alloc(::hx::Ctx *_hx_ctx, ::haxe::ds::_List::ListNode head) {
+	ListIterator_obj *__this = (ListIterator_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(ListIterator_obj), true, "haxe.ds._List.ListIterator"));
+	*(void **)__this = ListIterator_obj::_hx_vtable;
+	__this->__construct(head);
+	return __this;
+}
+
+ListIterator_obj::ListIterator_obj()
+{
+}
+
+void ListIterator_obj::__Mark(HX_MARK_PARAMS)
+{
+	HX_MARK_BEGIN_CLASS(ListIterator);
+	HX_MARK_MEMBER_NAME(head,"head");
+	HX_MARK_END_CLASS();
+}
+
+void ListIterator_obj::__Visit(HX_VISIT_PARAMS)
+{
+	HX_VISIT_MEMBER_NAME(head,"head");
+}
+
+::hx::Val ListIterator_obj::__Field(const ::String &inName,::hx::PropertyAccess inCallProp)
+{
+	switch(inName.length) {
+	case 4:
+		if (HX_FIELD_EQ(inName,"head") ) { return ::hx::Val( head ); }
+		if (HX_FIELD_EQ(inName,"next") ) { return ::hx::Val( next_dyn() ); }
+		break;
+	case 7:
+		if (HX_FIELD_EQ(inName,"hasNext") ) { return ::hx::Val( hasNext_dyn() ); }
+	}
+	return super::__Field(inName,inCallProp);
+}
+
+::hx::Val ListIterator_obj::__SetField(const ::String &inName,const ::hx::Val &inValue,::hx::PropertyAccess inCallProp)
+{
+	switch(inName.length) {
+	case 4:
+		if (HX_FIELD_EQ(inName,"head") ) { head=inValue.Cast<  ::haxe::ds::_List::ListNode >(); return inValue; }
+	}
+	return super::__SetField(inName,inValue,inCallProp);
+}
+
+void ListIterator_obj::__GetFields(Array< ::String> &outFields)
+{
+	outFields->push(HX_("head",20,29,0b,45));
+	super::__GetFields(outFields);
+};
+
+#ifdef HXCPP_SCRIPTABLE
+static ::hx::StorageInfo ListIterator_obj_sMemberStorageInfo[] = {
+	{::hx::fsObject /*  ::haxe::ds::_List::ListNode */ ,(int)offsetof(ListIterator_obj,head),HX_("head",20,29,0b,45)},
+	{ ::hx::fsUnknown, 0, null()}
+};
+static ::hx::StaticInfo *ListIterator_obj_sStaticStorageInfo = 0;
+#endif
+
+static ::String ListIterator_obj_sMemberFields[] = {
+	HX_("head",20,29,0b,45),
+	HX_("hasNext",6d,a5,46,18),
+	HX_("next",f3,84,02,49),
+	::String(null()) };
+
+::hx::Class ListIterator_obj::__mClass;
+
+void ListIterator_obj::__register()
+{
+	ListIterator_obj _hx_dummy;
+	ListIterator_obj::_hx_vtable = *(void **)&_hx_dummy;
+	::hx::Static(__mClass) = new ::hx::Class_obj();
+	__mClass->mName = HX_("haxe.ds._List.ListIterator",74,ee,81,0e);
+	__mClass->mSuper = &super::__SGetClass();
+	__mClass->mConstructEmpty = &__CreateEmpty;
+	__mClass->mConstructArgs = &__Create;
+	__mClass->mGetStaticField = &::hx::Class_obj::GetNoStaticField;
+	__mClass->mSetStaticField = &::hx::Class_obj::SetNoStaticField;
+	__mClass->mStatics = ::hx::Class_obj::dupFunctions(0 /* sStaticFields */);
+	__mClass->mMembers = ::hx::Class_obj::dupFunctions(ListIterator_obj_sMemberFields);
+	__mClass->mCanCast = ::hx::TCanCast< ListIterator_obj >;
+#ifdef HXCPP_SCRIPTABLE
+	__mClass->mMemberStorageInfo = ListIterator_obj_sMemberStorageInfo;
+#endif
+#ifdef HXCPP_SCRIPTABLE
+	__mClass->mStaticStorageInfo = ListIterator_obj_sStaticStorageInfo;
+#endif
+	::hx::_hx_RegisterClass(__mClass->mName, __mClass);
+}
+
+} // end namespace haxe
+} // end namespace ds
+} // end namespace _List
diff --git a/Sources/c_snikket/src/haxe/xml/Parser.cpp b/Sources/c_snikket/src/haxe/xml/Parser.cpp
deleted file mode 100644
index 1237bc5..0000000
--- a/Sources/c_snikket/src/haxe/xml/Parser.cpp
+++ /dev/null
@@ -1,1062 +0,0 @@
-// Generated by Haxe 4.3.3
-#include <hxcpp.h>
-
-#ifndef INCLUDED_Std
-#include <Std.h>
-#endif
-#ifndef INCLUDED_StringBuf
-#include <StringBuf.h>
-#endif
-#ifndef INCLUDED_Xml
-#include <Xml.h>
-#endif
-#ifndef INCLUDED__Xml_XmlType_Impl_
-#include <_Xml/XmlType_Impl_.h>
-#endif
-#ifndef INCLUDED_haxe_IMap
-#include <haxe/IMap.h>
-#endif
-#ifndef INCLUDED_haxe_ds_StringMap
-#include <haxe/ds/StringMap.h>
-#endif
-#ifndef INCLUDED_haxe_xml_Parser
-#include <haxe/xml/Parser.h>
-#endif
-#ifndef INCLUDED_haxe_xml_XmlParserException
-#include <haxe/xml/XmlParserException.h>
-#endif
-
-HX_LOCAL_STACK_FRAME(_hx_pos_4387901c245e1a2b_115_parse,"haxe.xml.Parser","parse",0x937905c3,"haxe.xml.Parser.parse","/usr/local/lib/haxe/std/haxe/xml/Parser.hx",115,0x9bd139bb)
-HX_LOCAL_STACK_FRAME(_hx_pos_4387901c245e1a2b_121_doParse,"haxe.xml.Parser","doParse",0x2e9a6a38,"haxe.xml.Parser.doParse","/usr/local/lib/haxe/std/haxe/xml/Parser.hx",121,0x9bd139bb)
-HX_LOCAL_STACK_FRAME(_hx_pos_4387901c245e1a2b_100_boot,"haxe.xml.Parser","boot",0x0af6f0a2,"haxe.xml.Parser.boot","/usr/local/lib/haxe/std/haxe/xml/Parser.hx",100,0x9bd139bb)
-namespace haxe{
-namespace xml{
-
-void Parser_obj::__construct() { }
-
-Dynamic Parser_obj::__CreateEmpty() { return new Parser_obj; }
-
-void *Parser_obj::_hx_vtable = 0;
-
-Dynamic Parser_obj::__Create(::hx::DynamicArray inArgs)
-{
-	::hx::ObjectPtr< Parser_obj > _hx_result = new Parser_obj();
-	_hx_result->__construct();
-	return _hx_result;
-}
-
-bool Parser_obj::_hx_isInstanceOf(int inClassId) {
-	return inClassId==(int)0x00000001 || inClassId==(int)0x1c6f1730;
-}
-
- ::haxe::ds::StringMap Parser_obj::escapes;
-
- ::Xml Parser_obj::parse(::String str,::hx::Null< bool >  __o_strict){
-            		bool strict = __o_strict.Default(false);
-            	HX_STACKFRAME(&_hx_pos_4387901c245e1a2b_115_parse)
-HXLINE( 116)		 ::Xml doc = ::Xml_obj::createDocument();
-HXLINE( 117)		::haxe::xml::Parser_obj::doParse(str,strict,0,doc);
-HXLINE( 118)		return doc;
-            	}
-
-
-STATIC_HX_DEFINE_DYNAMIC_FUNC2(Parser_obj,parse,return )
-
-int Parser_obj::doParse(::String str,bool strict,::hx::Null< int >  __o_p, ::Xml parent){
-            		int p = __o_p.Default(0);
-            	HX_GC_STACKFRAME(&_hx_pos_4387901c245e1a2b_121_doParse)
-HXLINE( 122)		 ::Xml xml = null();
-HXLINE( 123)		int state = 1;
-HXLINE( 124)		int next = 1;
-HXLINE( 125)		::String aname = null();
-HXLINE( 126)		int start = 0;
-HXLINE( 127)		int nsubs = 0;
-HXLINE( 128)		int nbrackets = 0;
-HXLINE( 129)		 ::StringBuf buf =  ::StringBuf_obj::__alloc( HX_CTX );
-HXLINE( 131)		int escapeNext = 1;
-HXLINE( 132)		int attrValQuote = -1;
-HXLINE( 137)		while((p < str.length)){
-HXLINE( 138)			int c = str.cca(p);
-HXLINE( 139)			switch((int)(state)){
-            				case (int)0: {
-HXLINE( 141)					switch((int)(c)){
-            						case (int)9: case (int)10: case (int)13: case (int)32: {
-            						}
-            						break;
-            						default:{
-HXLINE( 144)							state = next;
-HXLINE( 145)							continue;
-            						}
-            					}
-            				}
-            				break;
-            				case (int)1: {
-HXLINE( 148)					if ((c == 60)) {
-HXLINE( 150)						state = 0;
-HXLINE( 151)						next = 2;
-            					}
-            					else {
-HXLINE( 153)						start = p;
-HXLINE( 154)						state = 13;
-HXLINE( 155)						continue;
-            					}
-            				}
-            				break;
-            				case (int)2: {
-HXLINE( 179)					switch((int)(c)){
-            						case (int)33: {
-HXLINE( 181)							if ((str.cca((p + 1)) == 91)) {
-HXLINE( 182)								p = (p + 2);
-HXLINE( 183)								if ((str.substr(p,6).toUpperCase() != HX_("CDATA[",ce,73,5f,1c))) {
-HXLINE( 184)									HX_STACK_DO_THROW( ::haxe::xml::XmlParserException_obj::__alloc( HX_CTX ,HX_("Expected <![CDATA[",1c,11,1f,2d),str,p));
-            								}
-HXLINE( 185)								p = (p + 5);
-HXLINE( 186)								state = 17;
-HXLINE( 187)								start = (p + 1);
-            							}
-            							else {
-HXLINE( 188)								bool _hx_tmp;
-HXDLIN( 188)								if ((str.cca((p + 1)) != 68)) {
-HXLINE( 188)									_hx_tmp = (str.cca((p + 1)) == 100);
-            								}
-            								else {
-HXLINE( 188)									_hx_tmp = true;
-            								}
-HXDLIN( 188)								if (_hx_tmp) {
-HXLINE( 189)									if ((str.substr((p + 2),6).toUpperCase() != HX_("OCTYPE",ce,19,d4,61))) {
-HXLINE( 190)										HX_STACK_DO_THROW( ::haxe::xml::XmlParserException_obj::__alloc( HX_CTX ,HX_("Expected <!DOCTYPE",c5,0b,26,b6),str,p));
-            									}
-HXLINE( 191)									p = (p + 8);
-HXLINE( 192)									state = 16;
-HXLINE( 193)									start = (p + 1);
-            								}
-            								else {
-HXLINE( 194)									bool _hx_tmp1;
-HXDLIN( 194)									if ((str.cca((p + 1)) == 45)) {
-HXLINE( 194)										_hx_tmp1 = (str.cca((p + 2)) != 45);
-            									}
-            									else {
-HXLINE( 194)										_hx_tmp1 = true;
-            									}
-HXDLIN( 194)									if (_hx_tmp1) {
-HXLINE( 194)										HX_STACK_DO_THROW( ::haxe::xml::XmlParserException_obj::__alloc( HX_CTX ,HX_("Expected <!--",8d,3d,c1,53),str,p));
-            									}
-            									else {
-HXLINE( 196)										p = (p + 2);
-HXLINE( 197)										state = 15;
-HXLINE( 198)										start = (p + 1);
-            									}
-            								}
-            							}
-            						}
-            						break;
-            						case (int)47: {
-HXLINE( 204)							if (::hx::IsNull( parent )) {
-HXLINE( 205)								HX_STACK_DO_THROW( ::haxe::xml::XmlParserException_obj::__alloc( HX_CTX ,HX_("Expected node name",a1,85,63,3f),str,p));
-            							}
-HXLINE( 206)							start = (p + 1);
-HXLINE( 207)							state = 0;
-HXLINE( 208)							next = 10;
-            						}
-            						break;
-            						case (int)63: {
-HXLINE( 201)							state = 14;
-HXLINE( 202)							start = p;
-            						}
-            						break;
-            						default:{
-HXLINE( 210)							state = 3;
-HXLINE( 211)							start = p;
-HXLINE( 212)							continue;
-            						}
-            					}
-            				}
-            				break;
-            				case (int)3: {
-HXLINE( 215)					bool _hx_tmp2;
-HXDLIN( 215)					bool _hx_tmp3;
-HXDLIN( 215)					bool _hx_tmp4;
-HXDLIN( 215)					bool _hx_tmp5;
-HXDLIN( 215)					bool _hx_tmp6;
-HXDLIN( 215)					bool _hx_tmp7;
-HXDLIN( 215)					bool _hx_tmp8;
-HXDLIN( 215)					if ((c >= 97)) {
-HXLINE( 215)						_hx_tmp8 = (c <= 122);
-            					}
-            					else {
-HXLINE( 215)						_hx_tmp8 = false;
-            					}
-HXDLIN( 215)					if (!(_hx_tmp8)) {
-HXLINE( 215)						if ((c >= 65)) {
-HXLINE( 215)							_hx_tmp7 = (c <= 90);
-            						}
-            						else {
-HXLINE( 215)							_hx_tmp7 = false;
-            						}
-            					}
-            					else {
-HXLINE( 215)						_hx_tmp7 = true;
-            					}
-HXDLIN( 215)					if (!(_hx_tmp7)) {
-HXLINE( 215)						if ((c >= 48)) {
-HXLINE( 215)							_hx_tmp6 = (c <= 57);
-            						}
-            						else {
-HXLINE( 215)							_hx_tmp6 = false;
-            						}
-            					}
-            					else {
-HXLINE( 215)						_hx_tmp6 = true;
-            					}
-HXDLIN( 215)					if (!(_hx_tmp6)) {
-HXLINE( 215)						_hx_tmp5 = (c == 58);
-            					}
-            					else {
-HXLINE( 215)						_hx_tmp5 = true;
-            					}
-HXDLIN( 215)					if (!(_hx_tmp5)) {
-HXLINE( 215)						_hx_tmp4 = (c == 46);
-            					}
-            					else {
-HXLINE( 215)						_hx_tmp4 = true;
-            					}
-HXDLIN( 215)					if (!(_hx_tmp4)) {
-HXLINE( 215)						_hx_tmp3 = (c == 95);
-            					}
-            					else {
-HXLINE( 215)						_hx_tmp3 = true;
-            					}
-HXDLIN( 215)					if (!(_hx_tmp3)) {
-HXLINE( 215)						_hx_tmp2 = (c == 45);
-            					}
-            					else {
-HXLINE( 215)						_hx_tmp2 = true;
-            					}
-HXDLIN( 215)					if (!(_hx_tmp2)) {
-HXLINE( 216)						if ((p == start)) {
-HXLINE( 217)							HX_STACK_DO_THROW( ::haxe::xml::XmlParserException_obj::__alloc( HX_CTX ,HX_("Expected node name",a1,85,63,3f),str,p));
-            						}
-HXLINE( 218)						xml = ::Xml_obj::createElement(str.substr(start,(p - start)));
-HXLINE( 219)						{
-HXLINE( 219)							parent->addChild(xml);
-HXDLIN( 219)							nsubs = (nsubs + 1);
-            						}
-HXLINE( 220)						state = 0;
-HXLINE( 221)						next = 4;
-HXLINE( 222)						continue;
-            					}
-            				}
-            				break;
-            				case (int)4: {
-HXLINE( 225)					switch((int)(c)){
-            						case (int)47: {
-HXLINE( 227)							state = 11;
-            						}
-            						break;
-            						case (int)62: {
-HXLINE( 229)							state = 9;
-            						}
-            						break;
-            						default:{
-HXLINE( 231)							state = 5;
-HXLINE( 232)							start = p;
-HXLINE( 233)							continue;
-            						}
-            					}
-            				}
-            				break;
-            				case (int)5: {
-HXLINE( 236)					bool _hx_tmp9;
-HXDLIN( 236)					bool _hx_tmp10;
-HXDLIN( 236)					bool _hx_tmp11;
-HXDLIN( 236)					bool _hx_tmp12;
-HXDLIN( 236)					bool _hx_tmp13;
-HXDLIN( 236)					bool _hx_tmp14;
-HXDLIN( 236)					bool _hx_tmp15;
-HXDLIN( 236)					if ((c >= 97)) {
-HXLINE( 236)						_hx_tmp15 = (c <= 122);
-            					}
-            					else {
-HXLINE( 236)						_hx_tmp15 = false;
-            					}
-HXDLIN( 236)					if (!(_hx_tmp15)) {
-HXLINE( 236)						if ((c >= 65)) {
-HXLINE( 236)							_hx_tmp14 = (c <= 90);
-            						}
-            						else {
-HXLINE( 236)							_hx_tmp14 = false;
-            						}
-            					}
-            					else {
-HXLINE( 236)						_hx_tmp14 = true;
-            					}
-HXDLIN( 236)					if (!(_hx_tmp14)) {
-HXLINE( 236)						if ((c >= 48)) {
-HXLINE( 236)							_hx_tmp13 = (c <= 57);
-            						}
-            						else {
-HXLINE( 236)							_hx_tmp13 = false;
-            						}
-            					}
-            					else {
-HXLINE( 236)						_hx_tmp13 = true;
-            					}
-HXDLIN( 236)					if (!(_hx_tmp13)) {
-HXLINE( 236)						_hx_tmp12 = (c == 58);
-            					}
-            					else {
-HXLINE( 236)						_hx_tmp12 = true;
-            					}
-HXDLIN( 236)					if (!(_hx_tmp12)) {
-HXLINE( 236)						_hx_tmp11 = (c == 46);
-            					}
-            					else {
-HXLINE( 236)						_hx_tmp11 = true;
-            					}
-HXDLIN( 236)					if (!(_hx_tmp11)) {
-HXLINE( 236)						_hx_tmp10 = (c == 95);
-            					}
-            					else {
-HXLINE( 236)						_hx_tmp10 = true;
-            					}
-HXDLIN( 236)					if (!(_hx_tmp10)) {
-HXLINE( 236)						_hx_tmp9 = (c == 45);
-            					}
-            					else {
-HXLINE( 236)						_hx_tmp9 = true;
-            					}
-HXDLIN( 236)					if (!(_hx_tmp9)) {
-HXLINE( 238)						if ((start == p)) {
-HXLINE( 239)							HX_STACK_DO_THROW( ::haxe::xml::XmlParserException_obj::__alloc( HX_CTX ,HX_("Expected attribute name",57,65,2b,54),str,p));
-            						}
-HXLINE( 237)						::String tmp = str.substr(start,(p - start));
-HXLINE( 241)						aname = tmp;
-HXLINE( 242)						if (xml->exists(aname)) {
-HXLINE( 243)							HX_STACK_DO_THROW( ::haxe::xml::XmlParserException_obj::__alloc( HX_CTX ,((HX_("Duplicate attribute [",22,75,cb,05) + aname) + HX_("]",5d,00,00,00)),str,p));
-            						}
-HXLINE( 244)						state = 0;
-HXLINE( 245)						next = 6;
-HXLINE( 246)						continue;
-            					}
-            				}
-            				break;
-            				case (int)6: {
-HXLINE( 249)					if ((c == 61)) {
-HXLINE( 251)						state = 0;
-HXLINE( 252)						next = 7;
-            					}
-            					else {
-HXLINE( 254)						HX_STACK_DO_THROW( ::haxe::xml::XmlParserException_obj::__alloc( HX_CTX ,HX_("Expected =",b5,dc,23,c6),str,p));
-            					}
-            				}
-            				break;
-            				case (int)7: {
-HXLINE( 257)					switch((int)(c)){
-            						case (int)34: case (int)39: {
-HXLINE( 259)							buf =  ::StringBuf_obj::__alloc( HX_CTX );
-HXLINE( 260)							state = 8;
-HXLINE( 261)							start = (p + 1);
-HXLINE( 262)							attrValQuote = c;
-            						}
-            						break;
-            						default:{
-HXLINE( 264)							HX_STACK_DO_THROW( ::haxe::xml::XmlParserException_obj::__alloc( HX_CTX ,HX_("Expected \"",9a,dc,23,c6),str,p));
-            						}
-            					}
-            				}
-            				break;
-            				case (int)8: {
-HXLINE( 267)					switch((int)(c)){
-            						case (int)38: {
-HXLINE( 269)							{
-HXLINE( 269)								 ::Dynamic len = (p - start);
-HXDLIN( 269)								if (::hx::IsNotNull( buf->charBuf )) {
-HXLINE( 269)									buf->flush();
-            								}
-HXDLIN( 269)								if (::hx::IsNull( buf->b )) {
-HXLINE( 269)									buf->b = ::Array_obj< ::String >::__new(1)->init(0,str.substr(start,len));
-            								}
-            								else {
-HXLINE( 269)									::Array< ::String > buf1 = buf->b;
-HXDLIN( 269)									buf1->push(str.substr(start,len));
-            								}
-            							}
-HXLINE( 270)							state = 18;
-HXLINE( 271)							escapeNext = 8;
-HXLINE( 272)							start = (p + 1);
-            						}
-            						break;
-            						case (int)60: case (int)62: {
-HXLINE( 273)							if (strict) {
-HXLINE( 275)								HX_STACK_DO_THROW( ::haxe::xml::XmlParserException_obj::__alloc( HX_CTX ,((HX_("Invalid unescaped ",ff,da,cb,cc) + ::String::fromCharCode(c)) + HX_(" in attribute value",52,5a,ca,13)),str,p));
-            							}
-            							else {
-HXLINE( 276)								if ((c == attrValQuote)) {
-HXLINE( 277)									{
-HXLINE( 277)										 ::Dynamic len1 = (p - start);
-HXDLIN( 277)										if (::hx::IsNotNull( buf->charBuf )) {
-HXLINE( 277)											buf->flush();
-            										}
-HXDLIN( 277)										if (::hx::IsNull( buf->b )) {
-HXLINE( 277)											buf->b = ::Array_obj< ::String >::__new(1)->init(0,str.substr(start,len1));
-            										}
-            										else {
-HXLINE( 277)											::Array< ::String > buf2 = buf->b;
-HXDLIN( 277)											buf2->push(str.substr(start,len1));
-            										}
-            									}
-HXLINE( 278)									::String val = buf->toString();
-HXLINE( 279)									buf =  ::StringBuf_obj::__alloc( HX_CTX );
-HXLINE( 280)									xml->set(aname,val);
-HXLINE( 281)									state = 0;
-HXLINE( 282)									next = 4;
-            								}
-            							}
-            						}
-            						break;
-            						default:{
-HXLINE( 276)							if ((c == attrValQuote)) {
-HXLINE( 277)								{
-HXLINE( 277)									 ::Dynamic len2 = (p - start);
-HXDLIN( 277)									if (::hx::IsNotNull( buf->charBuf )) {
-HXLINE( 277)										buf->flush();
-            									}
-HXDLIN( 277)									if (::hx::IsNull( buf->b )) {
-HXLINE( 277)										buf->b = ::Array_obj< ::String >::__new(1)->init(0,str.substr(start,len2));
-            									}
-            									else {
-HXLINE( 277)										::Array< ::String > buf3 = buf->b;
-HXDLIN( 277)										buf3->push(str.substr(start,len2));
-            									}
-            								}
-HXLINE( 278)								::String val1 = buf->toString();
-HXLINE( 279)								buf =  ::StringBuf_obj::__alloc( HX_CTX );
-HXLINE( 280)								xml->set(aname,val1);
-HXLINE( 281)								state = 0;
-HXLINE( 282)								next = 4;
-            							}
-            						}
-            					}
-            				}
-            				break;
-            				case (int)9: {
-HXLINE( 285)					p = ::haxe::xml::Parser_obj::doParse(str,strict,p,xml);
-HXLINE( 286)					start = p;
-HXLINE( 287)					state = 1;
-            				}
-            				break;
-            				case (int)10: {
-HXLINE( 305)					bool _hx_tmp16;
-HXDLIN( 305)					bool _hx_tmp17;
-HXDLIN( 305)					bool _hx_tmp18;
-HXDLIN( 305)					bool _hx_tmp19;
-HXDLIN( 305)					bool _hx_tmp20;
-HXDLIN( 305)					bool _hx_tmp21;
-HXDLIN( 305)					bool _hx_tmp22;
-HXDLIN( 305)					if ((c >= 97)) {
-HXLINE( 305)						_hx_tmp22 = (c <= 122);
-            					}
-            					else {
-HXLINE( 305)						_hx_tmp22 = false;
-            					}
-HXDLIN( 305)					if (!(_hx_tmp22)) {
-HXLINE( 305)						if ((c >= 65)) {
-HXLINE( 305)							_hx_tmp21 = (c <= 90);
-            						}
-            						else {
-HXLINE( 305)							_hx_tmp21 = false;
-            						}
-            					}
-            					else {
-HXLINE( 305)						_hx_tmp21 = true;
-            					}
-HXDLIN( 305)					if (!(_hx_tmp21)) {
-HXLINE( 305)						if ((c >= 48)) {
-HXLINE( 305)							_hx_tmp20 = (c <= 57);
-            						}
-            						else {
-HXLINE( 305)							_hx_tmp20 = false;
-            						}
-            					}
-            					else {
-HXLINE( 305)						_hx_tmp20 = true;
-            					}
-HXDLIN( 305)					if (!(_hx_tmp20)) {
-HXLINE( 305)						_hx_tmp19 = (c == 58);
-            					}
-            					else {
-HXLINE( 305)						_hx_tmp19 = true;
-            					}
-HXDLIN( 305)					if (!(_hx_tmp19)) {
-HXLINE( 305)						_hx_tmp18 = (c == 46);
-            					}
-            					else {
-HXLINE( 305)						_hx_tmp18 = true;
-            					}
-HXDLIN( 305)					if (!(_hx_tmp18)) {
-HXLINE( 305)						_hx_tmp17 = (c == 95);
-            					}
-            					else {
-HXLINE( 305)						_hx_tmp17 = true;
-            					}
-HXDLIN( 305)					if (!(_hx_tmp17)) {
-HXLINE( 305)						_hx_tmp16 = (c == 45);
-            					}
-            					else {
-HXLINE( 305)						_hx_tmp16 = true;
-            					}
-HXDLIN( 305)					if (!(_hx_tmp16)) {
-HXLINE( 306)						if ((start == p)) {
-HXLINE( 307)							HX_STACK_DO_THROW( ::haxe::xml::XmlParserException_obj::__alloc( HX_CTX ,HX_("Expected node name",a1,85,63,3f),str,p));
-            						}
-HXLINE( 309)						::String v = str.substr(start,(p - start));
-HXLINE( 310)						bool _hx_tmp23;
-HXDLIN( 310)						if (::hx::IsNotNull( parent )) {
-HXLINE( 310)							_hx_tmp23 = (parent->nodeType != 0);
-            						}
-            						else {
-HXLINE( 310)							_hx_tmp23 = true;
-            						}
-HXDLIN( 310)						if (_hx_tmp23) {
-HXLINE( 311)							HX_STACK_DO_THROW( ::haxe::xml::XmlParserException_obj::__alloc( HX_CTX ,((HX_("Unexpected </",42,6f,35,1e) + v) + HX_(">, tag is not open",35,30,75,b8)),str,p));
-            						}
-HXLINE( 313)						if ((parent->nodeType != ::Xml_obj::Element)) {
-HXLINE( 313)							HX_STACK_DO_THROW((HX_("Bad node type, expected Element but found ",d8,90,8b,bb) + ::_Xml::XmlType_Impl__obj::toString(parent->nodeType)));
-            						}
-HXDLIN( 313)						if ((v != parent->nodeName)) {
-HXLINE( 314)							if ((parent->nodeType != ::Xml_obj::Element)) {
-HXLINE( 314)								HX_STACK_DO_THROW((HX_("Bad node type, expected Element but found ",d8,90,8b,bb) + ::_Xml::XmlType_Impl__obj::toString(parent->nodeType)));
-            							}
-HXDLIN( 314)							HX_STACK_DO_THROW( ::haxe::xml::XmlParserException_obj::__alloc( HX_CTX ,((HX_("Expected </",fb,40,3d,99) + parent->nodeName) + HX_(">",3e,00,00,00)),str,p));
-            						}
-HXLINE( 316)						state = 0;
-HXLINE( 317)						next = 12;
-HXLINE( 318)						continue;
-            					}
-            				}
-            				break;
-            				case (int)11: {
-HXLINE( 289)					if ((c == 62)) {
-HXLINE( 291)						state = 1;
-            					}
-            					else {
-HXLINE( 293)						HX_STACK_DO_THROW( ::haxe::xml::XmlParserException_obj::__alloc( HX_CTX ,HX_("Expected >",b6,dc,23,c6),str,p));
-            					}
-            				}
-            				break;
-            				case (int)12: {
-HXLINE( 296)					if ((c == 62)) {
-HXLINE( 298)						if ((nsubs == 0)) {
-HXLINE( 299)							parent->addChild(::Xml_obj::createPCData(HX_("",00,00,00,00)));
-            						}
-HXLINE( 300)						return p;
-            					}
-            					else {
-HXLINE( 302)						HX_STACK_DO_THROW( ::haxe::xml::XmlParserException_obj::__alloc( HX_CTX ,HX_("Expected >",b6,dc,23,c6),str,p));
-            					}
-            				}
-            				break;
-            				case (int)13: {
-HXLINE( 158)					if ((c == 60)) {
-HXLINE( 159)						{
-HXLINE( 159)							 ::Dynamic len3 = (p - start);
-HXDLIN( 159)							if (::hx::IsNotNull( buf->charBuf )) {
-HXLINE( 159)								buf->flush();
-            							}
-HXDLIN( 159)							if (::hx::IsNull( buf->b )) {
-HXLINE( 159)								buf->b = ::Array_obj< ::String >::__new(1)->init(0,str.substr(start,len3));
-            							}
-            							else {
-HXLINE( 159)								::Array< ::String > buf4 = buf->b;
-HXDLIN( 159)								buf4->push(str.substr(start,len3));
-            							}
-            						}
-HXLINE( 160)						 ::Xml child = ::Xml_obj::createPCData(buf->toString());
-HXLINE( 161)						buf =  ::StringBuf_obj::__alloc( HX_CTX );
-HXLINE( 162)						{
-HXLINE( 162)							parent->addChild(child);
-HXDLIN( 162)							nsubs = (nsubs + 1);
-            						}
-HXLINE( 163)						state = 0;
-HXLINE( 164)						next = 2;
-            					}
-            					else {
-HXLINE( 165)						if ((c == 38)) {
-HXLINE( 166)							{
-HXLINE( 166)								 ::Dynamic len4 = (p - start);
-HXDLIN( 166)								if (::hx::IsNotNull( buf->charBuf )) {
-HXLINE( 166)									buf->flush();
-            								}
-HXDLIN( 166)								if (::hx::IsNull( buf->b )) {
-HXLINE( 166)									buf->b = ::Array_obj< ::String >::__new(1)->init(0,str.substr(start,len4));
-            								}
-            								else {
-HXLINE( 166)									::Array< ::String > buf5 = buf->b;
-HXDLIN( 166)									buf5->push(str.substr(start,len4));
-            								}
-            							}
-HXLINE( 167)							state = 18;
-HXLINE( 168)							escapeNext = 13;
-HXLINE( 169)							start = (p + 1);
-            						}
-            					}
-            				}
-            				break;
-            				case (int)14: {
-HXLINE( 336)					bool _hx_tmp24;
-HXDLIN( 336)					if ((c == 63)) {
-HXLINE( 336)						_hx_tmp24 = (str.cca((p + 1)) == 62);
-            					}
-            					else {
-HXLINE( 336)						_hx_tmp24 = false;
-            					}
-HXDLIN( 336)					if (_hx_tmp24) {
-HXLINE( 337)						p = (p + 1);
-HXLINE( 338)						::String str1 = str.substr((start + 1),((p - start) - 2));
-HXLINE( 339)						{
-HXLINE( 339)							parent->addChild(::Xml_obj::createProcessingInstruction(str1));
-HXDLIN( 339)							nsubs = (nsubs + 1);
-            						}
-HXLINE( 340)						state = 1;
-            					}
-            				}
-            				break;
-            				case (int)15: {
-HXLINE( 321)					bool _hx_tmp25;
-HXDLIN( 321)					bool _hx_tmp26;
-HXDLIN( 321)					if ((c == 45)) {
-HXLINE( 321)						_hx_tmp26 = (str.cca((p + 1)) == 45);
-            					}
-            					else {
-HXLINE( 321)						_hx_tmp26 = false;
-            					}
-HXDLIN( 321)					if (_hx_tmp26) {
-HXLINE( 321)						_hx_tmp25 = (str.cca((p + 2)) == 62);
-            					}
-            					else {
-HXLINE( 321)						_hx_tmp25 = false;
-            					}
-HXDLIN( 321)					if (_hx_tmp25) {
-HXLINE( 322)						{
-HXLINE( 322)							parent->addChild(::Xml_obj::createComment(str.substr(start,(p - start))));
-HXDLIN( 322)							nsubs = (nsubs + 1);
-            						}
-HXLINE( 323)						p = (p + 2);
-HXLINE( 324)						state = 1;
-            					}
-            				}
-            				break;
-            				case (int)16: {
-HXLINE( 327)					if ((c == 91)) {
-HXLINE( 328)						nbrackets = (nbrackets + 1);
-            					}
-            					else {
-HXLINE( 329)						if ((c == 93)) {
-HXLINE( 330)							nbrackets = (nbrackets - 1);
-            						}
-            						else {
-HXLINE( 331)							bool _hx_tmp27;
-HXDLIN( 331)							if ((c == 62)) {
-HXLINE( 331)								_hx_tmp27 = (nbrackets == 0);
-            							}
-            							else {
-HXLINE( 331)								_hx_tmp27 = false;
-            							}
-HXDLIN( 331)							if (_hx_tmp27) {
-HXLINE( 332)								{
-HXLINE( 332)									parent->addChild(::Xml_obj::createDocType(str.substr(start,(p - start))));
-HXDLIN( 332)									nsubs = (nsubs + 1);
-            								}
-HXLINE( 333)								state = 1;
-            							}
-            						}
-            					}
-            				}
-            				break;
-            				case (int)17: {
-HXLINE( 172)					bool _hx_tmp28;
-HXDLIN( 172)					bool _hx_tmp29;
-HXDLIN( 172)					if ((c == 93)) {
-HXLINE( 172)						_hx_tmp29 = (str.cca((p + 1)) == 93);
-            					}
-            					else {
-HXLINE( 172)						_hx_tmp29 = false;
-            					}
-HXDLIN( 172)					if (_hx_tmp29) {
-HXLINE( 172)						_hx_tmp28 = (str.cca((p + 2)) == 62);
-            					}
-            					else {
-HXLINE( 172)						_hx_tmp28 = false;
-            					}
-HXDLIN( 172)					if (_hx_tmp28) {
-HXLINE( 173)						 ::Xml child1 = ::Xml_obj::createCData(str.substr(start,(p - start)));
-HXLINE( 174)						{
-HXLINE( 174)							parent->addChild(child1);
-HXDLIN( 174)							nsubs = (nsubs + 1);
-            						}
-HXLINE( 175)						p = (p + 2);
-HXLINE( 176)						state = 1;
-            					}
-            				}
-            				break;
-            				case (int)18: {
-HXLINE( 343)					if ((c == 59)) {
-HXLINE( 344)						::String s = str.substr(start,(p - start));
-HXLINE( 345)						if ((s.cca(0) == 35)) {
-HXLINE( 346)							 ::Dynamic c1;
-HXDLIN( 346)							if ((s.cca(1) == 120)) {
-HXLINE( 346)								c1 = ::Std_obj::parseInt((HX_("0",30,00,00,00) + s.substr(1,(s.length - 1))));
-            							}
-            							else {
-HXLINE( 346)								c1 = ::Std_obj::parseInt(s.substr(1,(s.length - 1)));
-            							}
-HXLINE( 366)							{
-HXLINE( 366)								int c2 = ( (int)(c1) );
-HXDLIN( 366)								if ((c2 >= 127)) {
-HXLINE( 366)									::String x = ::String::fromCharCode(c2);
-HXDLIN( 366)									if (::hx::IsNotNull( buf->charBuf )) {
-HXLINE( 366)										buf->flush();
-            									}
-HXDLIN( 366)									if (::hx::IsNull( buf->b )) {
-HXLINE( 366)										buf->b = ::Array_obj< ::String >::__new(1)->init(0,::Std_obj::string(x));
-            									}
-            									else {
-HXLINE( 366)										::Array< ::String > buf6 = buf->b;
-HXDLIN( 366)										buf6->push(::Std_obj::string(x));
-            									}
-            								}
-            								else {
-HXLINE( 366)									if (::hx::IsNull( buf->charBuf )) {
-HXLINE( 366)										buf->charBuf = ::Array_obj< char >::__new();
-            									}
-HXDLIN( 366)									buf->charBuf->push(c2);
-            								}
-            							}
-            						}
-            						else {
-HXLINE( 367)							if (!(::haxe::xml::Parser_obj::escapes->exists(s))) {
-HXLINE( 368)								if (strict) {
-HXLINE( 369)									HX_STACK_DO_THROW( ::haxe::xml::XmlParserException_obj::__alloc( HX_CTX ,(HX_("Undefined entity: ",39,48,f2,48) + s),str,p));
-            								}
-HXLINE( 370)								{
-HXLINE( 370)									::String x1 = ((HX_("&",26,00,00,00) + s) + HX_(";",3b,00,00,00));
-HXDLIN( 370)									if (::hx::IsNotNull( buf->charBuf )) {
-HXLINE( 370)										buf->flush();
-            									}
-HXDLIN( 370)									if (::hx::IsNull( buf->b )) {
-HXLINE( 370)										buf->b = ::Array_obj< ::String >::__new(1)->init(0,::Std_obj::string(x1));
-            									}
-            									else {
-HXLINE( 370)										::Array< ::String > buf7 = buf->b;
-HXDLIN( 370)										buf7->push(::Std_obj::string(x1));
-            									}
-            								}
-            							}
-            							else {
-HXLINE( 372)								::String x2 = ::haxe::xml::Parser_obj::escapes->get_string(s);
-HXDLIN( 372)								if (::hx::IsNotNull( buf->charBuf )) {
-HXLINE( 372)									buf->flush();
-            								}
-HXDLIN( 372)								if (::hx::IsNull( buf->b )) {
-HXLINE( 372)									buf->b = ::Array_obj< ::String >::__new(1)->init(0,::Std_obj::string(x2));
-            								}
-            								else {
-HXLINE( 372)									::Array< ::String > buf8 = buf->b;
-HXDLIN( 372)									buf8->push(::Std_obj::string(x2));
-            								}
-            							}
-            						}
-HXLINE( 374)						start = (p + 1);
-HXLINE( 375)						state = escapeNext;
-            					}
-            					else {
-HXLINE( 376)						bool _hx_tmp30;
-HXDLIN( 376)						bool _hx_tmp31;
-HXDLIN( 376)						bool _hx_tmp32;
-HXDLIN( 376)						bool _hx_tmp33;
-HXDLIN( 376)						bool _hx_tmp34;
-HXDLIN( 376)						bool _hx_tmp35;
-HXDLIN( 376)						bool _hx_tmp36;
-HXDLIN( 376)						bool _hx_tmp37;
-HXDLIN( 376)						if ((c >= 97)) {
-HXLINE( 376)							_hx_tmp37 = (c <= 122);
-            						}
-            						else {
-HXLINE( 376)							_hx_tmp37 = false;
-            						}
-HXDLIN( 376)						if (!(_hx_tmp37)) {
-HXLINE( 376)							if ((c >= 65)) {
-HXLINE( 376)								_hx_tmp36 = (c <= 90);
-            							}
-            							else {
-HXLINE( 376)								_hx_tmp36 = false;
-            							}
-            						}
-            						else {
-HXLINE( 376)							_hx_tmp36 = true;
-            						}
-HXDLIN( 376)						if (!(_hx_tmp36)) {
-HXLINE( 376)							if ((c >= 48)) {
-HXLINE( 376)								_hx_tmp35 = (c <= 57);
-            							}
-            							else {
-HXLINE( 376)								_hx_tmp35 = false;
-            							}
-            						}
-            						else {
-HXLINE( 376)							_hx_tmp35 = true;
-            						}
-HXDLIN( 376)						if (!(_hx_tmp35)) {
-HXLINE( 376)							_hx_tmp34 = (c == 58);
-            						}
-            						else {
-HXLINE( 376)							_hx_tmp34 = true;
-            						}
-HXDLIN( 376)						if (!(_hx_tmp34)) {
-HXLINE( 376)							_hx_tmp33 = (c == 46);
-            						}
-            						else {
-HXLINE( 376)							_hx_tmp33 = true;
-            						}
-HXDLIN( 376)						if (!(_hx_tmp33)) {
-HXLINE( 376)							_hx_tmp32 = (c == 95);
-            						}
-            						else {
-HXLINE( 376)							_hx_tmp32 = true;
-            						}
-HXDLIN( 376)						if (!(_hx_tmp32)) {
-HXLINE( 376)							_hx_tmp31 = (c == 45);
-            						}
-            						else {
-HXLINE( 376)							_hx_tmp31 = true;
-            						}
-HXDLIN( 376)						if (!(_hx_tmp31)) {
-HXLINE( 376)							_hx_tmp30 = (c != 35);
-            						}
-            						else {
-HXLINE( 376)							_hx_tmp30 = false;
-            						}
-HXDLIN( 376)						if (_hx_tmp30) {
-HXLINE( 377)							if (strict) {
-HXLINE( 378)								HX_STACK_DO_THROW( ::haxe::xml::XmlParserException_obj::__alloc( HX_CTX ,(HX_("Invalid character in entity: ",24,85,11,30) + ::String::fromCharCode(c)),str,p));
-            							}
-HXLINE( 379)							{
-HXLINE( 379)								if (::hx::IsNull( buf->charBuf )) {
-HXLINE( 379)									buf->charBuf = ::Array_obj< char >::__new();
-            								}
-HXDLIN( 379)								buf->charBuf->push(38);
-            							}
-HXLINE( 380)							{
-HXLINE( 380)								 ::Dynamic len5 = (p - start);
-HXDLIN( 380)								if (::hx::IsNotNull( buf->charBuf )) {
-HXLINE( 380)									buf->flush();
-            								}
-HXDLIN( 380)								if (::hx::IsNull( buf->b )) {
-HXLINE( 380)									buf->b = ::Array_obj< ::String >::__new(1)->init(0,str.substr(start,len5));
-            								}
-            								else {
-HXLINE( 380)									::Array< ::String > buf9 = buf->b;
-HXDLIN( 380)									buf9->push(str.substr(start,len5));
-            								}
-            							}
-HXLINE( 381)							p = (p - 1);
-HXLINE( 382)							start = (p + 1);
-HXLINE( 383)							state = escapeNext;
-            						}
-            					}
-            				}
-            				break;
-            			}
-HXLINE( 386)			p = (p + 1);
-            		}
-HXLINE( 389)		if ((state == 1)) {
-HXLINE( 390)			start = p;
-HXLINE( 391)			state = 13;
-            		}
-HXLINE( 394)		if ((state == 13)) {
-HXLINE( 395)			if ((parent->nodeType == 0)) {
-HXLINE( 396)				if ((parent->nodeType != ::Xml_obj::Element)) {
-HXLINE( 396)					HX_STACK_DO_THROW((HX_("Bad node type, expected Element but found ",d8,90,8b,bb) + ::_Xml::XmlType_Impl__obj::toString(parent->nodeType)));
-            				}
-HXDLIN( 396)				HX_STACK_DO_THROW( ::haxe::xml::XmlParserException_obj::__alloc( HX_CTX ,((HX_("Unclosed node <",79,04,e1,00) + parent->nodeName) + HX_(">",3e,00,00,00)),str,p));
-            			}
-HXLINE( 398)			bool _hx_tmp38;
-HXDLIN( 398)			if ((p == start)) {
-HXLINE( 398)				_hx_tmp38 = (nsubs == 0);
-            			}
-            			else {
-HXLINE( 398)				_hx_tmp38 = true;
-            			}
-HXDLIN( 398)			if (_hx_tmp38) {
-HXLINE( 399)				{
-HXLINE( 399)					 ::Dynamic len6 = (p - start);
-HXDLIN( 399)					if (::hx::IsNotNull( buf->charBuf )) {
-HXLINE( 399)						buf->flush();
-            					}
-HXDLIN( 399)					if (::hx::IsNull( buf->b )) {
-HXLINE( 399)						buf->b = ::Array_obj< ::String >::__new(1)->init(0,str.substr(start,len6));
-            					}
-            					else {
-HXLINE( 399)						::Array< ::String > buf10 = buf->b;
-HXDLIN( 399)						buf10->push(str.substr(start,len6));
-            					}
-            				}
-HXLINE( 400)				{
-HXLINE( 400)					parent->addChild(::Xml_obj::createPCData(buf->toString()));
-HXDLIN( 400)					nsubs = (nsubs + 1);
-            				}
-            			}
-HXLINE( 402)			return p;
-            		}
-HXLINE( 405)		bool _hx_tmp39;
-HXDLIN( 405)		bool _hx_tmp40;
-HXDLIN( 405)		if (!(strict)) {
-HXLINE( 405)			_hx_tmp40 = (state == 18);
-            		}
-            		else {
-HXLINE( 405)			_hx_tmp40 = false;
-            		}
-HXDLIN( 405)		if (_hx_tmp40) {
-HXLINE( 405)			_hx_tmp39 = (escapeNext == 13);
-            		}
-            		else {
-HXLINE( 405)			_hx_tmp39 = false;
-            		}
-HXDLIN( 405)		if (_hx_tmp39) {
-HXLINE( 406)			{
-HXLINE( 406)				if (::hx::IsNull( buf->charBuf )) {
-HXLINE( 406)					buf->charBuf = ::Array_obj< char >::__new();
-            				}
-HXDLIN( 406)				buf->charBuf->push(38);
-            			}
-HXLINE( 407)			{
-HXLINE( 407)				 ::Dynamic len7 = (p - start);
-HXDLIN( 407)				if (::hx::IsNotNull( buf->charBuf )) {
-HXLINE( 407)					buf->flush();
-            				}
-HXDLIN( 407)				if (::hx::IsNull( buf->b )) {
-HXLINE( 407)					buf->b = ::Array_obj< ::String >::__new(1)->init(0,str.substr(start,len7));
-            				}
-            				else {
-HXLINE( 407)					::Array< ::String > buf11 = buf->b;
-HXDLIN( 407)					buf11->push(str.substr(start,len7));
-            				}
-            			}
-HXLINE( 408)			{
-HXLINE( 408)				parent->addChild(::Xml_obj::createPCData(buf->toString()));
-HXDLIN( 408)				nsubs = (nsubs + 1);
-            			}
-HXLINE( 409)			return p;
-            		}
-HXLINE( 412)		HX_STACK_DO_THROW( ::haxe::xml::XmlParserException_obj::__alloc( HX_CTX ,HX_("Unexpected end",2c,3e,ab,50),str,p));
-HXDLIN( 412)		return 0;
-            	}
-
-
-STATIC_HX_DEFINE_DYNAMIC_FUNC4(Parser_obj,doParse,return )
-
-
-Parser_obj::Parser_obj()
-{
-}
-
-bool Parser_obj::__GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp)
-{
-	switch(inName.length) {
-	case 5:
-		if (HX_FIELD_EQ(inName,"parse") ) { outValue = parse_dyn(); return true; }
-		break;
-	case 7:
-		if (HX_FIELD_EQ(inName,"escapes") ) { outValue = ( escapes ); return true; }
-		if (HX_FIELD_EQ(inName,"doParse") ) { outValue = doParse_dyn(); return true; }
-	}
-	return false;
-}
-
-bool Parser_obj::__SetStatic(const ::String &inName,Dynamic &ioValue,::hx::PropertyAccess inCallProp)
-{
-	switch(inName.length) {
-	case 7:
-		if (HX_FIELD_EQ(inName,"escapes") ) { escapes=ioValue.Cast<  ::haxe::ds::StringMap >(); return true; }
-	}
-	return false;
-}
-
-#ifdef HXCPP_SCRIPTABLE
-static ::hx::StorageInfo *Parser_obj_sMemberStorageInfo = 0;
-static ::hx::StaticInfo Parser_obj_sStaticStorageInfo[] = {
-	{::hx::fsObject /*  ::haxe::ds::StringMap */ ,(void *) &Parser_obj::escapes,HX_("escapes",d2,cd,20,a4)},
-	{ ::hx::fsUnknown, 0, null()}
-};
-#endif
-
-static void Parser_obj_sMarkStatics(HX_MARK_PARAMS) {
-	HX_MARK_MEMBER_NAME(Parser_obj::escapes,"escapes");
-};
-
-#ifdef HXCPP_VISIT_ALLOCS
-static void Parser_obj_sVisitStatics(HX_VISIT_PARAMS) {
-	HX_VISIT_MEMBER_NAME(Parser_obj::escapes,"escapes");
-};
-
-#endif
-
-::hx::Class Parser_obj::__mClass;
-
-static ::String Parser_obj_sStaticFields[] = {
-	HX_("escapes",d2,cd,20,a4),
-	HX_("parse",33,90,55,bd),
-	HX_("doParse",a8,70,82,f0),
-	::String(null())
-};
-
-void Parser_obj::__register()
-{
-	Parser_obj _hx_dummy;
-	Parser_obj::_hx_vtable = *(void **)&_hx_dummy;
-	::hx::Static(__mClass) = new ::hx::Class_obj();
-	__mClass->mName = HX_("haxe.xml.Parser",fe,49,90,c4);
-	__mClass->mSuper = &super::__SGetClass();
-	__mClass->mConstructEmpty = &__CreateEmpty;
-	__mClass->mConstructArgs = &__Create;
-	__mClass->mGetStaticField = &Parser_obj::__GetStatic;
-	__mClass->mSetStaticField = &Parser_obj::__SetStatic;
-	__mClass->mMarkFunc = Parser_obj_sMarkStatics;
-	__mClass->mStatics = ::hx::Class_obj::dupFunctions(Parser_obj_sStaticFields);
-	__mClass->mMembers = ::hx::Class_obj::dupFunctions(0 /* sMemberFields */);
-	__mClass->mCanCast = ::hx::TCanCast< Parser_obj >;
-#ifdef HXCPP_VISIT_ALLOCS
-	__mClass->mVisitFunc = Parser_obj_sVisitStatics;
-#endif
-#ifdef HXCPP_SCRIPTABLE
-	__mClass->mMemberStorageInfo = Parser_obj_sMemberStorageInfo;
-#endif
-#ifdef HXCPP_SCRIPTABLE
-	__mClass->mStaticStorageInfo = Parser_obj_sStaticStorageInfo;
-#endif
-	::hx::_hx_RegisterClass(__mClass->mName, __mClass);
-}
-
-void Parser_obj::__boot()
-{
-{
-            		HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_0) HXARGC(0)
-            		 ::haxe::ds::StringMap _hx_run(){
-            			HX_GC_STACKFRAME(&_hx_pos_4387901c245e1a2b_100_boot)
-HXLINE( 101)			 ::haxe::ds::StringMap h =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
-HXLINE( 102)			h->set(HX_("lt",88,5e,00,00),HX_("<",3c,00,00,00));
-HXLINE( 103)			h->set(HX_("gt",2d,5a,00,00),HX_(">",3e,00,00,00));
-HXLINE( 104)			h->set(HX_("amp",04,fa,49,00),HX_("&",26,00,00,00));
-HXLINE( 105)			h->set(HX_("quot",09,45,0a,4b),HX_("\"",22,00,00,00));
-HXLINE( 106)			h->set(HX_("apos",d3,0f,73,40),HX_("'",27,00,00,00));
-HXLINE( 107)			return h;
-            		}
-            		HX_END_LOCAL_FUNC0(return)
-
-            	HX_STACKFRAME(&_hx_pos_4387901c245e1a2b_100_boot)
-HXDLIN( 100)		escapes = ( ( ::haxe::ds::StringMap)( ::Dynamic(new _hx_Closure_0())()) );
-            	}
-}
-
-} // end namespace haxe
-} // end namespace xml
diff --git a/Sources/c_snikket/src/hx/StdLibs.cpp b/Sources/c_snikket/src/hx/StdLibs.cpp
index f4c4890..9972d5f 100644
--- a/Sources/c_snikket/src/hx/StdLibs.cpp
+++ b/Sources/c_snikket/src/hx/StdLibs.cpp
@@ -46,7 +46,9 @@ typedef int64_t __int64;
 #elif defined(WEBOS)
 #define PRINTF(fmt, ...) syslog(LOG_INFO, "trace", fmt, __VA_ARGS__);
 #else
-#define PRINTF printf
+#include "os/log.h"
+os_log_t customLog = os_log_create("com.cheogram.app", "borogove");
+#define PRINTF(fmt, ...) os_log(customLog, fmt, __VA_ARGS__)
 #endif
 
 void __hx_stack_set_last_exception();
diff --git a/Sources/c_snikket/src/snikket/Autolink.cpp b/Sources/c_snikket/src/snikket/Autolink.cpp
index 9546015..772db6a 100644
--- a/Sources/c_snikket/src/snikket/Autolink.cpp
+++ b/Sources/c_snikket/src/snikket/Autolink.cpp
@@ -23,7 +23,7 @@
 HX_LOCAL_STACK_FRAME(_hx_pos_e03e81a8315e14a8_348_one,"snikket.Autolink","one",0x4e62ad12,"snikket.Autolink.one","snikket/Autolink.hx",348,0x041baf83)
 HX_LOCAL_STACK_FRAME(_hx_pos_e03e81a8315e14a8_349_one,"snikket.Autolink","one",0x4e62ad12,"snikket.Autolink.one","snikket/Autolink.hx",349,0x041baf83)
 HX_LOCAL_STACK_FRAME(_hx_pos_e03e81a8315e14a8_341_one,"snikket.Autolink","one",0x4e62ad12,"snikket.Autolink.one","snikket/Autolink.hx",341,0x041baf83)
-HX_LOCAL_STACK_FRAME(_hx_pos_e03e81a8315e14a8_352_match,"snikket.Autolink","match",0x7edc5ef1,"snikket.Autolink.match","snikket/Autolink.hx",352,0x041baf83)
+HX_LOCAL_STACK_FRAME(_hx_pos_e03e81a8315e14a8_355_match,"snikket.Autolink","match",0x7edc5ef1,"snikket.Autolink.match","snikket/Autolink.hx",355,0x041baf83)
 HX_LOCAL_STACK_FRAME(_hx_pos_e03e81a8315e14a8_28_boot,"snikket.Autolink","boot",0x3f5dc806,"snikket.Autolink.boot","snikket/Autolink.hx",28,0x041baf83)
 HX_LOCAL_STACK_FRAME(_hx_pos_e03e81a8315e14a8_40_boot,"snikket.Autolink","boot",0x3f5dc806,"snikket.Autolink.boot","snikket/Autolink.hx",40,0x041baf83)
 HX_LOCAL_STACK_FRAME(_hx_pos_e03e81a8315e14a8_162_boot,"snikket.Autolink","boot",0x3f5dc806,"snikket.Autolink.boot","snikket/Autolink.hx",162,0x041baf83)
@@ -108,13 +108,13 @@ bool Autolink_obj::_hx_isInstanceOf(int inClassId) {
 
 ::String Autolink_obj::WEB_URL_WITH_PROTOCOL;
 
-::String Autolink_obj::AUTOLINK_WEB_URL;
+ ::EReg Autolink_obj::AUTOLINK_WEB_URL;
 
-::String Autolink_obj::TEL_URI;
+ ::EReg Autolink_obj::TEL_URI;
 
-::String Autolink_obj::SMS_URI;
+ ::EReg Autolink_obj::SMS_URI;
 
-::String Autolink_obj::XMPP_URI;
+ ::EReg Autolink_obj::XMPP_URI;
 
  ::Dynamic Autolink_obj::one(::String s,int start){
             		HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_0) HXARGC(2)
@@ -150,12 +150,11 @@ HXDLIN( 349)		return null();
 
 STATIC_HX_DEFINE_DYNAMIC_FUNC2(Autolink_obj,one,return )
 
- ::Dynamic Autolink_obj::match(::String s,int start,::String pattern,bool addHttps){
-            	HX_GC_STACKFRAME(&_hx_pos_e03e81a8315e14a8_352_match)
-HXLINE( 354)		 ::EReg pattern1 =  ::EReg_obj::__alloc( HX_CTX ,pattern,HX_("u",75,00,00,00));
-HXLINE( 355)		if (pattern1->matchSub(s,start,null())) {
-HXLINE( 356)			 ::Dynamic pos = pattern1->matchedPos();
-HXLINE( 357)			::String link = pattern1->matched(0);
+ ::Dynamic Autolink_obj::match(::String s,int start, ::EReg pattern,bool addHttps){
+            	HX_GC_STACKFRAME(&_hx_pos_e03e81a8315e14a8_355_match)
+HXDLIN( 355)		if (pattern->matchSub(s,start,null())) {
+HXLINE( 356)			 ::Dynamic pos = pattern->matchedPos();
+HXLINE( 357)			::String link = pattern->matched(0);
 HXLINE( 358)			::String uri;
 HXDLIN( 358)			bool uri1;
 HXDLIN( 358)			if (addHttps) {
@@ -262,13 +261,13 @@ bool Autolink_obj::__SetStatic(const ::String &inName,Dynamic &ioValue,::hx::Pro
 {
 	switch(inName.length) {
 	case 7:
-		if (HX_FIELD_EQ(inName,"TEL_URI") ) { TEL_URI=ioValue.Cast< ::String >(); return true; }
-		if (HX_FIELD_EQ(inName,"SMS_URI") ) { SMS_URI=ioValue.Cast< ::String >(); return true; }
+		if (HX_FIELD_EQ(inName,"TEL_URI") ) { TEL_URI=ioValue.Cast<  ::EReg >(); return true; }
+		if (HX_FIELD_EQ(inName,"SMS_URI") ) { SMS_URI=ioValue.Cast<  ::EReg >(); return true; }
 		break;
 	case 8:
 		if (HX_FIELD_EQ(inName,"UCS_CHAR") ) { UCS_CHAR=ioValue.Cast< ::String >(); return true; }
 		if (HX_FIELD_EQ(inName,"PROTOCOL") ) { PROTOCOL=ioValue.Cast< ::String >(); return true; }
-		if (HX_FIELD_EQ(inName,"XMPP_URI") ) { XMPP_URI=ioValue.Cast< ::String >(); return true; }
+		if (HX_FIELD_EQ(inName,"XMPP_URI") ) { XMPP_URI=ioValue.Cast<  ::EReg >(); return true; }
 		break;
 	case 9:
 		if (HX_FIELD_EQ(inName,"IRI_LABEL") ) { IRI_LABEL=ioValue.Cast< ::String >(); return true; }
@@ -296,7 +295,7 @@ bool Autolink_obj::__SetStatic(const ::String &inName,Dynamic &ioValue,::hx::Pro
 		break;
 	case 16:
 		if (HX_FIELD_EQ(inName,"STRICT_HOST_NAME") ) { STRICT_HOST_NAME=ioValue.Cast< ::String >(); return true; }
-		if (HX_FIELD_EQ(inName,"AUTOLINK_WEB_URL") ) { AUTOLINK_WEB_URL=ioValue.Cast< ::String >(); return true; }
+		if (HX_FIELD_EQ(inName,"AUTOLINK_WEB_URL") ) { AUTOLINK_WEB_URL=ioValue.Cast<  ::EReg >(); return true; }
 		break;
 	case 18:
 		if (HX_FIELD_EQ(inName,"STRICT_DOMAIN_NAME") ) { STRICT_DOMAIN_NAME=ioValue.Cast< ::String >(); return true; }
@@ -339,10 +338,10 @@ static ::hx::StaticInfo Autolink_obj_sStaticStorageInfo[] = {
 	{::hx::fsString,(void *) &Autolink_obj::RELAXED_DOMAIN_NAME,HX_("RELAXED_DOMAIN_NAME",b6,71,df,1f)},
 	{::hx::fsString,(void *) &Autolink_obj::WEB_URL_WITHOUT_PROTOCOL,HX_("WEB_URL_WITHOUT_PROTOCOL",aa,4d,e7,46)},
 	{::hx::fsString,(void *) &Autolink_obj::WEB_URL_WITH_PROTOCOL,HX_("WEB_URL_WITH_PROTOCOL",f6,04,a9,cf)},
-	{::hx::fsString,(void *) &Autolink_obj::AUTOLINK_WEB_URL,HX_("AUTOLINK_WEB_URL",2e,ec,59,4b)},
-	{::hx::fsString,(void *) &Autolink_obj::TEL_URI,HX_("TEL_URI",88,ff,2a,3d)},
-	{::hx::fsString,(void *) &Autolink_obj::SMS_URI,HX_("SMS_URI",46,7b,3e,4e)},
-	{::hx::fsString,(void *) &Autolink_obj::XMPP_URI,HX_("XMPP_URI",02,45,f3,76)},
+	{::hx::fsObject /*  ::EReg */ ,(void *) &Autolink_obj::AUTOLINK_WEB_URL,HX_("AUTOLINK_WEB_URL",2e,ec,59,4b)},
+	{::hx::fsObject /*  ::EReg */ ,(void *) &Autolink_obj::TEL_URI,HX_("TEL_URI",88,ff,2a,3d)},
+	{::hx::fsObject /*  ::EReg */ ,(void *) &Autolink_obj::SMS_URI,HX_("SMS_URI",46,7b,3e,4e)},
+	{::hx::fsObject /*  ::EReg */ ,(void *) &Autolink_obj::XMPP_URI,HX_("XMPP_URI",02,45,f3,76)},
 	{ ::hx::fsUnknown, 0, null()}
 };
 #endif
@@ -553,20 +552,20 @@ HXDLIN( 298)		WEB_URL_WITHOUT_PROTOCOL = ((((((((((((((HX_("(",28,00,00,00) + ::
 HXDLIN( 311)		WEB_URL_WITH_PROTOCOL = (((((((((((((((((((HX_("(",28,00,00,00) + ::snikket::Autolink_obj::WORD_BOUNDARY) + HX_("(?:",43,91,1e,00)) + HX_("(?:",43,91,1e,00)) + ::snikket::Autolink_obj::PROTOCOL) + HX_("(?:",43,91,1e,00)) + ::snikket::Autolink_obj::USER_INFO) + HX_(")?",f6,23,00,00)) + HX_(")",29,00,00,00)) + HX_("(?:",43,91,1e,00)) + ::snikket::Autolink_obj::RELAXED_DOMAIN_NAME) + HX_(")?",f6,23,00,00)) + HX_("(?:",43,91,1e,00)) + ::snikket::Autolink_obj::PORT_NUMBER) + HX_(")?",f6,23,00,00)) + HX_(")",29,00,00,00)) + HX_("(?:",43,91,1e,00)) + ::snikket::Autolink_obj::PATH_AND_QUERY) + HX_(")?",f6,23,00,00)) + HX_(")",29,00,00,00));
             	}
 {
-            	HX_STACKFRAME(&_hx_pos_e03e81a8315e14a8_328_boot)
-HXDLIN( 328)		AUTOLINK_WEB_URL = (((((HX_("(",28,00,00,00) + ::snikket::Autolink_obj::WEB_URL_WITH_PROTOCOL) + HX_("|",7c,00,00,00)) + ::snikket::Autolink_obj::WEB_URL_WITHOUT_PROTOCOL) + HX_(")",29,00,00,00)) + ::snikket::Autolink_obj::WORD_BOUNDARY);
+            	HX_GC_STACKFRAME(&_hx_pos_e03e81a8315e14a8_328_boot)
+HXDLIN( 328)		AUTOLINK_WEB_URL =  ::EReg_obj::__alloc( HX_CTX ,(((((HX_("(",28,00,00,00) + ::snikket::Autolink_obj::WEB_URL_WITH_PROTOCOL) + HX_("|",7c,00,00,00)) + ::snikket::Autolink_obj::WEB_URL_WITHOUT_PROTOCOL) + HX_(")",29,00,00,00)) + ::snikket::Autolink_obj::WORD_BOUNDARY),HX_("u",75,00,00,00));
             	}
 {
-            	HX_STACKFRAME(&_hx_pos_e03e81a8315e14a8_331_boot)
-HXDLIN( 331)		TEL_URI = ((HX_("tel:(?:(?:\\+\\d+)|(?:\\d+;phone-context=",00,31,ab,3d) + ::snikket::Autolink_obj::PATH_CHAR) + HX_("+))",cb,c4,20,00));
+            	HX_GC_STACKFRAME(&_hx_pos_e03e81a8315e14a8_331_boot)
+HXDLIN( 331)		TEL_URI =  ::EReg_obj::__alloc( HX_CTX ,((HX_("tel:(?:(?:\\+\\d+)|(?:\\d+;phone-context=",00,31,ab,3d) + ::snikket::Autolink_obj::PATH_CHAR) + HX_("+))",cb,c4,20,00)),HX_("u",75,00,00,00));
             	}
 {
-            	HX_STACKFRAME(&_hx_pos_e03e81a8315e14a8_334_boot)
-HXDLIN( 334)		SMS_URI = ((HX_("sms:(?:(?:\\+\\d+)|(?:\\d+;phone-context=",02,3f,54,78) + ::snikket::Autolink_obj::PATH_CHAR) + HX_("+))",cb,c4,20,00));
+            	HX_GC_STACKFRAME(&_hx_pos_e03e81a8315e14a8_334_boot)
+HXDLIN( 334)		SMS_URI =  ::EReg_obj::__alloc( HX_CTX ,((HX_("sms:(?:(?:\\+\\d+)|(?:\\d+;phone-context=",02,3f,54,78) + ::snikket::Autolink_obj::PATH_CHAR) + HX_("+))",cb,c4,20,00)),HX_("u",75,00,00,00));
             	}
 {
-            	HX_STACKFRAME(&_hx_pos_e03e81a8315e14a8_336_boot)
-HXDLIN( 336)		XMPP_URI = (((HX_("xmpp\\:(?:(?:[",08,ef,83,26) + ::snikket::Autolink_obj::GOOD_IRI_CHAR) + HX_("\\;\\/\\?\\@\\&\\=\\#\\~\\-\\.\\+\\!\\*\\'\\(\\)\\,\\_])",75,2a,04,95)) + HX_("|(?:\\%[a-fA-F0-9]{2}))+",d1,f8,1c,37));
+            	HX_GC_STACKFRAME(&_hx_pos_e03e81a8315e14a8_336_boot)
+HXDLIN( 336)		XMPP_URI =  ::EReg_obj::__alloc( HX_CTX ,(((HX_("xmpp\\:(?:(?:[",08,ef,83,26) + ::snikket::Autolink_obj::GOOD_IRI_CHAR) + HX_("\\;\\/\\?\\@\\&\\=\\#\\~\\-\\.\\+\\!\\*\\'\\(\\)\\,\\_])",75,2a,04,95)) + HX_("|(?:\\%[a-fA-F0-9]{2}))+",d1,f8,1c,37)),HX_("u",75,00,00,00));
             	}
 }
 
diff --git a/Sources/c_snikket/src/snikket/AvailableChat.cpp b/Sources/c_snikket/src/snikket/AvailableChat.cpp
index 1d4d240..516eae9 100644
--- a/Sources/c_snikket/src/snikket/AvailableChat.cpp
+++ b/Sources/c_snikket/src/snikket/AvailableChat.cpp
@@ -8,20 +8,20 @@
 #include <snikket/Caps.h>
 #endif
 
-HX_DEFINE_STACK_FRAME(_hx_pos_eb4b7fa35bcf9ef4_1544_new,"snikket.AvailableChat","new",0xe206b262,"snikket.AvailableChat.new","snikket/Chat.hx",1544,0x18616bf4)
+HX_DEFINE_STACK_FRAME(_hx_pos_eb4b7fa35bcf9ef4_1553_new,"snikket.AvailableChat","new",0xe206b262,"snikket.AvailableChat.new","snikket/Chat.hx",1553,0x18616bf4)
 HX_LOCAL_STACK_FRAME(_hx_pos_84f492ff0c9cb600_355_chatId__fromC,"snikket.AvailableChat","chatId__fromC",0xa5503488,"snikket.AvailableChat.chatId__fromC","HaxeCBridge.hx",355,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_84f492ff0c9cb600_355_displayName__fromC,"snikket.AvailableChat","displayName__fromC",0x0c214eaa,"snikket.AvailableChat.displayName__fromC","HaxeCBridge.hx",355,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_84f492ff0c9cb600_355_note__fromC,"snikket.AvailableChat","note__fromC",0xff5acec9,"snikket.AvailableChat.note__fromC","HaxeCBridge.hx",355,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_eb4b7fa35bcf9ef4_1540_isChannel,"snikket.AvailableChat","isChannel",0x4a03cd7b,"snikket.AvailableChat.isChannel","snikket/Chat.hx",1540,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_eb4b7fa35bcf9ef4_1520_boot,"snikket.AvailableChat","boot",0xdbee63f0,"snikket.AvailableChat.boot","snikket/Chat.hx",1520,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_eb4b7fa35bcf9ef4_1549_isChannel,"snikket.AvailableChat","isChannel",0x4a03cd7b,"snikket.AvailableChat.isChannel","snikket/Chat.hx",1549,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_eb4b7fa35bcf9ef4_1529_boot,"snikket.AvailableChat","boot",0xdbee63f0,"snikket.AvailableChat.boot","snikket/Chat.hx",1529,0x18616bf4)
 namespace snikket{
 
 void AvailableChat_obj::__construct(::String chatId,::String displayName,::String note, ::snikket::Caps caps){
-            	HX_STACKFRAME(&_hx_pos_eb4b7fa35bcf9ef4_1544_new)
-HXLINE(1545)		this->chatId = chatId;
-HXLINE(1546)		this->displayName = displayName;
-HXLINE(1547)		this->note = note;
-HXLINE(1548)		this->caps = caps;
+            	HX_STACKFRAME(&_hx_pos_eb4b7fa35bcf9ef4_1553_new)
+HXLINE(1554)		this->chatId = chatId;
+HXLINE(1555)		this->displayName = displayName;
+HXLINE(1556)		this->note = note;
+HXLINE(1557)		this->caps = caps;
             	}
 
 Dynamic AvailableChat_obj::__CreateEmpty() { return new AvailableChat_obj; }
@@ -64,8 +64,8 @@ HXDLIN( 355)		return this->note;
 HX_DEFINE_DYNAMIC_FUNC0(AvailableChat_obj,note__fromC,return )
 
 bool AvailableChat_obj::isChannel(){
-            	HX_STACKFRAME(&_hx_pos_eb4b7fa35bcf9ef4_1540_isChannel)
-HXDLIN(1540)		return this->caps->isChannel(this->chatId);
+            	HX_STACKFRAME(&_hx_pos_eb4b7fa35bcf9ef4_1549_isChannel)
+HXDLIN(1549)		return this->caps->isChannel(this->chatId);
             	}
 
 
@@ -208,8 +208,8 @@ void AvailableChat_obj::__register()
 void AvailableChat_obj::__boot()
 {
 {
-            	HX_STACKFRAME(&_hx_pos_eb4b7fa35bcf9ef4_1520_boot)
-HXDLIN(1520)		__mClass->__meta__ =  ::Dynamic(::hx::Anon_obj::Create(1)
+            	HX_STACKFRAME(&_hx_pos_eb4b7fa35bcf9ef4_1529_boot)
+HXDLIN(1529)		__mClass->__meta__ =  ::Dynamic(::hx::Anon_obj::Create(1)
             			->setFixed(0,HX_("fields",79,8e,8e,80), ::Dynamic(::hx::Anon_obj::Create(3)
             				->setFixed(0,HX_("chatId__fromC",06,fc,b1,94), ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("HaxeCBridge.wrapper",8b,ea,27,d4),null())))
diff --git a/Sources/c_snikket/src/snikket/Caps.cpp b/Sources/c_snikket/src/snikket/Caps.cpp
index e058fc4..abb29ae 100644
--- a/Sources/c_snikket/src/snikket/Caps.cpp
+++ b/Sources/c_snikket/src/snikket/Caps.cpp
@@ -26,26 +26,29 @@
 #include <snikket/_Stanza/NodeInterface.h>
 #endif
 
-HX_DEFINE_STACK_FRAME(_hx_pos_a541ea7d0210a2a3_10_new,"snikket.Caps","new",0xb2cdb3c4,"snikket.Caps.new","snikket/Caps.hx",10,0xee3b624b)
-HX_LOCAL_STACK_FRAME(_hx_pos_a541ea7d0210a2a3_53_isChannel,"snikket.Caps","isChannel",0xeab9045d,"snikket.Caps.isChannel","snikket/Caps.hx",53,0xee3b624b)
-HX_LOCAL_STACK_FRAME(_hx_pos_a541ea7d0210a2a3_55_isChannel,"snikket.Caps","isChannel",0xeab9045d,"snikket.Caps.isChannel","snikket/Caps.hx",55,0xee3b624b)
-HX_LOCAL_STACK_FRAME(_hx_pos_a541ea7d0210a2a3_58_discoReply,"snikket.Caps","discoReply",0xd5aeac6c,"snikket.Caps.discoReply","snikket/Caps.hx",58,0xee3b624b)
-HX_LOCAL_STACK_FRAME(_hx_pos_a541ea7d0210a2a3_69_addC,"snikket.Caps","addC",0xb896ff1e,"snikket.Caps.addC","snikket/Caps.hx",69,0xee3b624b)
-HX_LOCAL_STACK_FRAME(_hx_pos_a541ea7d0210a2a3_80_computeVer,"snikket.Caps","computeVer",0xc6252848,"snikket.Caps.computeVer","snikket/Caps.hx",80,0xee3b624b)
-HX_LOCAL_STACK_FRAME(_hx_pos_a541ea7d0210a2a3_81_computeVer,"snikket.Caps","computeVer",0xc6252848,"snikket.Caps.computeVer","snikket/Caps.hx",81,0xee3b624b)
-HX_LOCAL_STACK_FRAME(_hx_pos_a541ea7d0210a2a3_79_computeVer,"snikket.Caps","computeVer",0xc6252848,"snikket.Caps.computeVer","snikket/Caps.hx",79,0xee3b624b)
-HX_LOCAL_STACK_FRAME(_hx_pos_a541ea7d0210a2a3_92_verRaw,"snikket.Caps","verRaw",0x4ddd5e61,"snikket.Caps.verRaw","snikket/Caps.hx",92,0xee3b624b)
-HX_LOCAL_STACK_FRAME(_hx_pos_a541ea7d0210a2a3_98_ver,"snikket.Caps","ver",0xb2d3c5c7,"snikket.Caps.ver","snikket/Caps.hx",98,0xee3b624b)
-HX_LOCAL_STACK_FRAME(_hx_pos_a541ea7d0210a2a3_18_withIdentity,"snikket.Caps","withIdentity",0xadb07d80,"snikket.Caps.withIdentity","snikket/Caps.hx",18,0xee3b624b)
-HX_LOCAL_STACK_FRAME(_hx_pos_a541ea7d0210a2a3_33_withFeature,"snikket.Caps","withFeature",0x4980f8b4,"snikket.Caps.withFeature","snikket/Caps.hx",33,0xee3b624b)
+HX_DEFINE_STACK_FRAME(_hx_pos_a541ea7d0210a2a3_11_new,"snikket.Caps","new",0xb2cdb3c4,"snikket.Caps.new","snikket/Caps.hx",11,0xee3b624b)
+HX_LOCAL_STACK_FRAME(_hx_pos_a541ea7d0210a2a3_57_isChannel,"snikket.Caps","isChannel",0xeab9045d,"snikket.Caps.isChannel","snikket/Caps.hx",57,0xee3b624b)
+HX_LOCAL_STACK_FRAME(_hx_pos_a541ea7d0210a2a3_59_isChannel,"snikket.Caps","isChannel",0xeab9045d,"snikket.Caps.isChannel","snikket/Caps.hx",59,0xee3b624b)
+HX_LOCAL_STACK_FRAME(_hx_pos_a541ea7d0210a2a3_62_discoReply,"snikket.Caps","discoReply",0xd5aeac6c,"snikket.Caps.discoReply","snikket/Caps.hx",62,0xee3b624b)
+HX_LOCAL_STACK_FRAME(_hx_pos_a541ea7d0210a2a3_73_addC,"snikket.Caps","addC",0xb896ff1e,"snikket.Caps.addC","snikket/Caps.hx",73,0xee3b624b)
+HX_LOCAL_STACK_FRAME(_hx_pos_a541ea7d0210a2a3_84_computeVer,"snikket.Caps","computeVer",0xc6252848,"snikket.Caps.computeVer","snikket/Caps.hx",84,0xee3b624b)
+HX_LOCAL_STACK_FRAME(_hx_pos_a541ea7d0210a2a3_85_computeVer,"snikket.Caps","computeVer",0xc6252848,"snikket.Caps.computeVer","snikket/Caps.hx",85,0xee3b624b)
+HX_LOCAL_STACK_FRAME(_hx_pos_a541ea7d0210a2a3_83_computeVer,"snikket.Caps","computeVer",0xc6252848,"snikket.Caps.computeVer","snikket/Caps.hx",83,0xee3b624b)
+HX_LOCAL_STACK_FRAME(_hx_pos_a541ea7d0210a2a3_96_verRaw,"snikket.Caps","verRaw",0x4ddd5e61,"snikket.Caps.verRaw","snikket/Caps.hx",96,0xee3b624b)
+HX_LOCAL_STACK_FRAME(_hx_pos_a541ea7d0210a2a3_102_ver,"snikket.Caps","ver",0xb2d3c5c7,"snikket.Caps.ver","snikket/Caps.hx",102,0xee3b624b)
+HX_LOCAL_STACK_FRAME(_hx_pos_a541ea7d0210a2a3_19_withIdentity,"snikket.Caps","withIdentity",0xadb07d80,"snikket.Caps.withIdentity","snikket/Caps.hx",19,0xee3b624b)
+HX_LOCAL_STACK_FRAME(_hx_pos_a541ea7d0210a2a3_34_withFeature,"snikket.Caps","withFeature",0x4980f8b4,"snikket.Caps.withFeature","snikket/Caps.hx",34,0xee3b624b)
 namespace snikket{
 
-void Caps_obj::__construct(::String node,::Array< ::Dynamic> identities,::Array< ::String > features){
-            	HX_STACKFRAME(&_hx_pos_a541ea7d0210a2a3_10_new)
-HXLINE(  14)		this->_ver = null();
-HXLINE(  48)		this->node = node;
-HXLINE(  49)		this->identities = identities;
-HXLINE(  50)		this->features = features;
+void Caps_obj::__construct(::String node,::Array< ::Dynamic> identities,::Array< ::String > features,::Array< unsigned char > ver){
+            	HX_GC_STACKFRAME(&_hx_pos_a541ea7d0210a2a3_11_new)
+HXLINE(  15)		this->_ver = null();
+HXLINE(  49)		this->node = node;
+HXLINE(  50)		this->identities = identities;
+HXLINE(  51)		this->features = features;
+HXLINE(  52)		if (::hx::IsNotNull( ver )) {
+HXLINE(  53)			this->_ver =  ::snikket::Hash_obj::__alloc( HX_CTX ,HX_("sha-1",90,a8,1c,7c),ver);
+            		}
             	}
 
 Dynamic Caps_obj::__CreateEmpty() { return new Caps_obj; }
@@ -55,7 +58,7 @@ void *Caps_obj::_hx_vtable = 0;
 Dynamic Caps_obj::__Create(::hx::DynamicArray inArgs)
 {
 	::hx::ObjectPtr< Caps_obj > _hx_result = new Caps_obj();
-	_hx_result->__construct(inArgs[0],inArgs[1],inArgs[2]);
+	_hx_result->__construct(inArgs[0],inArgs[1],inArgs[2],inArgs[3]);
 	return _hx_result;
 }
 
@@ -64,67 +67,67 @@ bool Caps_obj::_hx_isInstanceOf(int inClassId) {
 }
 
 bool Caps_obj::isChannel(::String chatId){
-            	HX_STACKFRAME(&_hx_pos_a541ea7d0210a2a3_53_isChannel)
-HXLINE(  54)		if ((chatId.indexOf(HX_("@",40,00,00,00),null()) < 0)) {
-HXLINE(  54)			return false;
+            	HX_STACKFRAME(&_hx_pos_a541ea7d0210a2a3_57_isChannel)
+HXLINE(  58)		if ((chatId.indexOf(HX_("@",40,00,00,00),null()) < 0)) {
+HXLINE(  58)			return false;
             		}
-HXLINE(  55)		if (this->features->contains(HX_("http://jabber.org/protocol/muc",07,b2,7f,c6))) {
+HXLINE(  59)		if (this->features->contains(HX_("http://jabber.org/protocol/muc",07,b2,7f,c6))) {
             			HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_0) HXARGC(1)
             			bool _hx_run( ::snikket::Identity identity){
-            				HX_STACKFRAME(&_hx_pos_a541ea7d0210a2a3_55_isChannel)
-HXLINE(  55)				return (identity->category == HX_("conference",1c,2b,83,41));
+            				HX_STACKFRAME(&_hx_pos_a541ea7d0210a2a3_59_isChannel)
+HXLINE(  59)				return (identity->category == HX_("conference",1c,2b,83,41));
             			}
             			HX_END_LOCAL_FUNC1(return)
 
-HXLINE(  55)			return ::hx::IsNotNull( ::Lambda_obj::find(this->identities, ::Dynamic(new _hx_Closure_0())) );
+HXLINE(  59)			return ::hx::IsNotNull( ::Lambda_obj::find(this->identities, ::Dynamic(new _hx_Closure_0())) );
             		}
             		else {
-HXLINE(  55)			return false;
+HXLINE(  59)			return false;
             		}
-HXDLIN(  55)		return false;
+HXDLIN(  59)		return false;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Caps_obj,isChannel,return )
 
  ::snikket::Stanza Caps_obj::discoReply(){
-            	HX_GC_STACKFRAME(&_hx_pos_a541ea7d0210a2a3_58_discoReply)
-HXLINE(  59)		 ::snikket::Stanza query =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("query",08,8b,ea,5d), ::Dynamic(::hx::Anon_obj::Create(1)
+            	HX_GC_STACKFRAME(&_hx_pos_a541ea7d0210a2a3_62_discoReply)
+HXLINE(  63)		 ::snikket::Stanza query =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("query",08,8b,ea,5d), ::Dynamic(::hx::Anon_obj::Create(1)
             			->setFixed(0,HX_("xmlns",dc,31,74,60),HX_("http://jabber.org/protocol/disco#info",cb,2b,7f,0b))));
-HXLINE(  60)		{
-HXLINE(  60)			int _g = 0;
-HXDLIN(  60)			::Array< ::Dynamic> _g1 = this->identities;
-HXDLIN(  60)			while((_g < _g1->length)){
-HXLINE(  60)				 ::snikket::Identity identity = _g1->__get(_g).StaticCast<  ::snikket::Identity >();
-HXDLIN(  60)				_g = (_g + 1);
-HXLINE(  61)				identity->addToDisco(query);
+HXLINE(  64)		{
+HXLINE(  64)			int _g = 0;
+HXDLIN(  64)			::Array< ::Dynamic> _g1 = this->identities;
+HXDLIN(  64)			while((_g < _g1->length)){
+HXLINE(  64)				 ::snikket::Identity identity = _g1->__get(_g).StaticCast<  ::snikket::Identity >();
+HXDLIN(  64)				_g = (_g + 1);
+HXLINE(  65)				identity->addToDisco(query);
             			}
             		}
-HXLINE(  63)		{
-HXLINE(  63)			int _g2 = 0;
-HXDLIN(  63)			::Array< ::String > _g3 = this->features;
-HXDLIN(  63)			while((_g2 < _g3->length)){
-HXLINE(  63)				::String feature = _g3->__get(_g2);
-HXDLIN(  63)				_g2 = (_g2 + 1);
-HXLINE(  64)				query->tag(HX_("feature",b6,f2,7c,1a), ::Dynamic(::hx::Anon_obj::Create(1)
+HXLINE(  67)		{
+HXLINE(  67)			int _g2 = 0;
+HXDLIN(  67)			::Array< ::String > _g3 = this->features;
+HXDLIN(  67)			while((_g2 < _g3->length)){
+HXLINE(  67)				::String feature = _g3->__get(_g2);
+HXDLIN(  67)				_g2 = (_g2 + 1);
+HXLINE(  68)				query->tag(HX_("feature",b6,f2,7c,1a), ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("var",e7,de,59,00),feature)))->up();
             			}
             		}
-HXLINE(  66)		return query;
+HXLINE(  70)		return query;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Caps_obj,discoReply,return )
 
  ::snikket::Stanza Caps_obj::addC( ::snikket::Stanza stanza){
-            	HX_STACKFRAME(&_hx_pos_a541ea7d0210a2a3_69_addC)
-HXLINE(  73)		::String _hx_tmp = this->node;
-HXLINE(  70)		stanza->tag(HX_("c",63,00,00,00), ::Dynamic(::hx::Anon_obj::Create(4)
+            	HX_STACKFRAME(&_hx_pos_a541ea7d0210a2a3_73_addC)
+HXLINE(  77)		::String _hx_tmp = this->node;
+HXLINE(  74)		stanza->tag(HX_("c",63,00,00,00), ::Dynamic(::hx::Anon_obj::Create(4)
             			->setFixed(0,HX_("ver",63,e2,59,00),this->ver())
             			->setFixed(1,HX_("hash",ce,2f,08,45),HX_("sha-1",90,a8,1c,7c))
             			->setFixed(2,HX_("node",02,0a,0a,49),_hx_tmp)
             			->setFixed(3,HX_("xmlns",dc,31,74,60),HX_("http://jabber.org/protocol/caps",95,d0,90,e2))))->up();
-HXLINE(  76)		return stanza;
+HXLINE(  80)		return stanza;
             	}
 
 
@@ -133,171 +136,171 @@ HX_DEFINE_DYNAMIC_FUNC1(Caps_obj,addC,return )
  ::snikket::Hash Caps_obj::computeVer(){
             		HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_0) HXARGC(2)
             		int _hx_run(::String x,::String y){
-            			HX_STACKFRAME(&_hx_pos_a541ea7d0210a2a3_80_computeVer)
-HXLINE(  80)			if ((x == y)) {
-HXLINE(  80)				return 0;
+            			HX_STACKFRAME(&_hx_pos_a541ea7d0210a2a3_84_computeVer)
+HXLINE(  84)			if ((x == y)) {
+HXLINE(  84)				return 0;
             			}
             			else {
-HXLINE(  80)				if ((x < y)) {
-HXLINE(  80)					return -1;
+HXLINE(  84)				if ((x < y)) {
+HXLINE(  84)					return -1;
             				}
             				else {
-HXLINE(  80)					return 1;
+HXLINE(  84)					return 1;
             				}
             			}
-HXDLIN(  80)			return 0;
+HXDLIN(  84)			return 0;
             		}
             		HX_END_LOCAL_FUNC2(return)
 
             		HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_1) HXARGC(2)
             		int _hx_run( ::snikket::Identity x, ::snikket::Identity y){
-            			HX_STACKFRAME(&_hx_pos_a541ea7d0210a2a3_81_computeVer)
-HXLINE(  81)			::String _hx_tmp = x->ver();
-HXDLIN(  81)			if ((_hx_tmp == y->ver())) {
-HXLINE(  81)				return 0;
+            			HX_STACKFRAME(&_hx_pos_a541ea7d0210a2a3_85_computeVer)
+HXLINE(  85)			::String _hx_tmp = x->ver();
+HXDLIN(  85)			if ((_hx_tmp == y->ver())) {
+HXLINE(  85)				return 0;
             			}
             			else {
-HXLINE(  81)				::String _hx_tmp1 = x->ver();
-HXDLIN(  81)				if ((_hx_tmp1 < y->ver())) {
-HXLINE(  81)					return -1;
+HXLINE(  85)				::String _hx_tmp1 = x->ver();
+HXDLIN(  85)				if ((_hx_tmp1 < y->ver())) {
+HXLINE(  85)					return -1;
             				}
             				else {
-HXLINE(  81)					return 1;
+HXLINE(  85)					return 1;
             				}
             			}
-HXDLIN(  81)			return 0;
+HXDLIN(  85)			return 0;
             		}
             		HX_END_LOCAL_FUNC2(return)
 
-            	HX_STACKFRAME(&_hx_pos_a541ea7d0210a2a3_79_computeVer)
-HXLINE(  80)		this->features->sort( ::Dynamic(new _hx_Closure_0()));
-HXLINE(  81)		this->identities->sort( ::Dynamic(new _hx_Closure_1()));
-HXLINE(  82)		::String s = HX_("",00,00,00,00);
-HXLINE(  83)		{
-HXLINE(  83)			int _g = 0;
-HXDLIN(  83)			::Array< ::Dynamic> _g1 = this->identities;
-HXDLIN(  83)			while((_g < _g1->length)){
-HXLINE(  83)				 ::snikket::Identity identity = _g1->__get(_g).StaticCast<  ::snikket::Identity >();
-HXDLIN(  83)				_g = (_g + 1);
-HXLINE(  84)				s = (s + (identity->ver() + HX_("<",3c,00,00,00)));
+            	HX_STACKFRAME(&_hx_pos_a541ea7d0210a2a3_83_computeVer)
+HXLINE(  84)		this->features->sort( ::Dynamic(new _hx_Closure_0()));
+HXLINE(  85)		this->identities->sort( ::Dynamic(new _hx_Closure_1()));
+HXLINE(  86)		::String s = HX_("",00,00,00,00);
+HXLINE(  87)		{
+HXLINE(  87)			int _g = 0;
+HXDLIN(  87)			::Array< ::Dynamic> _g1 = this->identities;
+HXDLIN(  87)			while((_g < _g1->length)){
+HXLINE(  87)				 ::snikket::Identity identity = _g1->__get(_g).StaticCast<  ::snikket::Identity >();
+HXDLIN(  87)				_g = (_g + 1);
+HXLINE(  88)				s = (s + (identity->ver() + HX_("<",3c,00,00,00)));
             			}
             		}
-HXLINE(  86)		{
-HXLINE(  86)			int _g2 = 0;
-HXDLIN(  86)			::Array< ::String > _g3 = this->features;
-HXDLIN(  86)			while((_g2 < _g3->length)){
-HXLINE(  86)				::String feature = _g3->__get(_g2);
-HXDLIN(  86)				_g2 = (_g2 + 1);
-HXLINE(  87)				s = (s + (feature + HX_("<",3c,00,00,00)));
+HXLINE(  90)		{
+HXLINE(  90)			int _g2 = 0;
+HXDLIN(  90)			::Array< ::String > _g3 = this->features;
+HXDLIN(  90)			while((_g2 < _g3->length)){
+HXLINE(  90)				::String feature = _g3->__get(_g2);
+HXDLIN(  90)				_g2 = (_g2 + 1);
+HXLINE(  91)				s = (s + (feature + HX_("<",3c,00,00,00)));
             			}
             		}
-HXLINE(  89)		return ::snikket::Hash_obj::sha1(::haxe::io::Bytes_obj::ofString(s,null()));
+HXLINE(  93)		return ::snikket::Hash_obj::sha1(::haxe::io::Bytes_obj::ofString(s,null()));
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Caps_obj,computeVer,return )
 
  ::snikket::Hash Caps_obj::verRaw(){
-            	HX_STACKFRAME(&_hx_pos_a541ea7d0210a2a3_92_verRaw)
-HXLINE(  93)		if (::hx::IsNull( this->_ver )) {
-HXLINE(  93)			this->_ver = this->computeVer();
+            	HX_STACKFRAME(&_hx_pos_a541ea7d0210a2a3_96_verRaw)
+HXLINE(  97)		if (::hx::IsNull( this->_ver )) {
+HXLINE(  97)			this->_ver = this->computeVer();
             		}
-HXLINE(  94)		return this->_ver;
+HXLINE(  98)		return this->_ver;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Caps_obj,verRaw,return )
 
 ::String Caps_obj::ver(){
-            	HX_STACKFRAME(&_hx_pos_a541ea7d0210a2a3_98_ver)
-HXDLIN(  98)		return this->verRaw()->toBase64();
+            	HX_STACKFRAME(&_hx_pos_a541ea7d0210a2a3_102_ver)
+HXDLIN( 102)		return this->verRaw()->toBase64();
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Caps_obj,ver,return )
 
 ::Array< ::String > Caps_obj::withIdentity( ::Dynamic caps,::String category,::String type){
-            	HX_STACKFRAME(&_hx_pos_a541ea7d0210a2a3_18_withIdentity)
-HXLINE(  19)		::Array< ::String > result = ::Array_obj< ::String >::__new(0);
-HXLINE(  20)		{
-HXLINE(  20)			 ::Dynamic cap = caps;
-HXDLIN(  20)			while(( (bool)(cap->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE(  20)				 ::Dynamic cap1 = cap->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
-HXLINE(  21)				if (::hx::IsNotNull( cap1->__Field(HX_("value",71,7f,b8,31),::hx::paccDynamic) )) {
-HXLINE(  22)					int _g = 0;
-HXDLIN(  22)					::Array< ::Dynamic> _g1 = ( ( ::snikket::Caps)(cap1->__Field(HX_("value",71,7f,b8,31),::hx::paccDynamic)) )->identities;
-HXDLIN(  22)					while((_g < _g1->length)){
-HXLINE(  22)						 ::snikket::Identity identity = _g1->__get(_g).StaticCast<  ::snikket::Identity >();
-HXDLIN(  22)						_g = (_g + 1);
-HXLINE(  23)						bool _hx_tmp;
-HXDLIN(  23)						bool _hx_tmp1;
-HXDLIN(  23)						if (::hx::IsNotNull( category )) {
-HXLINE(  23)							_hx_tmp1 = (category == identity->category);
+            	HX_STACKFRAME(&_hx_pos_a541ea7d0210a2a3_19_withIdentity)
+HXLINE(  20)		::Array< ::String > result = ::Array_obj< ::String >::__new(0);
+HXLINE(  21)		{
+HXLINE(  21)			 ::Dynamic cap = caps;
+HXDLIN(  21)			while(( (bool)(cap->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE(  21)				 ::Dynamic cap1 = cap->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
+HXLINE(  22)				if (::hx::IsNotNull( cap1->__Field(HX_("value",71,7f,b8,31),::hx::paccDynamic) )) {
+HXLINE(  23)					int _g = 0;
+HXDLIN(  23)					::Array< ::Dynamic> _g1 = ( ( ::snikket::Caps)(cap1->__Field(HX_("value",71,7f,b8,31),::hx::paccDynamic)) )->identities;
+HXDLIN(  23)					while((_g < _g1->length)){
+HXLINE(  23)						 ::snikket::Identity identity = _g1->__get(_g).StaticCast<  ::snikket::Identity >();
+HXDLIN(  23)						_g = (_g + 1);
+HXLINE(  24)						bool _hx_tmp;
+HXDLIN(  24)						bool _hx_tmp1;
+HXDLIN(  24)						if (::hx::IsNotNull( category )) {
+HXLINE(  24)							_hx_tmp1 = (category == identity->category);
             						}
             						else {
-HXLINE(  23)							_hx_tmp1 = true;
+HXLINE(  24)							_hx_tmp1 = true;
             						}
-HXDLIN(  23)						if (_hx_tmp1) {
-HXLINE(  23)							if (::hx::IsNotNull( type )) {
-HXLINE(  23)								_hx_tmp = (type == identity->type);
+HXDLIN(  24)						if (_hx_tmp1) {
+HXLINE(  24)							if (::hx::IsNotNull( type )) {
+HXLINE(  24)								_hx_tmp = (type == identity->type);
             							}
             							else {
-HXLINE(  23)								_hx_tmp = true;
+HXLINE(  24)								_hx_tmp = true;
             							}
             						}
             						else {
-HXLINE(  23)							_hx_tmp = false;
+HXLINE(  24)							_hx_tmp = false;
             						}
-HXDLIN(  23)						if (_hx_tmp) {
-HXLINE(  24)							result->push( ::Dynamic(cap1->__Field(HX_("key",9f,89,51,00),::hx::paccDynamic)));
+HXDLIN(  24)						if (_hx_tmp) {
+HXLINE(  25)							result->push( ::Dynamic(cap1->__Field(HX_("key",9f,89,51,00),::hx::paccDynamic)));
             						}
             					}
             				}
             			}
             		}
-HXLINE(  29)		return result;
+HXLINE(  30)		return result;
             	}
 
 
 STATIC_HX_DEFINE_DYNAMIC_FUNC3(Caps_obj,withIdentity,return )
 
 ::Array< ::String > Caps_obj::withFeature( ::Dynamic caps,::String feature){
-            	HX_STACKFRAME(&_hx_pos_a541ea7d0210a2a3_33_withFeature)
-HXLINE(  34)		::Array< ::String > result = ::Array_obj< ::String >::__new(0);
-HXLINE(  35)		{
-HXLINE(  35)			 ::Dynamic cap = caps;
-HXDLIN(  35)			while(( (bool)(cap->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE(  35)				 ::Dynamic cap1 = cap->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
-HXLINE(  36)				if (::hx::IsNotNull( cap1->__Field(HX_("value",71,7f,b8,31),::hx::paccDynamic) )) {
-HXLINE(  37)					int _g = 0;
-HXDLIN(  37)					::Array< ::String > _g1 = ( ( ::snikket::Caps)(cap1->__Field(HX_("value",71,7f,b8,31),::hx::paccDynamic)) )->features;
-HXDLIN(  37)					while((_g < _g1->length)){
-HXLINE(  37)						::String feat = _g1->__get(_g);
-HXDLIN(  37)						_g = (_g + 1);
-HXLINE(  38)						if ((feature == feat)) {
-HXLINE(  39)							result->push( ::Dynamic(cap1->__Field(HX_("key",9f,89,51,00),::hx::paccDynamic)));
+            	HX_STACKFRAME(&_hx_pos_a541ea7d0210a2a3_34_withFeature)
+HXLINE(  35)		::Array< ::String > result = ::Array_obj< ::String >::__new(0);
+HXLINE(  36)		{
+HXLINE(  36)			 ::Dynamic cap = caps;
+HXDLIN(  36)			while(( (bool)(cap->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE(  36)				 ::Dynamic cap1 = cap->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
+HXLINE(  37)				if (::hx::IsNotNull( cap1->__Field(HX_("value",71,7f,b8,31),::hx::paccDynamic) )) {
+HXLINE(  38)					int _g = 0;
+HXDLIN(  38)					::Array< ::String > _g1 = ( ( ::snikket::Caps)(cap1->__Field(HX_("value",71,7f,b8,31),::hx::paccDynamic)) )->features;
+HXDLIN(  38)					while((_g < _g1->length)){
+HXLINE(  38)						::String feat = _g1->__get(_g);
+HXDLIN(  38)						_g = (_g + 1);
+HXLINE(  39)						if ((feature == feat)) {
+HXLINE(  40)							result->push( ::Dynamic(cap1->__Field(HX_("key",9f,89,51,00),::hx::paccDynamic)));
             						}
             					}
             				}
             			}
             		}
-HXLINE(  44)		return result;
+HXLINE(  45)		return result;
             	}
 
 
 STATIC_HX_DEFINE_DYNAMIC_FUNC2(Caps_obj,withFeature,return )
 
 
-::hx::ObjectPtr< Caps_obj > Caps_obj::__new(::String node,::Array< ::Dynamic> identities,::Array< ::String > features) {
+::hx::ObjectPtr< Caps_obj > Caps_obj::__new(::String node,::Array< ::Dynamic> identities,::Array< ::String > features,::Array< unsigned char > ver) {
 	::hx::ObjectPtr< Caps_obj > __this = new Caps_obj();
-	__this->__construct(node,identities,features);
+	__this->__construct(node,identities,features,ver);
 	return __this;
 }
 
-::hx::ObjectPtr< Caps_obj > Caps_obj::__alloc(::hx::Ctx *_hx_ctx,::String node,::Array< ::Dynamic> identities,::Array< ::String > features) {
+::hx::ObjectPtr< Caps_obj > Caps_obj::__alloc(::hx::Ctx *_hx_ctx,::String node,::Array< ::Dynamic> identities,::Array< ::String > features,::Array< unsigned char > ver) {
 	Caps_obj *__this = (Caps_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Caps_obj), true, "snikket.Caps"));
 	*(void **)__this = Caps_obj::_hx_vtable;
-	__this->__construct(node,identities,features);
+	__this->__construct(node,identities,features,ver);
 	return __this;
 }
 
diff --git a/Sources/c_snikket/src/snikket/Channel.cpp b/Sources/c_snikket/src/snikket/Channel.cpp
index 106f956..d45e7d2 100644
--- a/Sources/c_snikket/src/snikket/Channel.cpp
+++ b/Sources/c_snikket/src/snikket/Channel.cpp
@@ -125,87 +125,87 @@
 #include <thenshim/_Promise/Promise_Impl_.h>
 #endif
 
-HX_DEFINE_STACK_FRAME(_hx_pos_5e4df8d46126c981_973_new,"snikket.Channel","new",0x8a02a1a4,"snikket.Channel.new","snikket/Chat.hx",973,0x18616bf4)
+HX_DEFINE_STACK_FRAME(_hx_pos_5e4df8d46126c981_982_new,"snikket.Channel","new",0x8a02a1a4,"snikket.Channel.new","snikket/Chat.hx",982,0x18616bf4)
 static const ::String _hx_array_data_db683fb2_1[] = {
 	HX_("http://jabber.org/protocol/muc",07,b2,7f,c6),
 };
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1016_selfPing,"snikket.Channel","selfPing",0x9e7c785a,"snikket.Channel.selfPing","snikket/Chat.hx",1016,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1006_selfPing,"snikket.Channel","selfPing",0x9e7c785a,"snikket.Channel.selfPing","snikket/Chat.hx",1006,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_994_selfPing,"snikket.Channel","selfPing",0x9e7c785a,"snikket.Channel.selfPing","snikket/Chat.hx",994,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_998_selfPing,"snikket.Channel","selfPing",0x9e7c785a,"snikket.Channel.selfPing","snikket/Chat.hx",998,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1040_join,"snikket.Channel","join",0x35ad7e26,"snikket.Channel.join","snikket/Chat.hx",1040,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1032_join,"snikket.Channel","join",0x35ad7e26,"snikket.Channel.join","snikket/Chat.hx",1032,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1051_selfPingSuccess,"snikket.Channel","selfPingSuccess",0xafddf489,"snikket.Channel.selfPingSuccess","snikket/Chat.hx",1051,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1062_setPresence,"snikket.Channel","setPresence",0x9dbfd141,"snikket.Channel.setPresence","snikket/Chat.hx",1062,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1063_setPresence,"snikket.Channel","setPresence",0x9dbfd141,"snikket.Channel.setPresence","snikket/Chat.hx",1063,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1025_selfPing,"snikket.Channel","selfPing",0x9e7c785a,"snikket.Channel.selfPing","snikket/Chat.hx",1025,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1015_selfPing,"snikket.Channel","selfPing",0x9e7c785a,"snikket.Channel.selfPing","snikket/Chat.hx",1015,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1003_selfPing,"snikket.Channel","selfPing",0x9e7c785a,"snikket.Channel.selfPing","snikket/Chat.hx",1003,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1007_selfPing,"snikket.Channel","selfPing",0x9e7c785a,"snikket.Channel.selfPing","snikket/Chat.hx",1007,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1049_join,"snikket.Channel","join",0x35ad7e26,"snikket.Channel.join","snikket/Chat.hx",1049,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1041_join,"snikket.Channel","join",0x35ad7e26,"snikket.Channel.join","snikket/Chat.hx",1041,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1060_selfPingSuccess,"snikket.Channel","selfPingSuccess",0xafddf489,"snikket.Channel.selfPingSuccess","snikket/Chat.hx",1060,0x18616bf4)
 HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1071_setPresence,"snikket.Channel","setPresence",0x9dbfd141,"snikket.Channel.setPresence","snikket/Chat.hx",1071,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1078_setPresence,"snikket.Channel","setPresence",0x9dbfd141,"snikket.Channel.setPresence","snikket/Chat.hx",1078,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1101_doSync,"snikket.Channel","doSync",0xa5ffb0c2,"snikket.Channel.doSync","snikket/Chat.hx",1101,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1130_doSync,"snikket.Channel","doSync",0xa5ffb0c2,"snikket.Channel.doSync","snikket/Chat.hx",1130,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1072_setPresence,"snikket.Channel","setPresence",0x9dbfd141,"snikket.Channel.setPresence","snikket/Chat.hx",1072,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1080_setPresence,"snikket.Channel","setPresence",0x9dbfd141,"snikket.Channel.setPresence","snikket/Chat.hx",1080,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1087_setPresence,"snikket.Channel","setPresence",0x9dbfd141,"snikket.Channel.setPresence","snikket/Chat.hx",1087,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1110_doSync,"snikket.Channel","doSync",0xa5ffb0c2,"snikket.Channel.doSync","snikket/Chat.hx",1110,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1139_doSync,"snikket.Channel","doSync",0xa5ffb0c2,"snikket.Channel.doSync","snikket/Chat.hx",1139,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1141_doSync,"snikket.Channel","doSync",0xa5ffb0c2,"snikket.Channel.doSync","snikket/Chat.hx",1141,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1170_doSync,"snikket.Channel","doSync",0xa5ffb0c2,"snikket.Channel.doSync","snikket/Chat.hx",1170,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1116_doSync,"snikket.Channel","doSync",0xa5ffb0c2,"snikket.Channel.doSync","snikket/Chat.hx",1116,0x18616bf4)
 HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1132_doSync,"snikket.Channel","doSync",0xa5ffb0c2,"snikket.Channel.doSync","snikket/Chat.hx",1132,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1161_doSync,"snikket.Channel","doSync",0xa5ffb0c2,"snikket.Channel.doSync","snikket/Chat.hx",1161,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1107_doSync,"snikket.Channel","doSync",0xa5ffb0c2,"snikket.Channel.doSync","snikket/Chat.hx",1107,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1123_doSync,"snikket.Channel","doSync",0xa5ffb0c2,"snikket.Channel.doSync","snikket/Chat.hx",1123,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1119_doSync,"snikket.Channel","doSync",0xa5ffb0c2,"snikket.Channel.doSync","snikket/Chat.hx",1119,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1171_doSync,"snikket.Channel","doSync",0xa5ffb0c2,"snikket.Channel.doSync","snikket/Chat.hx",1171,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1084_doSync,"snikket.Channel","doSync",0xa5ffb0c2,"snikket.Channel.doSync","snikket/Chat.hx",1084,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1184_isTrusted,"snikket.Channel","isTrusted",0x2c7a5171,"snikket.Channel.isTrusted","snikket/Chat.hx",1184,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1188_isPrivate,"snikket.Channel","isPrivate",0x9f42c67d,"snikket.Channel.isPrivate","snikket/Chat.hx",1188,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1194_refreshDisco,"snikket.Channel","refreshDisco",0x9d89e5db,"snikket.Channel.refreshDisco","snikket/Chat.hx",1194,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1192_refreshDisco,"snikket.Channel","refreshDisco",0x9d89e5db,"snikket.Channel.refreshDisco","snikket/Chat.hx",1192,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1207_preview,"snikket.Channel","preview",0x1b05a34c,"snikket.Channel.preview","snikket/Chat.hx",1207,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1214_livePresence,"snikket.Channel","livePresence",0x644ddf83,"snikket.Channel.livePresence","snikket/Chat.hx",1214,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1221_syncing,"snikket.Channel","syncing",0x8651c0ab,"snikket.Channel.syncing","snikket/Chat.hx",1221,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1225_canAudioCall,"snikket.Channel","canAudioCall",0x94c730a0,"snikket.Channel.canAudioCall","snikket/Chat.hx",1225,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1229_canVideoCall,"snikket.Channel","canVideoCall",0x9aca02c5,"snikket.Channel.canVideoCall","snikket/Chat.hx",1229,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1233_nickInUse,"snikket.Channel","nickInUse",0x59744703,"snikket.Channel.nickInUse","snikket/Chat.hx",1233,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1237_getFullJid,"snikket.Channel","getFullJid",0xa835e1bc,"snikket.Channel.getFullJid","snikket/Chat.hx",1237,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1243_getParticipants,"snikket.Channel","getParticipants",0x390cb25a,"snikket.Channel.getParticipants","snikket/Chat.hx",1243,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1241_getParticipants,"snikket.Channel","getParticipants",0x390cb25a,"snikket.Channel.getParticipants","snikket/Chat.hx",1241,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1248_getParticipantDetails,"snikket.Channel","getParticipantDetails",0xdfad9dc9,"snikket.Channel.getParticipantDetails","snikket/Chat.hx",1248,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1261_getMessagesBefore,"snikket.Channel","getMessagesBefore",0xefb5f1e5,"snikket.Channel.getMessagesBefore","snikket/Chat.hx",1261,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1267_getMessagesBefore,"snikket.Channel","getMessagesBefore",0xefb5f1e5,"snikket.Channel.getMessagesBefore","snikket/Chat.hx",1267,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1259_getMessagesBefore,"snikket.Channel","getMessagesBefore",0xefb5f1e5,"snikket.Channel.getMessagesBefore","snikket/Chat.hx",1259,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1284_getMessagesAfter,"snikket.Channel","getMessagesAfter",0x103df776,"snikket.Channel.getMessagesAfter","snikket/Chat.hx",1284,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1290_getMessagesAfter,"snikket.Channel","getMessagesAfter",0x103df776,"snikket.Channel.getMessagesAfter","snikket/Chat.hx",1290,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1278_getMessagesAfter,"snikket.Channel","getMessagesAfter",0x103df776,"snikket.Channel.getMessagesAfter","snikket/Chat.hx",1278,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1303_getMessagesAround,"snikket.Channel","getMessagesAround",0x0b8795b3,"snikket.Channel.getMessagesAround","snikket/Chat.hx",1303,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1302_getMessagesAround,"snikket.Channel","getMessagesAround",0x0b8795b3,"snikket.Channel.getMessagesAround","snikket/Chat.hx",1302,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1313_prepareIncomingMessage,"snikket.Channel","prepareIncomingMessage",0x3bfa74f6,"snikket.Channel.prepareIncomingMessage","snikket/Chat.hx",1313,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1324_prepareOutgoingMessage,"snikket.Channel","prepareOutgoingMessage",0xa2273a30,"snikket.Channel.prepareOutgoingMessage","snikket/Chat.hx",1324,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1342_correctMessage,"snikket.Channel","correctMessage",0x4d2d23b9,"snikket.Channel.correctMessage","snikket/Chat.hx",1342,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1337_correctMessage,"snikket.Channel","correctMessage",0x4d2d23b9,"snikket.Channel.correctMessage","snikket/Chat.hx",1337,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1355_sendMessage,"snikket.Channel","sendMessage",0x2aa53ea3,"snikket.Channel.sendMessage","snikket/Chat.hx",1355,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1371_sendMessage,"snikket.Channel","sendMessage",0x2aa53ea3,"snikket.Channel.sendMessage","snikket/Chat.hx",1371,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1378_sendMessage,"snikket.Channel","sendMessage",0x2aa53ea3,"snikket.Channel.sendMessage","snikket/Chat.hx",1378,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1409_removeReaction,"snikket.Channel","removeReaction",0x19751149,"snikket.Channel.removeReaction","snikket/Chat.hx",1409,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1389_removeReaction,"snikket.Channel","removeReaction",0x19751149,"snikket.Channel.removeReaction","snikket/Chat.hx",1389,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1404_removeReaction,"snikket.Channel","removeReaction",0x19751149,"snikket.Channel.removeReaction","snikket/Chat.hx",1404,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1419_lastMessageId,"snikket.Channel","lastMessageId",0xa72b1e90,"snikket.Channel.lastMessageId","snikket/Chat.hx",1419,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1424_markReadUpTo,"snikket.Channel","markReadUpTo",0x9e644e95,"snikket.Channel.markReadUpTo","snikket/Chat.hx",1424,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1423_markReadUpTo,"snikket.Channel","markReadUpTo",0x9e644e95,"snikket.Channel.markReadUpTo","snikket/Chat.hx",1423,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1459_bookmark,"snikket.Channel","bookmark",0x9931a4f2,"snikket.Channel.bookmark","snikket/Chat.hx",1459,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1477_bookmark,"snikket.Channel","bookmark",0x9931a4f2,"snikket.Channel.bookmark","snikket/Chat.hx",1477,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1438_bookmark,"snikket.Channel","bookmark",0x9931a4f2,"snikket.Channel.bookmark","snikket/Chat.hx",1438,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1488_sendChatState,"snikket.Channel","sendChatState",0xee67aff5,"snikket.Channel.sendChatState","snikket/Chat.hx",1488,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1504_close,"snikket.Channel","close",0xb85bc1fc,"snikket.Channel.close","snikket/Chat.hx",1504,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_973_boot,"snikket.Channel","boot",0x3063ce6e,"snikket.Channel.boot","snikket/Chat.hx",973,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1128_doSync,"snikket.Channel","doSync",0xa5ffb0c2,"snikket.Channel.doSync","snikket/Chat.hx",1128,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1180_doSync,"snikket.Channel","doSync",0xa5ffb0c2,"snikket.Channel.doSync","snikket/Chat.hx",1180,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1093_doSync,"snikket.Channel","doSync",0xa5ffb0c2,"snikket.Channel.doSync","snikket/Chat.hx",1093,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1193_isTrusted,"snikket.Channel","isTrusted",0x2c7a5171,"snikket.Channel.isTrusted","snikket/Chat.hx",1193,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1197_isPrivate,"snikket.Channel","isPrivate",0x9f42c67d,"snikket.Channel.isPrivate","snikket/Chat.hx",1197,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1203_refreshDisco,"snikket.Channel","refreshDisco",0x9d89e5db,"snikket.Channel.refreshDisco","snikket/Chat.hx",1203,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1201_refreshDisco,"snikket.Channel","refreshDisco",0x9d89e5db,"snikket.Channel.refreshDisco","snikket/Chat.hx",1201,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1216_preview,"snikket.Channel","preview",0x1b05a34c,"snikket.Channel.preview","snikket/Chat.hx",1216,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1223_livePresence,"snikket.Channel","livePresence",0x644ddf83,"snikket.Channel.livePresence","snikket/Chat.hx",1223,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1230_syncing,"snikket.Channel","syncing",0x8651c0ab,"snikket.Channel.syncing","snikket/Chat.hx",1230,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1234_canAudioCall,"snikket.Channel","canAudioCall",0x94c730a0,"snikket.Channel.canAudioCall","snikket/Chat.hx",1234,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1238_canVideoCall,"snikket.Channel","canVideoCall",0x9aca02c5,"snikket.Channel.canVideoCall","snikket/Chat.hx",1238,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1242_nickInUse,"snikket.Channel","nickInUse",0x59744703,"snikket.Channel.nickInUse","snikket/Chat.hx",1242,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1246_getFullJid,"snikket.Channel","getFullJid",0xa835e1bc,"snikket.Channel.getFullJid","snikket/Chat.hx",1246,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1252_getParticipants,"snikket.Channel","getParticipants",0x390cb25a,"snikket.Channel.getParticipants","snikket/Chat.hx",1252,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1250_getParticipants,"snikket.Channel","getParticipants",0x390cb25a,"snikket.Channel.getParticipants","snikket/Chat.hx",1250,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1257_getParticipantDetails,"snikket.Channel","getParticipantDetails",0xdfad9dc9,"snikket.Channel.getParticipantDetails","snikket/Chat.hx",1257,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1270_getMessagesBefore,"snikket.Channel","getMessagesBefore",0xefb5f1e5,"snikket.Channel.getMessagesBefore","snikket/Chat.hx",1270,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1276_getMessagesBefore,"snikket.Channel","getMessagesBefore",0xefb5f1e5,"snikket.Channel.getMessagesBefore","snikket/Chat.hx",1276,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1268_getMessagesBefore,"snikket.Channel","getMessagesBefore",0xefb5f1e5,"snikket.Channel.getMessagesBefore","snikket/Chat.hx",1268,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1293_getMessagesAfter,"snikket.Channel","getMessagesAfter",0x103df776,"snikket.Channel.getMessagesAfter","snikket/Chat.hx",1293,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1299_getMessagesAfter,"snikket.Channel","getMessagesAfter",0x103df776,"snikket.Channel.getMessagesAfter","snikket/Chat.hx",1299,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1287_getMessagesAfter,"snikket.Channel","getMessagesAfter",0x103df776,"snikket.Channel.getMessagesAfter","snikket/Chat.hx",1287,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1312_getMessagesAround,"snikket.Channel","getMessagesAround",0x0b8795b3,"snikket.Channel.getMessagesAround","snikket/Chat.hx",1312,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1311_getMessagesAround,"snikket.Channel","getMessagesAround",0x0b8795b3,"snikket.Channel.getMessagesAround","snikket/Chat.hx",1311,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1322_prepareIncomingMessage,"snikket.Channel","prepareIncomingMessage",0x3bfa74f6,"snikket.Channel.prepareIncomingMessage","snikket/Chat.hx",1322,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1333_prepareOutgoingMessage,"snikket.Channel","prepareOutgoingMessage",0xa2273a30,"snikket.Channel.prepareOutgoingMessage","snikket/Chat.hx",1333,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1351_correctMessage,"snikket.Channel","correctMessage",0x4d2d23b9,"snikket.Channel.correctMessage","snikket/Chat.hx",1351,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1346_correctMessage,"snikket.Channel","correctMessage",0x4d2d23b9,"snikket.Channel.correctMessage","snikket/Chat.hx",1346,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1364_sendMessage,"snikket.Channel","sendMessage",0x2aa53ea3,"snikket.Channel.sendMessage","snikket/Chat.hx",1364,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1380_sendMessage,"snikket.Channel","sendMessage",0x2aa53ea3,"snikket.Channel.sendMessage","snikket/Chat.hx",1380,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1387_sendMessage,"snikket.Channel","sendMessage",0x2aa53ea3,"snikket.Channel.sendMessage","snikket/Chat.hx",1387,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1418_removeReaction,"snikket.Channel","removeReaction",0x19751149,"snikket.Channel.removeReaction","snikket/Chat.hx",1418,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1398_removeReaction,"snikket.Channel","removeReaction",0x19751149,"snikket.Channel.removeReaction","snikket/Chat.hx",1398,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1413_removeReaction,"snikket.Channel","removeReaction",0x19751149,"snikket.Channel.removeReaction","snikket/Chat.hx",1413,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1428_lastMessageId,"snikket.Channel","lastMessageId",0xa72b1e90,"snikket.Channel.lastMessageId","snikket/Chat.hx",1428,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1433_markReadUpTo,"snikket.Channel","markReadUpTo",0x9e644e95,"snikket.Channel.markReadUpTo","snikket/Chat.hx",1433,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1432_markReadUpTo,"snikket.Channel","markReadUpTo",0x9e644e95,"snikket.Channel.markReadUpTo","snikket/Chat.hx",1432,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1468_bookmark,"snikket.Channel","bookmark",0x9931a4f2,"snikket.Channel.bookmark","snikket/Chat.hx",1468,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1486_bookmark,"snikket.Channel","bookmark",0x9931a4f2,"snikket.Channel.bookmark","snikket/Chat.hx",1486,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1447_bookmark,"snikket.Channel","bookmark",0x9931a4f2,"snikket.Channel.bookmark","snikket/Chat.hx",1447,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1497_sendChatState,"snikket.Channel","sendChatState",0xee67aff5,"snikket.Channel.sendChatState","snikket/Chat.hx",1497,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_1513_close,"snikket.Channel","close",0xb85bc1fc,"snikket.Channel.close","snikket/Chat.hx",1513,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_5e4df8d46126c981_982_boot,"snikket.Channel","boot",0x3063ce6e,"snikket.Channel.boot","snikket/Chat.hx",982,0x18616bf4)
 namespace snikket{
 
 void Channel_obj::__construct( ::snikket::Client client, ::snikket::GenericStream stream,::Dynamic persistence,::String chatId,::hx::Null< int >  __o_uiState,::hx::Null< bool >  __o_isBlocked, ::snikket::Stanza extensions,::String readUpToId,::String readUpToBy, ::snikket::Caps disco){
             		int uiState = __o_uiState.Default(1);
             		bool isBlocked = __o_isBlocked.Default(false);
-            	HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_973_new)
-HXLINE( 979)		this->_nickInUse = null();
-HXLINE( 978)		this->forceLive = false;
-HXLINE( 977)		this->sync = null();
-HXLINE( 976)		this->inSync = true;
-HXLINE( 975)		this->disco =  ::snikket::Caps_obj::__alloc( HX_CTX ,HX_("",00,00,00,00),::Array_obj< ::Dynamic>::__new(0),::Array_obj< ::String >::fromData( _hx_array_data_db683fb2_1,1));
-HXLINE( 983)		super::__construct(client,stream,persistence,chatId,uiState,isBlocked,extensions,readUpToId,readUpToBy);
-HXLINE( 984)		if (::hx::IsNotNull( disco )) {
-HXLINE( 985)			this->disco = disco;
-HXLINE( 986)			if (!(disco->features->contains(HX_("http://jabber.org/protocol/muc",07,b2,7f,c6)))) {
-HXLINE( 988)				this->forceLive = true;
+            	HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_982_new)
+HXLINE( 988)		this->_nickInUse = null();
+HXLINE( 987)		this->forceLive = false;
+HXLINE( 986)		this->sync = null();
+HXLINE( 985)		this->inSync = true;
+HXLINE( 984)		this->disco =  ::snikket::Caps_obj::__alloc( HX_CTX ,HX_("",00,00,00,00),::Array_obj< ::Dynamic>::__new(0),::Array_obj< ::String >::fromData( _hx_array_data_db683fb2_1,1),null());
+HXLINE( 992)		super::__construct(client,stream,persistence,chatId,uiState,isBlocked,extensions,readUpToId,readUpToBy);
+HXLINE( 993)		if (::hx::IsNotNull( disco )) {
+HXLINE( 994)			this->disco = disco;
+HXLINE( 995)			if (!(disco->features->contains(HX_("http://jabber.org/protocol/muc",07,b2,7f,c6)))) {
+HXLINE( 997)				this->forceLive = true;
             			}
             		}
             	}
@@ -234,100 +234,100 @@ void Channel_obj::selfPing(bool refresh){
             		void _hx_run(){
             			HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_2, ::snikket::Channel,_gthis) HXARGC(1)
             			void _hx_run( ::snikket::Stanza response){
-            				HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1016_selfPing)
-HXLINE(1016)				if ((( (::String)(::Reflect_obj::field(response->attr,HX_("type",ba,f2,08,4d))) ) == HX_("error",c8,cb,29,73))) {
-HXLINE(1017)					 ::snikket::Stanza tmp = response->getChild(HX_("error",c8,cb,29,73),null());
-HXDLIN(1017)					 ::snikket::Stanza err;
-HXDLIN(1017)					if (::hx::IsNotNull( tmp )) {
-HXLINE(1017)						err = tmp->getChild(null(),HX_("urn:ietf:params:xml:ns:xmpp-stanzas",27,f2,3d,30));
+            				HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1025_selfPing)
+HXLINE(1025)				if ((( (::String)(::Reflect_obj::field(response->attr,HX_("type",ba,f2,08,4d))) ) == HX_("error",c8,cb,29,73))) {
+HXLINE(1026)					 ::snikket::Stanza tmp = response->getChild(HX_("error",c8,cb,29,73),null());
+HXDLIN(1026)					 ::snikket::Stanza err;
+HXDLIN(1026)					if (::hx::IsNotNull( tmp )) {
+HXLINE(1026)						err = tmp->getChild(null(),HX_("urn:ietf:params:xml:ns:xmpp-stanzas",27,f2,3d,30));
             					}
             					else {
-HXLINE(1017)						err = null();
+HXLINE(1026)						err = null();
             					}
-HXLINE(1018)					bool _hx_tmp;
-HXDLIN(1018)					if ((err->name != HX_("service-unavailable",f8,3c,11,1c))) {
-HXLINE(1018)						_hx_tmp = (err->name == HX_("feature-not-implemented",71,20,2e,96));
+HXLINE(1027)					bool _hx_tmp;
+HXDLIN(1027)					if ((err->name != HX_("service-unavailable",f8,3c,11,1c))) {
+HXLINE(1027)						_hx_tmp = (err->name == HX_("feature-not-implemented",71,20,2e,96));
             					}
             					else {
-HXLINE(1018)						_hx_tmp = true;
+HXLINE(1027)						_hx_tmp = true;
             					}
-HXDLIN(1018)					if (_hx_tmp) {
-HXLINE(1018)						_gthis->selfPingSuccess();
-HXDLIN(1018)						return;
+HXDLIN(1027)					if (_hx_tmp) {
+HXLINE(1027)						_gthis->selfPingSuccess();
+HXDLIN(1027)						return;
             					}
-HXLINE(1019)					bool _hx_tmp1;
-HXDLIN(1019)					if ((err->name != HX_("remote-server-not-found",e5,4f,ca,aa))) {
-HXLINE(1019)						_hx_tmp1 = (err->name == HX_("remote-server-timeout",fe,b0,ee,1a));
+HXLINE(1028)					bool _hx_tmp1;
+HXDLIN(1028)					if ((err->name != HX_("remote-server-not-found",e5,4f,ca,aa))) {
+HXLINE(1028)						_hx_tmp1 = (err->name == HX_("remote-server-timeout",fe,b0,ee,1a));
             					}
             					else {
-HXLINE(1019)						_hx_tmp1 = true;
+HXLINE(1028)						_hx_tmp1 = true;
             					}
-HXDLIN(1019)					if (_hx_tmp1) {
-HXLINE(1019)						_gthis->selfPingSuccess();
-HXDLIN(1019)						return;
+HXDLIN(1028)					if (_hx_tmp1) {
+HXLINE(1028)						_gthis->selfPingSuccess();
+HXDLIN(1028)						return;
             					}
-HXLINE(1020)					if ((err->name == HX_("item-not-found",4e,b5,9b,5b))) {
-HXLINE(1020)						_gthis->selfPingSuccess();
-HXDLIN(1020)						return;
+HXLINE(1029)					if ((err->name == HX_("item-not-found",4e,b5,9b,5b))) {
+HXLINE(1029)						_gthis->selfPingSuccess();
+HXDLIN(1029)						return;
             					}
-HXLINE(1021)					::haxe::Log_obj::trace(HX_("SYNC: self-ping fail, join",ea,45,f2,f0), ::Dynamic(::hx::Anon_obj::Create(5)
+HXLINE(1030)					::haxe::Log_obj::trace(HX_("SYNC: self-ping fail, join",ea,45,f2,f0), ::Dynamic(::hx::Anon_obj::Create(5)
             						->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.Channel",b2,3f,68,db))
             						->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(1)->init(0,_gthis->chatId))
             						->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("selfPing",1e,60,3c,38))
             						->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/Chat.hx",f4,6b,61,18))
-            						->setFixed(4,HX_("lineNumber",dd,81,22,76),1021)));
-HXLINE(1022)					_gthis->join();
+            						->setFixed(4,HX_("lineNumber",dd,81,22,76),1030)));
+HXLINE(1031)					_gthis->join();
             				}
             				else {
-HXLINE(1024)					_gthis->selfPingSuccess();
+HXLINE(1033)					_gthis->selfPingSuccess();
             				}
             			}
             			HX_END_LOCAL_FUNC1((void))
 
-            			HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1006_selfPing)
-HXLINE(1007)			if (!(_gthis->disco->features->contains(HX_("http://jabber.org/protocol/muc",07,b2,7f,c6)))) {
-HXLINE(1009)				_gthis->forceLive = true;
-HXLINE(1010)				return;
+            			HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1015_selfPing)
+HXLINE(1016)			if (!(_gthis->disco->features->contains(HX_("http://jabber.org/protocol/muc",07,b2,7f,c6)))) {
+HXLINE(1018)				_gthis->forceLive = true;
+HXLINE(1019)				return;
             			}
-HXLINE(1012)			 ::snikket::GenericStream _gthis1 = _gthis->stream;
-HXLINE(1013)			::String _hx_tmp = _gthis->getFullJid()->asString();
-HXLINE(1012)			_gthis1->sendIq( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("iq",e8,5b,00,00), ::Dynamic(::hx::Anon_obj::Create(2)
+HXLINE(1021)			 ::snikket::GenericStream _gthis1 = _gthis->stream;
+HXLINE(1022)			::String _hx_tmp = _gthis->getFullJid()->asString();
+HXLINE(1021)			_gthis1->sendIq( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("iq",e8,5b,00,00), ::Dynamic(::hx::Anon_obj::Create(2)
             				->setFixed(0,HX_("to",7b,65,00,00),_hx_tmp)
             				->setFixed(1,HX_("type",ba,f2,08,4d),HX_("get",96,80,4e,00))))->tag(HX_("ping",72,f2,57,4a), ::Dynamic(::hx::Anon_obj::Create(1)
             				->setFixed(0,HX_("xmlns",dc,31,74,60),HX_("urn:xmpp:ping",8e,30,3f,fd))))->up(), ::Dynamic(new _hx_Closure_2(_gthis)));
             		}
             		HX_END_LOCAL_FUNC0((void))
 
-            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_994_selfPing)
-HXDLIN( 994)		 ::snikket::Channel _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 995)		if ((this->uiState == 2)) {
+            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1003_selfPing)
+HXDLIN(1003)		 ::snikket::Channel _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE(1004)		if ((this->uiState == 2)) {
             			HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_0) HXARGC(1)
             			 ::snikket::Stanza _hx_run( ::snikket::Stanza stanza){
-            				HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_998_selfPing)
-HXLINE( 999)				::Reflect_obj::setField(stanza->attr,HX_("type",ba,f2,08,4d),HX_("unavailable",50,e0,29,fd));
-HXLINE(1000)				return stanza;
+            				HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1007_selfPing)
+HXLINE(1008)				::Reflect_obj::setField(stanza->attr,HX_("type",ba,f2,08,4d),HX_("unavailable",50,e0,29,fd));
+HXLINE(1009)				return stanza;
             			}
             			HX_END_LOCAL_FUNC1(return)
 
-HXLINE( 996)			 ::snikket::Client _hx_tmp = this->client;
-HXDLIN( 996)			_hx_tmp->sendPresence(this->getFullJid()->asString(), ::Dynamic(new _hx_Closure_0()));
-HXLINE(1003)			return;
+HXLINE(1005)			 ::snikket::Client _hx_tmp = this->client;
+HXDLIN(1005)			_hx_tmp->sendPresence(this->getFullJid()->asString(), ::Dynamic(new _hx_Closure_0()));
+HXLINE(1012)			return;
             		}
-HXLINE(1006)		 ::Dynamic _hx_tmp1;
-HXDLIN(1006)		if (refresh) {
-HXLINE(1006)			_hx_tmp1 = this->refreshDisco_dyn();
+HXLINE(1015)		 ::Dynamic _hx_tmp1;
+HXDLIN(1015)		if (refresh) {
+HXLINE(1015)			_hx_tmp1 = this->refreshDisco_dyn();
             		}
             		else {
             			HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_1) HXARGC(1)
             			void _hx_run( ::Dynamic cb){
-            				HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1006_selfPing)
-HXLINE(1006)				cb();
+            				HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1015_selfPing)
+HXLINE(1015)				cb();
             			}
             			HX_END_LOCAL_FUNC1((void))
 
-HXLINE(1006)			_hx_tmp1 =  ::Dynamic(new _hx_Closure_1());
+HXLINE(1015)			_hx_tmp1 =  ::Dynamic(new _hx_Closure_1());
             		}
-HXDLIN(1006)		_hx_tmp1( ::Dynamic(new _hx_Closure_3(_gthis)));
+HXDLIN(1015)		_hx_tmp1( ::Dynamic(new _hx_Closure_3(_gthis)));
             	}
 
 
@@ -336,167 +336,167 @@ HX_DEFINE_DYNAMIC_FUNC1(Channel_obj,selfPing,(void))
 void Channel_obj::join(){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::Channel,_gthis) HXARGC(1)
             		 ::snikket::Stanza _hx_run( ::snikket::Stanza stanza){
-            			HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1040_join)
-HXLINE(1041)			stanza->tag(HX_("x",78,00,00,00), ::Dynamic(::hx::Anon_obj::Create(1)
+            			HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1049_join)
+HXLINE(1050)			stanza->tag(HX_("x",78,00,00,00), ::Dynamic(::hx::Anon_obj::Create(1)
             				->setFixed(0,HX_("xmlns",dc,31,74,60),HX_("http://jabber.org/protocol/muc",07,b2,7f,c6))));
-HXLINE(1042)			if (_gthis->disco->features->contains(HX_("urn:xmpp:mam:2",f5,ef,8c,da))) {
-HXLINE(1042)				stanza->tag(HX_("history",54,35,47,64), ::Dynamic(::hx::Anon_obj::Create(1)
+HXLINE(1051)			if (_gthis->disco->features->contains(HX_("urn:xmpp:mam:2",f5,ef,8c,da))) {
+HXLINE(1051)				stanza->tag(HX_("history",54,35,47,64), ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("maxchars",b9,7f,a3,5c),HX_("0",30,00,00,00))))->up();
             			}
-HXLINE(1044)			stanza->up();
-HXLINE(1045)			return stanza;
+HXLINE(1053)			stanza->up();
+HXLINE(1054)			return stanza;
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            	HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1032_join)
-HXDLIN(1032)		 ::snikket::Channel _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE(1033)		this->presence =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
-HXLINE(1034)		this->_nickInUse = null();
-HXLINE(1035)		this->inSync = false;
-HXLINE(1036)		this->client->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,::hx::ObjectPtr<OBJ_>(this)));
-HXLINE(1037)		 ::snikket::JID desiredFullJid = ::snikket::JID_obj::parse(this->chatId);
-HXDLIN(1037)		 ::snikket::JID desiredFullJid1 = desiredFullJid->withResource(this->client->displayName());
-HXLINE(1038)		 ::snikket::Client _hx_tmp = this->client;
-HXDLIN(1038)		_hx_tmp->sendPresence(desiredFullJid1->asString(), ::Dynamic(new _hx_Closure_0(_gthis)));
-HXLINE(1048)		::Dynamic _hx_tmp1 = this->persistence;
-HXDLIN(1048)		::String _hx_tmp2 = this->client->accountId();
-HXDLIN(1048)		::snikket::Persistence_obj::lastId(_hx_tmp1,_hx_tmp2,this->chatId,this->doSync_dyn());
+            	HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1041_join)
+HXDLIN(1041)		 ::snikket::Channel _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE(1042)		this->presence =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
+HXLINE(1043)		this->_nickInUse = null();
+HXLINE(1044)		this->inSync = false;
+HXLINE(1045)		this->client->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,::hx::ObjectPtr<OBJ_>(this)));
+HXLINE(1046)		 ::snikket::JID desiredFullJid = ::snikket::JID_obj::parse(this->chatId);
+HXDLIN(1046)		 ::snikket::JID desiredFullJid1 = desiredFullJid->withResource(this->client->displayName());
+HXLINE(1047)		 ::snikket::Client _hx_tmp = this->client;
+HXDLIN(1047)		_hx_tmp->sendPresence(desiredFullJid1->asString(), ::Dynamic(new _hx_Closure_0(_gthis)));
+HXLINE(1057)		::Dynamic _hx_tmp1 = this->persistence;
+HXDLIN(1057)		::String _hx_tmp2 = this->client->accountId();
+HXDLIN(1057)		::snikket::Persistence_obj::lastId(_hx_tmp1,_hx_tmp2,this->chatId,this->doSync_dyn());
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Channel_obj,join,(void))
 
 void Channel_obj::selfPingSuccess(){
-            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1051_selfPingSuccess)
-HXLINE(1052)		::String _hx_tmp = this->nickInUse();
-HXDLIN(1052)		if ((_hx_tmp != this->client->displayName())) {
-HXLINE(1053)			 ::snikket::JID desiredFullJid = ::snikket::JID_obj::parse(this->chatId);
-HXDLIN(1053)			 ::snikket::JID desiredFullJid1 = desiredFullJid->withResource(this->client->displayName());
-HXLINE(1054)			 ::snikket::Client _hx_tmp1 = this->client;
-HXDLIN(1054)			_hx_tmp1->sendPresence(desiredFullJid1->asString(),null());
-            		}
-HXLINE(1058)		this->inSync = false;
-HXLINE(1059)		::Dynamic _hx_tmp2 = this->persistence;
-HXDLIN(1059)		::String _hx_tmp3 = this->client->accountId();
-HXDLIN(1059)		::snikket::Persistence_obj::lastId(_hx_tmp2,_hx_tmp3,this->chatId,this->doSync_dyn());
+            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1060_selfPingSuccess)
+HXLINE(1061)		::String _hx_tmp = this->nickInUse();
+HXDLIN(1061)		if ((_hx_tmp != this->client->displayName())) {
+HXLINE(1062)			 ::snikket::JID desiredFullJid = ::snikket::JID_obj::parse(this->chatId);
+HXDLIN(1062)			 ::snikket::JID desiredFullJid1 = desiredFullJid->withResource(this->client->displayName());
+HXLINE(1063)			 ::snikket::Client _hx_tmp1 = this->client;
+HXDLIN(1063)			_hx_tmp1->sendPresence(desiredFullJid1->asString(),null());
+            		}
+HXLINE(1067)		this->inSync = false;
+HXLINE(1068)		::Dynamic _hx_tmp2 = this->persistence;
+HXDLIN(1068)		::String _hx_tmp3 = this->client->accountId();
+HXDLIN(1068)		::snikket::Persistence_obj::lastId(_hx_tmp2,_hx_tmp3,this->chatId,this->doSync_dyn());
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Channel_obj,selfPingSuccess,(void))
 
 void Channel_obj::setPresence(::String resource, ::snikket::Presence presence){
-            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1062_setPresence)
-HXLINE(1063)		 ::snikket::Stanza tmp;
-HXDLIN(1063)		if (::hx::IsNotNull( presence )) {
-HXLINE(1063)			tmp = presence->mucUser;
+            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1071_setPresence)
+HXLINE(1072)		 ::snikket::Stanza tmp;
+HXDLIN(1072)		if (::hx::IsNotNull( presence )) {
+HXLINE(1072)			tmp = presence->mucUser;
             		}
             		else {
-HXLINE(1063)			tmp = null();
+HXLINE(1072)			tmp = null();
             		}
-HXDLIN(1063)		 ::snikket::Stanza oneTen;
-HXDLIN(1063)		if (::hx::IsNotNull( tmp )) {
+HXDLIN(1072)		 ::snikket::Stanza oneTen;
+HXDLIN(1072)		if (::hx::IsNotNull( tmp )) {
             			HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_0) HXARGC(1)
             			bool _hx_run( ::snikket::Stanza status){
-            				HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1063_setPresence)
-HXLINE(1063)				return (( (::String)(::Reflect_obj::field(status->attr,HX_("code",2d,b1,c4,41))) ) == HX_("110",50,59,25,00));
+            				HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1072_setPresence)
+HXLINE(1072)				return (( (::String)(::Reflect_obj::field(status->attr,HX_("code",2d,b1,c4,41))) ) == HX_("110",50,59,25,00));
             			}
             			HX_END_LOCAL_FUNC1(return)
 
-HXLINE(1063)			oneTen = ( ( ::snikket::Stanza)(::Lambda_obj::find(tmp->allTags(HX_("status",32,e7,fb,05),null()), ::Dynamic(new _hx_Closure_0()))) );
+HXLINE(1072)			oneTen = ( ( ::snikket::Stanza)(::Lambda_obj::find(tmp->allTags(HX_("status",32,e7,fb,05),null()), ::Dynamic(new _hx_Closure_0()))) );
             		}
             		else {
-HXLINE(1063)			oneTen = null();
+HXLINE(1072)			oneTen = null();
             		}
-HXLINE(1064)		if (::hx::IsNotNull( oneTen )) {
-HXLINE(1065)			this->_nickInUse = resource;
+HXLINE(1073)		if (::hx::IsNotNull( oneTen )) {
+HXLINE(1074)			this->_nickInUse = resource;
             		}
             		else {
-HXLINE(1066)			if ((resource == this->_nickInUse)) {
-HXLINE(1067)				this->_nickInUse = null();
+HXLINE(1075)			if ((resource == this->_nickInUse)) {
+HXLINE(1076)				this->_nickInUse = null();
             			}
             		}
-HXLINE(1069)		bool _hx_tmp;
-HXDLIN(1069)		bool _hx_tmp1;
-HXDLIN(1069)		if (::hx::IsNotNull( presence )) {
-HXLINE(1069)			_hx_tmp1 = ::hx::IsNotNull( presence->mucUser );
+HXLINE(1078)		bool _hx_tmp;
+HXDLIN(1078)		bool _hx_tmp1;
+HXDLIN(1078)		if (::hx::IsNotNull( presence )) {
+HXLINE(1078)			_hx_tmp1 = ::hx::IsNotNull( presence->mucUser );
             		}
             		else {
-HXLINE(1069)			_hx_tmp1 = false;
+HXLINE(1078)			_hx_tmp1 = false;
             		}
-HXDLIN(1069)		if (_hx_tmp1) {
-HXLINE(1069)			_hx_tmp = ::hx::IsNull( oneTen );
+HXDLIN(1078)		if (_hx_tmp1) {
+HXLINE(1078)			_hx_tmp = ::hx::IsNull( oneTen );
             		}
             		else {
-HXLINE(1069)			_hx_tmp = false;
-            		}
-HXDLIN(1069)		if (_hx_tmp) {
-HXLINE(1070)			 ::snikket::Presence existing = ( ( ::snikket::Presence)(this->presence->get(resource)) );
-HXLINE(1071)			bool _hx_tmp2;
-HXDLIN(1071)			if (::hx::IsNotNull( existing )) {
-HXLINE(1071)				 ::snikket::Stanza tmp1;
-HXDLIN(1071)				if (::hx::IsNotNull( existing )) {
-HXLINE(1071)					tmp1 = existing->mucUser;
+HXLINE(1078)			_hx_tmp = false;
+            		}
+HXDLIN(1078)		if (_hx_tmp) {
+HXLINE(1079)			 ::snikket::Presence existing = ( ( ::snikket::Presence)(this->presence->get(resource)) );
+HXLINE(1080)			bool _hx_tmp2;
+HXDLIN(1080)			if (::hx::IsNotNull( existing )) {
+HXLINE(1080)				 ::snikket::Stanza tmp1;
+HXDLIN(1080)				if (::hx::IsNotNull( existing )) {
+HXLINE(1080)					tmp1 = existing->mucUser;
             				}
             				else {
-HXLINE(1071)					tmp1 = null();
+HXLINE(1080)					tmp1 = null();
             				}
-HXDLIN(1071)				 ::snikket::Stanza _hx_tmp3;
-HXDLIN(1071)				if (::hx::IsNotNull( tmp1 )) {
+HXDLIN(1080)				 ::snikket::Stanza _hx_tmp3;
+HXDLIN(1080)				if (::hx::IsNotNull( tmp1 )) {
             					HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_1) HXARGC(1)
             					bool _hx_run( ::snikket::Stanza status){
-            						HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1071_setPresence)
-HXLINE(1071)						return (( (::String)(::Reflect_obj::field(status->attr,HX_("code",2d,b1,c4,41))) ) == HX_("110",50,59,25,00));
+            						HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1080_setPresence)
+HXLINE(1080)						return (( (::String)(::Reflect_obj::field(status->attr,HX_("code",2d,b1,c4,41))) ) == HX_("110",50,59,25,00));
             					}
             					HX_END_LOCAL_FUNC1(return)
 
-HXLINE(1071)					_hx_tmp3 = ( ( ::snikket::Stanza)(::Lambda_obj::find(tmp1->allTags(HX_("status",32,e7,fb,05),null()), ::Dynamic(new _hx_Closure_1()))) );
+HXLINE(1080)					_hx_tmp3 = ( ( ::snikket::Stanza)(::Lambda_obj::find(tmp1->allTags(HX_("status",32,e7,fb,05),null()), ::Dynamic(new _hx_Closure_1()))) );
             				}
             				else {
-HXLINE(1071)					_hx_tmp3 = null();
+HXLINE(1080)					_hx_tmp3 = null();
             				}
-HXDLIN(1071)				_hx_tmp2 = ::hx::IsNotNull( _hx_tmp3 );
+HXDLIN(1080)				_hx_tmp2 = ::hx::IsNotNull( _hx_tmp3 );
             			}
             			else {
-HXLINE(1071)				_hx_tmp2 = false;
+HXLINE(1080)				_hx_tmp2 = false;
             			}
-HXDLIN(1071)			if (_hx_tmp2) {
-HXLINE(1072)				presence->mucUser->tag(HX_("status",32,e7,fb,05), ::Dynamic(::hx::Anon_obj::Create(1)
+HXDLIN(1080)			if (_hx_tmp2) {
+HXLINE(1081)				presence->mucUser->tag(HX_("status",32,e7,fb,05), ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("code",2d,b1,c4,41),HX_("110",50,59,25,00))));
-HXLINE(1073)				this->setPresence(resource,presence);
-HXLINE(1074)				return;
+HXLINE(1082)				this->setPresence(resource,presence);
+HXLINE(1083)				return;
             			}
             		}
-HXLINE(1077)		this->super::setPresence(resource,presence);
-HXLINE(1078)		 ::snikket::Stanza tmp2;
-HXDLIN(1078)		if (::hx::IsNotNull( presence )) {
-HXLINE(1078)			tmp2 = presence->mucUser;
+HXLINE(1086)		this->super::setPresence(resource,presence);
+HXLINE(1087)		 ::snikket::Stanza tmp2;
+HXDLIN(1087)		if (::hx::IsNotNull( presence )) {
+HXLINE(1087)			tmp2 = presence->mucUser;
             		}
             		else {
-HXLINE(1078)			tmp2 = null();
+HXLINE(1087)			tmp2 = null();
             		}
-HXDLIN(1078)		 ::snikket::Stanza tripleThree;
-HXDLIN(1078)		if (::hx::IsNotNull( tmp2 )) {
+HXDLIN(1087)		 ::snikket::Stanza tripleThree;
+HXDLIN(1087)		if (::hx::IsNotNull( tmp2 )) {
             			HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_2) HXARGC(1)
             			bool _hx_run( ::snikket::Stanza status){
-            				HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1078_setPresence)
-HXLINE(1078)				return (( (::String)(::Reflect_obj::field(status->attr,HX_("code",2d,b1,c4,41))) ) == HX_("333",93,df,26,00));
+            				HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1087_setPresence)
+HXLINE(1087)				return (( (::String)(::Reflect_obj::field(status->attr,HX_("code",2d,b1,c4,41))) ) == HX_("333",93,df,26,00));
             			}
             			HX_END_LOCAL_FUNC1(return)
 
-HXLINE(1078)			tripleThree = ( ( ::snikket::Stanza)(::Lambda_obj::find(tmp2->allTags(HX_("status",32,e7,fb,05),null()), ::Dynamic(new _hx_Closure_2()))) );
+HXLINE(1087)			tripleThree = ( ( ::snikket::Stanza)(::Lambda_obj::find(tmp2->allTags(HX_("status",32,e7,fb,05),null()), ::Dynamic(new _hx_Closure_2()))) );
             		}
             		else {
-HXLINE(1078)			tripleThree = null();
+HXLINE(1087)			tripleThree = null();
             		}
-HXLINE(1079)		bool _hx_tmp4;
-HXDLIN(1079)		if (::hx::IsNotNull( oneTen )) {
-HXLINE(1079)			_hx_tmp4 = ::hx::IsNotNull( tripleThree );
+HXLINE(1088)		bool _hx_tmp4;
+HXDLIN(1088)		if (::hx::IsNotNull( oneTen )) {
+HXLINE(1088)			_hx_tmp4 = ::hx::IsNotNull( tripleThree );
             		}
             		else {
-HXLINE(1079)			_hx_tmp4 = false;
+HXLINE(1088)			_hx_tmp4 = false;
             		}
-HXDLIN(1079)		if (_hx_tmp4) {
-HXLINE(1080)			this->selfPing(true);
+HXDLIN(1088)		if (_hx_tmp4) {
+HXLINE(1089)			this->selfPing(true);
             		}
             	}
 
@@ -504,10 +504,10 @@ HXLINE(1080)			this->selfPing(true);
 void Channel_obj::doSync(::String lastId){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::Channel,_gthis) HXARGC(2)
             		 ::snikket::ChatMessageBuilder _hx_run( ::snikket::ChatMessageBuilder builder, ::snikket::Stanza stanza){
-            			HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1101_doSync)
-HXLINE(1102)			builder = _gthis->prepareIncomingMessage(builder,stanza);
-HXLINE(1103)			builder->syncPoint = true;
-HXLINE(1104)			return builder;
+            			HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1110_doSync)
+HXLINE(1111)			builder = _gthis->prepareIncomingMessage(builder,stanza);
+HXLINE(1112)			builder->syncPoint = true;
+HXLINE(1113)			return builder;
             		}
             		HX_END_LOCAL_FUNC2(return)
 
@@ -515,140 +515,140 @@ HXLINE(1104)			return builder;
             		void _hx_run( ::Dynamic messageList){
             			HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_5, ::snikket::Channel,_gthis,::Array< ::Dynamic>,pageChatMessages) HXARGC(2)
             			void _hx_run( ::Dynamic resolve, ::Dynamic reject){
-            				HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1130_doSync)
-HXLINE(1130)				_gthis->client->storeMessages(pageChatMessages,resolve);
+            				HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1139_doSync)
+HXLINE(1139)				_gthis->client->storeMessages(pageChatMessages,resolve);
             			}
             			HX_END_LOCAL_FUNC2((void))
 
             			HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_7, ::snikket::Channel,_gthis,::Array< ::Dynamic>,chatMessages) HXARGC(1)
             			void _hx_run(::Array< ::Dynamic> stored){
-            				HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1132_doSync)
-HXLINE(1133)				{
-HXLINE(1133)					int _g = 0;
-HXDLIN(1133)					while((_g < stored->length)){
-HXLINE(1133)						::Array< ::Dynamic> messages = stored->__get(_g).StaticCast< ::Array< ::Dynamic> >();
-HXDLIN(1133)						_g = (_g + 1);
-HXLINE(1134)						if (::hx::IsNotNull( messages )) {
-HXLINE(1135)							int _g1 = 0;
-HXDLIN(1135)							while((_g1 < messages->length)){
-HXLINE(1135)								 ::snikket::ChatMessage message = messages->__get(_g1).StaticCast<  ::snikket::ChatMessage >();
-HXDLIN(1135)								_g1 = (_g1 + 1);
-HXLINE(1136)								_gthis->client->notifySyncMessageHandlers(message);
-HXLINE(1137)								bool _hx_tmp;
-HXDLIN(1137)								if (::hx::IsNotNull( message )) {
-HXLINE(1137)									::String _hx_tmp1 = message->chatId();
-HXDLIN(1137)									_hx_tmp = (_hx_tmp1 == _gthis->chatId);
+            				HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1141_doSync)
+HXLINE(1142)				{
+HXLINE(1142)					int _g = 0;
+HXDLIN(1142)					while((_g < stored->length)){
+HXLINE(1142)						::Array< ::Dynamic> messages = stored->__get(_g).StaticCast< ::Array< ::Dynamic> >();
+HXDLIN(1142)						_g = (_g + 1);
+HXLINE(1143)						if (::hx::IsNotNull( messages )) {
+HXLINE(1144)							int _g1 = 0;
+HXDLIN(1144)							while((_g1 < messages->length)){
+HXLINE(1144)								 ::snikket::ChatMessage message = messages->__get(_g1).StaticCast<  ::snikket::ChatMessage >();
+HXDLIN(1144)								_g1 = (_g1 + 1);
+HXLINE(1145)								_gthis->client->notifySyncMessageHandlers(message);
+HXLINE(1146)								bool _hx_tmp;
+HXDLIN(1146)								if (::hx::IsNotNull( message )) {
+HXLINE(1146)									::String _hx_tmp1 = message->chatId();
+HXDLIN(1146)									_hx_tmp = (_hx_tmp1 == _gthis->chatId);
             								}
             								else {
-HXLINE(1137)									_hx_tmp = false;
+HXLINE(1146)									_hx_tmp = false;
             								}
-HXDLIN(1137)								if (_hx_tmp) {
-HXLINE(1137)									chatMessages->push(message);
+HXDLIN(1146)								if (_hx_tmp) {
+HXLINE(1146)									chatMessages->push(message);
             								}
-HXLINE(1138)								if ((chatMessages->length > 1000)) {
-HXLINE(1138)									chatMessages->shift().StaticCast<  ::snikket::ChatMessage >();
+HXLINE(1147)								if ((chatMessages->length > 1000)) {
+HXLINE(1147)									chatMessages->shift().StaticCast<  ::snikket::ChatMessage >();
             								}
             							}
             						}
             					}
             				}
-HXLINE(1142)				if (_gthis->sync->hasMore()) {
-HXLINE(1143)					_gthis->sync->fetchNext();
+HXLINE(1151)				if (_gthis->sync->hasMore()) {
+HXLINE(1152)					_gthis->sync->fetchNext();
             				}
             				else {
             					HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_6, ::snikket::Channel,_gthis) HXARGC(1)
             					bool _hx_run( ::snikket::ChatMessage m){
-            						HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1161_doSync)
-HXLINE(1161)						::String m1 = m->serverId;
-HXDLIN(1161)						if ((m1 != _gthis->readUpTo())) {
-HXLINE(1161)							return !(m->isIncoming());
+            						HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1170_doSync)
+HXLINE(1170)						::String m1 = m->serverId;
+HXDLIN(1170)						if ((m1 != _gthis->readUpTo())) {
+HXLINE(1170)							return !(m->isIncoming());
             						}
             						else {
-HXLINE(1161)							return true;
+HXLINE(1170)							return true;
             						}
-HXDLIN(1161)						return false;
+HXDLIN(1170)						return false;
             					}
             					HX_END_LOCAL_FUNC1(return)
 
-HXLINE(1145)					_gthis->inSync = true;
-HXLINE(1146)					_gthis->sync = null();
-HXLINE(1147)					 ::snikket::ChatMessage lastFromSync = chatMessages->__get((chatMessages->length - 1)).StaticCast<  ::snikket::ChatMessage >();
-HXLINE(1148)					bool _hx_tmp2;
-HXDLIN(1148)					if (::hx::IsNotNull( lastFromSync )) {
-HXLINE(1148)						if (::hx::IsNotNull( _gthis->lastMessageTimestamp() )) {
-HXLINE(1148)							::String lastFromSync1 = lastFromSync->timestamp;
-HXDLIN(1148)							_hx_tmp2 = (::Reflect_obj::compare(lastFromSync1,_gthis->lastMessageTimestamp()) > 0);
+HXLINE(1154)					_gthis->inSync = true;
+HXLINE(1155)					_gthis->sync = null();
+HXLINE(1156)					 ::snikket::ChatMessage lastFromSync = chatMessages->__get((chatMessages->length - 1)).StaticCast<  ::snikket::ChatMessage >();
+HXLINE(1157)					bool _hx_tmp2;
+HXDLIN(1157)					if (::hx::IsNotNull( lastFromSync )) {
+HXLINE(1157)						if (::hx::IsNotNull( _gthis->lastMessageTimestamp() )) {
+HXLINE(1157)							::String lastFromSync1 = lastFromSync->timestamp;
+HXDLIN(1157)							_hx_tmp2 = (::Reflect_obj::compare(lastFromSync1,_gthis->lastMessageTimestamp()) > 0);
             						}
             						else {
-HXLINE(1148)							_hx_tmp2 = true;
+HXLINE(1157)							_hx_tmp2 = true;
             						}
             					}
             					else {
-HXLINE(1148)						_hx_tmp2 = false;
+HXLINE(1157)						_hx_tmp2 = false;
             					}
-HXDLIN(1148)					if (_hx_tmp2) {
-HXLINE(1149)						_gthis->setLastMessage(lastFromSync);
-HXLINE(1150)						_gthis->client->sortChats();
+HXDLIN(1157)					if (_hx_tmp2) {
+HXLINE(1158)						_gthis->setLastMessage(lastFromSync);
+HXLINE(1159)						_gthis->client->sortChats();
             					}
-HXLINE(1152)					 ::haxe::ds::StringMap serverIds =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
-HXLINE(1153)					::Array< ::Dynamic> dedupedMessages = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE(1154)					chatMessages->reverse();
-HXLINE(1155)					{
-HXLINE(1155)						int _g2 = 0;
-HXDLIN(1155)						while((_g2 < chatMessages->length)){
-HXLINE(1155)							 ::snikket::ChatMessage m = chatMessages->__get(_g2).StaticCast<  ::snikket::ChatMessage >();
-HXDLIN(1155)							_g2 = (_g2 + 1);
-HXLINE(1156)							 ::Dynamic tmp = serverIds->get(m->serverId);
-HXDLIN(1156)							bool _hx_tmp3;
-HXDLIN(1156)							if (::hx::IsNotNull( tmp )) {
-HXLINE(1156)								_hx_tmp3 = ( (bool)(tmp) );
+HXLINE(1161)					 ::haxe::ds::StringMap serverIds =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
+HXLINE(1162)					::Array< ::Dynamic> dedupedMessages = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE(1163)					chatMessages->reverse();
+HXLINE(1164)					{
+HXLINE(1164)						int _g2 = 0;
+HXDLIN(1164)						while((_g2 < chatMessages->length)){
+HXLINE(1164)							 ::snikket::ChatMessage m = chatMessages->__get(_g2).StaticCast<  ::snikket::ChatMessage >();
+HXDLIN(1164)							_g2 = (_g2 + 1);
+HXLINE(1165)							 ::Dynamic tmp = serverIds->get(m->serverId);
+HXDLIN(1165)							bool _hx_tmp3;
+HXDLIN(1165)							if (::hx::IsNotNull( tmp )) {
+HXLINE(1165)								_hx_tmp3 = ( (bool)(tmp) );
             							}
             							else {
-HXLINE(1156)								_hx_tmp3 = false;
+HXLINE(1165)								_hx_tmp3 = false;
             							}
-HXDLIN(1156)							if (!(_hx_tmp3)) {
-HXLINE(1157)								dedupedMessages->unshift(m);
-HXLINE(1158)								serverIds->set(m->serverId,true);
+HXDLIN(1165)							if (!(_hx_tmp3)) {
+HXLINE(1166)								dedupedMessages->unshift(m);
+HXLINE(1167)								serverIds->set(m->serverId,true);
             							}
             						}
             					}
-HXLINE(1161)					int readIndex = ::Lambda_obj::findIndex(dedupedMessages, ::Dynamic(new _hx_Closure_6(_gthis)));
-HXLINE(1162)					if ((readIndex < 0)) {
-HXLINE(1163)						 ::snikket::Channel _gthis1 = _gthis;
-HXDLIN(1163)						int _hx_tmp4 = _gthis->unreadCount();
-HXDLIN(1163)						_gthis1->setUnreadCount((_hx_tmp4 + dedupedMessages->length));
+HXLINE(1170)					int readIndex = ::Lambda_obj::findIndex(dedupedMessages, ::Dynamic(new _hx_Closure_6(_gthis)));
+HXLINE(1171)					if ((readIndex < 0)) {
+HXLINE(1172)						 ::snikket::Channel _gthis1 = _gthis;
+HXDLIN(1172)						int _hx_tmp4 = _gthis->unreadCount();
+HXDLIN(1172)						_gthis1->setUnreadCount((_hx_tmp4 + dedupedMessages->length));
             					}
             					else {
-HXLINE(1165)						_gthis->setUnreadCount(((dedupedMessages->length - readIndex) - 1));
+HXLINE(1174)						_gthis->setUnreadCount(((dedupedMessages->length - readIndex) - 1));
             					}
-HXLINE(1167)					_gthis->client->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,_gthis));
+HXLINE(1176)					_gthis->client->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,_gthis));
             				}
             			}
             			HX_END_LOCAL_FUNC1((void))
 
-            			HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1107_doSync)
-HXLINE(1108)			::Array< ::Dynamic> promises = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE(1109)			::Array< ::Dynamic> pageChatMessages = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE(1110)			{
-HXLINE(1110)				int _g = 0;
-HXDLIN(1110)				::Array< ::Dynamic> _g1 = ( (::Array< ::Dynamic>)(messageList->__Field(HX_("messages",cc,d8,fd,34),::hx::paccDynamic)) );
-HXDLIN(1110)				while((_g < _g1->length)){
-HXLINE(1110)					 ::snikket::MessageStanza m = _g1->__get(_g).StaticCast<  ::snikket::MessageStanza >();
-HXDLIN(1110)					_g = (_g + 1);
-HXLINE(1111)					switch((int)(m->_hx_getIndex())){
+            			HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1116_doSync)
+HXLINE(1117)			::Array< ::Dynamic> promises = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE(1118)			::Array< ::Dynamic> pageChatMessages = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE(1119)			{
+HXLINE(1119)				int _g = 0;
+HXDLIN(1119)				::Array< ::Dynamic> _g1 = ( (::Array< ::Dynamic>)(messageList->__Field(HX_("messages",cc,d8,fd,34),::hx::paccDynamic)) );
+HXDLIN(1119)				while((_g < _g1->length)){
+HXLINE(1119)					 ::snikket::MessageStanza m = _g1->__get(_g).StaticCast<  ::snikket::MessageStanza >();
+HXDLIN(1119)					_g = (_g + 1);
+HXLINE(1120)					switch((int)(m->_hx_getIndex())){
             						case (int)1: {
-HXLINE(1112)							 ::snikket::ChatMessage message = m->_hx_getObject(0).StaticCast<  ::snikket::ChatMessage >();
-HXDLIN(1112)							{
-HXLINE(1113)								{
-HXLINE(1113)									int _g2 = 0;
-HXDLIN(1113)									::Array< ::Dynamic> _g3 = message->inlineHashReferences();
-HXDLIN(1113)									while((_g2 < _g3->length)){
-HXLINE(1113)										 ::snikket::Hash hash = _g3->__get(_g2).StaticCast<  ::snikket::Hash >();
-HXDLIN(1113)										_g2 = (_g2 + 1);
-HXLINE(1114)										_gthis->client->fetchMediaByHash(::Array_obj< ::Dynamic>::__new(1)->init(0,hash),::Array_obj< ::Dynamic>::__new(1)->init(0,message->from));
+HXLINE(1121)							 ::snikket::ChatMessage message = m->_hx_getObject(0).StaticCast<  ::snikket::ChatMessage >();
+HXDLIN(1121)							{
+HXLINE(1122)								{
+HXLINE(1122)									int _g2 = 0;
+HXDLIN(1122)									::Array< ::Dynamic> _g3 = message->inlineHashReferences();
+HXDLIN(1122)									while((_g2 < _g3->length)){
+HXLINE(1122)										 ::snikket::Hash hash = _g3->__get(_g2).StaticCast<  ::snikket::Hash >();
+HXDLIN(1122)										_g2 = (_g2 + 1);
+HXLINE(1123)										_gthis->client->fetchMediaByHash(::Array_obj< ::Dynamic>::__new(1)->init(0,hash),::Array_obj< ::Dynamic>::__new(1)->init(0,message->from));
             									}
             								}
-HXLINE(1116)								pageChatMessages->push(message);
+HXLINE(1125)								pageChatMessages->push(message);
             							}
             						}
             						break;
@@ -657,18 +657,18 @@ HXLINE(1116)								pageChatMessages->push(message);
             							void _hx_run( ::Dynamic resolve, ::Dynamic reject){
             								HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_1, ::Dynamic,resolve) HXARGC(1)
             								void _hx_run( ::snikket::ChatMessage _){
-            									HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1123_doSync)
-HXLINE(1123)									resolve(null());
+            									HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1132_doSync)
+HXLINE(1132)									resolve(null());
             								}
             								HX_END_LOCAL_FUNC1((void))
 
-            								HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1123_doSync)
-HXLINE(1123)								::thenshim::_Promise::Promise_Impl__obj::then(_gthis->client->moderateMessage(action), ::Dynamic(new _hx_Closure_1(resolve)),null());
+            								HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1132_doSync)
+HXLINE(1132)								::thenshim::_Promise::Promise_Impl__obj::then(_gthis->client->moderateMessage(action), ::Dynamic(new _hx_Closure_1(resolve)),null());
             							}
             							HX_END_LOCAL_FUNC2((void))
 
-HXLINE(1121)							 ::snikket::ModerationAction action = m->_hx_getObject(0).StaticCast<  ::snikket::ModerationAction >();
-HXLINE(1122)							promises->push(::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_2(_gthis,action))));
+HXLINE(1130)							 ::snikket::ModerationAction action = m->_hx_getObject(0).StaticCast<  ::snikket::ModerationAction >();
+HXLINE(1131)							promises->push(::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_2(_gthis,action))));
             						}
             						break;
             						case (int)3: {
@@ -676,20 +676,20 @@ HXLINE(1122)							promises->push(::thenshim::_Promise::Promise_Impl__obj::_new(
             							void _hx_run( ::Dynamic resolve, ::Dynamic reject){
             								HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_3, ::Dynamic,resolve) HXARGC(1)
             								void _hx_run( ::snikket::ChatMessage _){
-            									HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1119_doSync)
-HXLINE(1119)									resolve(null());
+            									HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1128_doSync)
+HXLINE(1128)									resolve(null());
             								}
             								HX_END_LOCAL_FUNC1((void))
 
-            								HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1119_doSync)
-HXLINE(1119)								::Dynamic _gthis1 = _gthis->persistence;
-HXDLIN(1119)								::String _hx_tmp = _gthis->client->accountId();
-HXDLIN(1119)								::snikket::Persistence_obj::storeReaction(_gthis1,_hx_tmp,update, ::Dynamic(new _hx_Closure_3(resolve)));
+            								HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1128_doSync)
+HXLINE(1128)								::Dynamic _gthis1 = _gthis->persistence;
+HXDLIN(1128)								::String _hx_tmp = _gthis->client->accountId();
+HXDLIN(1128)								::snikket::Persistence_obj::storeReaction(_gthis1,_hx_tmp,update, ::Dynamic(new _hx_Closure_3(resolve)));
             							}
             							HX_END_LOCAL_FUNC2((void))
 
-HXLINE(1117)							 ::snikket::ReactionUpdate update = m->_hx_getObject(0).StaticCast<  ::snikket::ReactionUpdate >();
-HXLINE(1118)							promises->push(::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_4(_gthis,update))));
+HXLINE(1126)							 ::snikket::ReactionUpdate update = m->_hx_getObject(0).StaticCast<  ::snikket::ReactionUpdate >();
+HXLINE(1127)							promises->push(::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_4(_gthis,update))));
             						}
             						break;
             						default:{
@@ -697,70 +697,70 @@ HXLINE(1118)							promises->push(::thenshim::_Promise::Promise_Impl__obj::_new(
             					}
             				}
             			}
-HXLINE(1129)			promises->push(::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_5(_gthis,pageChatMessages))));
-HXLINE(1132)			::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::PromiseTools_obj::all(promises), ::Dynamic(new _hx_Closure_7(_gthis,chatMessages)),null());
+HXLINE(1138)			promises->push(::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_5(_gthis,pageChatMessages))));
+HXLINE(1141)			::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::PromiseTools_obj::all(promises), ::Dynamic(new _hx_Closure_7(_gthis,chatMessages)),null());
             		}
             		HX_END_LOCAL_FUNC1((void))
 
             		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_9, ::snikket::Channel,_gthis,::String,lastId) HXARGC(1)
             		void _hx_run( ::snikket::Stanza stanza){
-            			HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1171_doSync)
-HXLINE(1172)			_gthis->sync = null();
-HXLINE(1173)			if (::hx::IsNotNull( lastId )) {
-HXLINE(1175)				_gthis->doSync(null());
+            			HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1180_doSync)
+HXLINE(1181)			_gthis->sync = null();
+HXLINE(1182)			if (::hx::IsNotNull( lastId )) {
+HXLINE(1184)				_gthis->doSync(null());
             			}
             			else {
-HXLINE(1177)				::haxe::Log_obj::trace(HX_("SYNC failed",e2,ec,6f,fa), ::Dynamic(::hx::Anon_obj::Create(5)
+HXLINE(1186)				::haxe::Log_obj::trace(HX_("SYNC failed",e2,ec,6f,fa), ::Dynamic(::hx::Anon_obj::Create(5)
             					->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.Channel",b2,3f,68,db))
             					->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(2)->init(0,_gthis->chatId)->init(1,stanza))
             					->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("doSync",86,5f,63,1c))
             					->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/Chat.hx",f4,6b,61,18))
-            					->setFixed(4,HX_("lineNumber",dd,81,22,76),1177)));
+            					->setFixed(4,HX_("lineNumber",dd,81,22,76),1186)));
             			}
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1084_doSync)
-HXDLIN(1084)		 ::snikket::Channel _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE(1085)		if (!(this->disco->features->contains(HX_("urn:xmpp:mam:2",f5,ef,8c,da)))) {
-HXLINE(1086)			this->inSync = true;
-HXLINE(1087)			return;
+            	HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1093_doSync)
+HXDLIN(1093)		 ::snikket::Channel _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE(1094)		if (!(this->disco->features->contains(HX_("urn:xmpp:mam:2",f5,ef,8c,da)))) {
+HXLINE(1095)			this->inSync = true;
+HXLINE(1096)			return;
             		}
-HXLINE(1089)		if (::hx::IsNotNull( this->sync )) {
-HXLINE(1089)			return;
+HXLINE(1098)		if (::hx::IsNotNull( this->sync )) {
+HXLINE(1098)			return;
             		}
-HXLINE(1091)		::String threeDaysAgo = ::snikket::Date_obj::format(::Date_obj::fromTime((::Date_obj::now()->getTime() + ((Float)-259200000.))));
-HXLINE(1097)		 ::Dynamic _hx_tmp;
-HXDLIN(1097)		if (::hx::IsNull( lastId )) {
-HXLINE(1097)			_hx_tmp =  ::Dynamic(::hx::Anon_obj::Create(1)
+HXLINE(1100)		::String threeDaysAgo = ::snikket::Date_obj::format(::Date_obj::fromTime((::Date_obj::now()->getTime() + ((Float)-259200000.))));
+HXLINE(1106)		 ::Dynamic _hx_tmp;
+HXDLIN(1106)		if (::hx::IsNull( lastId )) {
+HXLINE(1106)			_hx_tmp =  ::Dynamic(::hx::Anon_obj::Create(1)
             				->setFixed(0,HX_("startTime",8f,45,f0,05),threeDaysAgo));
             		}
             		else {
-HXLINE(1097)			_hx_tmp =  ::Dynamic(::hx::Anon_obj::Create(1)
+HXLINE(1106)			_hx_tmp =  ::Dynamic(::hx::Anon_obj::Create(1)
             				->setFixed(0,HX_("page",4f,da,51,4a), ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("after",1c,66,a2,1d),lastId))));
             		}
-HXLINE(1094)		this->sync =  ::snikket::MessageSync_obj::__alloc( HX_CTX ,this->client,this->stream,_hx_tmp,this->chatId);
-HXLINE(1100)		this->sync->setNewestPageFirst(false);
-HXLINE(1101)		this->sync->addContext( ::Dynamic(new _hx_Closure_0(_gthis)));
-HXLINE(1106)		::Array< ::Dynamic> chatMessages = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE(1107)		this->sync->onMessages( ::Dynamic(new _hx_Closure_8(_gthis,chatMessages)));
-HXLINE(1171)		this->sync->onError( ::Dynamic(new _hx_Closure_9(_gthis,lastId)));
-HXLINE(1180)		this->sync->fetchNext();
+HXLINE(1103)		this->sync =  ::snikket::MessageSync_obj::__alloc( HX_CTX ,this->client,this->stream,_hx_tmp,this->chatId);
+HXLINE(1109)		this->sync->setNewestPageFirst(false);
+HXLINE(1110)		this->sync->addContext( ::Dynamic(new _hx_Closure_0(_gthis)));
+HXLINE(1115)		::Array< ::Dynamic> chatMessages = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE(1116)		this->sync->onMessages( ::Dynamic(new _hx_Closure_8(_gthis,chatMessages)));
+HXLINE(1180)		this->sync->onError( ::Dynamic(new _hx_Closure_9(_gthis,lastId)));
+HXLINE(1189)		this->sync->fetchNext();
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Channel_obj,doSync,(void))
 
 bool Channel_obj::isTrusted(){
-            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1184_isTrusted)
-HXDLIN(1184)		return (this->uiState != 2);
+            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1193_isTrusted)
+HXDLIN(1193)		return (this->uiState != 2);
             	}
 
 
 bool Channel_obj::isPrivate(){
-            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1188_isPrivate)
-HXDLIN(1188)		return this->disco->features->contains(HX_("muc_membersonly",41,e9,70,b7));
+            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1197_isPrivate)
+HXDLIN(1197)		return this->disco->features->contains(HX_("muc_membersonly",41,e9,70,b7));
             	}
 
 
@@ -769,154 +769,154 @@ HX_DEFINE_DYNAMIC_FUNC0(Channel_obj,isPrivate,return )
 void Channel_obj::refreshDisco( ::Dynamic callback){
             		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_0, ::snikket::Channel,_gthis, ::snikket::queries::DiscoInfoGet,discoGet, ::Dynamic,callback) HXARGC(0)
             		void _hx_run(){
-            			HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1194_refreshDisco)
-HXLINE(1195)			if (::hx::IsNotNull( discoGet->getResult() )) {
-HXLINE(1196)				bool setupNotifications;
-HXDLIN(1196)				if (::hx::IsNull( _gthis->disco )) {
-HXLINE(1196)					setupNotifications = ::hx::IsNull( _gthis->notificationSettings );
+            			HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1203_refreshDisco)
+HXLINE(1204)			if (::hx::IsNotNull( discoGet->getResult() )) {
+HXLINE(1205)				bool setupNotifications;
+HXDLIN(1205)				if (::hx::IsNull( _gthis->disco )) {
+HXLINE(1205)					setupNotifications = ::hx::IsNull( _gthis->notificationSettings );
             				}
             				else {
-HXLINE(1196)					setupNotifications = false;
+HXLINE(1205)					setupNotifications = false;
             				}
-HXLINE(1197)				_gthis->disco = discoGet->getResult();
-HXLINE(1198)				bool _hx_tmp;
-HXDLIN(1198)				if (setupNotifications) {
-HXLINE(1198)					_hx_tmp = !(_gthis->isPrivate());
+HXLINE(1206)				_gthis->disco = discoGet->getResult();
+HXLINE(1207)				bool _hx_tmp;
+HXDLIN(1207)				if (setupNotifications) {
+HXLINE(1207)					_hx_tmp = !(_gthis->isPrivate());
             				}
             				else {
-HXLINE(1198)					_hx_tmp = false;
+HXLINE(1207)					_hx_tmp = false;
             				}
-HXDLIN(1198)				if (_hx_tmp) {
-HXLINE(1198)					_gthis->notificationSettings =  ::Dynamic(::hx::Anon_obj::Create(2)
+HXDLIN(1207)				if (_hx_tmp) {
+HXLINE(1207)					_gthis->notificationSettings =  ::Dynamic(::hx::Anon_obj::Create(2)
             						->setFixed(0,HX_("mention",ea,9e,bf,b9),true)
             						->setFixed(1,HX_("reply",2a,09,c6,e6),false));
             				}
-HXLINE(1199)				::Dynamic _gthis1 = _gthis->persistence;
-HXDLIN(1199)				::snikket::Persistence_obj::storeCaps(_gthis1,discoGet->getResult());
-HXLINE(1200)				::Dynamic _gthis2 = _gthis->persistence;
-HXDLIN(1200)				::String _hx_tmp1 = _gthis->client->accountId();
-HXDLIN(1200)				::snikket::Persistence_obj::storeChats(_gthis2,_hx_tmp1,::Array_obj< ::Dynamic>::__new(1)->init(0,_gthis));
+HXLINE(1208)				::Dynamic _gthis1 = _gthis->persistence;
+HXDLIN(1208)				::snikket::Persistence_obj::storeCaps(_gthis1,discoGet->getResult());
+HXLINE(1209)				::Dynamic _gthis2 = _gthis->persistence;
+HXDLIN(1209)				::String _hx_tmp1 = _gthis->client->accountId();
+HXDLIN(1209)				::snikket::Persistence_obj::storeChats(_gthis2,_hx_tmp1,::Array_obj< ::Dynamic>::__new(1)->init(0,_gthis));
             			}
-HXLINE(1202)			if (::hx::IsNotNull( callback )) {
-HXLINE(1202)				callback();
+HXLINE(1211)			if (::hx::IsNotNull( callback )) {
+HXLINE(1211)				callback();
             			}
             		}
             		HX_END_LOCAL_FUNC0((void))
 
-            	HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1192_refreshDisco)
-HXDLIN(1192)		 ::snikket::Channel _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE(1193)		 ::snikket::queries::DiscoInfoGet discoGet =  ::snikket::queries::DiscoInfoGet_obj::__alloc( HX_CTX ,this->chatId,null());
-HXLINE(1194)		discoGet->onFinished( ::Dynamic(new _hx_Closure_0(_gthis,discoGet,callback)));
-HXLINE(1204)		this->client->sendQuery(discoGet);
+            	HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1201_refreshDisco)
+HXDLIN(1201)		 ::snikket::Channel _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE(1202)		 ::snikket::queries::DiscoInfoGet discoGet =  ::snikket::queries::DiscoInfoGet_obj::__alloc( HX_CTX ,this->chatId,null());
+HXLINE(1203)		discoGet->onFinished( ::Dynamic(new _hx_Closure_0(_gthis,discoGet,callback)));
+HXLINE(1213)		this->client->sendQuery(discoGet);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Channel_obj,refreshDisco,(void))
 
 ::String Channel_obj::preview(){
-            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1207_preview)
-HXLINE(1208)		if (::hx::IsNull( this->lastMessage )) {
-HXLINE(1208)			return this->super::preview();
+            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1216_preview)
+HXLINE(1217)		if (::hx::IsNull( this->lastMessage )) {
+HXLINE(1217)			return this->super::preview();
             		}
-HXLINE(1210)		::String _hx_tmp = (this->getParticipantDetails(this->lastMessage->senderId)->displayName + HX_(": ",a6,32,00,00));
-HXDLIN(1210)		return (_hx_tmp + this->super::preview());
+HXLINE(1219)		::String _hx_tmp = (this->getParticipantDetails(this->lastMessage->senderId)->displayName + HX_(": ",a6,32,00,00));
+HXDLIN(1219)		return (_hx_tmp + this->super::preview());
             	}
 
 
 bool Channel_obj::livePresence(){
-            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1214_livePresence)
-HXLINE(1215)		if (this->forceLive) {
-HXLINE(1215)			return true;
+            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1223_livePresence)
+HXLINE(1224)		if (this->forceLive) {
+HXLINE(1224)			return true;
             		}
-HXLINE(1217)		return ::hx::IsNotNull( this->_nickInUse );
+HXLINE(1226)		return ::hx::IsNotNull( this->_nickInUse );
             	}
 
 
 bool Channel_obj::syncing(){
-            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1221_syncing)
-HXDLIN(1221)		if (this->inSync) {
-HXDLIN(1221)			return !(this->livePresence());
+            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1230_syncing)
+HXDLIN(1230)		if (this->inSync) {
+HXDLIN(1230)			return !(this->livePresence());
             		}
             		else {
-HXDLIN(1221)			return true;
+HXDLIN(1230)			return true;
             		}
-HXDLIN(1221)		return false;
+HXDLIN(1230)		return false;
             	}
 
 
 bool Channel_obj::canAudioCall(){
-            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1225_canAudioCall)
-HXDLIN(1225)		 ::snikket::Caps tmp = this->disco;
-HXDLIN(1225)		::Array< ::String > tmp1;
-HXDLIN(1225)		if (::hx::IsNotNull( tmp )) {
-HXDLIN(1225)			tmp1 = tmp->features;
+            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1234_canAudioCall)
+HXDLIN(1234)		 ::snikket::Caps tmp = this->disco;
+HXDLIN(1234)		::Array< ::String > tmp1;
+HXDLIN(1234)		if (::hx::IsNotNull( tmp )) {
+HXDLIN(1234)			tmp1 = tmp->features;
             		}
             		else {
-HXDLIN(1225)			tmp1 = null();
+HXDLIN(1234)			tmp1 = null();
             		}
-HXDLIN(1225)		 ::Dynamic tmp2;
-HXDLIN(1225)		if (::hx::IsNotNull( tmp1 )) {
-HXDLIN(1225)			tmp2 = tmp1->contains(HX_("urn:xmpp:jingle:apps:rtp:audio",0f,8b,54,6c));
+HXDLIN(1234)		 ::Dynamic tmp2;
+HXDLIN(1234)		if (::hx::IsNotNull( tmp1 )) {
+HXDLIN(1234)			tmp2 = tmp1->contains(HX_("urn:xmpp:jingle:apps:rtp:audio",0f,8b,54,6c));
             		}
             		else {
-HXDLIN(1225)			tmp2 = null();
+HXDLIN(1234)			tmp2 = null();
             		}
-HXDLIN(1225)		if (::hx::IsNotNull( tmp2 )) {
-HXDLIN(1225)			return ( (bool)(tmp2) );
+HXDLIN(1234)		if (::hx::IsNotNull( tmp2 )) {
+HXDLIN(1234)			return ( (bool)(tmp2) );
             		}
             		else {
-HXDLIN(1225)			return false;
+HXDLIN(1234)			return false;
             		}
-HXDLIN(1225)		return false;
+HXDLIN(1234)		return false;
             	}
 
 
 bool Channel_obj::canVideoCall(){
-            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1229_canVideoCall)
-HXDLIN(1229)		 ::snikket::Caps tmp = this->disco;
-HXDLIN(1229)		::Array< ::String > tmp1;
-HXDLIN(1229)		if (::hx::IsNotNull( tmp )) {
-HXDLIN(1229)			tmp1 = tmp->features;
+            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1238_canVideoCall)
+HXDLIN(1238)		 ::snikket::Caps tmp = this->disco;
+HXDLIN(1238)		::Array< ::String > tmp1;
+HXDLIN(1238)		if (::hx::IsNotNull( tmp )) {
+HXDLIN(1238)			tmp1 = tmp->features;
             		}
             		else {
-HXDLIN(1229)			tmp1 = null();
+HXDLIN(1238)			tmp1 = null();
             		}
-HXDLIN(1229)		 ::Dynamic tmp2;
-HXDLIN(1229)		if (::hx::IsNotNull( tmp1 )) {
-HXDLIN(1229)			tmp2 = tmp1->contains(HX_("urn:xmpp:jingle:apps:rtp:video",b4,26,d0,7b));
+HXDLIN(1238)		 ::Dynamic tmp2;
+HXDLIN(1238)		if (::hx::IsNotNull( tmp1 )) {
+HXDLIN(1238)			tmp2 = tmp1->contains(HX_("urn:xmpp:jingle:apps:rtp:video",b4,26,d0,7b));
             		}
             		else {
-HXDLIN(1229)			tmp2 = null();
+HXDLIN(1238)			tmp2 = null();
             		}
-HXDLIN(1229)		if (::hx::IsNotNull( tmp2 )) {
-HXDLIN(1229)			return ( (bool)(tmp2) );
+HXDLIN(1238)		if (::hx::IsNotNull( tmp2 )) {
+HXDLIN(1238)			return ( (bool)(tmp2) );
             		}
             		else {
-HXDLIN(1229)			return false;
+HXDLIN(1238)			return false;
             		}
-HXDLIN(1229)		return false;
+HXDLIN(1238)		return false;
             	}
 
 
 ::String Channel_obj::nickInUse(){
-            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1233_nickInUse)
-HXDLIN(1233)		::String tmp = this->_nickInUse;
-HXDLIN(1233)		if (::hx::IsNotNull( tmp )) {
-HXDLIN(1233)			return tmp;
+            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1242_nickInUse)
+HXDLIN(1242)		::String tmp = this->_nickInUse;
+HXDLIN(1242)		if (::hx::IsNotNull( tmp )) {
+HXDLIN(1242)			return tmp;
             		}
             		else {
-HXDLIN(1233)			return this->client->displayName();
+HXDLIN(1242)			return this->client->displayName();
             		}
-HXDLIN(1233)		return null();
+HXDLIN(1242)		return null();
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Channel_obj,nickInUse,return )
 
  ::snikket::JID Channel_obj::getFullJid(){
-            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1237_getFullJid)
-HXDLIN(1237)		 ::snikket::JID _hx_tmp = ::snikket::JID_obj::parse(this->chatId);
-HXDLIN(1237)		return _hx_tmp->withResource(this->nickInUse());
+            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1246_getFullJid)
+HXDLIN(1246)		 ::snikket::JID _hx_tmp = ::snikket::JID_obj::parse(this->chatId);
+HXDLIN(1246)		return _hx_tmp->withResource(this->nickInUse());
             	}
 
 
@@ -925,207 +925,215 @@ HX_DEFINE_DYNAMIC_FUNC0(Channel_obj,getFullJid,return )
 ::Array< ::String > Channel_obj::getParticipants(){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::Channel,_gthis) HXARGC(0)
             		 ::Dynamic _hx_run(){
-            			HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1243_getParticipants)
-HXLINE(1243)			return _gthis->presence->keys();
+            			HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1252_getParticipants)
+HXLINE(1252)			return _gthis->presence->keys();
             		}
             		HX_END_LOCAL_FUNC0(return)
 
             		HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_1) HXARGC(1)
             		bool _hx_run(::String resource){
-            			HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1243_getParticipants)
-HXLINE(1243)			return ::hx::IsNotNull( resource );
+            			HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1252_getParticipants)
+HXLINE(1252)			return ::hx::IsNotNull( resource );
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            	HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1241_getParticipants)
-HXDLIN(1241)		 ::snikket::Channel _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE(1242)		 ::snikket::JID jid = ::snikket::JID_obj::parse(this->chatId);
-HXLINE(1243)		::Array< ::String > _this = ::Lambda_obj::filter( ::Dynamic(::hx::Anon_obj::Create(1)
+            	HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1250_getParticipants)
+HXDLIN(1250)		 ::snikket::Channel _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE(1251)		 ::snikket::JID jid = ::snikket::JID_obj::parse(this->chatId);
+HXLINE(1252)		::Array< ::String > _this = ::Lambda_obj::filter( ::Dynamic(::hx::Anon_obj::Create(1)
             			->setFixed(0,HX_("iterator",ee,49,9a,93), ::Dynamic(new _hx_Closure_0(_gthis)))), ::Dynamic(new _hx_Closure_1()));
-HXDLIN(1243)		::Array< ::String > result = ::Array_obj< ::String >::__new(_this->length);
-HXDLIN(1243)		{
-HXLINE(1243)			int _g = 0;
-HXDLIN(1243)			int _g1 = _this->length;
-HXDLIN(1243)			while((_g < _g1)){
-HXLINE(1243)				_g = (_g + 1);
-HXDLIN(1243)				int i = (_g - 1);
-HXDLIN(1243)				{
-HXLINE(1243)					::String resource = ( (::String)(_hx_array_unsafe_get(_this,i)) );
-HXDLIN(1243)					::String inValue =  ::snikket::JID_obj::__alloc( HX_CTX ,jid->node,jid->domain,resource)->asString();
-HXDLIN(1243)					result->__unsafe_set(i,inValue);
+HXDLIN(1252)		::Array< ::String > result = ::Array_obj< ::String >::__new(_this->length);
+HXDLIN(1252)		{
+HXLINE(1252)			int _g = 0;
+HXDLIN(1252)			int _g1 = _this->length;
+HXDLIN(1252)			while((_g < _g1)){
+HXLINE(1252)				_g = (_g + 1);
+HXDLIN(1252)				int i = (_g - 1);
+HXDLIN(1252)				{
+HXLINE(1252)					::String resource = ( (::String)(_hx_array_unsafe_get(_this,i)) );
+HXDLIN(1252)					::String inValue =  ::snikket::JID_obj::__alloc( HX_CTX ,jid->node,jid->domain,resource,null())->asString();
+HXDLIN(1252)					result->__unsafe_set(i,inValue);
             				}
             			}
             		}
-HXDLIN(1243)		return result;
+HXDLIN(1252)		return result;
             	}
 
 
  ::snikket::Participant Channel_obj::getParticipantDetails(::String participantId){
-            	HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1248_getParticipantDetails)
-HXDLIN(1248)		if ((participantId == this->getFullJid()->asString())) {
-HXLINE(1249)			 ::snikket::Client chat = this->client;
-HXDLIN(1249)			 ::snikket::DirectChat chat1 = chat->getDirectChat(this->client->accountId(),false);
-HXLINE(1250)			::String _hx_tmp = this->client->displayName();
-HXDLIN(1250)			::String _hx_tmp1 = chat1->getPhoto();
-HXDLIN(1250)			return  ::snikket::Participant_obj::__alloc( HX_CTX ,_hx_tmp,_hx_tmp1,chat1->getPlaceholder(),true);
+            	HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1257_getParticipantDetails)
+HXDLIN(1257)		if ((participantId == this->getFullJid()->asString())) {
+HXLINE(1258)			 ::snikket::Client chat = this->client;
+HXDLIN(1258)			 ::snikket::DirectChat chat1 = chat->getDirectChat(this->client->accountId(),false);
+HXLINE(1259)			::String _hx_tmp = this->client->displayName();
+HXDLIN(1259)			::String _hx_tmp1 = chat1->getPhoto();
+HXDLIN(1259)			return  ::snikket::Participant_obj::__alloc( HX_CTX ,_hx_tmp,_hx_tmp1,chat1->getPlaceholder(),true);
             		}
             		else {
-HXLINE(1252)			::String nick = ::snikket::JID_obj::parse(participantId)->resource;
-HXLINE(1253)			::String placeholderUri;
-HXDLIN(1253)			if (::hx::IsNull( nick )) {
-HXLINE(1253)				placeholderUri = HX_(" ",20,00,00,00);
+HXLINE(1261)			::String nick = ::snikket::JID_obj::parse(participantId)->resource;
+HXLINE(1262)			::String placeholderUri;
+HXDLIN(1262)			if (::hx::IsNull( nick )) {
+HXLINE(1262)				placeholderUri = HX_(" ",20,00,00,00);
+            			}
+            			else {
+HXLINE(1262)				placeholderUri = nick.charAt(0);
+            			}
+HXDLIN(1262)			::String placeholderUri1 = ::snikket::Color_obj::defaultPhoto(participantId,placeholderUri);
+HXLINE(1263)			::String tmp = nick;
+HXDLIN(1263)			::String _hx_tmp2;
+HXDLIN(1263)			if (::hx::IsNotNull( tmp )) {
+HXLINE(1263)				_hx_tmp2 = tmp;
             			}
             			else {
-HXLINE(1253)				placeholderUri = nick.charAt(0);
+HXLINE(1263)				_hx_tmp2 = HX_("",00,00,00,00);
             			}
-HXDLIN(1253)			::String placeholderUri1 = ::snikket::Color_obj::defaultPhoto(participantId,placeholderUri);
-HXLINE(1254)			return  ::snikket::Participant_obj::__alloc( HX_CTX ,nick,null(),placeholderUri1,false);
+HXDLIN(1263)			return  ::snikket::Participant_obj::__alloc( HX_CTX ,_hx_tmp2,null(),placeholderUri1,false);
             		}
-HXLINE(1248)		return null();
+HXLINE(1257)		return null();
             	}
 
 
 void Channel_obj::getMessagesBefore(::String beforeId,::String beforeTime, ::Dynamic handler){
             		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_1, ::snikket::Channel,_gthis,::String,beforeId, ::Dynamic,handler) HXARGC(1)
             		void _hx_run(::Array< ::Dynamic> messages){
-            			HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1261_getMessagesBefore)
-HXLINE(1261)			if ((messages->length > 0)) {
-HXLINE(1262)				handler(messages);
+            			HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1270_getMessagesBefore)
+HXLINE(1270)			if ((messages->length > 0)) {
+HXLINE(1271)				handler(messages);
             			}
             			else {
             				HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::Channel,_gthis) HXARGC(2)
             				 ::snikket::ChatMessageBuilder _hx_run( ::snikket::ChatMessageBuilder builder, ::snikket::Stanza stanza){
-            					HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1267_getMessagesBefore)
-HXLINE(1268)					builder = _gthis->prepareIncomingMessage(builder,stanza);
-HXLINE(1269)					builder->syncPoint = false;
-HXLINE(1270)					return builder;
+            					HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1276_getMessagesBefore)
+HXLINE(1277)					builder = _gthis->prepareIncomingMessage(builder,stanza);
+HXLINE(1278)					builder->syncPoint = false;
+HXLINE(1279)					return builder;
             				}
             				HX_END_LOCAL_FUNC2(return)
 
-HXLINE(1264)				 ::Dynamic filter =  ::Dynamic(::hx::Anon_obj::Create(0));
-HXLINE(1265)				if (::hx::IsNotNull( beforeId )) {
-HXLINE(1265)					filter->__SetField(HX_("page",4f,da,51,4a), ::Dynamic(::hx::Anon_obj::Create(1)
+HXLINE(1273)				 ::Dynamic filter =  ::Dynamic(::hx::Anon_obj::Create(0));
+HXLINE(1274)				if (::hx::IsNotNull( beforeId )) {
+HXLINE(1274)					filter->__SetField(HX_("page",4f,da,51,4a), ::Dynamic(::hx::Anon_obj::Create(1)
             						->setFixed(0,HX_("before",7f,54,32,9a),beforeId)),::hx::paccDynamic);
             				}
-HXLINE(1266)				 ::snikket::MessageSync sync =  ::snikket::MessageSync_obj::__alloc( HX_CTX ,_gthis->client,_gthis->stream,filter,_gthis->chatId);
-HXLINE(1267)				sync->addContext( ::Dynamic(new _hx_Closure_0(_gthis)));
-HXLINE(1272)				_gthis->fetchFromSync(sync,handler);
+HXLINE(1275)				 ::snikket::MessageSync sync =  ::snikket::MessageSync_obj::__alloc( HX_CTX ,_gthis->client,_gthis->stream,filter,_gthis->chatId);
+HXLINE(1276)				sync->addContext( ::Dynamic(new _hx_Closure_0(_gthis)));
+HXLINE(1281)				_gthis->fetchFromSync(sync,handler);
             			}
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1259_getMessagesBefore)
-HXDLIN(1259)		 ::snikket::Channel _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE(1260)		::Dynamic _hx_tmp = this->persistence;
-HXDLIN(1260)		::String _hx_tmp1 = this->client->accountId();
-HXDLIN(1260)		::snikket::Persistence_obj::getMessagesBefore(_hx_tmp,_hx_tmp1,this->chatId,beforeId,beforeTime, ::Dynamic(new _hx_Closure_1(_gthis,beforeId,handler)));
+            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1268_getMessagesBefore)
+HXDLIN(1268)		 ::snikket::Channel _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE(1269)		::Dynamic _hx_tmp = this->persistence;
+HXDLIN(1269)		::String _hx_tmp1 = this->client->accountId();
+HXDLIN(1269)		::snikket::Persistence_obj::getMessagesBefore(_hx_tmp,_hx_tmp1,this->chatId,beforeId,beforeTime, ::Dynamic(new _hx_Closure_1(_gthis,beforeId,handler)));
             	}
 
 
 void Channel_obj::getMessagesAfter(::String afterId,::String afterTime, ::Dynamic handler){
             		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_1, ::snikket::Channel,_gthis,::String,afterId, ::Dynamic,handler) HXARGC(1)
             		void _hx_run(::Array< ::Dynamic> messages){
-            			HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1284_getMessagesAfter)
-HXLINE(1284)			if ((messages->length > 0)) {
-HXLINE(1285)				handler(messages);
+            			HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1293_getMessagesAfter)
+HXLINE(1293)			if ((messages->length > 0)) {
+HXLINE(1294)				handler(messages);
             			}
             			else {
             				HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::Channel,_gthis) HXARGC(2)
             				 ::snikket::ChatMessageBuilder _hx_run( ::snikket::ChatMessageBuilder builder, ::snikket::Stanza stanza){
-            					HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1290_getMessagesAfter)
-HXLINE(1291)					builder = _gthis->prepareIncomingMessage(builder,stanza);
-HXLINE(1292)					builder->syncPoint = false;
-HXLINE(1293)					return builder;
+            					HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1299_getMessagesAfter)
+HXLINE(1300)					builder = _gthis->prepareIncomingMessage(builder,stanza);
+HXLINE(1301)					builder->syncPoint = false;
+HXLINE(1302)					return builder;
             				}
             				HX_END_LOCAL_FUNC2(return)
 
-HXLINE(1287)				 ::Dynamic filter =  ::Dynamic(::hx::Anon_obj::Create(0));
-HXLINE(1288)				if (::hx::IsNotNull( afterId )) {
-HXLINE(1288)					filter->__SetField(HX_("page",4f,da,51,4a), ::Dynamic(::hx::Anon_obj::Create(1)
+HXLINE(1296)				 ::Dynamic filter =  ::Dynamic(::hx::Anon_obj::Create(0));
+HXLINE(1297)				if (::hx::IsNotNull( afterId )) {
+HXLINE(1297)					filter->__SetField(HX_("page",4f,da,51,4a), ::Dynamic(::hx::Anon_obj::Create(1)
             						->setFixed(0,HX_("after",1c,66,a2,1d),afterId)),::hx::paccDynamic);
             				}
-HXLINE(1289)				 ::snikket::MessageSync sync =  ::snikket::MessageSync_obj::__alloc( HX_CTX ,_gthis->client,_gthis->stream,filter,_gthis->chatId);
-HXLINE(1290)				sync->addContext( ::Dynamic(new _hx_Closure_0(_gthis)));
-HXLINE(1295)				_gthis->fetchFromSync(sync,handler);
+HXLINE(1298)				 ::snikket::MessageSync sync =  ::snikket::MessageSync_obj::__alloc( HX_CTX ,_gthis->client,_gthis->stream,filter,_gthis->chatId);
+HXLINE(1299)				sync->addContext( ::Dynamic(new _hx_Closure_0(_gthis)));
+HXLINE(1304)				_gthis->fetchFromSync(sync,handler);
             			}
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1278_getMessagesAfter)
-HXDLIN(1278)		 ::snikket::Channel _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE(1279)		bool _hx_tmp;
-HXDLIN(1279)		::String afterId1 = afterId;
-HXDLIN(1279)		if ((afterId1 == this->lastMessageId())) {
-HXLINE(1279)			_hx_tmp = !(this->syncing());
+            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1287_getMessagesAfter)
+HXDLIN(1287)		 ::snikket::Channel _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE(1288)		bool _hx_tmp;
+HXDLIN(1288)		::String afterId1 = afterId;
+HXDLIN(1288)		if ((afterId1 == this->lastMessageId())) {
+HXLINE(1288)			_hx_tmp = !(this->syncing());
             		}
             		else {
-HXLINE(1279)			_hx_tmp = false;
+HXLINE(1288)			_hx_tmp = false;
             		}
-HXDLIN(1279)		if (_hx_tmp) {
-HXLINE(1280)			handler(::Array_obj< ::Dynamic>::__new(0));
-HXLINE(1281)			return;
+HXDLIN(1288)		if (_hx_tmp) {
+HXLINE(1289)			handler(::Array_obj< ::Dynamic>::__new(0));
+HXLINE(1290)			return;
             		}
-HXLINE(1283)		::Dynamic _hx_tmp1 = this->persistence;
-HXDLIN(1283)		::String _hx_tmp2 = this->client->accountId();
-HXDLIN(1283)		::snikket::Persistence_obj::getMessagesAfter(_hx_tmp1,_hx_tmp2,this->chatId,afterId,afterTime, ::Dynamic(new _hx_Closure_1(_gthis,afterId,handler)));
+HXLINE(1292)		::Dynamic _hx_tmp1 = this->persistence;
+HXDLIN(1292)		::String _hx_tmp2 = this->client->accountId();
+HXDLIN(1292)		::snikket::Persistence_obj::getMessagesAfter(_hx_tmp1,_hx_tmp2,this->chatId,afterId,afterTime, ::Dynamic(new _hx_Closure_1(_gthis,afterId,handler)));
             	}
 
 
 void Channel_obj::getMessagesAround(::String aroundId,::String aroundTime, ::Dynamic handler){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::Dynamic,handler) HXARGC(1)
             		void _hx_run(::Array< ::Dynamic> messages){
-            			HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1303_getMessagesAround)
-HXLINE(1303)			if ((messages->length > 0)) {
-HXLINE(1304)				handler(messages);
+            			HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1312_getMessagesAround)
+HXLINE(1312)			if ((messages->length > 0)) {
+HXLINE(1313)				handler(messages);
             			}
             			else {
-HXLINE(1307)				handler(::Array_obj< ::Dynamic>::__new(0));
+HXLINE(1316)				handler(::Array_obj< ::Dynamic>::__new(0));
             			}
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1302_getMessagesAround)
-HXDLIN(1302)		::Dynamic _hx_tmp = this->persistence;
-HXDLIN(1302)		::String _hx_tmp1 = this->client->accountId();
-HXDLIN(1302)		::snikket::Persistence_obj::getMessagesAround(_hx_tmp,_hx_tmp1,this->chatId,aroundId,aroundTime, ::Dynamic(new _hx_Closure_0(handler)));
+            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1311_getMessagesAround)
+HXDLIN(1311)		::Dynamic _hx_tmp = this->persistence;
+HXDLIN(1311)		::String _hx_tmp1 = this->client->accountId();
+HXDLIN(1311)		::snikket::Persistence_obj::getMessagesAround(_hx_tmp,_hx_tmp1,this->chatId,aroundId,aroundTime, ::Dynamic(new _hx_Closure_0(handler)));
             	}
 
 
  ::snikket::ChatMessageBuilder Channel_obj::prepareIncomingMessage( ::snikket::ChatMessageBuilder message, ::snikket::Stanza stanza){
-            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1313_prepareIncomingMessage)
-HXLINE(1314)		message->syncPoint = !(this->syncing());
-HXLINE(1315)		if ((message->type == 0)) {
-HXLINE(1315)			message->type = 3;
-            		}
-HXLINE(1316)		message->senderId = ( (::String)(::Reflect_obj::field(stanza->attr,HX_("from",6a,a5,c2,43))) );
-HXLINE(1317)		::String _hx_tmp = message->get_senderId();
-HXDLIN(1317)		if ((_hx_tmp == this->getFullJid()->asString())) {
-HXLINE(1318)			message->recipients = message->replyTo;
-HXLINE(1319)			message->direction = 1;
-            		}
-HXLINE(1321)		return message;
+            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1322_prepareIncomingMessage)
+HXLINE(1323)		message->syncPoint = !(this->syncing());
+HXLINE(1324)		if ((message->type == 0)) {
+HXLINE(1324)			message->type = 3;
+            		}
+HXLINE(1325)		message->senderId = ( (::String)(::Reflect_obj::field(stanza->attr,HX_("from",6a,a5,c2,43))) );
+HXLINE(1326)		::String _hx_tmp = message->get_senderId();
+HXDLIN(1326)		if ((_hx_tmp == this->getFullJid()->asString())) {
+HXLINE(1327)			message->recipients = message->replyTo;
+HXLINE(1328)			message->direction = 1;
+            		}
+HXLINE(1330)		return message;
             	}
 
 
  ::snikket::ChatMessageBuilder Channel_obj::prepareOutgoingMessage( ::snikket::ChatMessageBuilder message){
-            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1324_prepareOutgoingMessage)
-HXLINE(1325)		message->type = 2;
-HXLINE(1326)		::String tmp = message->timestamp;
-HXDLIN(1326)		::String _hx_tmp;
-HXDLIN(1326)		if (::hx::IsNotNull( tmp )) {
-HXLINE(1326)			_hx_tmp = tmp;
+            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1333_prepareOutgoingMessage)
+HXLINE(1334)		message->type = 2;
+HXLINE(1335)		::String tmp = message->timestamp;
+HXDLIN(1335)		::String _hx_tmp;
+HXDLIN(1335)		if (::hx::IsNotNull( tmp )) {
+HXLINE(1335)			_hx_tmp = tmp;
             		}
             		else {
-HXLINE(1326)			_hx_tmp = ::snikket::Date_obj::format(::Date_obj::now());
-            		}
-HXDLIN(1326)		message->timestamp = _hx_tmp;
-HXLINE(1327)		message->direction = 1;
-HXLINE(1328)		message->from = this->client->jid;
-HXLINE(1329)		message->sender = this->getFullJid();
-HXLINE(1330)		message->replyTo = ::Array_obj< ::Dynamic>::__new(1)->init(0,message->sender);
-HXLINE(1331)		message->to = ::snikket::JID_obj::parse(this->chatId);
-HXLINE(1332)		message->recipients = ::Array_obj< ::Dynamic>::__new(1)->init(0,message->to);
-HXLINE(1333)		return message;
+HXLINE(1335)			_hx_tmp = ::snikket::Date_obj::format(::Date_obj::now());
+            		}
+HXDLIN(1335)		message->timestamp = _hx_tmp;
+HXLINE(1336)		message->direction = 1;
+HXLINE(1337)		message->from = this->client->jid;
+HXLINE(1338)		message->sender = this->getFullJid();
+HXLINE(1339)		message->replyTo = ::Array_obj< ::Dynamic>::__new(1)->init(0,message->sender);
+HXLINE(1340)		message->to = ::snikket::JID_obj::parse(this->chatId);
+HXLINE(1341)		message->recipients = ::Array_obj< ::Dynamic>::__new(1)->init(0,message->to);
+HXLINE(1342)		return message;
             	}
 
 
@@ -1134,123 +1142,131 @@ HX_DEFINE_DYNAMIC_FUNC1(Channel_obj,prepareOutgoingMessage,return )
 void Channel_obj::correctMessage(::String localId, ::snikket::ChatMessageBuilder message){
             		HX_BEGIN_LOCAL_FUNC_S4(::hx::LocalFunc,_hx_Closure_0, ::snikket::Channel,_gthis,::Array< ::Dynamic>,message1,::String,localId,::String,toSendId) HXARGC(1)
             		void _hx_run(::Array< ::Dynamic> corrected){
-            			HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1342_correctMessage)
-HXLINE(1343)			::Array< ::Dynamic> _hx_tmp;
-HXDLIN(1343)			if ((corrected->__get(0).StaticCast<  ::snikket::ChatMessage >()->localId == localId)) {
-HXLINE(1343)				_hx_tmp = corrected->__get(0).StaticCast<  ::snikket::ChatMessage >()->versions;
+            			HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1351_correctMessage)
+HXLINE(1352)			::Array< ::Dynamic> _hx_tmp;
+HXDLIN(1352)			 ::snikket::ChatMessage tmp = corrected->__get(0).StaticCast<  ::snikket::ChatMessage >()->versions->__get(0).StaticCast<  ::snikket::ChatMessage >();
+HXDLIN(1352)			::String _hx_tmp1;
+HXDLIN(1352)			if (::hx::IsNotNull( tmp )) {
+HXLINE(1352)				_hx_tmp1 = tmp->localId;
+            			}
+            			else {
+HXLINE(1352)				_hx_tmp1 = null();
+            			}
+HXDLIN(1352)			if ((_hx_tmp1 == localId)) {
+HXLINE(1352)				_hx_tmp = corrected->__get(0).StaticCast<  ::snikket::ChatMessage >()->versions;
             			}
             			else {
-HXLINE(1343)				_hx_tmp = ::Array_obj< ::Dynamic>::__new(1)->init(0,message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->build());
+HXLINE(1352)				_hx_tmp = ::Array_obj< ::Dynamic>::__new(1)->init(0,message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->build());
             			}
-HXDLIN(1343)			message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->versions = _hx_tmp;
-HXLINE(1344)			message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->localId = toSendId;
-HXLINE(1345)			 ::snikket::Client _gthis1 = _gthis->client;
-HXDLIN(1345)			_gthis1->sendStanza(message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->build()->asStanza());
-HXLINE(1346)			_gthis->client->notifyMessageHandlers(corrected->__get(0).StaticCast<  ::snikket::ChatMessage >(),1);
-HXLINE(1347)			 ::snikket::ChatMessage tmp = _gthis->lastMessage;
-HXDLIN(1347)			::String _hx_tmp1;
-HXDLIN(1347)			if (::hx::IsNotNull( tmp )) {
-HXLINE(1347)				_hx_tmp1 = tmp->localId;
+HXDLIN(1352)			message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->versions = _hx_tmp;
+HXLINE(1353)			message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->localId = toSendId;
+HXLINE(1354)			 ::snikket::Client _gthis1 = _gthis->client;
+HXDLIN(1354)			_gthis1->sendStanza(message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->build()->asStanza());
+HXLINE(1355)			_gthis->client->notifyMessageHandlers(corrected->__get(0).StaticCast<  ::snikket::ChatMessage >(),1);
+HXLINE(1356)			 ::snikket::ChatMessage tmp1 = _gthis->lastMessage;
+HXDLIN(1356)			::String _hx_tmp2;
+HXDLIN(1356)			if (::hx::IsNotNull( tmp1 )) {
+HXLINE(1356)				_hx_tmp2 = tmp1->localId;
             			}
             			else {
-HXLINE(1347)				_hx_tmp1 = null();
+HXLINE(1356)				_hx_tmp2 = null();
             			}
-HXDLIN(1347)			if ((localId == _hx_tmp1)) {
-HXLINE(1348)				_gthis->setLastMessage(corrected->__get(0).StaticCast<  ::snikket::ChatMessage >());
-HXLINE(1349)				_gthis->client->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,_gthis));
+HXDLIN(1356)			if ((localId == _hx_tmp2)) {
+HXLINE(1357)				_gthis->setLastMessage(corrected->__get(0).StaticCast<  ::snikket::ChatMessage >());
+HXLINE(1358)				_gthis->client->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,_gthis));
             			}
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1337_correctMessage)
-HXDLIN(1337)		::Array< ::Dynamic> message1 = ::Array_obj< ::Dynamic>::__new(1)->init(0,message);
-HXDLIN(1337)		 ::snikket::Channel _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE(1338)		::String toSendId = message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->localId;
-HXLINE(1339)		message1[0] = this->prepareOutgoingMessage(message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >());
-HXLINE(1340)		 ::snikket::ChatMessage _hx_tmp = message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->build();
-HXDLIN(1340)		message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->versions = ::Array_obj< ::Dynamic>::__new(1)->init(0,_hx_tmp);
-HXLINE(1341)		message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->localId = localId;
-HXLINE(1342)		 ::snikket::Client _hx_tmp1 = this->client;
-HXDLIN(1342)		_hx_tmp1->storeMessages(::Array_obj< ::Dynamic>::__new(1)->init(0,message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->build()), ::Dynamic(new _hx_Closure_0(_gthis,message1,localId,toSendId)));
+            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1346_correctMessage)
+HXDLIN(1346)		::Array< ::Dynamic> message1 = ::Array_obj< ::Dynamic>::__new(1)->init(0,message);
+HXDLIN(1346)		 ::snikket::Channel _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE(1347)		::String toSendId = message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->localId;
+HXLINE(1348)		message1[0] = this->prepareOutgoingMessage(message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >());
+HXLINE(1349)		 ::snikket::ChatMessage _hx_tmp = message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->build();
+HXDLIN(1349)		message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->versions = ::Array_obj< ::Dynamic>::__new(1)->init(0,_hx_tmp);
+HXLINE(1350)		message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->localId = localId;
+HXLINE(1351)		 ::snikket::Client _hx_tmp1 = this->client;
+HXDLIN(1351)		_hx_tmp1->storeMessages(::Array_obj< ::Dynamic>::__new(1)->init(0,message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->build()), ::Dynamic(new _hx_Closure_0(_gthis,message1,localId,toSendId)));
             	}
 
 
 void Channel_obj::sendMessage( ::snikket::ChatMessageBuilder message){
-            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1355_sendMessage)
-HXDLIN(1355)		 ::snikket::Channel _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE(1356)		if (::hx::IsNotNull( this->typingTimer )) {
-HXLINE(1356)			this->typingTimer->stop();
-            		}
-HXLINE(1357)		this->client->chatActivity(::hx::ObjectPtr<OBJ_>(this),null());
-HXLINE(1358)		message = this->prepareOutgoingMessage(message);
-HXLINE(1359)		 ::snikket::Stanza stanza = message->build()->asStanza();
-HXLINE(1361)		{
-HXLINE(1361)			 ::Dynamic this1 = stanza->attr;
-HXDLIN(1361)			::String value = this->getFullJid()->asString();
-HXDLIN(1361)			::Reflect_obj::setField(this1,HX_("from",6a,a5,c2,43),value);
-            		}
-HXLINE(1362)		 ::snikket::MessageStanza fromStanza = ::snikket::Message_obj::fromStanza(stanza,this->client->jid,null())->parsed;
-HXLINE(1363)		{
-HXLINE(1363)			 ::Dynamic this2 = stanza->attr;
-HXDLIN(1363)			::String value1 = this->client->jid->asString();
-HXDLIN(1363)			::Reflect_obj::setField(this2,HX_("from",6a,a5,c2,43),value1);
-            		}
-HXLINE(1364)		switch((int)(fromStanza->_hx_getIndex())){
+            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1364_sendMessage)
+HXDLIN(1364)		 ::snikket::Channel _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE(1365)		if (::hx::IsNotNull( this->typingTimer )) {
+HXLINE(1365)			this->typingTimer->stop();
+            		}
+HXLINE(1366)		this->client->chatActivity(::hx::ObjectPtr<OBJ_>(this),null());
+HXLINE(1367)		message = this->prepareOutgoingMessage(message);
+HXLINE(1368)		 ::snikket::Stanza stanza = message->build()->asStanza();
+HXLINE(1370)		{
+HXLINE(1370)			 ::Dynamic this1 = stanza->attr;
+HXDLIN(1370)			::String value = this->getFullJid()->asString();
+HXDLIN(1370)			::Reflect_obj::setField(this1,HX_("from",6a,a5,c2,43),value);
+            		}
+HXLINE(1371)		 ::snikket::MessageStanza fromStanza = ::snikket::Message_obj::fromStanza(stanza,this->client->jid,null())->parsed;
+HXLINE(1372)		{
+HXLINE(1372)			 ::Dynamic this2 = stanza->attr;
+HXDLIN(1372)			::String value1 = this->client->jid->asString();
+HXDLIN(1372)			::Reflect_obj::setField(this2,HX_("from",6a,a5,c2,43),value1);
+            		}
+HXLINE(1373)		switch((int)(fromStanza->_hx_getIndex())){
             			case (int)1: {
-HXLINE(1365)				 ::snikket::ChatMessage _g = fromStanza->_hx_getObject(0).StaticCast<  ::snikket::ChatMessage >();
-HXDLIN(1365)				{
+HXLINE(1374)				 ::snikket::ChatMessage _g = fromStanza->_hx_getObject(0).StaticCast<  ::snikket::ChatMessage >();
+HXDLIN(1374)				{
             					HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0, ::snikket::Channel,_gthis, ::snikket::Stanza,stanza) HXARGC(1)
             					void _hx_run(::Array< ::Dynamic> stored){
-            						HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1371_sendMessage)
-HXLINE(1372)						_gthis->client->sendStanza(stanza);
-HXLINE(1373)						_gthis->setLastMessage(stored->__get(0).StaticCast<  ::snikket::ChatMessage >());
-HXLINE(1374)						int _hx_tmp;
-HXDLIN(1374)						if ((stored->__get(0).StaticCast<  ::snikket::ChatMessage >()->versions->length > 1)) {
-HXLINE(1374)							_hx_tmp = 1;
+            						HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1380_sendMessage)
+HXLINE(1381)						_gthis->client->sendStanza(stanza);
+HXLINE(1382)						_gthis->setLastMessage(stored->__get(0).StaticCast<  ::snikket::ChatMessage >());
+HXLINE(1383)						int _hx_tmp;
+HXDLIN(1383)						if ((stored->__get(0).StaticCast<  ::snikket::ChatMessage >()->versions->length > 1)) {
+HXLINE(1383)							_hx_tmp = 1;
             						}
             						else {
-HXLINE(1374)							_hx_tmp = 0;
+HXLINE(1383)							_hx_tmp = 0;
             						}
-HXDLIN(1374)						_gthis->client->notifyMessageHandlers(stored->__get(0).StaticCast<  ::snikket::ChatMessage >(),_hx_tmp);
-HXLINE(1375)						_gthis->client->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,_gthis));
+HXDLIN(1383)						_gthis->client->notifyMessageHandlers(stored->__get(0).StaticCast<  ::snikket::ChatMessage >(),_hx_tmp);
+HXLINE(1384)						_gthis->client->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,_gthis));
             					}
             					HX_END_LOCAL_FUNC1((void))
 
-HXLINE(1366)					if (::hx::IsNotNull( this->isActive )) {
-HXLINE(1367)						this->isActive = true;
-HXLINE(1368)						this->activeThread = message->threadId;
-HXLINE(1369)						stanza->tag(HX_("active",c6,41,46,16), ::Dynamic(::hx::Anon_obj::Create(1)
+HXLINE(1375)					if (::hx::IsNotNull( this->isActive )) {
+HXLINE(1376)						this->isActive = true;
+HXLINE(1377)						this->activeThread = message->threadId;
+HXLINE(1378)						stanza->tag(HX_("active",c6,41,46,16), ::Dynamic(::hx::Anon_obj::Create(1)
             							->setFixed(0,HX_("xmlns",dc,31,74,60),HX_("http://jabber.org/protocol/chatstates",8e,6d,41,6d))))->up();
             					}
-HXLINE(1371)					 ::snikket::Client _hx_tmp = this->client;
-HXDLIN(1371)					_hx_tmp->storeMessages(::Array_obj< ::Dynamic>::__new(1)->init(0,message->build()), ::Dynamic(new _hx_Closure_0(_gthis,stanza)));
+HXLINE(1380)					 ::snikket::Client _hx_tmp = this->client;
+HXDLIN(1380)					_hx_tmp->storeMessages(::Array_obj< ::Dynamic>::__new(1)->init(0,message->build()), ::Dynamic(new _hx_Closure_0(_gthis,stanza)));
             				}
             			}
             			break;
             			case (int)3: {
             				HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_1, ::snikket::Channel,_gthis, ::snikket::Stanza,stanza) HXARGC(1)
             				void _hx_run( ::snikket::ChatMessage stored){
-            					HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1378_sendMessage)
-HXLINE(1379)					_gthis->client->sendStanza(stanza);
-HXLINE(1380)					if (::hx::IsNotNull( stored )) {
-HXLINE(1380)						_gthis->client->notifyMessageHandlers(stored,2);
+            					HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1387_sendMessage)
+HXLINE(1388)					_gthis->client->sendStanza(stanza);
+HXLINE(1389)					if (::hx::IsNotNull( stored )) {
+HXLINE(1389)						_gthis->client->notifyMessageHandlers(stored,2);
             					}
             				}
             				HX_END_LOCAL_FUNC1((void))
 
-HXLINE(1377)				 ::snikket::ReactionUpdate update = fromStanza->_hx_getObject(0).StaticCast<  ::snikket::ReactionUpdate >();
-HXLINE(1378)				::Dynamic _hx_tmp1 = this->persistence;
-HXDLIN(1378)				::snikket::Persistence_obj::storeReaction(_hx_tmp1,this->client->accountId(),update, ::Dynamic(new _hx_Closure_1(_gthis,stanza)));
+HXLINE(1386)				 ::snikket::ReactionUpdate update = fromStanza->_hx_getObject(0).StaticCast<  ::snikket::ReactionUpdate >();
+HXLINE(1387)				::Dynamic _hx_tmp1 = this->persistence;
+HXDLIN(1387)				::snikket::Persistence_obj::storeReaction(_hx_tmp1,this->client->accountId(),update, ::Dynamic(new _hx_Closure_1(_gthis,stanza)));
             			}
             			break;
             			default:{
-HXLINE(1383)				::haxe::Log_obj::trace(HX_("Invalid message",7e,ab,89,95), ::Dynamic(::hx::Anon_obj::Create(5)
+HXLINE(1392)				::haxe::Log_obj::trace(HX_("Invalid message",7e,ab,89,95), ::Dynamic(::hx::Anon_obj::Create(5)
             					->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.Channel",b2,3f,68,db))
             					->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(1)->init(0,fromStanza))
             					->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("sendMessage",5f,89,1d,24))
             					->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/Chat.hx",f4,6b,61,18))
-            					->setFixed(4,HX_("lineNumber",dd,81,22,76),1383)));
-HXLINE(1384)				HX_STACK_DO_THROW(HX_("Trying to send invalid message.",dc,74,a0,91));
+            					->setFixed(4,HX_("lineNumber",dd,81,22,76),1392)));
+HXLINE(1393)				HX_STACK_DO_THROW(HX_("Trying to send invalid message.",dc,74,a0,91));
             			}
             		}
             	}
@@ -1259,143 +1275,143 @@ HXLINE(1384)				HX_STACK_DO_THROW(HX_("Trying to send invalid message.",dc,74,a0
 void Channel_obj::removeReaction( ::snikket::ChatMessage m, ::snikket::Reaction reaction){
             		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_1, ::snikket::Channel,_gthis, ::snikket::ReactionUpdate,update4) HXARGC(1)
             		void _hx_run( ::snikket::ChatMessage stored){
-            			HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1409_removeReaction)
-HXLINE(1410)			 ::snikket::Stanza stanza = update4->asStanza();
-HXLINE(1411)			{
-HXLINE(1411)				::String value = _gthis->chatId;
-HXDLIN(1411)				::Reflect_obj::setField(stanza->attr,HX_("to",7b,65,00,00),value);
+            			HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1418_removeReaction)
+HXLINE(1419)			 ::snikket::Stanza stanza = update4->asStanza();
+HXLINE(1420)			{
+HXLINE(1420)				::String value = _gthis->chatId;
+HXDLIN(1420)				::Reflect_obj::setField(stanza->attr,HX_("to",7b,65,00,00),value);
             			}
-HXLINE(1412)			_gthis->client->sendStanza(stanza);
-HXLINE(1413)			if (::hx::IsNotNull( stored )) {
-HXLINE(1413)				_gthis->client->notifyMessageHandlers(stored,2);
+HXLINE(1421)			_gthis->client->sendStanza(stanza);
+HXLINE(1422)			if (::hx::IsNotNull( stored )) {
+HXLINE(1422)				_gthis->client->notifyMessageHandlers(stored,2);
             			}
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1389_removeReaction)
-HXDLIN(1389)		 ::snikket::Channel _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE(1390)		if (::Std_obj::isOfType(reaction,::hx::ClassOf< ::snikket::CustomEmojiReaction >())) {
-HXLINE(1391)			if (::hx::IsNull( reaction->envelopeId )) {
-HXLINE(1391)				HX_STACK_DO_THROW(HX_("Cannot remove custom emoji reaction without envelopeId",90,e6,80,fb));
+            	HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1398_removeReaction)
+HXDLIN(1398)		 ::snikket::Channel _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE(1399)		if (::Std_obj::isOfType(reaction,::hx::ClassOf< ::snikket::CustomEmojiReaction >())) {
+HXLINE(1400)			if (::hx::IsNull( reaction->envelopeId )) {
+HXLINE(1400)				HX_STACK_DO_THROW(HX_("Cannot remove custom emoji reaction without envelopeId",90,e6,80,fb));
             			}
-HXLINE(1392)			 ::snikket::ChatMessageBuilder correct = m->reply();
-HXLINE(1393)			correct->localId = ::snikket::ID_obj::_hx_long();
-HXLINE(1394)			correct->setHtml(HX_("",00,00,00,00));
-HXLINE(1395)			correct->text = null();
-HXLINE(1396)			this->correctMessage(reaction->envelopeId,correct);
-HXLINE(1397)			return;
-            		}
-HXLINE(1401)		::Array< ::Dynamic> reactions = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE(1402)		{
-HXLINE(1402)			::Dynamic map = m->reactions;
-HXDLIN(1402)			::Dynamic _g_map = map;
-HXDLIN(1402)			 ::Dynamic _g_keys = ::haxe::IMap_obj::keys(map);
-HXDLIN(1402)			while(( (bool)(_g_keys->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE(1402)				::String key = ( (::String)(_g_keys->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
-HXDLIN(1402)				::Array< ::Dynamic> _g_value = ( (::Array< ::Dynamic>)(::haxe::IMap_obj::get(_g_map,key)) );
-HXDLIN(1402)				::String _g_key = key;
-HXDLIN(1402)				::String areaction = _g_key;
-HXDLIN(1402)				::Array< ::Dynamic> reacts = _g_value;
-HXLINE(1403)				if ((areaction != reaction->key)) {
+HXLINE(1401)			 ::snikket::ChatMessageBuilder correct = m->reply();
+HXLINE(1402)			correct->localId = ::snikket::ID_obj::_hx_long();
+HXLINE(1403)			correct->setHtml(HX_("",00,00,00,00));
+HXLINE(1404)			correct->text = null();
+HXLINE(1405)			this->correctMessage(reaction->envelopeId,correct);
+HXLINE(1406)			return;
+            		}
+HXLINE(1410)		::Array< ::Dynamic> reactions = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE(1411)		{
+HXLINE(1411)			::Dynamic map = m->reactions;
+HXDLIN(1411)			::Dynamic _g_map = map;
+HXDLIN(1411)			 ::Dynamic _g_keys = ::haxe::IMap_obj::keys(map);
+HXDLIN(1411)			while(( (bool)(_g_keys->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE(1411)				::String key = ( (::String)(_g_keys->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
+HXDLIN(1411)				::Array< ::Dynamic> _g_value = ( (::Array< ::Dynamic>)(::haxe::IMap_obj::get(_g_map,key)) );
+HXDLIN(1411)				::String _g_key = key;
+HXDLIN(1411)				::String areaction = _g_key;
+HXDLIN(1411)				::Array< ::Dynamic> reacts = _g_value;
+HXLINE(1412)				if ((areaction != reaction->key)) {
             					HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::Channel,_gthis) HXARGC(1)
             					bool _hx_run( ::snikket::Reaction r){
-            						HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1404_removeReaction)
-HXLINE(1404)						::String r1 = r->senderId;
-HXDLIN(1404)						return (r1 == _gthis->getFullJid()->asString());
+            						HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1413_removeReaction)
+HXLINE(1413)						::String r1 = r->senderId;
+HXDLIN(1413)						return (r1 == _gthis->getFullJid()->asString());
             					}
             					HX_END_LOCAL_FUNC1(return)
 
-HXLINE(1404)					 ::snikket::Reaction react = ( ( ::snikket::Reaction)(::Lambda_obj::find(reacts, ::Dynamic(new _hx_Closure_0(_gthis)))) );
-HXLINE(1405)					bool _hx_tmp;
-HXDLIN(1405)					if (::hx::IsNotNull( react )) {
-HXLINE(1405)						_hx_tmp = !(::Std_obj::isOfType(react,::hx::ClassOf< ::snikket::CustomEmojiReaction >()));
+HXLINE(1413)					 ::snikket::Reaction react = ( ( ::snikket::Reaction)(::Lambda_obj::find(reacts, ::Dynamic(new _hx_Closure_0(_gthis)))) );
+HXLINE(1414)					bool _hx_tmp;
+HXDLIN(1414)					if (::hx::IsNotNull( react )) {
+HXLINE(1414)						_hx_tmp = !(::Std_obj::isOfType(react,::hx::ClassOf< ::snikket::CustomEmojiReaction >()));
             					}
             					else {
-HXLINE(1405)						_hx_tmp = false;
+HXLINE(1414)						_hx_tmp = false;
             					}
-HXDLIN(1405)					if (_hx_tmp) {
-HXLINE(1405)						reactions->push(react);
+HXDLIN(1414)					if (_hx_tmp) {
+HXLINE(1414)						reactions->push(react);
             					}
             				}
             			}
             		}
-HXLINE(1408)		::String update = ::snikket::ID_obj::_hx_long();
-HXDLIN(1408)		::String m1 = m->serverId;
-HXDLIN(1408)		::String update1 = m->chatId();
-HXDLIN(1408)		::String update2 = m->chatId();
-HXDLIN(1408)		::String update3 = this->getFullJid()->asString();
-HXDLIN(1408)		 ::snikket::ReactionUpdate update4 =  ::snikket::ReactionUpdate_obj::__alloc( HX_CTX ,update,m1,update1,null(),update2,update3,::snikket::Date_obj::format(::Date_obj::now()),reactions,0);
-HXLINE(1409)		::Dynamic _hx_tmp1 = this->persistence;
-HXDLIN(1409)		::String _hx_tmp2 = this->client->accountId();
-HXDLIN(1409)		::snikket::Persistence_obj::storeReaction(_hx_tmp1,_hx_tmp2,update4, ::Dynamic(new _hx_Closure_1(_gthis,update4)));
+HXLINE(1417)		::String update = ::snikket::ID_obj::_hx_long();
+HXDLIN(1417)		::String m1 = m->serverId;
+HXDLIN(1417)		::String update1 = m->chatId();
+HXDLIN(1417)		::String update2 = m->chatId();
+HXDLIN(1417)		::String update3 = this->getFullJid()->asString();
+HXDLIN(1417)		 ::snikket::ReactionUpdate update4 =  ::snikket::ReactionUpdate_obj::__alloc( HX_CTX ,update,m1,update1,null(),update2,update3,::snikket::Date_obj::format(::Date_obj::now()),reactions,0);
+HXLINE(1418)		::Dynamic _hx_tmp1 = this->persistence;
+HXDLIN(1418)		::String _hx_tmp2 = this->client->accountId();
+HXDLIN(1418)		::snikket::Persistence_obj::storeReaction(_hx_tmp1,_hx_tmp2,update4, ::Dynamic(new _hx_Closure_1(_gthis,update4)));
             	}
 
 
 ::String Channel_obj::lastMessageId(){
-            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1419_lastMessageId)
-HXDLIN(1419)		 ::snikket::ChatMessage tmp = this->lastMessage;
-HXDLIN(1419)		if (::hx::IsNotNull( tmp )) {
-HXDLIN(1419)			return tmp->serverId;
+            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1428_lastMessageId)
+HXDLIN(1428)		 ::snikket::ChatMessage tmp = this->lastMessage;
+HXDLIN(1428)		if (::hx::IsNotNull( tmp )) {
+HXDLIN(1428)			return tmp->serverId;
             		}
             		else {
-HXDLIN(1419)			return null();
+HXDLIN(1428)			return null();
             		}
-HXDLIN(1419)		return null();
+HXDLIN(1428)		return null();
             	}
 
 
 void Channel_obj::markReadUpTo( ::snikket::ChatMessage message){
             		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0, ::snikket::ChatMessage,message, ::snikket::Channel,_gthis) HXARGC(0)
             		void _hx_run(){
-            			HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1424_markReadUpTo)
-HXLINE(1425)			::String _gthis1 = _gthis->chatId;
-HXDLIN(1425)			::String stanza = ::snikket::ID_obj::_hx_long();
-HXDLIN(1425)			 ::snikket::Stanza stanza1 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("message",c7,35,11,9a), ::Dynamic(::hx::Anon_obj::Create(3)
+            			HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1433_markReadUpTo)
+HXLINE(1434)			::String _gthis1 = _gthis->chatId;
+HXDLIN(1434)			::String stanza = ::snikket::ID_obj::_hx_long();
+HXDLIN(1434)			 ::snikket::Stanza stanza1 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("message",c7,35,11,9a), ::Dynamic(::hx::Anon_obj::Create(3)
             				->setFixed(0,HX_("id",db,5b,00,00),stanza)
             				->setFixed(1,HX_("to",7b,65,00,00),_gthis1)
             				->setFixed(2,HX_("type",ba,f2,08,4d),HX_("groupchat",97,1d,c8,e5))))->tag(HX_("displayed",21,17,db,c1), ::Dynamic(::hx::Anon_obj::Create(2)
             				->setFixed(0,HX_("id",db,5b,00,00),message->serverId)
             				->setFixed(1,HX_("xmlns",dc,31,74,60),HX_("urn:xmpp:chat-markers:0",96,b8,66,e7))))->up();
-HXLINE(1427)			if (::hx::IsNotNull( message->threadId )) {
-HXLINE(1428)				stanza1->textTag(HX_("thread",ca,7a,b9,8e),message->threadId,null());
+HXLINE(1436)			if (::hx::IsNotNull( message->threadId )) {
+HXLINE(1437)				stanza1->textTag(HX_("thread",ca,7a,b9,8e),message->threadId,null());
             			}
-HXLINE(1430)			_gthis->client->sendStanza(stanza1);
-HXLINE(1432)			_gthis->publishMds();
-HXLINE(1433)			_gthis->client->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,_gthis));
+HXLINE(1439)			_gthis->client->sendStanza(stanza1);
+HXLINE(1441)			_gthis->publishMds();
+HXLINE(1442)			_gthis->client->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,_gthis));
             		}
             		HX_END_LOCAL_FUNC0((void))
 
-            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1423_markReadUpTo)
-HXDLIN(1423)		 ::snikket::Channel _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE(1424)		this->markReadUpToMessage(message, ::Dynamic(new _hx_Closure_0(message,_gthis)));
+            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1432_markReadUpTo)
+HXDLIN(1432)		 ::snikket::Channel _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE(1433)		this->markReadUpToMessage(message, ::Dynamic(new _hx_Closure_0(message,_gthis)));
             	}
 
 
 void Channel_obj::bookmark(){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_1, ::snikket::Channel,_gthis) HXARGC(1)
             		void _hx_run( ::snikket::Stanza response){
-            			HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1459_bookmark)
-HXLINE(1459)			if ((( (::String)(::Reflect_obj::field(response->attr,HX_("type",ba,f2,08,4d))) ) == HX_("error",c8,cb,29,73))) {
-HXLINE(1460)				 ::snikket::Stanza tmp = response->getChild(HX_("error",c8,cb,29,73),null());
-HXDLIN(1460)				 ::snikket::Stanza preconditionError;
-HXDLIN(1460)				if (::hx::IsNotNull( tmp )) {
-HXLINE(1460)					preconditionError = tmp->getChild(HX_("precondition-not-met",2d,db,78,db),HX_("http://jabber.org/protocol/pubsub#errors",97,74,3a,a8));
+            			HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1468_bookmark)
+HXLINE(1468)			if ((( (::String)(::Reflect_obj::field(response->attr,HX_("type",ba,f2,08,4d))) ) == HX_("error",c8,cb,29,73))) {
+HXLINE(1469)				 ::snikket::Stanza tmp = response->getChild(HX_("error",c8,cb,29,73),null());
+HXDLIN(1469)				 ::snikket::Stanza preconditionError;
+HXDLIN(1469)				if (::hx::IsNotNull( tmp )) {
+HXLINE(1469)					preconditionError = tmp->getChild(HX_("precondition-not-met",2d,db,78,db),HX_("http://jabber.org/protocol/pubsub#errors",97,74,3a,a8));
             				}
             				else {
-HXLINE(1460)					preconditionError = null();
+HXLINE(1469)					preconditionError = null();
             				}
-HXLINE(1461)				if (::hx::IsNotNull( preconditionError )) {
+HXLINE(1470)				if (::hx::IsNotNull( preconditionError )) {
             					HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::Channel,_gthis) HXARGC(1)
             					void _hx_run( ::snikket::Stanza response){
-            						HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1477_bookmark)
-HXLINE(1477)						if ((( (::String)(::Reflect_obj::field(response->attr,HX_("type",ba,f2,08,4d))) ) == HX_("result",dd,68,84,08))) {
-HXLINE(1478)							_gthis->bookmark();
+            						HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1486_bookmark)
+HXLINE(1486)						if ((( (::String)(::Reflect_obj::field(response->attr,HX_("type",ba,f2,08,4d))) ) == HX_("result",dd,68,84,08))) {
+HXLINE(1487)							_gthis->bookmark();
             						}
             					}
             					HX_END_LOCAL_FUNC1((void))
 
-HXLINE(1463)					 ::snikket::GenericStream _gthis1 = _gthis->stream;
-HXDLIN(1463)					_gthis1->sendIq( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("iq",e8,5b,00,00), ::Dynamic(::hx::Anon_obj::Create(1)
+HXLINE(1472)					 ::snikket::GenericStream _gthis1 = _gthis->stream;
+HXDLIN(1472)					_gthis1->sendIq( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("iq",e8,5b,00,00), ::Dynamic(::hx::Anon_obj::Create(1)
             						->setFixed(0,HX_("type",ba,f2,08,4d),HX_("set",a2,9b,57,00))))->tag(HX_("pubsub",e3,da,f8,66), ::Dynamic(::hx::Anon_obj::Create(1)
             						->setFixed(0,HX_("xmlns",dc,31,74,60),HX_("http://jabber.org/protocol/pubsub#owner",c7,28,a3,08))))->tag(HX_("configure",e6,f9,5b,c0), ::Dynamic(::hx::Anon_obj::Create(1)
             						->setFixed(0,HX_("node",02,0a,0a,49),HX_("urn:xmpp:bookmarks:1",58,3c,53,7d))))->tag(HX_("x",78,00,00,00), ::Dynamic(::hx::Anon_obj::Create(2)
@@ -1414,28 +1430,28 @@ HXDLIN(1463)					_gthis1->sendIq( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("i
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1438_bookmark)
-HXDLIN(1438)		 ::snikket::Channel _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE(1439)		 ::snikket::GenericStream _hx_tmp = this->stream;
-HXLINE(1440)		 ::snikket::Stanza _hx_tmp1 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("iq",e8,5b,00,00), ::Dynamic(::hx::Anon_obj::Create(1)
+            	HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1447_bookmark)
+HXDLIN(1447)		 ::snikket::Channel _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE(1448)		 ::snikket::GenericStream _hx_tmp = this->stream;
+HXLINE(1449)		 ::snikket::Stanza _hx_tmp1 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("iq",e8,5b,00,00), ::Dynamic(::hx::Anon_obj::Create(1)
             			->setFixed(0,HX_("type",ba,f2,08,4d),HX_("set",a2,9b,57,00))))->tag(HX_("pubsub",e3,da,f8,66), ::Dynamic(::hx::Anon_obj::Create(1)
             			->setFixed(0,HX_("xmlns",dc,31,74,60),HX_("http://jabber.org/protocol/pubsub",57,94,3c,f2))))->tag(HX_("publish",8f,21,1d,ae), ::Dynamic(::hx::Anon_obj::Create(1)
             			->setFixed(0,HX_("node",02,0a,0a,49),HX_("urn:xmpp:bookmarks:1",58,3c,53,7d))))->tag(HX_("item",13,c5,bf,45), ::Dynamic(::hx::Anon_obj::Create(1)
             			->setFixed(0,HX_("id",db,5b,00,00),this->chatId)));
-HXLINE(1444)		::String _hx_tmp2 = this->getDisplayName();
-HXDLIN(1444)		::String _hx_tmp3;
-HXDLIN(1444)		if ((this->uiState == 2)) {
-HXLINE(1444)			_hx_tmp3 = HX_("false",a3,35,4f,fb);
+HXLINE(1453)		::String _hx_tmp2 = this->getDisplayName();
+HXDLIN(1453)		::String _hx_tmp3;
+HXDLIN(1453)		if ((this->uiState == 2)) {
+HXLINE(1453)			_hx_tmp3 = HX_("false",a3,35,4f,fb);
             		}
             		else {
-HXLINE(1444)			_hx_tmp3 = HX_("true",4e,a7,03,4d);
+HXLINE(1453)			_hx_tmp3 = HX_("true",4e,a7,03,4d);
             		}
-HXLINE(1440)		 ::snikket::Stanza _hx_tmp4 = _hx_tmp1->tag(HX_("conference",1c,2b,83,41), ::Dynamic(::hx::Anon_obj::Create(3)
+HXLINE(1449)		 ::snikket::Stanza _hx_tmp4 = _hx_tmp1->tag(HX_("conference",1c,2b,83,41), ::Dynamic(::hx::Anon_obj::Create(3)
             			->setFixed(0,HX_("autojoin",d9,f6,b1,3e),_hx_tmp3)
             			->setFixed(1,HX_("name",4b,72,ff,48),_hx_tmp2)
             			->setFixed(2,HX_("xmlns",dc,31,74,60),HX_("urn:xmpp:bookmarks:1",58,3c,53,7d))));
-HXLINE(1445)		::String _hx_tmp5 = this->client->displayName();
-HXLINE(1439)		_hx_tmp->sendIq(_hx_tmp4->textTag(HX_("nick",a3,7b,05,49),_hx_tmp5,null())->addChild(this->extensions)->up()->up()->tag(HX_("publish-options",60,0b,5c,74),null())->tag(HX_("x",78,00,00,00), ::Dynamic(::hx::Anon_obj::Create(2)
+HXLINE(1454)		::String _hx_tmp5 = this->client->displayName();
+HXLINE(1448)		_hx_tmp->sendIq(_hx_tmp4->textTag(HX_("nick",a3,7b,05,49),_hx_tmp5,null())->addChild(this->extensions)->up()->up()->tag(HX_("publish-options",60,0b,5c,74),null())->tag(HX_("x",78,00,00,00), ::Dynamic(::hx::Anon_obj::Create(2)
             			->setFixed(0,HX_("type",ba,f2,08,4d),HX_("submit",18,58,06,9a))
             			->setFixed(1,HX_("xmlns",dc,31,74,60),HX_("jabber:x:data",c2,e1,e9,7c))))->tag(HX_("field",ba,94,93,00), ::Dynamic(::hx::Anon_obj::Create(2)
             			->setFixed(0,HX_("var",e7,de,59,00),HX_("FORM_TYPE",d5,96,c9,5a))
@@ -1450,34 +1466,34 @@ HXLINE(1439)		_hx_tmp->sendIq(_hx_tmp4->textTag(HX_("nick",a3,7b,05,49),_hx_tmp5
 
 
 void Channel_obj::sendChatState(::String state,::String threadId){
-            	HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1488_sendChatState)
-HXLINE(1490)		::String stanza = ::snikket::ID_obj::_hx_long();
-HXLINE(1492)		::String stanza1 = this->client->jid->asString();
-HXLINE(1489)		 ::snikket::Stanza stanza2 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("message",c7,35,11,9a), ::Dynamic(::hx::Anon_obj::Create(4)
+            	HX_GC_STACKFRAME(&_hx_pos_5e4df8d46126c981_1497_sendChatState)
+HXLINE(1499)		::String stanza = ::snikket::ID_obj::_hx_long();
+HXLINE(1501)		::String stanza1 = this->client->jid->asString();
+HXLINE(1498)		 ::snikket::Stanza stanza2 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("message",c7,35,11,9a), ::Dynamic(::hx::Anon_obj::Create(4)
             			->setFixed(0,HX_("id",db,5b,00,00),stanza)
             			->setFixed(1,HX_("to",7b,65,00,00),this->chatId)
             			->setFixed(2,HX_("from",6a,a5,c2,43),stanza1)
             			->setFixed(3,HX_("type",ba,f2,08,4d),HX_("groupchat",97,1d,c8,e5))))->tag(state, ::Dynamic(::hx::Anon_obj::Create(1)
             			->setFixed(0,HX_("xmlns",dc,31,74,60),HX_("http://jabber.org/protocol/chatstates",8e,6d,41,6d))))->up();
-HXLINE(1497)		if (::hx::IsNotNull( threadId )) {
-HXLINE(1498)			stanza2->textTag(HX_("thread",ca,7a,b9,8e),threadId,null());
+HXLINE(1506)		if (::hx::IsNotNull( threadId )) {
+HXLINE(1507)			stanza2->textTag(HX_("thread",ca,7a,b9,8e),threadId,null());
             		}
-HXLINE(1500)		this->stream->sendStanza(stanza2);
+HXLINE(1509)		this->stream->sendStanza(stanza2);
             	}
 
 
 void Channel_obj::close(){
-            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1504_close)
-HXLINE(1505)		if (::hx::IsNotNull( this->typingTimer )) {
-HXLINE(1505)			this->typingTimer->stop();
-            		}
-HXLINE(1506)		this->uiState = 2;
-HXLINE(1507)		::Dynamic _hx_tmp = this->persistence;
-HXDLIN(1507)		::snikket::Persistence_obj::storeChats(_hx_tmp,this->client->accountId(),::Array_obj< ::Dynamic>::__new(1)->init(0,::hx::ObjectPtr<OBJ_>(this)));
-HXLINE(1508)		this->selfPing(false);
-HXLINE(1509)		this->bookmark();
-HXLINE(1510)		this->sendChatState(HX_("gone",5f,94,69,44),null());
-HXLINE(1511)		this->client->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,::hx::ObjectPtr<OBJ_>(this)));
+            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_1513_close)
+HXLINE(1514)		if (::hx::IsNotNull( this->typingTimer )) {
+HXLINE(1514)			this->typingTimer->stop();
+            		}
+HXLINE(1515)		this->uiState = 2;
+HXLINE(1516)		::Dynamic _hx_tmp = this->persistence;
+HXDLIN(1516)		::snikket::Persistence_obj::storeChats(_hx_tmp,this->client->accountId(),::Array_obj< ::Dynamic>::__new(1)->init(0,::hx::ObjectPtr<OBJ_>(this)));
+HXLINE(1517)		this->selfPing(false);
+HXLINE(1518)		this->bookmark();
+HXLINE(1519)		this->sendChatState(HX_("gone",5f,94,69,44),null());
+HXLINE(1520)		this->client->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,::hx::ObjectPtr<OBJ_>(this)));
             	}
 
 
@@ -1703,8 +1719,8 @@ void Channel_obj::__register()
 void Channel_obj::__boot()
 {
 {
-            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_973_boot)
-HXDLIN( 973)		__mClass->__meta__ =  ::Dynamic(::hx::Anon_obj::Create(1)
+            	HX_STACKFRAME(&_hx_pos_5e4df8d46126c981_982_boot)
+HXDLIN( 982)		__mClass->__meta__ =  ::Dynamic(::hx::Anon_obj::Create(1)
             			->setFixed(0,HX_("fields",79,8e,8e,80), ::Dynamic(::hx::Anon_obj::Create(19)
             				->setFixed(0,HX_("setPresence",fd,1b,38,97), ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("HaxeCBridge.noemit",dc,2c,99,2f),null())))
diff --git a/Sources/c_snikket/src/snikket/Chat.cpp b/Sources/c_snikket/src/snikket/Chat.cpp
index 7930100..94ddb88 100644
--- a/Sources/c_snikket/src/snikket/Chat.cpp
+++ b/Sources/c_snikket/src/snikket/Chat.cpp
@@ -153,51 +153,52 @@ HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_304_block,"snikket.Chat","block",0
 HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_321_block,"snikket.Chat","block",0xf87b9fa8,"snikket.Chat.block","snikket/Chat.hx",321,0x18616bf4)
 HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_328_unblock,"snikket.Chat","unblock",0x32f0236f,"snikket.Chat.unblock","snikket/Chat.hx",328,0x18616bf4)
 HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_338_unblock,"snikket.Chat","unblock",0x32f0236f,"snikket.Chat.unblock","snikket/Chat.hx",338,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_346_setNotifications,"snikket.Chat","setNotifications",0xb3d8bbab,"snikket.Chat.setNotifications","snikket/Chat.hx",346,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_360_notificationsFiltered,"snikket.Chat","notificationsFiltered",0x958be1ba,"snikket.Chat.notificationsFiltered","snikket/Chat.hx",360,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_367_notifyMention,"snikket.Chat","notifyMention",0x4bac447c,"snikket.Chat.notifyMention","snikket/Chat.hx",367,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_374_notifyReply,"snikket.Chat","notifyReply",0xf1fbc63c,"snikket.Chat.notifyReply","snikket/Chat.hx",374,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_345_setNotificationsInternal,"snikket.Chat","setNotificationsInternal",0x8cf50208,"snikket.Chat.setNotificationsInternal","snikket/Chat.hx",345,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_355_setNotifications,"snikket.Chat","setNotifications",0xb3d8bbab,"snikket.Chat.setNotifications","snikket/Chat.hx",355,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_366_notificationsFiltered,"snikket.Chat","notificationsFiltered",0x958be1ba,"snikket.Chat.notificationsFiltered","snikket/Chat.hx",366,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_373_notifyMention,"snikket.Chat","notifyMention",0x4bac447c,"snikket.Chat.notifyMention","snikket/Chat.hx",373,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_380_notifyReply,"snikket.Chat","notifyReply",0xf1fbc63c,"snikket.Chat.notifyReply","snikket/Chat.hx",380,0x18616bf4)
 HX_LOCAL_STACK_FRAME(_hx_pos_12e7dd114cfbd541_252_lastMessageId__fromC,"snikket.Chat","lastMessageId__fromC",0xf7fe75b2,"snikket.Chat.lastMessageId__fromC","HaxeCBridge.hx",252,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_386_lastMessageTimestamp,"snikket.Chat","lastMessageTimestamp",0x5028348a,"snikket.Chat.lastMessageTimestamp","snikket/Chat.hx",386,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_390_updateFromBookmark,"snikket.Chat","updateFromBookmark",0x2780dcae,"snikket.Chat.updateFromBookmark","snikket/Chat.hx",390,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_399_updateFromRoster,"snikket.Chat","updateFromRoster",0x1d9e4f83,"snikket.Chat.updateFromRoster","snikket/Chat.hx",399,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_407_getPhoto,"snikket.Chat","getPhoto",0xd6c858c1,"snikket.Chat.getPhoto","snikket/Chat.hx",407,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_416_getPlaceholder,"snikket.Chat","getPlaceholder",0xa955f8c2,"snikket.Chat.getPlaceholder","snikket/Chat.hx",416,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_423_readUpTo,"snikket.Chat","readUpTo",0x2aa097b1,"snikket.Chat.readUpTo","snikket/Chat.hx",423,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_430_unreadCount,"snikket.Chat","unreadCount",0x5b4cf8bb,"snikket.Chat.unreadCount","snikket/Chat.hx",430,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_435_setUnreadCount,"snikket.Chat","setUnreadCount",0xaf7385e3,"snikket.Chat.setUnreadCount","snikket/Chat.hx",435,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_441_preview,"snikket.Chat","preview",0xbd3d9723,"snikket.Chat.preview","snikket/Chat.hx",441,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_454_setLastMessage,"snikket.Chat","setLastMessage",0x5d3f57d4,"snikket.Chat.setLastMessage","snikket/Chat.hx",454,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_457_setDisplayName,"snikket.Chat","setDisplayName",0x3f747f70,"snikket.Chat.setDisplayName","snikket/Chat.hx",457,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_465_getDisplayName,"snikket.Chat","getDisplayName",0x1f5496fc,"snikket.Chat.getDisplayName","snikket/Chat.hx",465,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_480_setPresence,"snikket.Chat","setPresence",0x5193fc98,"snikket.Chat.setPresence","snikket/Chat.hx",480,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_484_setCaps,"snikket.Chat","setCaps",0x88a113fe,"snikket.Chat.setCaps","snikket/Chat.hx",484,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_496_removePresence,"snikket.Chat","removePresence",0x97f1c0e4,"snikket.Chat.removePresence","snikket/Chat.hx",496,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_504_getCaps,"snikket.Chat","getCaps",0x959f82f2,"snikket.Chat.getCaps","snikket/Chat.hx",504,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_500_getCaps,"snikket.Chat","getCaps",0x959f82f2,"snikket.Chat.getCaps","snikket/Chat.hx",500,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_513_getResourceCaps,"snikket.Chat","getResourceCaps",0x30ef43e0,"snikket.Chat.getResourceCaps","snikket/Chat.hx",513,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_518_setAvatarSha1,"snikket.Chat","setAvatarSha1",0xd1ceb0db,"snikket.Chat.setAvatarSha1","snikket/Chat.hx",518,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_522_setTrusted,"snikket.Chat","setTrusted",0x7948483a,"snikket.Chat.setTrusted","snikket/Chat.hx",522,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_529_isTrusted,"snikket.Chat","isTrusted",0xc3782908,"snikket.Chat.isTrusted","snikket/Chat.hx",529,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_534_livePresence,"snikket.Chat","livePresence",0x0a1fa04c,"snikket.Chat.livePresence","snikket/Chat.hx",534,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_538_syncing,"snikket.Chat","syncing",0x2889b482,"snikket.Chat.syncing","snikket/Chat.hx",538,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_544_canAudioCall,"snikket.Chat","canAudioCall",0x3a98f169,"snikket.Chat.canAudioCall","snikket/Chat.hx",544,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_555_canVideoCall,"snikket.Chat","canVideoCall",0x409bc38e,"snikket.Chat.canVideoCall","snikket/Chat.hx",555,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_569_startCall,"snikket.Chat","startCall",0xa38085fb,"snikket.Chat.startCall","snikket/Chat.hx",569,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_576_addMedia,"snikket.Chat","addMedia",0x3416ab88,"snikket.Chat.addMedia","snikket/Chat.hx",576,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_585_acceptCall,"snikket.Chat","acceptCall",0xc4d6678b,"snikket.Chat.acceptCall","snikket/Chat.hx",585,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_594_hangup,"snikket.Chat","hangup",0x83c5b792,"snikket.Chat.hangup","snikket/Chat.hx",594,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_603_callStatus,"snikket.Chat","callStatus",0x40ee2a35,"snikket.Chat.callStatus","snikket/Chat.hx",603,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_614_dtmf,"snikket.Chat","dtmf",0x419954ee,"snikket.Chat.dtmf","snikket/Chat.hx",614,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_627_videoTracks,"snikket.Chat","videoTracks",0x7880a2fe,"snikket.Chat.videoTracks","snikket/Chat.hx",627,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_392_lastMessageTimestamp,"snikket.Chat","lastMessageTimestamp",0x5028348a,"snikket.Chat.lastMessageTimestamp","snikket/Chat.hx",392,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_396_updateFromBookmark,"snikket.Chat","updateFromBookmark",0x2780dcae,"snikket.Chat.updateFromBookmark","snikket/Chat.hx",396,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_405_updateFromRoster,"snikket.Chat","updateFromRoster",0x1d9e4f83,"snikket.Chat.updateFromRoster","snikket/Chat.hx",405,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_413_getPhoto,"snikket.Chat","getPhoto",0xd6c858c1,"snikket.Chat.getPhoto","snikket/Chat.hx",413,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_422_getPlaceholder,"snikket.Chat","getPlaceholder",0xa955f8c2,"snikket.Chat.getPlaceholder","snikket/Chat.hx",422,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_429_readUpTo,"snikket.Chat","readUpTo",0x2aa097b1,"snikket.Chat.readUpTo","snikket/Chat.hx",429,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_436_unreadCount,"snikket.Chat","unreadCount",0x5b4cf8bb,"snikket.Chat.unreadCount","snikket/Chat.hx",436,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_441_setUnreadCount,"snikket.Chat","setUnreadCount",0xaf7385e3,"snikket.Chat.setUnreadCount","snikket/Chat.hx",441,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_447_preview,"snikket.Chat","preview",0xbd3d9723,"snikket.Chat.preview","snikket/Chat.hx",447,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_460_setLastMessage,"snikket.Chat","setLastMessage",0x5d3f57d4,"snikket.Chat.setLastMessage","snikket/Chat.hx",460,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_463_setDisplayName,"snikket.Chat","setDisplayName",0x3f747f70,"snikket.Chat.setDisplayName","snikket/Chat.hx",463,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_471_getDisplayName,"snikket.Chat","getDisplayName",0x1f5496fc,"snikket.Chat.getDisplayName","snikket/Chat.hx",471,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_489_setPresence,"snikket.Chat","setPresence",0x5193fc98,"snikket.Chat.setPresence","snikket/Chat.hx",489,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_493_setCaps,"snikket.Chat","setCaps",0x88a113fe,"snikket.Chat.setCaps","snikket/Chat.hx",493,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_505_removePresence,"snikket.Chat","removePresence",0x97f1c0e4,"snikket.Chat.removePresence","snikket/Chat.hx",505,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_513_getCaps,"snikket.Chat","getCaps",0x959f82f2,"snikket.Chat.getCaps","snikket/Chat.hx",513,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_509_getCaps,"snikket.Chat","getCaps",0x959f82f2,"snikket.Chat.getCaps","snikket/Chat.hx",509,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_522_getResourceCaps,"snikket.Chat","getResourceCaps",0x30ef43e0,"snikket.Chat.getResourceCaps","snikket/Chat.hx",522,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_527_setAvatarSha1,"snikket.Chat","setAvatarSha1",0xd1ceb0db,"snikket.Chat.setAvatarSha1","snikket/Chat.hx",527,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_531_setTrusted,"snikket.Chat","setTrusted",0x7948483a,"snikket.Chat.setTrusted","snikket/Chat.hx",531,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_538_isTrusted,"snikket.Chat","isTrusted",0xc3782908,"snikket.Chat.isTrusted","snikket/Chat.hx",538,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_543_livePresence,"snikket.Chat","livePresence",0x0a1fa04c,"snikket.Chat.livePresence","snikket/Chat.hx",543,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_547_syncing,"snikket.Chat","syncing",0x2889b482,"snikket.Chat.syncing","snikket/Chat.hx",547,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_553_canAudioCall,"snikket.Chat","canAudioCall",0x3a98f169,"snikket.Chat.canAudioCall","snikket/Chat.hx",553,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_564_canVideoCall,"snikket.Chat","canVideoCall",0x409bc38e,"snikket.Chat.canVideoCall","snikket/Chat.hx",564,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_578_startCall,"snikket.Chat","startCall",0xa38085fb,"snikket.Chat.startCall","snikket/Chat.hx",578,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_585_addMedia,"snikket.Chat","addMedia",0x3416ab88,"snikket.Chat.addMedia","snikket/Chat.hx",585,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_594_acceptCall,"snikket.Chat","acceptCall",0xc4d6678b,"snikket.Chat.acceptCall","snikket/Chat.hx",594,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_603_hangup,"snikket.Chat","hangup",0x83c5b792,"snikket.Chat.hangup","snikket/Chat.hx",603,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_612_callStatus,"snikket.Chat","callStatus",0x40ee2a35,"snikket.Chat.callStatus","snikket/Chat.hx",612,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_623_dtmf,"snikket.Chat","dtmf",0x419954ee,"snikket.Chat.dtmf","snikket/Chat.hx",623,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_636_videoTracks,"snikket.Chat","videoTracks",0x7880a2fe,"snikket.Chat.videoTracks","snikket/Chat.hx",636,0x18616bf4)
 HX_LOCAL_STACK_FRAME(_hx_pos_12e7dd114cfbd541_250_videoTracks__fromC,"snikket.Chat","videoTracks__fromC",0xb4b1493b,"snikket.Chat.videoTracks__fromC","HaxeCBridge.hx",250,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_638_markReadUpToId,"snikket.Chat","markReadUpToId",0x495f62d9,"snikket.Chat.markReadUpToId","snikket/Chat.hx",638,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_631_markReadUpToId,"snikket.Chat","markReadUpToId",0x495f62d9,"snikket.Chat.markReadUpToId","snikket/Chat.hx",631,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_647_markReadUpToId,"snikket.Chat","markReadUpToId",0x495f62d9,"snikket.Chat.markReadUpToId","snikket/Chat.hx",647,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_640_markReadUpToId,"snikket.Chat","markReadUpToId",0x495f62d9,"snikket.Chat.markReadUpToId","snikket/Chat.hx",640,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_666_markReadUpToMessage,"snikket.Chat","markReadUpToMessage",0xab221609,"snikket.Chat.markReadUpToMessage","snikket/Chat.hx",666,0x18616bf4)
 HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_657_markReadUpToMessage,"snikket.Chat","markReadUpToMessage",0xab221609,"snikket.Chat.markReadUpToMessage","snikket/Chat.hx",657,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_648_markReadUpToMessage,"snikket.Chat","markReadUpToMessage",0xab221609,"snikket.Chat.markReadUpToMessage","snikket/Chat.hx",648,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_682_publishMds,"snikket.Chat","publishMds",0x809032b2,"snikket.Chat.publishMds","snikket/Chat.hx",682,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_698_publishMds,"snikket.Chat","publishMds",0x809032b2,"snikket.Chat.publishMds","snikket/Chat.hx",698,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_664_publishMds,"snikket.Chat","publishMds",0x809032b2,"snikket.Chat.publishMds","snikket/Chat.hx",664,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_691_publishMds,"snikket.Chat","publishMds",0x809032b2,"snikket.Chat.publishMds","snikket/Chat.hx",691,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_707_publishMds,"snikket.Chat","publishMds",0x809032b2,"snikket.Chat.publishMds","snikket/Chat.hx",707,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_673_publishMds,"snikket.Chat","publishMds",0x809032b2,"snikket.Chat.publishMds","snikket/Chat.hx",673,0x18616bf4)
 HX_LOCAL_STACK_FRAME(_hx_pos_3993c1e3d3f53fe2_43_boot,"snikket.Chat","boot",0x40431e37,"snikket.Chat.boot","snikket/Chat.hx",43,0x18616bf4)
 namespace snikket{
 
@@ -799,7 +800,8 @@ HXLINE( 298)		this->client->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::Virtu
 
 HX_DEFINE_DYNAMIC_FUNC0(Chat_obj,togglePinned,(void))
 
-void Chat_obj::block( ::snikket::ChatMessage reportSpam,bool onServer){
+void Chat_obj::block( ::snikket::ChatMessage reportSpam,::hx::Null< bool >  __o_onServer){
+            		bool onServer = __o_onServer.Default(true);
             	HX_GC_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_304_block)
 HXLINE( 305)		bool _hx_tmp;
 HXDLIN( 305)		if (::hx::IsNotNull( reportSpam )) {
@@ -874,55 +876,64 @@ HXLINE( 334)			_hx_tmp1->sendIq( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("iq
 
 HX_DEFINE_DYNAMIC_FUNC1(Chat_obj,unblock,(void))
 
-void Chat_obj::setNotifications(bool filtered,bool mention,bool reply){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_346_setNotifications)
-HXLINE( 347)		if (filtered) {
-HXLINE( 348)			this->notificationSettings =  ::Dynamic(::hx::Anon_obj::Create(2)
+void Chat_obj::setNotificationsInternal(bool filtered,bool mention,bool reply){
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_345_setNotificationsInternal)
+HXDLIN( 345)		if (filtered) {
+HXLINE( 346)			this->notificationSettings =  ::Dynamic(::hx::Anon_obj::Create(2)
             				->setFixed(0,HX_("mention",ea,9e,bf,b9),mention)
             				->setFixed(1,HX_("reply",2a,09,c6,e6),reply));
             		}
             		else {
-HXLINE( 350)			this->notificationSettings = null();
+HXLINE( 348)			this->notificationSettings = null();
             		}
-HXLINE( 352)		::Dynamic _hx_tmp = this->persistence;
-HXDLIN( 352)		::snikket::Persistence_obj::storeChats(_hx_tmp,this->client->accountId(),::Array_obj< ::Dynamic>::__new(1)->init(0,::hx::ObjectPtr<OBJ_>(this)));
-HXLINE( 353)		this->client->updatePushIfEnabled();
+            	}
+
+
+HX_DEFINE_DYNAMIC_FUNC3(Chat_obj,setNotificationsInternal,(void))
+
+void Chat_obj::setNotifications(bool filtered,bool mention,bool reply){
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_355_setNotifications)
+HXLINE( 356)		this->setNotificationsInternal(filtered,mention,reply);
+HXLINE( 357)		::Dynamic _hx_tmp = this->persistence;
+HXDLIN( 357)		::snikket::Persistence_obj::storeChats(_hx_tmp,this->client->accountId(),::Array_obj< ::Dynamic>::__new(1)->init(0,::hx::ObjectPtr<OBJ_>(this)));
+HXLINE( 358)		this->client->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,::hx::ObjectPtr<OBJ_>(this)));
+HXLINE( 359)		this->client->updatePushIfEnabled();
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC3(Chat_obj,setNotifications,(void))
 
 bool Chat_obj::notificationsFiltered(){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_360_notificationsFiltered)
-HXDLIN( 360)		return ::hx::IsNotNull( this->notificationSettings );
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_366_notificationsFiltered)
+HXDLIN( 366)		return ::hx::IsNotNull( this->notificationSettings );
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Chat_obj,notificationsFiltered,return )
 
 bool Chat_obj::notifyMention(){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_367_notifyMention)
-HXDLIN( 367)		if (::hx::IsNotNull( this->notificationSettings )) {
-HXDLIN( 367)			return ( (bool)(this->notificationSettings->__Field(HX_("mention",ea,9e,bf,b9),::hx::paccDynamic)) );
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_373_notifyMention)
+HXDLIN( 373)		if (::hx::IsNotNull( this->notificationSettings )) {
+HXDLIN( 373)			return ( (bool)(this->notificationSettings->__Field(HX_("mention",ea,9e,bf,b9),::hx::paccDynamic)) );
             		}
             		else {
-HXDLIN( 367)			return true;
+HXDLIN( 373)			return true;
             		}
-HXDLIN( 367)		return false;
+HXDLIN( 373)		return false;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Chat_obj,notifyMention,return )
 
 bool Chat_obj::notifyReply(){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_374_notifyReply)
-HXDLIN( 374)		if (::hx::IsNotNull( this->notificationSettings )) {
-HXDLIN( 374)			return ( (bool)(this->notificationSettings->__Field(HX_("reply",2a,09,c6,e6),::hx::paccDynamic)) );
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_380_notifyReply)
+HXDLIN( 380)		if (::hx::IsNotNull( this->notificationSettings )) {
+HXDLIN( 380)			return ( (bool)(this->notificationSettings->__Field(HX_("reply",2a,09,c6,e6),::hx::paccDynamic)) );
             		}
             		else {
-HXDLIN( 374)			return true;
+HXDLIN( 380)			return true;
             		}
-HXDLIN( 374)		return false;
+HXDLIN( 380)		return false;
             	}
 
 
@@ -939,81 +950,81 @@ HXDLIN( 252)		return this->lastMessageId();
 HX_DEFINE_DYNAMIC_FUNC0(Chat_obj,lastMessageId__fromC,return )
 
 ::String Chat_obj::lastMessageTimestamp(){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_386_lastMessageTimestamp)
-HXDLIN( 386)		 ::snikket::ChatMessage tmp = this->lastMessage;
-HXDLIN( 386)		if (::hx::IsNotNull( tmp )) {
-HXDLIN( 386)			return tmp->timestamp;
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_392_lastMessageTimestamp)
+HXDLIN( 392)		 ::snikket::ChatMessage tmp = this->lastMessage;
+HXDLIN( 392)		if (::hx::IsNotNull( tmp )) {
+HXDLIN( 392)			return tmp->timestamp;
             		}
             		else {
-HXDLIN( 386)			return null();
+HXDLIN( 392)			return null();
             		}
-HXDLIN( 386)		return null();
+HXDLIN( 392)		return null();
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Chat_obj,lastMessageTimestamp,return )
 
 void Chat_obj::updateFromBookmark( ::snikket::Stanza item){
-            	HX_GC_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_390_updateFromBookmark)
-HXLINE( 391)		 ::snikket::Stanza conf = item->getChild(HX_("conference",1c,2b,83,41),HX_("urn:xmpp:bookmarks:1",58,3c,53,7d));
-HXLINE( 392)		::String fn = ( (::String)(::Reflect_obj::field(conf->attr,HX_("name",4b,72,ff,48))) );
-HXLINE( 393)		if (::hx::IsNotNull( fn )) {
-HXLINE( 393)			this->displayName = fn;
+            	HX_GC_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_396_updateFromBookmark)
+HXLINE( 397)		 ::snikket::Stanza conf = item->getChild(HX_("conference",1c,2b,83,41),HX_("urn:xmpp:bookmarks:1",58,3c,53,7d));
+HXLINE( 398)		::String fn = ( (::String)(::Reflect_obj::field(conf->attr,HX_("name",4b,72,ff,48))) );
+HXLINE( 399)		if (::hx::IsNotNull( fn )) {
+HXLINE( 399)			this->displayName = fn;
             		}
-HXLINE( 394)		int _hx_tmp;
-HXDLIN( 394)		bool _hx_tmp1;
-HXDLIN( 394)		if ((( (::String)(::Reflect_obj::field(conf->attr,HX_("autojoin",d9,f6,b1,3e))) ) != HX_("1",31,00,00,00))) {
-HXLINE( 394)			_hx_tmp1 = (( (::String)(::Reflect_obj::field(conf->attr,HX_("autojoin",d9,f6,b1,3e))) ) == HX_("true",4e,a7,03,4d));
+HXLINE( 400)		int _hx_tmp;
+HXDLIN( 400)		bool _hx_tmp1;
+HXDLIN( 400)		if ((( (::String)(::Reflect_obj::field(conf->attr,HX_("autojoin",d9,f6,b1,3e))) ) != HX_("1",31,00,00,00))) {
+HXLINE( 400)			_hx_tmp1 = (( (::String)(::Reflect_obj::field(conf->attr,HX_("autojoin",d9,f6,b1,3e))) ) == HX_("true",4e,a7,03,4d));
             		}
             		else {
-HXLINE( 394)			_hx_tmp1 = true;
+HXLINE( 400)			_hx_tmp1 = true;
             		}
-HXDLIN( 394)		if (_hx_tmp1) {
-HXLINE( 394)			if ((this->uiState == 0)) {
-HXLINE( 394)				_hx_tmp = 0;
+HXDLIN( 400)		if (_hx_tmp1) {
+HXLINE( 400)			if ((this->uiState == 0)) {
+HXLINE( 400)				_hx_tmp = 0;
             			}
             			else {
-HXLINE( 394)				_hx_tmp = 1;
+HXLINE( 400)				_hx_tmp = 1;
             			}
             		}
             		else {
-HXLINE( 394)			_hx_tmp = 2;
+HXLINE( 400)			_hx_tmp = 2;
             		}
-HXDLIN( 394)		this->uiState = _hx_tmp;
-HXLINE( 395)		 ::snikket::Stanza tmp = conf->getChild(HX_("extensions",14,7c,70,89),null());
-HXDLIN( 395)		 ::snikket::Stanza _hx_tmp2;
-HXDLIN( 395)		if (::hx::IsNotNull( tmp )) {
-HXLINE( 395)			_hx_tmp2 = tmp;
+HXDLIN( 400)		this->uiState = _hx_tmp;
+HXLINE( 401)		 ::snikket::Stanza tmp = conf->getChild(HX_("extensions",14,7c,70,89),null());
+HXDLIN( 401)		 ::snikket::Stanza _hx_tmp2;
+HXDLIN( 401)		if (::hx::IsNotNull( tmp )) {
+HXLINE( 401)			_hx_tmp2 = tmp;
             		}
             		else {
-HXLINE( 395)			_hx_tmp2 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("extensions",14,7c,70,89), ::Dynamic(::hx::Anon_obj::Create(1)
+HXLINE( 401)			_hx_tmp2 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("extensions",14,7c,70,89), ::Dynamic(::hx::Anon_obj::Create(1)
             				->setFixed(0,HX_("xmlns",dc,31,74,60),HX_("urn:xmpp:bookmarks:1",58,3c,53,7d))));
             		}
-HXDLIN( 395)		this->extensions = _hx_tmp2;
+HXDLIN( 401)		this->extensions = _hx_tmp2;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Chat_obj,updateFromBookmark,(void))
 
 void Chat_obj::updateFromRoster( ::Dynamic item){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_399_updateFromRoster)
-HXLINE( 400)		bool _hx_tmp;
-HXDLIN( 400)		if (::hx::IsNotEq( item->__Field(HX_("subscription",1d,ff,00,36),::hx::paccDynamic),HX_("both",81,88,1b,41) )) {
-HXLINE( 400)			_hx_tmp = ::hx::IsEq( item->__Field(HX_("subscription",1d,ff,00,36),::hx::paccDynamic),HX_("from",6a,a5,c2,43) );
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_405_updateFromRoster)
+HXLINE( 406)		bool _hx_tmp;
+HXDLIN( 406)		if (::hx::IsNotEq( item->__Field(HX_("subscription",1d,ff,00,36),::hx::paccDynamic),HX_("both",81,88,1b,41) )) {
+HXLINE( 406)			_hx_tmp = ::hx::IsEq( item->__Field(HX_("subscription",1d,ff,00,36),::hx::paccDynamic),HX_("from",6a,a5,c2,43) );
             		}
             		else {
-HXLINE( 400)			_hx_tmp = true;
+HXLINE( 406)			_hx_tmp = true;
             		}
-HXDLIN( 400)		this->setTrusted(_hx_tmp);
-HXLINE( 401)		bool _hx_tmp1;
-HXDLIN( 401)		if (::hx::IsNotNull( item->__Field(HX_("fn",48,59,00,00),::hx::paccDynamic) )) {
-HXLINE( 401)			_hx_tmp1 = ::hx::IsNotEq( item->__Field(HX_("fn",48,59,00,00),::hx::paccDynamic),HX_("",00,00,00,00) );
+HXDLIN( 406)		this->setTrusted(_hx_tmp);
+HXLINE( 407)		bool _hx_tmp1;
+HXDLIN( 407)		if (::hx::IsNotNull( item->__Field(HX_("fn",48,59,00,00),::hx::paccDynamic) )) {
+HXLINE( 407)			_hx_tmp1 = ::hx::IsNotEq( item->__Field(HX_("fn",48,59,00,00),::hx::paccDynamic),HX_("",00,00,00,00) );
             		}
             		else {
-HXLINE( 401)			_hx_tmp1 = false;
+HXLINE( 407)			_hx_tmp1 = false;
             		}
-HXDLIN( 401)		if (_hx_tmp1) {
-HXLINE( 401)			this->displayName = ( (::String)(item->__Field(HX_("fn",48,59,00,00),::hx::paccDynamic)) );
+HXDLIN( 407)		if (_hx_tmp1) {
+HXLINE( 407)			this->displayName = ( (::String)(item->__Field(HX_("fn",48,59,00,00),::hx::paccDynamic)) );
             		}
             	}
 
@@ -1021,189 +1032,170 @@ HXLINE( 401)			this->displayName = ( (::String)(item->__Field(HX_("fn",48,59,00,
 HX_DEFINE_DYNAMIC_FUNC1(Chat_obj,updateFromRoster,(void))
 
 ::String Chat_obj::getPhoto(){
-            	HX_GC_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_407_getPhoto)
-HXLINE( 408)		bool _hx_tmp;
-HXDLIN( 408)		if (::hx::IsNotNull( this->avatarSha1 )) {
-HXLINE( 408)			_hx_tmp = (::haxe::io::Bytes_obj::ofData(this->avatarSha1)->length < 1);
+            	HX_GC_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_413_getPhoto)
+HXLINE( 414)		bool _hx_tmp;
+HXDLIN( 414)		if (::hx::IsNotNull( this->avatarSha1 )) {
+HXLINE( 414)			_hx_tmp = (::haxe::io::Bytes_obj::ofData(this->avatarSha1)->length < 1);
             		}
             		else {
-HXLINE( 408)			_hx_tmp = true;
+HXLINE( 414)			_hx_tmp = true;
             		}
-HXDLIN( 408)		if (_hx_tmp) {
-HXLINE( 408)			return null();
+HXDLIN( 414)		if (_hx_tmp) {
+HXLINE( 414)			return null();
             		}
-HXLINE( 409)		return  ::snikket::Hash_obj::__alloc( HX_CTX ,HX_("sha-1",90,a8,1c,7c),this->avatarSha1)->toUri();
+HXLINE( 415)		return  ::snikket::Hash_obj::__alloc( HX_CTX ,HX_("sha-1",90,a8,1c,7c),this->avatarSha1)->toUri();
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Chat_obj,getPhoto,return )
 
 ::String Chat_obj::getPlaceholder(){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_416_getPlaceholder)
-HXDLIN( 416)		::String _hx_tmp = this->chatId;
-HXDLIN( 416)		return ::snikket::Color_obj::defaultPhoto(_hx_tmp,this->getDisplayName().charAt(0).toUpperCase());
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_422_getPlaceholder)
+HXDLIN( 422)		::String _hx_tmp = this->chatId;
+HXDLIN( 422)		return ::snikket::Color_obj::defaultPhoto(_hx_tmp,this->getDisplayName().charAt(0).toUpperCase());
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Chat_obj,getPlaceholder,return )
 
 ::String Chat_obj::readUpTo(){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_423_readUpTo)
-HXDLIN( 423)		return this->readUpToId;
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_429_readUpTo)
+HXDLIN( 429)		return this->readUpToId;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Chat_obj,readUpTo,return )
 
 int Chat_obj::unreadCount(){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_430_unreadCount)
-HXDLIN( 430)		return this->_unreadCount;
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_436_unreadCount)
+HXDLIN( 436)		return this->_unreadCount;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Chat_obj,unreadCount,return )
 
 void Chat_obj::setUnreadCount(int count){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_435_setUnreadCount)
-HXDLIN( 435)		this->_unreadCount = count;
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_441_setUnreadCount)
+HXDLIN( 441)		this->_unreadCount = count;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Chat_obj,setUnreadCount,(void))
 
 ::String Chat_obj::preview(){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_441_preview)
-HXLINE( 442)		if (::hx::IsNull( this->lastMessage )) {
-HXLINE( 442)			return HX_("",00,00,00,00);
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_447_preview)
+HXLINE( 448)		if (::hx::IsNull( this->lastMessage )) {
+HXLINE( 448)			return HX_("",00,00,00,00);
             		}
-HXLINE( 444)		if ((this->lastMessage->type == 1)) {
-HXLINE( 446)			if (this->lastMessage->isIncoming()) {
-HXLINE( 446)				return HX_("Incoming Call",18,e2,4d,47);
+HXLINE( 450)		if ((this->lastMessage->type == 1)) {
+HXLINE( 452)			if (this->lastMessage->isIncoming()) {
+HXLINE( 452)				return HX_("Incoming Call",18,e2,4d,47);
             			}
             			else {
-HXLINE( 446)				return HX_("Outgoing Call",d2,04,61,e8);
+HXLINE( 452)				return HX_("Outgoing Call",d2,04,61,e8);
             			}
             		}
             		else {
-HXLINE( 448)			return this->lastMessage->text;
+HXLINE( 454)			return this->lastMessage->text;
             		}
-HXLINE( 444)		return null();
+HXLINE( 450)		return null();
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Chat_obj,preview,return )
 
 void Chat_obj::setLastMessage( ::snikket::ChatMessage message){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_454_setLastMessage)
-HXDLIN( 454)		this->lastMessage = message;
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_460_setLastMessage)
+HXDLIN( 460)		this->lastMessage = message;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Chat_obj,setLastMessage,(void))
 
 void Chat_obj::setDisplayName(::String fn){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_457_setDisplayName)
-HXLINE( 458)		this->displayName = fn;
-HXLINE( 459)		this->bookmark();
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_463_setDisplayName)
+HXLINE( 464)		this->displayName = fn;
+HXLINE( 465)		this->bookmark();
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Chat_obj,setDisplayName,(void))
 
 ::String Chat_obj::getDisplayName(){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_465_getDisplayName)
-HXDLIN( 465)		 ::snikket::Chat _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 466)		::String fn;
-HXDLIN( 466)		bool fn1;
-HXDLIN( 466)		if ((this->displayName == this->chatId)) {
-HXLINE( 466)			::String fn2 = this->chatId;
-HXDLIN( 466)			fn1 = (fn2 == this->client->accountId());
-            		}
-            		else {
-HXLINE( 466)			fn1 = false;
-            		}
-HXDLIN( 466)		if (fn1) {
-HXLINE( 466)			fn = this->client->displayName();
-            		}
-            		else {
-HXLINE( 466)			fn = this->displayName;
-            		}
-HXLINE( 467)		::Array< ::String > participants = this->getParticipants();
-HXLINE( 468)		bool _hx_tmp;
-HXDLIN( 468)		bool _hx_tmp1;
-HXDLIN( 468)		if ((fn == this->chatId)) {
-HXLINE( 468)			_hx_tmp1 = (participants->length > 2);
-            		}
-            		else {
-HXLINE( 468)			_hx_tmp1 = false;
-            		}
-HXDLIN( 468)		if (_hx_tmp1) {
-HXLINE( 468)			_hx_tmp = (participants->length < 20);
-            		}
-            		else {
-HXLINE( 468)			_hx_tmp = false;
-            		}
-HXDLIN( 468)		if (_hx_tmp) {
-HXLINE( 469)			::Array< ::String > result = ::Array_obj< ::String >::__new(participants->length);
-HXDLIN( 469)			{
-HXLINE( 469)				int _g = 0;
-HXDLIN( 469)				int _g1 = participants->length;
-HXDLIN( 469)				while((_g < _g1)){
-HXLINE( 469)					_g = (_g + 1);
-HXDLIN( 469)					int i = (_g - 1);
-HXDLIN( 469)					{
-HXLINE( 470)						 ::snikket::Participant p = _gthis->getParticipantDetails(( (::String)(_hx_array_unsafe_get(participants,i)) ));
-HXLINE( 469)						::String inValue;
-HXLINE( 471)						if (p->isSelf) {
-HXLINE( 469)							inValue = null();
-            						}
-            						else {
-HXLINE( 469)							inValue = p->displayName;
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_471_getDisplayName)
+HXDLIN( 471)		 ::snikket::Chat _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 472)		if ((this->displayName == this->chatId)) {
+HXLINE( 473)			::String _hx_tmp = this->chatId;
+HXDLIN( 473)			if ((_hx_tmp == this->client->accountId())) {
+HXLINE( 473)				return this->client->displayName();
+            			}
+HXLINE( 475)			::Array< ::String > participants = this->getParticipants();
+HXLINE( 476)			bool _hx_tmp1;
+HXDLIN( 476)			if ((participants->length > 2)) {
+HXLINE( 476)				_hx_tmp1 = (participants->length < 20);
+            			}
+            			else {
+HXLINE( 476)				_hx_tmp1 = false;
+            			}
+HXDLIN( 476)			if (_hx_tmp1) {
+HXLINE( 477)				::Array< ::String > result = ::Array_obj< ::String >::__new(participants->length);
+HXDLIN( 477)				{
+HXLINE( 477)					int _g = 0;
+HXDLIN( 477)					int _g1 = participants->length;
+HXDLIN( 477)					while((_g < _g1)){
+HXLINE( 477)						_g = (_g + 1);
+HXDLIN( 477)						int i = (_g - 1);
+HXDLIN( 477)						{
+HXLINE( 478)							 ::snikket::Participant p = _gthis->getParticipantDetails(( (::String)(_hx_array_unsafe_get(participants,i)) ));
+HXLINE( 477)							::String inValue;
+HXLINE( 479)							if (p->isSelf) {
+HXLINE( 477)								inValue = null();
+            							}
+            							else {
+HXLINE( 477)								inValue = p->displayName;
+            							}
+HXDLIN( 477)							result->__unsafe_set(i,inValue);
             						}
-HXDLIN( 469)						result->__unsafe_set(i,inValue);
             					}
             				}
-            			}
-HXDLIN( 469)			::Array< ::String > _g2 = ::Array_obj< ::String >::__new(0);
-HXDLIN( 469)			{
-HXLINE( 469)				int _g3 = 0;
-HXDLIN( 469)				::Array< ::String > _g4 = result;
-HXDLIN( 469)				while((_g3 < _g4->length)){
-HXLINE( 469)					::String v = _g4->__get(_g3);
-HXDLIN( 469)					_g3 = (_g3 + 1);
-HXDLIN( 469)					if (::hx::IsNotNull( v )) {
-HXLINE( 469)						_g2->push(v);
+HXDLIN( 477)				::Array< ::String > _g2 = ::Array_obj< ::String >::__new(0);
+HXDLIN( 477)				{
+HXLINE( 477)					int _g3 = 0;
+HXDLIN( 477)					::Array< ::String > _g4 = result;
+HXDLIN( 477)					while((_g3 < _g4->length)){
+HXLINE( 477)						::String v = _g4->__get(_g3);
+HXDLIN( 477)						_g3 = (_g3 + 1);
+HXDLIN( 477)						if (::hx::IsNotNull( v )) {
+HXLINE( 477)							_g2->push(v);
+            						}
             					}
             				}
+HXDLIN( 477)				return _g2->join(HX_(", ",74,26,00,00));
             			}
-HXDLIN( 469)			return _g2->join(HX_(", ",74,26,00,00));
             		}
-            		else {
-HXLINE( 474)			return fn;
-            		}
-HXLINE( 468)		return null();
+HXLINE( 484)		return this->displayName;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Chat_obj,getDisplayName,return )
 
 void Chat_obj::setPresence(::String resource, ::snikket::Presence presence){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_480_setPresence)
-HXDLIN( 480)		this->presence->set(resource,presence);
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_489_setPresence)
+HXDLIN( 489)		this->presence->set(resource,presence);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC2(Chat_obj,setPresence,(void))
 
 void Chat_obj::setCaps(::String resource, ::snikket::Caps caps){
-            	HX_GC_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_484_setCaps)
-HXLINE( 485)		 ::snikket::Presence presence = ( ( ::snikket::Presence)(this->presence->get(resource)) );
-HXLINE( 486)		if (::hx::IsNotNull( presence )) {
-HXLINE( 487)			presence->caps = caps;
-HXLINE( 488)			this->setPresence(resource,presence);
+            	HX_GC_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_493_setCaps)
+HXLINE( 494)		 ::snikket::Presence presence = ( ( ::snikket::Presence)(this->presence->get(resource)) );
+HXLINE( 495)		if (::hx::IsNotNull( presence )) {
+HXLINE( 496)			presence->caps = caps;
+HXLINE( 497)			this->setPresence(resource,presence);
             		}
             		else {
-HXLINE( 490)			this->setPresence(resource, ::snikket::Presence_obj::__alloc( HX_CTX ,caps,null()));
+HXLINE( 499)			this->setPresence(resource, ::snikket::Presence_obj::__alloc( HX_CTX ,caps,null()));
             		}
             	}
 
@@ -1211,8 +1203,8 @@ HXLINE( 490)			this->setPresence(resource, ::snikket::Presence_obj::__alloc( HX_
 HX_DEFINE_DYNAMIC_FUNC2(Chat_obj,setCaps,(void))
 
 void Chat_obj::removePresence(::String resource){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_496_removePresence)
-HXDLIN( 496)		this->presence->remove(resource);
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_505_removePresence)
+HXDLIN( 505)		this->presence->remove(resource);
             	}
 
 
@@ -1221,17 +1213,17 @@ HX_DEFINE_DYNAMIC_FUNC1(Chat_obj,removePresence,(void))
  ::Dynamic Chat_obj::getCaps(){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::Dynamic,iter) HXARGC(0)
             		 ::Dynamic _hx_run(){
-            			HX_GC_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_504_getCaps)
-HXLINE( 505)			 ::Dynamic n = iter->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
-HXLINE( 506)			return  ::Dynamic(::hx::Anon_obj::Create(2)
+            			HX_GC_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_513_getCaps)
+HXLINE( 514)			 ::Dynamic n = iter->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
+HXLINE( 515)			return  ::Dynamic(::hx::Anon_obj::Create(2)
             				->setFixed(0,HX_("key",9f,89,51,00), ::Dynamic(n->__Field(HX_("key",9f,89,51,00),::hx::paccDynamic)))
             				->setFixed(1,HX_("value",71,7f,b8,31),( ( ::snikket::Presence)(n->__Field(HX_("value",71,7f,b8,31),::hx::paccDynamic)) )->caps));
             		}
             		HX_END_LOCAL_FUNC0(return)
 
-            	HX_GC_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_500_getCaps)
-HXLINE( 501)		 ::Dynamic iter =  ::haxe::iterators::MapKeyValueIterator_obj::__alloc( HX_CTX ,this->presence);
-HXLINE( 502)		return  ::Dynamic(::hx::Anon_obj::Create(2)
+            	HX_GC_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_509_getCaps)
+HXLINE( 510)		 ::Dynamic iter =  ::haxe::iterators::MapKeyValueIterator_obj::__alloc( HX_CTX ,this->presence);
+HXLINE( 511)		return  ::Dynamic(::hx::Anon_obj::Create(2)
             			->setFixed(0,HX_("hasNext",6d,a5,46,18), ::Dynamic(iter->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)))
             			->setFixed(1,HX_("next",f3,84,02,49), ::Dynamic(new _hx_Closure_0(iter))));
             	}
@@ -1240,188 +1232,188 @@ HXLINE( 502)		return  ::Dynamic(::hx::Anon_obj::Create(2)
 HX_DEFINE_DYNAMIC_FUNC0(Chat_obj,getCaps,return )
 
  ::snikket::Caps Chat_obj::getResourceCaps(::String resource){
-            	HX_GC_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_513_getResourceCaps)
-HXDLIN( 513)		 ::snikket::Presence tmp = ( ( ::snikket::Presence)(this->presence->get(resource)) );
-HXDLIN( 513)		 ::snikket::Caps tmp1;
-HXDLIN( 513)		if (::hx::IsNotNull( tmp )) {
-HXDLIN( 513)			tmp1 = tmp->caps;
+            	HX_GC_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_522_getResourceCaps)
+HXDLIN( 522)		 ::snikket::Presence tmp = ( ( ::snikket::Presence)(this->presence->get(resource)) );
+HXDLIN( 522)		 ::snikket::Caps tmp1;
+HXDLIN( 522)		if (::hx::IsNotNull( tmp )) {
+HXDLIN( 522)			tmp1 = tmp->caps;
             		}
             		else {
-HXDLIN( 513)			tmp1 = null();
+HXDLIN( 522)			tmp1 = null();
             		}
-HXDLIN( 513)		if (::hx::IsNotNull( tmp1 )) {
-HXDLIN( 513)			return tmp1;
+HXDLIN( 522)		if (::hx::IsNotNull( tmp1 )) {
+HXDLIN( 522)			return tmp1;
             		}
             		else {
-HXDLIN( 513)			return  ::snikket::Caps_obj::__alloc( HX_CTX ,HX_("",00,00,00,00),::Array_obj< ::Dynamic>::__new(0),::Array_obj< ::String >::__new(0));
+HXDLIN( 522)			return  ::snikket::Caps_obj::__alloc( HX_CTX ,HX_("",00,00,00,00),::Array_obj< ::Dynamic>::__new(0),::Array_obj< ::String >::__new(0),null());
             		}
-HXDLIN( 513)		return null();
+HXDLIN( 522)		return null();
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Chat_obj,getResourceCaps,return )
 
 void Chat_obj::setAvatarSha1(::Array< unsigned char > sha1){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_518_setAvatarSha1)
-HXDLIN( 518)		this->avatarSha1 = sha1;
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_527_setAvatarSha1)
+HXDLIN( 527)		this->avatarSha1 = sha1;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Chat_obj,setAvatarSha1,(void))
 
 void Chat_obj::setTrusted(bool trusted){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_522_setTrusted)
-HXDLIN( 522)		this->trusted = trusted;
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_531_setTrusted)
+HXDLIN( 531)		this->trusted = trusted;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Chat_obj,setTrusted,(void))
 
 bool Chat_obj::isTrusted(){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_529_isTrusted)
-HXDLIN( 529)		return this->trusted;
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_538_isTrusted)
+HXDLIN( 538)		return this->trusted;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Chat_obj,isTrusted,return )
 
 bool Chat_obj::livePresence(){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_534_livePresence)
-HXDLIN( 534)		return true;
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_543_livePresence)
+HXDLIN( 543)		return true;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Chat_obj,livePresence,return )
 
 bool Chat_obj::syncing(){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_538_syncing)
-HXDLIN( 538)		return !(this->client->inSync);
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_547_syncing)
+HXDLIN( 547)		return !(this->client->inSync);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Chat_obj,syncing,return )
 
 bool Chat_obj::canAudioCall(){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_544_canAudioCall)
-HXLINE( 545)		{
-HXLINE( 545)			::Dynamic map = this->presence;
-HXDLIN( 545)			::Dynamic _g_map = map;
-HXDLIN( 545)			 ::Dynamic _g_keys = ::haxe::IMap_obj::keys(map);
-HXDLIN( 545)			while(( (bool)(_g_keys->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE( 545)				::String key = ( (::String)(_g_keys->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
-HXDLIN( 545)				 ::snikket::Presence _g_value = ( ( ::snikket::Presence)(::haxe::IMap_obj::get(_g_map,key)) );
-HXDLIN( 545)				::String _g_key = key;
-HXDLIN( 545)				::String resource = _g_key;
-HXDLIN( 545)				 ::snikket::Presence p = _g_value;
-HXLINE( 546)				bool _hx_tmp;
-HXDLIN( 546)				 ::snikket::Caps tmp = p->caps;
-HXDLIN( 546)				::Array< ::String > tmp1;
-HXDLIN( 546)				if (::hx::IsNotNull( tmp )) {
-HXLINE( 546)					tmp1 = tmp->features;
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_553_canAudioCall)
+HXLINE( 554)		{
+HXLINE( 554)			::Dynamic map = this->presence;
+HXDLIN( 554)			::Dynamic _g_map = map;
+HXDLIN( 554)			 ::Dynamic _g_keys = ::haxe::IMap_obj::keys(map);
+HXDLIN( 554)			while(( (bool)(_g_keys->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE( 554)				::String key = ( (::String)(_g_keys->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
+HXDLIN( 554)				 ::snikket::Presence _g_value = ( ( ::snikket::Presence)(::haxe::IMap_obj::get(_g_map,key)) );
+HXDLIN( 554)				::String _g_key = key;
+HXDLIN( 554)				::String resource = _g_key;
+HXDLIN( 554)				 ::snikket::Presence p = _g_value;
+HXLINE( 555)				bool _hx_tmp;
+HXDLIN( 555)				 ::snikket::Caps tmp = p->caps;
+HXDLIN( 555)				::Array< ::String > tmp1;
+HXDLIN( 555)				if (::hx::IsNotNull( tmp )) {
+HXLINE( 555)					tmp1 = tmp->features;
             				}
             				else {
-HXLINE( 546)					tmp1 = null();
+HXLINE( 555)					tmp1 = null();
             				}
-HXDLIN( 546)				 ::Dynamic tmp2;
-HXDLIN( 546)				if (::hx::IsNotNull( tmp1 )) {
-HXLINE( 546)					tmp2 = tmp1->contains(HX_("urn:xmpp:jingle:apps:rtp:audio",0f,8b,54,6c));
+HXDLIN( 555)				 ::Dynamic tmp2;
+HXDLIN( 555)				if (::hx::IsNotNull( tmp1 )) {
+HXLINE( 555)					tmp2 = tmp1->contains(HX_("urn:xmpp:jingle:apps:rtp:audio",0f,8b,54,6c));
             				}
             				else {
-HXLINE( 546)					tmp2 = null();
+HXLINE( 555)					tmp2 = null();
             				}
-HXDLIN( 546)				if (::hx::IsNotNull( tmp2 )) {
-HXLINE( 546)					_hx_tmp = ( (bool)(tmp2) );
+HXDLIN( 555)				if (::hx::IsNotNull( tmp2 )) {
+HXLINE( 555)					_hx_tmp = ( (bool)(tmp2) );
             				}
             				else {
-HXLINE( 546)					_hx_tmp = false;
+HXLINE( 555)					_hx_tmp = false;
             				}
-HXDLIN( 546)				if (_hx_tmp) {
-HXLINE( 546)					return true;
+HXDLIN( 555)				if (_hx_tmp) {
+HXLINE( 555)					return true;
             				}
             			}
             		}
-HXLINE( 549)		return false;
+HXLINE( 558)		return false;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Chat_obj,canAudioCall,return )
 
 bool Chat_obj::canVideoCall(){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_555_canVideoCall)
-HXLINE( 556)		{
-HXLINE( 556)			::Dynamic map = this->presence;
-HXDLIN( 556)			::Dynamic _g_map = map;
-HXDLIN( 556)			 ::Dynamic _g_keys = ::haxe::IMap_obj::keys(map);
-HXDLIN( 556)			while(( (bool)(_g_keys->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE( 556)				::String key = ( (::String)(_g_keys->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
-HXDLIN( 556)				 ::snikket::Presence _g_value = ( ( ::snikket::Presence)(::haxe::IMap_obj::get(_g_map,key)) );
-HXDLIN( 556)				::String _g_key = key;
-HXDLIN( 556)				::String resource = _g_key;
-HXDLIN( 556)				 ::snikket::Presence p = _g_value;
-HXLINE( 557)				bool _hx_tmp;
-HXDLIN( 557)				 ::snikket::Caps tmp = p->caps;
-HXDLIN( 557)				::Array< ::String > tmp1;
-HXDLIN( 557)				if (::hx::IsNotNull( tmp )) {
-HXLINE( 557)					tmp1 = tmp->features;
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_564_canVideoCall)
+HXLINE( 565)		{
+HXLINE( 565)			::Dynamic map = this->presence;
+HXDLIN( 565)			::Dynamic _g_map = map;
+HXDLIN( 565)			 ::Dynamic _g_keys = ::haxe::IMap_obj::keys(map);
+HXDLIN( 565)			while(( (bool)(_g_keys->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE( 565)				::String key = ( (::String)(_g_keys->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
+HXDLIN( 565)				 ::snikket::Presence _g_value = ( ( ::snikket::Presence)(::haxe::IMap_obj::get(_g_map,key)) );
+HXDLIN( 565)				::String _g_key = key;
+HXDLIN( 565)				::String resource = _g_key;
+HXDLIN( 565)				 ::snikket::Presence p = _g_value;
+HXLINE( 566)				bool _hx_tmp;
+HXDLIN( 566)				 ::snikket::Caps tmp = p->caps;
+HXDLIN( 566)				::Array< ::String > tmp1;
+HXDLIN( 566)				if (::hx::IsNotNull( tmp )) {
+HXLINE( 566)					tmp1 = tmp->features;
             				}
             				else {
-HXLINE( 557)					tmp1 = null();
+HXLINE( 566)					tmp1 = null();
             				}
-HXDLIN( 557)				 ::Dynamic tmp2;
-HXDLIN( 557)				if (::hx::IsNotNull( tmp1 )) {
-HXLINE( 557)					tmp2 = tmp1->contains(HX_("urn:xmpp:jingle:apps:rtp:video",b4,26,d0,7b));
+HXDLIN( 566)				 ::Dynamic tmp2;
+HXDLIN( 566)				if (::hx::IsNotNull( tmp1 )) {
+HXLINE( 566)					tmp2 = tmp1->contains(HX_("urn:xmpp:jingle:apps:rtp:video",b4,26,d0,7b));
             				}
             				else {
-HXLINE( 557)					tmp2 = null();
+HXLINE( 566)					tmp2 = null();
             				}
-HXDLIN( 557)				if (::hx::IsNotNull( tmp2 )) {
-HXLINE( 557)					_hx_tmp = ( (bool)(tmp2) );
+HXDLIN( 566)				if (::hx::IsNotNull( tmp2 )) {
+HXLINE( 566)					_hx_tmp = ( (bool)(tmp2) );
             				}
             				else {
-HXLINE( 557)					_hx_tmp = false;
+HXLINE( 566)					_hx_tmp = false;
             				}
-HXDLIN( 557)				if (_hx_tmp) {
-HXLINE( 557)					return true;
+HXDLIN( 566)				if (_hx_tmp) {
+HXLINE( 566)					return true;
             				}
             			}
             		}
-HXLINE( 560)		return false;
+HXLINE( 569)		return false;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Chat_obj,canVideoCall,return )
 
 void Chat_obj::startCall(bool audio,bool video){
-            	HX_GC_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_569_startCall)
-HXLINE( 570)		 ::snikket::Client session = this->client;
-HXDLIN( 570)		 ::snikket::jingle::OutgoingProposedSession session1 =  ::snikket::jingle::OutgoingProposedSession_obj::__alloc( HX_CTX ,session,::snikket::JID_obj::parse(this->chatId));
-HXLINE( 571)		{
-HXLINE( 571)			::Dynamic this1 = this->jingleSessions;
-HXDLIN( 571)			( ( ::haxe::ds::StringMap)(this1) )->set(session1->get_sid(),session1);
-            		}
-HXLINE( 572)		session1->propose(audio,video);
+            	HX_GC_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_578_startCall)
+HXLINE( 579)		 ::snikket::Client session = this->client;
+HXDLIN( 579)		 ::snikket::jingle::OutgoingProposedSession session1 =  ::snikket::jingle::OutgoingProposedSession_obj::__alloc( HX_CTX ,session,::snikket::JID_obj::parse(this->chatId));
+HXLINE( 580)		{
+HXLINE( 580)			::Dynamic this1 = this->jingleSessions;
+HXDLIN( 580)			( ( ::haxe::ds::StringMap)(this1) )->set(session1->get_sid(),session1);
+            		}
+HXLINE( 581)		session1->propose(audio,video);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC2(Chat_obj,startCall,(void))
 
 void Chat_obj::addMedia(::Array< ::Dynamic> streams){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_576_addMedia)
-HXLINE( 577)		if ((this->callStatus() != HX_("ongoing",3b,aa,04,9b))) {
-HXLINE( 577)			HX_STACK_DO_THROW(HX_("cannot add media when no call ongoing",6a,0b,2b,6e));
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_585_addMedia)
+HXLINE( 586)		if ((this->callStatus() != HX_("ongoing",3b,aa,04,9b))) {
+HXLINE( 586)			HX_STACK_DO_THROW(HX_("cannot add media when no call ongoing",6a,0b,2b,6e));
             		}
-HXLINE( 578)		::snikket::jingle::Session_obj::addMedia(this->jingleSessions->iterator()->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)(),streams);
+HXLINE( 587)		::snikket::jingle::Session_obj::addMedia(this->jingleSessions->iterator()->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)(),streams);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Chat_obj,addMedia,(void))
 
 void Chat_obj::acceptCall(){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_585_acceptCall)
-HXDLIN( 585)		 ::Dynamic session = this->jingleSessions->iterator();
-HXDLIN( 585)		while(( (bool)(session->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXDLIN( 585)			::Dynamic session1 = session->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
-HXLINE( 586)			::snikket::jingle::Session_obj::accept(session1);
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_594_acceptCall)
+HXDLIN( 594)		 ::Dynamic session = this->jingleSessions->iterator();
+HXDLIN( 594)		while(( (bool)(session->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXDLIN( 594)			::Dynamic session1 = session->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
+HXLINE( 595)			::snikket::jingle::Session_obj::accept(session1);
             		}
             	}
 
@@ -1429,14 +1421,14 @@ HXLINE( 586)			::snikket::jingle::Session_obj::accept(session1);
 HX_DEFINE_DYNAMIC_FUNC0(Chat_obj,acceptCall,(void))
 
 void Chat_obj::hangup(){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_594_hangup)
-HXDLIN( 594)		 ::Dynamic session = this->jingleSessions->iterator();
-HXDLIN( 594)		while(( (bool)(session->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXDLIN( 594)			::Dynamic session1 = session->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
-HXLINE( 595)			::snikket::jingle::Session_obj::hangup(session1);
-HXLINE( 596)			{
-HXLINE( 596)				::Dynamic this1 = this->jingleSessions;
-HXDLIN( 596)				( ( ::haxe::ds::StringMap)(this1) )->remove(::snikket::jingle::Session_obj::get_sid(session1));
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_603_hangup)
+HXDLIN( 603)		 ::Dynamic session = this->jingleSessions->iterator();
+HXDLIN( 603)		while(( (bool)(session->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXDLIN( 603)			::Dynamic session1 = session->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
+HXLINE( 604)			::snikket::jingle::Session_obj::hangup(session1);
+HXLINE( 605)			{
+HXLINE( 605)				::Dynamic this1 = this->jingleSessions;
+HXDLIN( 605)				( ( ::haxe::ds::StringMap)(this1) )->remove(::snikket::jingle::Session_obj::get_sid(session1));
             			}
             		}
             	}
@@ -1445,63 +1437,63 @@ HXDLIN( 596)				( ( ::haxe::ds::StringMap)(this1) )->remove(::snikket::jingle::S
 HX_DEFINE_DYNAMIC_FUNC0(Chat_obj,hangup,(void))
 
 ::String Chat_obj::callStatus(){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_603_callStatus)
-HXLINE( 604)		{
-HXLINE( 604)			 ::Dynamic session = this->jingleSessions->iterator();
-HXDLIN( 604)			while(( (bool)(session->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE( 604)				::Dynamic session1 = session->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
-HXLINE( 605)				return ::snikket::jingle::Session_obj::callStatus(session1);
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_612_callStatus)
+HXLINE( 613)		{
+HXLINE( 613)			 ::Dynamic session = this->jingleSessions->iterator();
+HXDLIN( 613)			while(( (bool)(session->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE( 613)				::Dynamic session1 = session->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
+HXLINE( 614)				return ::snikket::jingle::Session_obj::callStatus(session1);
             			}
             		}
-HXLINE( 608)		return HX_("none",b8,12,0a,49);
+HXLINE( 617)		return HX_("none",b8,12,0a,49);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Chat_obj,callStatus,return )
 
  ::snikket::jingle::DTMFSender Chat_obj::dtmf(){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_614_dtmf)
-HXLINE( 615)		{
-HXLINE( 615)			 ::Dynamic session = this->jingleSessions->iterator();
-HXDLIN( 615)			while(( (bool)(session->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE( 615)				::Dynamic session1 = session->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
-HXLINE( 616)				 ::snikket::jingle::DTMFSender dtmf = ::snikket::jingle::Session_obj::dtmf(session1);
-HXLINE( 617)				if (::hx::IsNotNull( dtmf )) {
-HXLINE( 617)					return dtmf;
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_623_dtmf)
+HXLINE( 624)		{
+HXLINE( 624)			 ::Dynamic session = this->jingleSessions->iterator();
+HXDLIN( 624)			while(( (bool)(session->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE( 624)				::Dynamic session1 = session->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
+HXLINE( 625)				 ::snikket::jingle::DTMFSender dtmf = ::snikket::jingle::Session_obj::dtmf(session1);
+HXLINE( 626)				if (::hx::IsNotNull( dtmf )) {
+HXLINE( 626)					return dtmf;
             				}
             			}
             		}
-HXLINE( 620)		return null();
+HXLINE( 629)		return null();
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Chat_obj,dtmf,return )
 
 ::Array< ::Dynamic> Chat_obj::videoTracks(){
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_627_videoTracks)
-HXDLIN( 627)		::Array< ::Dynamic> _g = ::Array_obj< ::Dynamic>::__new(0);
-HXDLIN( 627)		{
-HXDLIN( 627)			 ::Dynamic x = this->jingleSessions->__Field(HX_("iterator",ee,49,9a,93),::hx::paccDynamic)();
-HXDLIN( 627)			while(( (bool)(x->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXDLIN( 627)				::Dynamic x1 = x->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
-HXDLIN( 627)				_g->push(::snikket::jingle::Session_obj::videoTracks(x1));
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_636_videoTracks)
+HXDLIN( 636)		::Array< ::Dynamic> _g = ::Array_obj< ::Dynamic>::__new(0);
+HXDLIN( 636)		{
+HXDLIN( 636)			 ::Dynamic x = this->jingleSessions->__Field(HX_("iterator",ee,49,9a,93),::hx::paccDynamic)();
+HXDLIN( 636)			while(( (bool)(x->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXDLIN( 636)				::Dynamic x1 = x->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
+HXDLIN( 636)				_g->push(::snikket::jingle::Session_obj::videoTracks(x1));
             			}
             		}
-HXDLIN( 627)		::Array< ::Dynamic> _g1 = ::Array_obj< ::Dynamic>::__new(0);
-HXDLIN( 627)		{
-HXDLIN( 627)			 ::Dynamic e = _g->__Field(HX_("iterator",ee,49,9a,93),::hx::paccDynamic)();
-HXDLIN( 627)			while(( (bool)(e->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXDLIN( 627)				 ::Dynamic e1 = e->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
-HXDLIN( 627)				{
-HXDLIN( 627)					 ::Dynamic x2 = e1->__Field(HX_("iterator",ee,49,9a,93),::hx::paccDynamic)();
-HXDLIN( 627)					while(( (bool)(x2->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXDLIN( 627)						 ::snikket::jingle::MediaStreamTrack x3 = ( ( ::snikket::jingle::MediaStreamTrack)(x2->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
-HXDLIN( 627)						_g1->push(x3);
+HXDLIN( 636)		::Array< ::Dynamic> _g1 = ::Array_obj< ::Dynamic>::__new(0);
+HXDLIN( 636)		{
+HXDLIN( 636)			 ::Dynamic e = _g->__Field(HX_("iterator",ee,49,9a,93),::hx::paccDynamic)();
+HXDLIN( 636)			while(( (bool)(e->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXDLIN( 636)				 ::Dynamic e1 = e->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
+HXDLIN( 636)				{
+HXDLIN( 636)					 ::Dynamic x2 = e1->__Field(HX_("iterator",ee,49,9a,93),::hx::paccDynamic)();
+HXDLIN( 636)					while(( (bool)(x2->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXDLIN( 636)						 ::snikket::jingle::MediaStreamTrack x3 = ( ( ::snikket::jingle::MediaStreamTrack)(x2->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
+HXDLIN( 636)						_g1->push(x3);
             					}
             				}
             			}
             		}
-HXDLIN( 627)		return _g1;
+HXDLIN( 636)		return _g1;
             	}
 
 
@@ -1557,47 +1549,47 @@ HXDLIN( 250)		return ( (size_t)(out->length) );
 void Chat_obj::markReadUpToId(::String upTo,::String upToBy, ::Dynamic callback){
             		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0, ::snikket::Chat,_gthis, ::Dynamic,callback) HXARGC(1)
             		void _hx_run(::Array< ::Dynamic> messages){
-            			HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_638_markReadUpToId)
-HXLINE( 639)			int i = messages->length;
-HXLINE( 640)			while(true){
-HXLINE( 640)				i = (i - 1);
-HXDLIN( 640)				if (!((i >= 0))) {
-HXLINE( 640)					goto _hx_goto_90;
+            			HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_647_markReadUpToId)
+HXLINE( 648)			int i = messages->length;
+HXLINE( 649)			while(true){
+HXLINE( 649)				i = (i - 1);
+HXDLIN( 649)				if (!((i >= 0))) {
+HXLINE( 649)					goto _hx_goto_91;
             				}
-HXLINE( 641)				bool _hx_tmp;
-HXDLIN( 641)				if ((messages->__get(i).StaticCast<  ::snikket::ChatMessage >()->serverId != _gthis->readUpToId)) {
-HXLINE( 641)					_hx_tmp = !(messages->__get(i).StaticCast<  ::snikket::ChatMessage >()->isIncoming());
+HXLINE( 650)				bool _hx_tmp;
+HXDLIN( 650)				if ((messages->__get(i).StaticCast<  ::snikket::ChatMessage >()->serverId != _gthis->readUpToId)) {
+HXLINE( 650)					_hx_tmp = !(messages->__get(i).StaticCast<  ::snikket::ChatMessage >()->isIncoming());
             				}
             				else {
-HXLINE( 641)					_hx_tmp = true;
+HXLINE( 650)					_hx_tmp = true;
             				}
-HXDLIN( 641)				if (_hx_tmp) {
-HXLINE( 641)					goto _hx_goto_90;
+HXDLIN( 650)				if (_hx_tmp) {
+HXLINE( 650)					goto _hx_goto_91;
             				}
             			}
-            			_hx_goto_90:;
-HXLINE( 643)			_gthis->setUnreadCount((messages->length - (i + 1)));
-HXLINE( 644)			if (::hx::IsNotNull( callback )) {
-HXLINE( 644)				callback();
+            			_hx_goto_91:;
+HXLINE( 652)			_gthis->setUnreadCount((messages->length - (i + 1)));
+HXLINE( 653)			if (::hx::IsNotNull( callback )) {
+HXLINE( 653)				callback();
             			}
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_631_markReadUpToId)
-HXDLIN( 631)		 ::snikket::Chat _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 632)		if (::hx::IsNull( upTo )) {
-HXLINE( 632)			return;
-            		}
-HXLINE( 633)		if ((this->readUpTo() == upTo)) {
-HXLINE( 633)			return;
-            		}
-HXLINE( 635)		this->readUpToId = upTo;
-HXLINE( 636)		this->readUpToBy = upToBy;
-HXLINE( 637)		::Dynamic _hx_tmp = this->persistence;
-HXDLIN( 637)		::snikket::Persistence_obj::storeChats(_hx_tmp,this->client->accountId(),::Array_obj< ::Dynamic>::__new(1)->init(0,::hx::ObjectPtr<OBJ_>(this)));
-HXLINE( 638)		::Dynamic _hx_tmp1 = this->persistence;
-HXDLIN( 638)		::String _hx_tmp2 = this->client->accountId();
-HXDLIN( 638)		::snikket::Persistence_obj::getMessagesBefore(_hx_tmp1,_hx_tmp2,this->chatId,null(),null(), ::Dynamic(new _hx_Closure_0(_gthis,callback)));
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_640_markReadUpToId)
+HXDLIN( 640)		 ::snikket::Chat _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 641)		if (::hx::IsNull( upTo )) {
+HXLINE( 641)			return;
+            		}
+HXLINE( 642)		if ((this->readUpTo() == upTo)) {
+HXLINE( 642)			return;
+            		}
+HXLINE( 644)		this->readUpToId = upTo;
+HXLINE( 645)		this->readUpToBy = upToBy;
+HXLINE( 646)		::Dynamic _hx_tmp = this->persistence;
+HXDLIN( 646)		::snikket::Persistence_obj::storeChats(_hx_tmp,this->client->accountId(),::Array_obj< ::Dynamic>::__new(1)->init(0,::hx::ObjectPtr<OBJ_>(this)));
+HXLINE( 647)		::Dynamic _hx_tmp1 = this->persistence;
+HXDLIN( 647)		::String _hx_tmp2 = this->client->accountId();
+HXDLIN( 647)		::snikket::Persistence_obj::getMessagesBefore(_hx_tmp1,_hx_tmp2,this->chatId,null(),null(), ::Dynamic(new _hx_Closure_0(_gthis,callback)));
             	}
 
 
@@ -1606,46 +1598,46 @@ HX_DEFINE_DYNAMIC_FUNC3(Chat_obj,markReadUpToId,(void))
 void Chat_obj::markReadUpToMessage( ::snikket::ChatMessage message, ::Dynamic callback){
             		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_0, ::snikket::Chat,_gthis, ::snikket::ChatMessage,message, ::Dynamic,callback) HXARGC(1)
             		void _hx_run( ::snikket::ChatMessage readMessage){
-            			HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_657_markReadUpToMessage)
-HXLINE( 658)			bool _hx_tmp;
-HXDLIN( 658)			if (::hx::IsNotNull( readMessage )) {
-HXLINE( 658)				_hx_tmp = (::Reflect_obj::compare(message->timestamp,readMessage->timestamp) <= 0);
+            			HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_666_markReadUpToMessage)
+HXLINE( 667)			bool _hx_tmp;
+HXDLIN( 667)			if (::hx::IsNotNull( readMessage )) {
+HXLINE( 667)				_hx_tmp = (::Reflect_obj::compare(message->timestamp,readMessage->timestamp) <= 0);
             			}
             			else {
-HXLINE( 658)				_hx_tmp = false;
+HXLINE( 667)				_hx_tmp = false;
             			}
-HXDLIN( 658)			if (_hx_tmp) {
-HXLINE( 658)				return;
+HXDLIN( 667)			if (_hx_tmp) {
+HXLINE( 667)				return;
             			}
-HXLINE( 660)			_gthis->markReadUpToId(message->serverId,message->serverIdBy,callback);
+HXLINE( 669)			_gthis->markReadUpToId(message->serverId,message->serverIdBy,callback);
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_648_markReadUpToMessage)
-HXDLIN( 648)		 ::snikket::Chat _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 649)		bool _hx_tmp;
-HXDLIN( 649)		if (::hx::IsNotNull( message->serverId )) {
-HXLINE( 649)			::String _hx_tmp1 = message->chatId();
-HXDLIN( 649)			_hx_tmp = (_hx_tmp1 != this->chatId);
+            	HX_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_657_markReadUpToMessage)
+HXDLIN( 657)		 ::snikket::Chat _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 658)		bool _hx_tmp;
+HXDLIN( 658)		if (::hx::IsNotNull( message->serverId )) {
+HXLINE( 658)			::String _hx_tmp1 = message->chatId();
+HXDLIN( 658)			_hx_tmp = (_hx_tmp1 != this->chatId);
             		}
             		else {
-HXLINE( 649)			_hx_tmp = true;
+HXLINE( 658)			_hx_tmp = true;
             		}
-HXDLIN( 649)		if (_hx_tmp) {
-HXLINE( 649)			return;
+HXDLIN( 658)		if (_hx_tmp) {
+HXLINE( 658)			return;
             		}
-HXLINE( 650)		::String _hx_tmp2 = this->readUpTo();
-HXDLIN( 650)		if ((_hx_tmp2 == message->serverId)) {
-HXLINE( 650)			return;
+HXLINE( 659)		::String _hx_tmp2 = this->readUpTo();
+HXDLIN( 659)		if ((_hx_tmp2 == message->serverId)) {
+HXLINE( 659)			return;
             		}
-HXLINE( 652)		if (::hx::IsNull( this->readUpTo() )) {
-HXLINE( 653)			this->markReadUpToId(message->serverId,message->serverIdBy,callback);
-HXLINE( 654)			return;
+HXLINE( 661)		if (::hx::IsNull( this->readUpTo() )) {
+HXLINE( 662)			this->markReadUpToId(message->serverId,message->serverIdBy,callback);
+HXLINE( 663)			return;
             		}
-HXLINE( 657)		::Dynamic _hx_tmp3 = this->persistence;
-HXDLIN( 657)		::String _hx_tmp4 = this->client->accountId();
-HXDLIN( 657)		::String _hx_tmp5 = this->chatId;
-HXDLIN( 657)		::snikket::Persistence_obj::getMessage(_hx_tmp3,_hx_tmp4,_hx_tmp5,this->readUpTo(),null(), ::Dynamic(new _hx_Closure_0(_gthis,message,callback)));
+HXLINE( 666)		::Dynamic _hx_tmp3 = this->persistence;
+HXDLIN( 666)		::String _hx_tmp4 = this->client->accountId();
+HXDLIN( 666)		::String _hx_tmp5 = this->chatId;
+HXDLIN( 666)		::snikket::Persistence_obj::getMessage(_hx_tmp3,_hx_tmp4,_hx_tmp5,this->readUpTo(),null(), ::Dynamic(new _hx_Closure_0(_gthis,message,callback)));
             	}
 
 
@@ -1654,28 +1646,28 @@ HX_DEFINE_DYNAMIC_FUNC2(Chat_obj,markReadUpToMessage,(void))
 void Chat_obj::publishMds(){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_1, ::snikket::Chat,_gthis) HXARGC(1)
             		void _hx_run( ::snikket::Stanza response){
-            			HX_GC_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_682_publishMds)
-HXLINE( 682)			if ((( (::String)(::Reflect_obj::field(response->attr,HX_("type",ba,f2,08,4d))) ) == HX_("error",c8,cb,29,73))) {
-HXLINE( 683)				 ::snikket::Stanza tmp = response->getChild(HX_("error",c8,cb,29,73),null());
-HXDLIN( 683)				 ::snikket::Stanza preconditionError;
-HXDLIN( 683)				if (::hx::IsNotNull( tmp )) {
-HXLINE( 683)					preconditionError = tmp->getChild(HX_("precondition-not-met",2d,db,78,db),HX_("http://jabber.org/protocol/pubsub#errors",97,74,3a,a8));
+            			HX_GC_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_691_publishMds)
+HXLINE( 691)			if ((( (::String)(::Reflect_obj::field(response->attr,HX_("type",ba,f2,08,4d))) ) == HX_("error",c8,cb,29,73))) {
+HXLINE( 692)				 ::snikket::Stanza tmp = response->getChild(HX_("error",c8,cb,29,73),null());
+HXDLIN( 692)				 ::snikket::Stanza preconditionError;
+HXDLIN( 692)				if (::hx::IsNotNull( tmp )) {
+HXLINE( 692)					preconditionError = tmp->getChild(HX_("precondition-not-met",2d,db,78,db),HX_("http://jabber.org/protocol/pubsub#errors",97,74,3a,a8));
             				}
             				else {
-HXLINE( 683)					preconditionError = null();
+HXLINE( 692)					preconditionError = null();
             				}
-HXLINE( 684)				if (::hx::IsNotNull( preconditionError )) {
+HXLINE( 693)				if (::hx::IsNotNull( preconditionError )) {
             					HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::Chat,_gthis) HXARGC(1)
             					void _hx_run( ::snikket::Stanza response){
-            						HX_GC_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_698_publishMds)
-HXLINE( 698)						if ((( (::String)(::Reflect_obj::field(response->attr,HX_("type",ba,f2,08,4d))) ) == HX_("result",dd,68,84,08))) {
-HXLINE( 699)							_gthis->publishMds();
+            						HX_GC_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_707_publishMds)
+HXLINE( 707)						if ((( (::String)(::Reflect_obj::field(response->attr,HX_("type",ba,f2,08,4d))) ) == HX_("result",dd,68,84,08))) {
+HXLINE( 708)							_gthis->publishMds();
             						}
             					}
             					HX_END_LOCAL_FUNC1((void))
 
-HXLINE( 686)					 ::snikket::GenericStream _gthis1 = _gthis->stream;
-HXDLIN( 686)					_gthis1->sendIq( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("iq",e8,5b,00,00), ::Dynamic(::hx::Anon_obj::Create(1)
+HXLINE( 695)					 ::snikket::GenericStream _gthis1 = _gthis->stream;
+HXDLIN( 695)					_gthis1->sendIq( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("iq",e8,5b,00,00), ::Dynamic(::hx::Anon_obj::Create(1)
             						->setFixed(0,HX_("type",ba,f2,08,4d),HX_("set",a2,9b,57,00))))->tag(HX_("pubsub",e3,da,f8,66), ::Dynamic(::hx::Anon_obj::Create(1)
             						->setFixed(0,HX_("xmlns",dc,31,74,60),HX_("http://jabber.org/protocol/pubsub#owner",c7,28,a3,08))))->tag(HX_("configure",e6,f9,5b,c0), ::Dynamic(::hx::Anon_obj::Create(1)
             						->setFixed(0,HX_("node",02,0a,0a,49),HX_("urn:xmpp:mds:displayed:0",bd,60,cc,fb))))->tag(HX_("x",78,00,00,00), ::Dynamic(::hx::Anon_obj::Create(2)
@@ -1692,17 +1684,17 @@ HXDLIN( 686)					_gthis1->sendIq( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("i
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_GC_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_664_publishMds)
-HXDLIN( 664)		 ::snikket::Chat _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 665)		 ::snikket::GenericStream _hx_tmp = this->stream;
-HXLINE( 666)		 ::snikket::Stanza _hx_tmp1 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("iq",e8,5b,00,00), ::Dynamic(::hx::Anon_obj::Create(1)
+            	HX_GC_STACKFRAME(&_hx_pos_3993c1e3d3f53fe2_673_publishMds)
+HXDLIN( 673)		 ::snikket::Chat _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 674)		 ::snikket::GenericStream _hx_tmp = this->stream;
+HXLINE( 675)		 ::snikket::Stanza _hx_tmp1 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("iq",e8,5b,00,00), ::Dynamic(::hx::Anon_obj::Create(1)
             			->setFixed(0,HX_("type",ba,f2,08,4d),HX_("set",a2,9b,57,00))))->tag(HX_("pubsub",e3,da,f8,66), ::Dynamic(::hx::Anon_obj::Create(1)
             			->setFixed(0,HX_("xmlns",dc,31,74,60),HX_("http://jabber.org/protocol/pubsub",57,94,3c,f2))))->tag(HX_("publish",8f,21,1d,ae), ::Dynamic(::hx::Anon_obj::Create(1)
             			->setFixed(0,HX_("node",02,0a,0a,49),HX_("urn:xmpp:mds:displayed:0",bd,60,cc,fb))))->tag(HX_("item",13,c5,bf,45), ::Dynamic(::hx::Anon_obj::Create(1)
             			->setFixed(0,HX_("id",db,5b,00,00),this->chatId)))->tag(HX_("displayed",21,17,db,c1), ::Dynamic(::hx::Anon_obj::Create(1)
             			->setFixed(0,HX_("xmlns",dc,31,74,60),HX_("urn:xmpp:mds:displayed:0",bd,60,cc,fb))));
-HXLINE( 671)		::String _hx_tmp2 = this->readUpTo();
-HXLINE( 665)		_hx_tmp->sendIq(_hx_tmp1->tag(HX_("stanza-id",73,8a,54,e9), ::Dynamic(::hx::Anon_obj::Create(3)
+HXLINE( 680)		::String _hx_tmp2 = this->readUpTo();
+HXLINE( 674)		_hx_tmp->sendIq(_hx_tmp1->tag(HX_("stanza-id",73,8a,54,e9), ::Dynamic(::hx::Anon_obj::Create(3)
             			->setFixed(0,HX_("by",d7,55,00,00),this->readUpToBy)
             			->setFixed(1,HX_("id",db,5b,00,00),_hx_tmp2)
             			->setFixed(2,HX_("xmlns",dc,31,74,60),HX_("urn:xmpp:sid:0",a8,4b,37,54))))->up()->up()->up()->tag(HX_("publish-options",60,0b,5c,74),null())->tag(HX_("x",78,00,00,00), ::Dynamic(::hx::Anon_obj::Create(2)
@@ -1910,6 +1902,9 @@ void Chat_obj::__Visit(HX_VISIT_PARAMS)
 	case 22:
 		if (HX_FIELD_EQ(inName,"prepareIncomingMessage") ) { return ::hx::Val( prepareIncomingMessage_dyn() ); }
 		break;
+	case 24:
+		if (HX_FIELD_EQ(inName,"setNotificationsInternal") ) { return ::hx::Val( setNotificationsInternal_dyn() ); }
+		break;
 	case 28:
 		if (HX_FIELD_EQ(inName,"getParticipantDetails__fromC") ) { return ::hx::Val( getParticipantDetails__fromC_dyn() ); }
 	}
@@ -2071,6 +2066,7 @@ static ::String Chat_obj_sMemberFields[] = {
 	HX_("togglePinned",cc,b5,2e,2c),
 	HX_("block",4d,75,fc,b4),
 	HX_("unblock",54,6c,8d,b1),
+	HX_("setNotificationsInternal",83,67,4b,5c),
 	HX_("setNotifications",26,ae,ef,ed),
 	HX_("notificationsFiltered",5f,11,ed,96),
 	HX_("notifyMention",21,c7,22,5a),
diff --git a/Sources/c_snikket/src/snikket/ChatMessage.cpp b/Sources/c_snikket/src/snikket/ChatMessage.cpp
index a4f8498..c8949fe 100644
--- a/Sources/c_snikket/src/snikket/ChatMessage.cpp
+++ b/Sources/c_snikket/src/snikket/ChatMessage.cpp
@@ -1244,14 +1244,14 @@ HXDLIN( 419)			::Reflect_obj::setField(attrs1,HX_("id",db,5b,00,00),value2);
 HXLINE( 420)		 ::snikket::Stanza stanza =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("message",c7,35,11,9a),attrs1);
 HXLINE( 421)		bool _hx_tmp;
 HXDLIN( 421)		if ((this->versions->length > 0)) {
-HXLINE( 421)			_hx_tmp = ::hx::IsNotNull( this->versions->__get((this->versions->length - 1)).StaticCast<  ::snikket::ChatMessage >()->localId );
+HXLINE( 421)			_hx_tmp = ::hx::IsNotNull( this->versions->__get(0).StaticCast<  ::snikket::ChatMessage >()->localId );
             		}
             		else {
 HXLINE( 421)			_hx_tmp = false;
             		}
 HXDLIN( 421)		if (_hx_tmp) {
 HXLINE( 421)			stanza->tag(HX_("replace",34,48,28,ab), ::Dynamic(::hx::Anon_obj::Create(2)
-            				->setFixed(0,HX_("id",db,5b,00,00),this->versions->__get((this->versions->length - 1)).StaticCast<  ::snikket::ChatMessage >()->localId)
+            				->setFixed(0,HX_("id",db,5b,00,00),this->versions->__get(0).StaticCast<  ::snikket::ChatMessage >()->localId)
             				->setFixed(1,HX_("xmlns",dc,31,74,60),HX_("urn:xmpp:message-correct:0",be,10,1b,b0))))->up();
             		}
 HXLINE( 422)		if (::hx::IsNotNull( this->threadId )) {
diff --git a/Sources/c_snikket/src/snikket/ChatMessageBuilder.cpp b/Sources/c_snikket/src/snikket/ChatMessageBuilder.cpp
index 47e6556..0d0072f 100644
--- a/Sources/c_snikket/src/snikket/ChatMessageBuilder.cpp
+++ b/Sources/c_snikket/src/snikket/ChatMessageBuilder.cpp
@@ -70,9 +70,6 @@
 #ifndef INCLUDED_snikket_Stanza
 #include <snikket/Stanza.h>
 #endif
-#ifndef INCLUDED_snikket_TextNode
-#include <snikket/TextNode.h>
-#endif
 #ifndef INCLUDED_snikket_XEP0393
 #include <snikket/XEP0393.h>
 #endif
@@ -667,7 +664,7 @@ HX_DEFINE_DYNAMIC_FUNC1(ChatMessageBuilder_obj,setHtml,(void))
             	HX_GC_STACKFRAME(&_hx_pos_cb10733abcc4a57a_258_htmlToNode)
 HXLINE( 259)		 ::htmlparser::HtmlNodeText txt = ( ( ::htmlparser::HtmlNodeText)(::snikket::_Util::Util_Fields__obj::downcast(node,::hx::ClassOf< ::htmlparser::HtmlNodeText >())) );
 HXLINE( 260)		if (::hx::IsNotNull( txt )) {
-HXLINE( 261)			return ::snikket::Node_obj::CData( ::snikket::TextNode_obj::__alloc( HX_CTX ,txt->toText()));
+HXLINE( 261)			return ::snikket::Node_obj::CData(txt->toText());
             		}
 HXLINE( 263)		 ::htmlparser::HtmlNodeElement el = ( ( ::htmlparser::HtmlNodeElement)(::snikket::_Util::Util_Fields__obj::downcast(node,::hx::ClassOf< ::htmlparser::HtmlNodeElement >())) );
 HXLINE( 264)		if (::hx::IsNotNull( el )) {
diff --git a/Sources/c_snikket/src/snikket/Client.cpp b/Sources/c_snikket/src/snikket/Client.cpp
index 4e215a1..5b48be7 100644
--- a/Sources/c_snikket/src/snikket/Client.cpp
+++ b/Sources/c_snikket/src/snikket/Client.cpp
@@ -319,7 +319,6 @@
 
 HX_DEFINE_STACK_FRAME(_hx_pos_ead56881d4bbcaca_106_new,"snikket.Client","new",0x69246d2e,"snikket.Client.new","snikket/Client.hx",106,0x180249e1)
 HX_DEFINE_STACK_FRAME(_hx_pos_ead56881d4bbcaca_110_new,"snikket.Client","new",0x69246d2e,"snikket.Client.new","snikket/Client.hx",110,0x180249e1)
-HX_DEFINE_STACK_FRAME(_hx_pos_ead56881d4bbcaca_117_new,"snikket.Client","new",0x69246d2e,"snikket.Client.new","snikket/Client.hx",117,0x180249e1)
 HX_DEFINE_STACK_FRAME(_hx_pos_ead56881d4bbcaca_116_new,"snikket.Client","new",0x69246d2e,"snikket.Client.new","snikket/Client.hx",116,0x180249e1)
 HX_DEFINE_STACK_FRAME(_hx_pos_ead56881d4bbcaca_127_new,"snikket.Client","new",0x69246d2e,"snikket.Client.new","snikket/Client.hx",127,0x180249e1)
 HX_DEFINE_STACK_FRAME(_hx_pos_ead56881d4bbcaca_122_new,"snikket.Client","new",0x69246d2e,"snikket.Client.new","snikket/Client.hx",122,0x180249e1)
@@ -362,149 +361,149 @@ HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_558_start,"snikket.Client","start"
 HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_565_start,"snikket.Client","start",0x37d760b0,"snikket.Client.start","snikket/Client.hx",565,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_556_start,"snikket.Client","start",0x37d760b0,"snikket.Client.start","snikket/Client.hx",556,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_554_start,"snikket.Client","start",0x37d760b0,"snikket.Client.start","snikket/Client.hx",554,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_597_startOffline,"snikket.Client","startOffline",0x5e9bcc13,"snikket.Client.startOffline","snikket/Client.hx",597,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_592_startOffline,"snikket.Client","startOffline",0x5e9bcc13,"snikket.Client.startOffline","snikket/Client.hx",592,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_583_startOffline,"snikket.Client","startOffline",0x5e9bcc13,"snikket.Client.startOffline","snikket/Client.hx",583,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_601_startOffline,"snikket.Client","startOffline",0x5e9bcc13,"snikket.Client.startOffline","snikket/Client.hx",601,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_596_startOffline,"snikket.Client","startOffline",0x5e9bcc13,"snikket.Client.startOffline","snikket/Client.hx",596,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_587_startOffline,"snikket.Client","startOffline",0x5e9bcc13,"snikket.Client.startOffline","snikket/Client.hx",587,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_582_startOffline,"snikket.Client","startOffline",0x5e9bcc13,"snikket.Client.startOffline","snikket/Client.hx",582,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_221_startOffline__fromC,"snikket.Client","startOffline__fromC",0x5d609cc6,"snikket.Client.startOffline__fromC","HaxeCBridge.hx",221,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_252_startOffline__fromC,"snikket.Client","startOffline__fromC",0x5d609cc6,"snikket.Client.startOffline__fromC","HaxeCBridge.hx",252,0xa18550d8)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_626_logout,"snikket.Client","logout",0xfb11ce7c,"snikket.Client.logout","snikket/Client.hx",626,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_622_logout,"snikket.Client","logout",0xfb11ce7c,"snikket.Client.logout","snikket/Client.hx",622,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_618_logout,"snikket.Client","logout",0xfb11ce7c,"snikket.Client.logout","snikket/Client.hx",618,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_634_usePassword,"snikket.Client","usePassword",0x35ea4550,"snikket.Client.usePassword","snikket/Client.hx",634,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_643_accountId,"snikket.Client","accountId",0x98c7ad36,"snikket.Client.accountId","snikket/Client.hx",643,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_652_displayName,"snikket.Client","displayName",0xc4012c7b,"snikket.Client.displayName","snikket/Client.hx",652,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_670_setDisplayName,"snikket.Client","setDisplayName",0x10b7671d,"snikket.Client.setDisplayName","snikket/Client.hx",670,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_660_setDisplayName,"snikket.Client","setDisplayName",0x10b7671d,"snikket.Client.setDisplayName","snikket/Client.hx",660,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_674_updateDisplayName,"snikket.Client","updateDisplayName",0x01ffe772,"snikket.Client.updateDisplayName","snikket/Client.hx",674,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_696_onConnected,"snikket.Client","onConnected",0x5848e078,"snikket.Client.onConnected","snikket/Client.hx",696,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_713_onConnected,"snikket.Client","onConnected",0x5848e078,"snikket.Client.onConnected","snikket/Client.hx",713,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_702_onConnected,"snikket.Client","onConnected",0x5848e078,"snikket.Client.onConnected","snikket/Client.hx",702,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_638_usePassword,"snikket.Client","usePassword",0x35ea4550,"snikket.Client.usePassword","snikket/Client.hx",638,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_647_accountId,"snikket.Client","accountId",0x98c7ad36,"snikket.Client.accountId","snikket/Client.hx",647,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_656_displayName,"snikket.Client","displayName",0xc4012c7b,"snikket.Client.displayName","snikket/Client.hx",656,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_674_setDisplayName,"snikket.Client","setDisplayName",0x10b7671d,"snikket.Client.setDisplayName","snikket/Client.hx",674,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_664_setDisplayName,"snikket.Client","setDisplayName",0x10b7671d,"snikket.Client.setDisplayName","snikket/Client.hx",664,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_678_updateDisplayName,"snikket.Client","updateDisplayName",0x01ffe772,"snikket.Client.updateDisplayName","snikket/Client.hx",678,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_700_onConnected,"snikket.Client","onConnected",0x5848e078,"snikket.Client.onConnected","snikket/Client.hx",700,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_682_onConnected,"snikket.Client","onConnected",0x5848e078,"snikket.Client.onConnected","snikket/Client.hx",682,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_751_prepareAttachment,"snikket.Client","prepareAttachment",0xbeef9598,"snikket.Client.prepareAttachment","snikket/Client.hx",751,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_753_prepareAttachment,"snikket.Client","prepareAttachment",0xbeef9598,"snikket.Client.prepareAttachment","snikket/Client.hx",753,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_756_prepareAttachment,"snikket.Client","prepareAttachment",0xbeef9598,"snikket.Client.prepareAttachment","snikket/Client.hx",756,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_750_prepareAttachment,"snikket.Client","prepareAttachment",0xbeef9598,"snikket.Client.prepareAttachment","snikket/Client.hx",750,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_717_onConnected,"snikket.Client","onConnected",0x5848e078,"snikket.Client.onConnected","snikket/Client.hx",717,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_706_onConnected,"snikket.Client","onConnected",0x5848e078,"snikket.Client.onConnected","snikket/Client.hx",706,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_704_onConnected,"snikket.Client","onConnected",0x5848e078,"snikket.Client.onConnected","snikket/Client.hx",704,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_686_onConnected,"snikket.Client","onConnected",0x5848e078,"snikket.Client.onConnected","snikket/Client.hx",686,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_755_prepareAttachment,"snikket.Client","prepareAttachment",0xbeef9598,"snikket.Client.prepareAttachment","snikket/Client.hx",755,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_757_prepareAttachment,"snikket.Client","prepareAttachment",0xbeef9598,"snikket.Client.prepareAttachment","snikket/Client.hx",757,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_760_prepareAttachment,"snikket.Client","prepareAttachment",0xbeef9598,"snikket.Client.prepareAttachment","snikket/Client.hx",760,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_754_prepareAttachment,"snikket.Client","prepareAttachment",0xbeef9598,"snikket.Client.prepareAttachment","snikket/Client.hx",754,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_221_prepareAttachment__fromC,"snikket.Client","prepareAttachment__fromC",0x503d3de1,"snikket.Client.prepareAttachment__fromC","HaxeCBridge.hx",221,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_252_prepareAttachment__fromC,"snikket.Client","prepareAttachment__fromC",0x503d3de1,"snikket.Client.prepareAttachment__fromC","HaxeCBridge.hx",252,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_773_prepareAttachmentFor,"snikket.Client","prepareAttachmentFor",0xe1e97851,"snikket.Client.prepareAttachmentFor","snikket/Client.hx",773,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_778_prepareAttachmentFor,"snikket.Client","prepareAttachmentFor",0xe1e97851,"snikket.Client.prepareAttachmentFor","snikket/Client.hx",778,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_779_prepareAttachmentFor,"snikket.Client","prepareAttachmentFor",0xe1e97851,"snikket.Client.prepareAttachmentFor","snikket/Client.hx",779,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_766_prepareAttachmentFor,"snikket.Client","prepareAttachmentFor",0xe1e97851,"snikket.Client.prepareAttachmentFor","snikket/Client.hx",766,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_794_getChats,"snikket.Client","getChats",0x5488e697,"snikket.Client.getChats","snikket/Client.hx",794,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_777_prepareAttachmentFor,"snikket.Client","prepareAttachmentFor",0xe1e97851,"snikket.Client.prepareAttachmentFor","snikket/Client.hx",777,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_782_prepareAttachmentFor,"snikket.Client","prepareAttachmentFor",0xe1e97851,"snikket.Client.prepareAttachmentFor","snikket/Client.hx",782,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_783_prepareAttachmentFor,"snikket.Client","prepareAttachmentFor",0xe1e97851,"snikket.Client.prepareAttachmentFor","snikket/Client.hx",783,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_770_prepareAttachmentFor,"snikket.Client","prepareAttachmentFor",0xe1e97851,"snikket.Client.prepareAttachmentFor","snikket/Client.hx",770,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_798_getChats,"snikket.Client","getChats",0x5488e697,"snikket.Client.getChats","snikket/Client.hx",798,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_250_getChats__fromC,"snikket.Client","getChats__fromC",0x4cad9ac2,"snikket.Client.getChats__fromC","HaxeCBridge.hx",250,0xa18550d8)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_811_findAvailableChats,"snikket.Client","findAvailableChats",0x877a8d1d,"snikket.Client.findAvailableChats","snikket/Client.hx",811,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_813_findAvailableChats,"snikket.Client","findAvailableChats",0x877a8d1d,"snikket.Client.findAvailableChats","snikket/Client.hx",813,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_810_findAvailableChats,"snikket.Client","findAvailableChats",0x877a8d1d,"snikket.Client.findAvailableChats","snikket/Client.hx",810,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_807_findAvailableChats,"snikket.Client","findAvailableChats",0x877a8d1d,"snikket.Client.findAvailableChats","snikket/Client.hx",807,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_809_findAvailableChats,"snikket.Client","findAvailableChats",0x877a8d1d,"snikket.Client.findAvailableChats","snikket/Client.hx",809,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_806_findAvailableChats,"snikket.Client","findAvailableChats",0x877a8d1d,"snikket.Client.findAvailableChats","snikket/Client.hx",806,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_803_findAvailableChats,"snikket.Client","findAvailableChats",0x877a8d1d,"snikket.Client.findAvailableChats","snikket/Client.hx",803,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_858_findAvailableChats,"snikket.Client","findAvailableChats",0x877a8d1d,"snikket.Client.findAvailableChats","snikket/Client.hx",858,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_862_findAvailableChats,"snikket.Client","findAvailableChats",0x877a8d1d,"snikket.Client.findAvailableChats","snikket/Client.hx",862,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_221_findAvailableChats__fromC,"snikket.Client","findAvailableChats__fromC",0x704470fc,"snikket.Client.findAvailableChats__fromC","HaxeCBridge.hx",221,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_252_findAvailableChats__fromC,"snikket.Client","findAvailableChats__fromC",0x704470fc,"snikket.Client.findAvailableChats__fromC","HaxeCBridge.hx",252,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_887_startChat,"snikket.Client","startChat",0x6a2603a8,"snikket.Client.startChat","snikket/Client.hx",887,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_921_getChat,"snikket.Client","getChat",0x441c2a5c,"snikket.Client.getChat","snikket/Client.hx",921,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_927_moderateMessage,"snikket.Client","moderateMessage",0xa3213212,"snikket.Client.moderateMessage","snikket/Client.hx",927,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_925_moderateMessage,"snikket.Client","moderateMessage",0xa3213212,"snikket.Client.moderateMessage","snikket/Client.hx",925,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_942_getDirectChat,"snikket.Client","getDirectChat",0x348a6525,"snikket.Client.getDirectChat","snikket/Client.hx",942,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_995_enablePush,"snikket.Client","enablePush",0xb901a2ef,"snikket.Client.enablePush","snikket/Client.hx",995,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_891_startChat,"snikket.Client","startChat",0x6a2603a8,"snikket.Client.startChat","snikket/Client.hx",891,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_925_getChat,"snikket.Client","getChat",0x441c2a5c,"snikket.Client.getChat","snikket/Client.hx",925,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_931_moderateMessage,"snikket.Client","moderateMessage",0xa3213212,"snikket.Client.moderateMessage","snikket/Client.hx",931,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_929_moderateMessage,"snikket.Client","moderateMessage",0xa3213212,"snikket.Client.moderateMessage","snikket/Client.hx",929,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_946_getDirectChat,"snikket.Client","getDirectChat",0x348a6525,"snikket.Client.getDirectChat","snikket/Client.hx",946,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_999_enablePush,"snikket.Client","enablePush",0xb901a2ef,"snikket.Client.enablePush","snikket/Client.hx",999,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_252_enablePush__fromC,"snikket.Client","enablePush__fromC",0x9c5b996a,"snikket.Client.enablePush__fromC","HaxeCBridge.hx",252,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1027_updatePushIfEnabled,"snikket.Client","updatePushIfEnabled",0x5fd409ef,"snikket.Client.updatePushIfEnabled","snikket/Client.hx",1027,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1038_addPasswordNeededListener,"snikket.Client","addPasswordNeededListener",0x82818693,"snikket.Client.addPasswordNeededListener","snikket/Client.hx",1038,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1037_addPasswordNeededListener,"snikket.Client","addPasswordNeededListener",0x82818693,"snikket.Client.addPasswordNeededListener","snikket/Client.hx",1037,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1031_updatePushIfEnabled,"snikket.Client","updatePushIfEnabled",0x5fd409ef,"snikket.Client.updatePushIfEnabled","snikket/Client.hx",1031,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1042_addPasswordNeededListener,"snikket.Client","addPasswordNeededListener",0x82818693,"snikket.Client.addPasswordNeededListener","snikket/Client.hx",1042,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1041_addPasswordNeededListener,"snikket.Client","addPasswordNeededListener",0x82818693,"snikket.Client.addPasswordNeededListener","snikket/Client.hx",1041,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_221_addPasswordNeededListener__fromC,"snikket.Client","addPasswordNeededListener__fromC",0xf03f3246,"snikket.Client.addPasswordNeededListener__fromC","HaxeCBridge.hx",221,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_252_addPasswordNeededListener__fromC,"snikket.Client","addPasswordNeededListener__fromC",0xf03f3246,"snikket.Client.addPasswordNeededListener__fromC","HaxeCBridge.hx",252,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1050_addStatusOnlineListener,"snikket.Client","addStatusOnlineListener",0x143d9788,"snikket.Client.addStatusOnlineListener","snikket/Client.hx",1050,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1054_addStatusOnlineListener,"snikket.Client","addStatusOnlineListener",0x143d9788,"snikket.Client.addStatusOnlineListener","snikket/Client.hx",1054,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_221_addStatusOnlineListener__fromC,"snikket.Client","addStatusOnlineListener__fromC",0x326c59f1,"snikket.Client.addStatusOnlineListener__fromC","HaxeCBridge.hx",221,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_252_addStatusOnlineListener__fromC,"snikket.Client","addStatusOnlineListener__fromC",0x326c59f1,"snikket.Client.addStatusOnlineListener__fromC","HaxeCBridge.hx",252,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1062_addStatusOfflineListener,"snikket.Client","addStatusOfflineListener",0xa2febff6,"snikket.Client.addStatusOfflineListener","snikket/Client.hx",1062,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1066_addStatusOfflineListener,"snikket.Client","addStatusOfflineListener",0xa2febff6,"snikket.Client.addStatusOfflineListener","snikket/Client.hx",1066,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_221_addStatusOfflineListener__fromC,"snikket.Client","addStatusOfflineListener__fromC",0xe34d3b43,"snikket.Client.addStatusOfflineListener__fromC","HaxeCBridge.hx",221,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_252_addStatusOfflineListener__fromC,"snikket.Client","addStatusOfflineListener__fromC",0xe34d3b43,"snikket.Client.addStatusOfflineListener__fromC","HaxeCBridge.hx",252,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1074_addConnectionFailedListener,"snikket.Client","addConnectionFailedListener",0x4e1f941e,"snikket.Client.addConnectionFailedListener","snikket/Client.hx",1074,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1078_addConnectionFailedListener,"snikket.Client","addConnectionFailedListener",0x4e1f941e,"snikket.Client.addConnectionFailedListener","snikket/Client.hx",1078,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_221_addConnectionFailedListener__fromC,"snikket.Client","addConnectionFailedListener__fromC",0x9290bc1b,"snikket.Client.addConnectionFailedListener__fromC","HaxeCBridge.hx",221,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_252_addConnectionFailedListener__fromC,"snikket.Client","addConnectionFailedListener__fromC",0x9290bc1b,"snikket.Client.addConnectionFailedListener__fromC","HaxeCBridge.hx",252,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1099_addChatMessageListener,"snikket.Client","addChatMessageListener",0xff8d07b4,"snikket.Client.addChatMessageListener","snikket/Client.hx",1099,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1103_addChatMessageListener,"snikket.Client","addChatMessageListener",0xff8d07b4,"snikket.Client.addChatMessageListener","snikket/Client.hx",1103,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_221_addChatMessageListener__fromC,"snikket.Client","addChatMessageListener__fromC",0xc5968745,"snikket.Client.addChatMessageListener__fromC","HaxeCBridge.hx",221,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_252_addChatMessageListener__fromC,"snikket.Client","addChatMessageListener__fromC",0xc5968745,"snikket.Client.addChatMessageListener__fromC","HaxeCBridge.hx",252,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1113_addSyncMessageListener,"snikket.Client","addSyncMessageListener",0xf5301791,"snikket.Client.addSyncMessageListener","snikket/Client.hx",1113,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1117_addSyncMessageListener,"snikket.Client","addSyncMessageListener",0xf5301791,"snikket.Client.addSyncMessageListener","snikket/Client.hx",1117,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_221_addSyncMessageListener__fromC,"snikket.Client","addSyncMessageListener__fromC",0x6f8fdd08,"snikket.Client.addSyncMessageListener__fromC","HaxeCBridge.hx",221,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_252_addSyncMessageListener__fromC,"snikket.Client","addSyncMessageListener__fromC",0x6f8fdd08,"snikket.Client.addSyncMessageListener__fromC","HaxeCBridge.hx",252,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1122_addChatsUpdatedListener,"snikket.Client","addChatsUpdatedListener",0xed116e03,"snikket.Client.addChatsUpdatedListener","snikket/Client.hx",1122,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1126_addChatsUpdatedListener,"snikket.Client","addChatsUpdatedListener",0xed116e03,"snikket.Client.addChatsUpdatedListener","snikket/Client.hx",1126,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_221_addChatsUpdatedListener__fromC,"snikket.Client","addChatsUpdatedListener__fromC",0x109c18d6,"snikket.Client.addChatsUpdatedListener__fromC","HaxeCBridge.hx",221,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_252_addChatsUpdatedListener__fromC,"snikket.Client","addChatsUpdatedListener__fromC",0x109c18d6,"snikket.Client.addChatsUpdatedListener__fromC","HaxeCBridge.hx",252,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1134_addCallRingListener,"snikket.Client","addCallRingListener",0xdc0d9f11,"snikket.Client.addCallRingListener","snikket/Client.hx",1134,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1138_addCallRingListener,"snikket.Client","addCallRingListener",0xdc0d9f11,"snikket.Client.addCallRingListener","snikket/Client.hx",1138,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_221_addCallRingListener__fromC,"snikket.Client","addCallRingListener__fromC",0x01ba4588,"snikket.Client.addCallRingListener__fromC","HaxeCBridge.hx",221,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_252_addCallRingListener__fromC,"snikket.Client","addCallRingListener__fromC",0x01ba4588,"snikket.Client.addCallRingListener__fromC","HaxeCBridge.hx",252,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1146_addCallRetractListener,"snikket.Client","addCallRetractListener",0x2db0b2e8,"snikket.Client.addCallRetractListener","snikket/Client.hx",1146,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1150_addCallRetractListener,"snikket.Client","addCallRetractListener",0x2db0b2e8,"snikket.Client.addCallRetractListener","snikket/Client.hx",1150,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_221_addCallRetractListener__fromC,"snikket.Client","addCallRetractListener__fromC",0x424d6a91,"snikket.Client.addCallRetractListener__fromC","HaxeCBridge.hx",221,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_252_addCallRetractListener__fromC,"snikket.Client","addCallRetractListener__fromC",0x424d6a91,"snikket.Client.addCallRetractListener__fromC","HaxeCBridge.hx",252,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1158_addCallRingingListener,"snikket.Client","addCallRingingListener",0x568d8519,"snikket.Client.addCallRingingListener","snikket/Client.hx",1158,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1162_addCallRingingListener,"snikket.Client","addCallRingingListener",0x568d8519,"snikket.Client.addCallRingingListener","snikket/Client.hx",1162,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_221_addCallRingingListener__fromC,"snikket.Client","addCallRingingListener__fromC",0x8136b080,"snikket.Client.addCallRingingListener__fromC","HaxeCBridge.hx",221,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_252_addCallRingingListener__fromC,"snikket.Client","addCallRingingListener__fromC",0x8136b080,"snikket.Client.addCallRingingListener__fromC","HaxeCBridge.hx",252,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1172_addCallMediaListener,"snikket.Client","addCallMediaListener",0x2dfd660b,"snikket.Client.addCallMediaListener","snikket/Client.hx",1172,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1176_addCallMediaListener,"snikket.Client","addCallMediaListener",0x2dfd660b,"snikket.Client.addCallMediaListener","snikket/Client.hx",1176,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_221_addCallMediaListener__fromC,"snikket.Client","addCallMediaListener__fromC",0x3b32b1ce,"snikket.Client.addCallMediaListener__fromC","HaxeCBridge.hx",221,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_252_addCallMediaListener__fromC,"snikket.Client","addCallMediaListener__fromC",0x3b32b1ce,"snikket.Client.addCallMediaListener__fromC","HaxeCBridge.hx",252,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1185_addCallTrackListener,"snikket.Client","addCallTrackListener",0xa60d6eb2,"snikket.Client.addCallTrackListener","snikket/Client.hx",1185,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1189_addCallTrackListener,"snikket.Client","addCallTrackListener",0xa60d6eb2,"snikket.Client.addCallTrackListener","snikket/Client.hx",1189,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_221_addCallTrackListener__fromC,"snikket.Client","addCallTrackListener__fromC",0xc89c1c07,"snikket.Client.addCallTrackListener__fromC","HaxeCBridge.hx",221,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_e44af0c967c6b6e2_252_addCallTrackListener__fromC,"snikket.Client","addCallTrackListener__fromC",0xc89c1c07,"snikket.Client.addCallTrackListener__fromC","HaxeCBridge.hx",252,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1194_setInForeground,"snikket.Client","setInForeground",0x4b9b9598,"snikket.Client.setInForeground","snikket/Client.hx",1194,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1202_setNotInForeground,"snikket.Client","setNotInForeground",0x61bbec2b,"snikket.Client.setNotInForeground","snikket/Client.hx",1202,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1198_setInForeground,"snikket.Client","setInForeground",0x4b9b9598,"snikket.Client.setInForeground","snikket/Client.hx",1198,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1206_setNotInForeground,"snikket.Client","setNotInForeground",0x61bbec2b,"snikket.Client.setNotInForeground","snikket/Client.hx",1206,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1216_fetchMediaByHash,"snikket.Client","fetchMediaByHash",0x227ef9a1,"snikket.Client.fetchMediaByHash","snikket/Client.hx",1216,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1212_fetchMediaByHash,"snikket.Client","fetchMediaByHash",0x227ef9a1,"snikket.Client.fetchMediaByHash","snikket/Client.hx",1212,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1208_fetchMediaByHash,"snikket.Client","fetchMediaByHash",0x227ef9a1,"snikket.Client.fetchMediaByHash","snikket/Client.hx",1208,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1219_fetchMediaByHashOneCounterpart,"snikket.Client","fetchMediaByHashOneCounterpart",0xeea071aa,"snikket.Client.fetchMediaByHashOneCounterpart","snikket/Client.hx",1219,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1225_fetchMediaByHashOneCounterpart,"snikket.Client","fetchMediaByHashOneCounterpart",0xeea071aa,"snikket.Client.fetchMediaByHashOneCounterpart","snikket/Client.hx",1225,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1230_fetchMediaByHashOneCounterpart,"snikket.Client","fetchMediaByHashOneCounterpart",0xeea071aa,"snikket.Client.fetchMediaByHashOneCounterpart","snikket/Client.hx",1230,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1223_fetchMediaByHashOneCounterpart,"snikket.Client","fetchMediaByHashOneCounterpart",0xeea071aa,"snikket.Client.fetchMediaByHashOneCounterpart","snikket/Client.hx",1223,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1229_fetchMediaByHashOneCounterpart,"snikket.Client","fetchMediaByHashOneCounterpart",0xeea071aa,"snikket.Client.fetchMediaByHashOneCounterpart","snikket/Client.hx",1229,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1234_fetchMediaByHashOneCounterpart,"snikket.Client","fetchMediaByHashOneCounterpart",0xeea071aa,"snikket.Client.fetchMediaByHashOneCounterpart","snikket/Client.hx",1234,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1220_fetchMediaByHashOneCounterpart,"snikket.Client","fetchMediaByHashOneCounterpart",0xeea071aa,"snikket.Client.fetchMediaByHashOneCounterpart","snikket/Client.hx",1220,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1215_fetchMediaByHashOneCounterpart,"snikket.Client","fetchMediaByHashOneCounterpart",0xeea071aa,"snikket.Client.fetchMediaByHashOneCounterpart","snikket/Client.hx",1215,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1239_chatActivity,"snikket.Client","chatActivity",0x128a3a39,"snikket.Client.chatActivity","snikket/Client.hx",1239,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1245_chatActivity,"snikket.Client","chatActivity",0x128a3a39,"snikket.Client.chatActivity","snikket/Client.hx",1245,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1256_sortChats,"snikket.Client","sortChats",0xbd9a9dab,"snikket.Client.sortChats","snikket/Client.hx",1256,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1265_storeMessages,"snikket.Client","storeMessages",0xb2e3dc1b,"snikket.Client.storeMessages","snikket/Client.hx",1265,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1270_sendQuery,"snikket.Client","sendQuery",0x8dcd73ee,"snikket.Client.sendQuery","snikket/Client.hx",1270,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1274_sendStanza,"snikket.Client","sendStanza",0xbca03e4f,"snikket.Client.sendStanza","snikket/Client.hx",1274,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1281_sendPresence,"snikket.Client","sendPresence",0xc1bc7d15,"snikket.Client.sendPresence","snikket/Client.hx",1281,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1282_sendPresence,"snikket.Client","sendPresence",0xc1bc7d15,"snikket.Client.sendPresence","snikket/Client.hx",1282,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1292_getIceServers,"snikket.Client","getIceServers",0xf7e15ac9,"snikket.Client.getIceServers","snikket/Client.hx",1292,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1227_fetchMediaByHashOneCounterpart,"snikket.Client","fetchMediaByHashOneCounterpart",0xeea071aa,"snikket.Client.fetchMediaByHashOneCounterpart","snikket/Client.hx",1227,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1238_fetchMediaByHashOneCounterpart,"snikket.Client","fetchMediaByHashOneCounterpart",0xeea071aa,"snikket.Client.fetchMediaByHashOneCounterpart","snikket/Client.hx",1238,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1224_fetchMediaByHashOneCounterpart,"snikket.Client","fetchMediaByHashOneCounterpart",0xeea071aa,"snikket.Client.fetchMediaByHashOneCounterpart","snikket/Client.hx",1224,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1219_fetchMediaByHashOneCounterpart,"snikket.Client","fetchMediaByHashOneCounterpart",0xeea071aa,"snikket.Client.fetchMediaByHashOneCounterpart","snikket/Client.hx",1219,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1243_chatActivity,"snikket.Client","chatActivity",0x128a3a39,"snikket.Client.chatActivity","snikket/Client.hx",1243,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1249_chatActivity,"snikket.Client","chatActivity",0x128a3a39,"snikket.Client.chatActivity","snikket/Client.hx",1249,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1260_sortChats,"snikket.Client","sortChats",0xbd9a9dab,"snikket.Client.sortChats","snikket/Client.hx",1260,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1269_storeMessages,"snikket.Client","storeMessages",0xb2e3dc1b,"snikket.Client.storeMessages","snikket/Client.hx",1269,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1274_sendQuery,"snikket.Client","sendQuery",0x8dcd73ee,"snikket.Client.sendQuery","snikket/Client.hx",1274,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1278_sendStanza,"snikket.Client","sendStanza",0xbca03e4f,"snikket.Client.sendStanza","snikket/Client.hx",1278,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1285_sendPresence,"snikket.Client","sendPresence",0xc1bc7d15,"snikket.Client.sendPresence","snikket/Client.hx",1285,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1286_sendPresence,"snikket.Client","sendPresence",0xc1bc7d15,"snikket.Client.sendPresence","snikket/Client.hx",1286,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1296_getIceServers,"snikket.Client","getIceServers",0xf7e15ac9,"snikket.Client.getIceServers","snikket/Client.hx",1296,0x180249e1)
 static const ::String _hx_array_data_7c06fe3c_192[] = {
 	HX_("stun",3a,f5,5b,4c),HX_("stuns",f9,9d,1a,84),HX_("turn",7d,eb,05,4d),HX_("turns",56,22,28,18),
 };
 static const ::String _hx_array_data_7c06fe3c_193[] = {
 	HX_("turn",7d,eb,05,4d),HX_("turns",56,22,28,18),
 };
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1290_getIceServers,"snikket.Client","getIceServers",0xf7e15ac9,"snikket.Client.getIceServers","snikket/Client.hx",1290,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1321_discoverServices,"snikket.Client","discoverServices",0x672de159,"snikket.Client.discoverServices","snikket/Client.hx",1321,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1324_discoverServices,"snikket.Client","discoverServices",0x672de159,"snikket.Client.discoverServices","snikket/Client.hx",1324,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1318_discoverServices,"snikket.Client","discoverServices",0x672de159,"snikket.Client.discoverServices","snikket/Client.hx",1318,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1333_notifyMessageHandlers,"snikket.Client","notifyMessageHandlers",0x61a351d5,"snikket.Client.notifyMessageHandlers","snikket/Client.hx",1333,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1342_notifySyncMessageHandlers,"snikket.Client","notifySyncMessageHandlers",0xb236243a,"snikket.Client.notifySyncMessageHandlers","snikket/Client.hx",1342,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1353_rosterGet,"snikket.Client","rosterGet",0xae66bf19,"snikket.Client.rosterGet","snikket/Client.hx",1353,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1351_rosterGet,"snikket.Client","rosterGet",0xae66bf19,"snikket.Client.rosterGet","snikket/Client.hx",1351,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1368_startChatWith,"snikket.Client","startChatWith",0x9e0699ce,"snikket.Client.startChatWith","snikket/Client.hx",1368,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1366_startChatWith,"snikket.Client","startChatWith",0x9e0699ce,"snikket.Client.startChatWith","snikket/Client.hx",1366,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1395_serverBlocked,"snikket.Client","serverBlocked",0xd88870b7,"snikket.Client.serverBlocked","snikket/Client.hx",1395,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1404_bookmarksGet,"snikket.Client","bookmarksGet",0x49f73b0b,"snikket.Client.bookmarksGet","snikket/Client.hx",1404,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1411_bookmarksGet,"snikket.Client","bookmarksGet",0x49f73b0b,"snikket.Client.bookmarksGet","snikket/Client.hx",1411,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1418_bookmarksGet,"snikket.Client","bookmarksGet",0x49f73b0b,"snikket.Client.bookmarksGet","snikket/Client.hx",1418,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1430_bookmarksGet,"snikket.Client","bookmarksGet",0x49f73b0b,"snikket.Client.bookmarksGet","snikket/Client.hx",1430,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1438_bookmarksGet,"snikket.Client","bookmarksGet",0x49f73b0b,"snikket.Client.bookmarksGet","snikket/Client.hx",1438,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1447_bookmarksGet,"snikket.Client","bookmarksGet",0x49f73b0b,"snikket.Client.bookmarksGet","snikket/Client.hx",1447,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1401_bookmarksGet,"snikket.Client","bookmarksGet",0x49f73b0b,"snikket.Client.bookmarksGet","snikket/Client.hx",1401,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1462_sync,"snikket.Client","sync",0x9a1851cd,"snikket.Client.sync","snikket/Client.hx",1462,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1294_getIceServers,"snikket.Client","getIceServers",0xf7e15ac9,"snikket.Client.getIceServers","snikket/Client.hx",1294,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1325_discoverServices,"snikket.Client","discoverServices",0x672de159,"snikket.Client.discoverServices","snikket/Client.hx",1325,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1328_discoverServices,"snikket.Client","discoverServices",0x672de159,"snikket.Client.discoverServices","snikket/Client.hx",1328,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1322_discoverServices,"snikket.Client","discoverServices",0x672de159,"snikket.Client.discoverServices","snikket/Client.hx",1322,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1337_notifyMessageHandlers,"snikket.Client","notifyMessageHandlers",0x61a351d5,"snikket.Client.notifyMessageHandlers","snikket/Client.hx",1337,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1346_notifySyncMessageHandlers,"snikket.Client","notifySyncMessageHandlers",0xb236243a,"snikket.Client.notifySyncMessageHandlers","snikket/Client.hx",1346,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1357_rosterGet,"snikket.Client","rosterGet",0xae66bf19,"snikket.Client.rosterGet","snikket/Client.hx",1357,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1355_rosterGet,"snikket.Client","rosterGet",0xae66bf19,"snikket.Client.rosterGet","snikket/Client.hx",1355,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1372_startChatWith,"snikket.Client","startChatWith",0x9e0699ce,"snikket.Client.startChatWith","snikket/Client.hx",1372,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1370_startChatWith,"snikket.Client","startChatWith",0x9e0699ce,"snikket.Client.startChatWith","snikket/Client.hx",1370,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1399_serverBlocked,"snikket.Client","serverBlocked",0xd88870b7,"snikket.Client.serverBlocked","snikket/Client.hx",1399,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1408_bookmarksGet,"snikket.Client","bookmarksGet",0x49f73b0b,"snikket.Client.bookmarksGet","snikket/Client.hx",1408,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1415_bookmarksGet,"snikket.Client","bookmarksGet",0x49f73b0b,"snikket.Client.bookmarksGet","snikket/Client.hx",1415,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1422_bookmarksGet,"snikket.Client","bookmarksGet",0x49f73b0b,"snikket.Client.bookmarksGet","snikket/Client.hx",1422,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1434_bookmarksGet,"snikket.Client","bookmarksGet",0x49f73b0b,"snikket.Client.bookmarksGet","snikket/Client.hx",1434,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1442_bookmarksGet,"snikket.Client","bookmarksGet",0x49f73b0b,"snikket.Client.bookmarksGet","snikket/Client.hx",1442,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1451_bookmarksGet,"snikket.Client","bookmarksGet",0x49f73b0b,"snikket.Client.bookmarksGet","snikket/Client.hx",1451,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1405_bookmarksGet,"snikket.Client","bookmarksGet",0x49f73b0b,"snikket.Client.bookmarksGet","snikket/Client.hx",1405,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1466_sync,"snikket.Client","sync",0x9a1851cd,"snikket.Client.sync","snikket/Client.hx",1466,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1470_onMAMJMI,"snikket.Client","onMAMJMI",0xc3bb101e,"snikket.Client.onMAMJMI","snikket/Client.hx",1470,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1493_doSync,"snikket.Client","doSync",0xbb063778,"snikket.Client.doSync","snikket/Client.hx",1493,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1519_doSync,"snikket.Client","doSync",0xbb063778,"snikket.Client.doSync","snikket/Client.hx",1519,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1522_doSync,"snikket.Client","doSync",0xbb063778,"snikket.Client.doSync","snikket/Client.hx",1522,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1547_doSync,"snikket.Client","doSync",0xbb063778,"snikket.Client.doSync","snikket/Client.hx",1547,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1498_doSync,"snikket.Client","doSync",0xbb063778,"snikket.Client.doSync","snikket/Client.hx",1498,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1470_sync,"snikket.Client","sync",0x9a1851cd,"snikket.Client.sync","snikket/Client.hx",1470,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1474_onMAMJMI,"snikket.Client","onMAMJMI",0xc3bb101e,"snikket.Client.onMAMJMI","snikket/Client.hx",1474,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1497_doSync,"snikket.Client","doSync",0xbb063778,"snikket.Client.doSync","snikket/Client.hx",1497,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1523_doSync,"snikket.Client","doSync",0xbb063778,"snikket.Client.doSync","snikket/Client.hx",1523,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1526_doSync,"snikket.Client","doSync",0xbb063778,"snikket.Client.doSync","snikket/Client.hx",1526,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1551_doSync,"snikket.Client","doSync",0xbb063778,"snikket.Client.doSync","snikket/Client.hx",1551,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1502_doSync,"snikket.Client","doSync",0xbb063778,"snikket.Client.doSync","snikket/Client.hx",1502,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1516_doSync,"snikket.Client","doSync",0xbb063778,"snikket.Client.doSync","snikket/Client.hx",1516,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1512_doSync,"snikket.Client","doSync",0xbb063778,"snikket.Client.doSync","snikket/Client.hx",1512,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1508_doSync,"snikket.Client","doSync",0xbb063778,"snikket.Client.doSync","snikket/Client.hx",1508,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1553_doSync,"snikket.Client","doSync",0xbb063778,"snikket.Client.doSync","snikket/Client.hx",1553,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1483_doSync,"snikket.Client","doSync",0xbb063778,"snikket.Client.doSync","snikket/Client.hx",1483,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1565_pingAllChannels,"snikket.Client","pingAllChannels",0x5c74390d,"snikket.Client.pingAllChannels","snikket/Client.hx",1565,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1572_joinAllChannels,"snikket.Client","joinAllChannels",0xde17fa95,"snikket.Client.joinAllChannels","snikket/Client.hx",1572,0x180249e1)
-HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1577_joinAllChannels,"snikket.Client","joinAllChannels",0xde17fa95,"snikket.Client.joinAllChannels","snikket/Client.hx",1577,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1557_doSync,"snikket.Client","doSync",0xbb063778,"snikket.Client.doSync","snikket/Client.hx",1557,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1487_doSync,"snikket.Client","doSync",0xbb063778,"snikket.Client.doSync","snikket/Client.hx",1487,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1569_pingAllChannels,"snikket.Client","pingAllChannels",0x5c74390d,"snikket.Client.pingAllChannels","snikket/Client.hx",1569,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1576_joinAllChannels,"snikket.Client","joinAllChannels",0xde17fa95,"snikket.Client.joinAllChannels","snikket/Client.hx",1576,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1581_joinAllChannels,"snikket.Client","joinAllChannels",0xde17fa95,"snikket.Client.joinAllChannels","snikket/Client.hx",1581,0x180249e1)
+HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_1585_joinAllChannels,"snikket.Client","joinAllChannels",0xde17fa95,"snikket.Client.joinAllChannels","snikket/Client.hx",1585,0x180249e1)
 HX_LOCAL_STACK_FRAME(_hx_pos_ead56881d4bbcaca_51_boot,"snikket.Client","boot",0x8ed41ba4,"snikket.Client.boot","snikket/Client.hx",51,0x180249e1)
 namespace snikket{
 
@@ -536,39 +535,48 @@ HXLINE( 113)			return ::snikket::EventResult_obj::EventHandled_dyn();
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_3, ::snikket::Client,_gthis,::Dynamic,persistence) HXARGC(1)
+            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_2, ::snikket::Client,_gthis,::Dynamic,persistence) HXARGC(1)
             		 ::snikket::EventResult _hx_run( ::Dynamic data){
-            			HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_2) HXARGC(1)
-            			bool _hx_run( ::snikket::Chat chat){
-            				HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_117_new)
-HXLINE( 117)				if ((chat->uiState != 2)) {
-HXLINE( 117)					return chat->syncing();
-            				}
-            				else {
-HXLINE( 117)					return false;
+            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_116_new)
+HXLINE( 117)			::Array< ::Dynamic> it = _gthis->chats;
+HXDLIN( 117)			bool result = false;
+HXDLIN( 117)			{
+HXLINE( 117)				int _g = 0;
+HXDLIN( 117)				while((_g < it->length)){
+HXLINE( 117)					 ::snikket::Chat x = it->__get(_g).StaticCast<  ::snikket::Chat >();
+HXDLIN( 117)					_g = (_g + 1);
+HXDLIN( 117)					bool _hx_tmp;
+HXDLIN( 117)					if ((x->uiState != 2)) {
+HXLINE( 117)						_hx_tmp = x->syncing();
+            					}
+            					else {
+HXLINE( 117)						_hx_tmp = false;
+            					}
+HXDLIN( 117)					if (_hx_tmp) {
+HXLINE( 117)						result = true;
+HXDLIN( 117)						goto _hx_goto_0;
+            					}
             				}
+            				_hx_goto_0:;
             			}
-            			HX_END_LOCAL_FUNC1(return)
-
-            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_116_new)
-HXLINE( 117)			bool anySyncHappening = ::Lambda_obj::exists(_gthis->chats, ::Dynamic(new _hx_Closure_2()));
+HXDLIN( 117)			bool anySyncHappening = result;
 HXLINE( 118)			::Dynamic persistence1 = persistence;
-HXDLIN( 118)			::String _hx_tmp = _gthis->accountId();
-HXDLIN( 118)			::Array< unsigned char > _hx_tmp1;
+HXDLIN( 118)			::String _hx_tmp1 = _gthis->accountId();
+HXDLIN( 118)			::Array< unsigned char > _hx_tmp2;
 HXDLIN( 118)			if (anySyncHappening) {
-HXLINE( 118)				_hx_tmp1 = null();
+HXLINE( 118)				_hx_tmp2 = null();
             			}
             			else {
-HXLINE( 118)				_hx_tmp1 = ( (::Array< unsigned char >)(data->__Field(HX_("sm",9a,64,00,00),::hx::paccDynamic)) );
+HXLINE( 118)				_hx_tmp2 = ( (::Array< unsigned char >)(data->__Field(HX_("sm",9a,64,00,00),::hx::paccDynamic)) );
             			}
-HXDLIN( 118)			::snikket::Persistence_obj::storeStreamManagement(persistence1,_hx_tmp,_hx_tmp1);
+HXDLIN( 118)			::snikket::Persistence_obj::storeStreamManagement(persistence1,_hx_tmp1,_hx_tmp2);
 HXLINE( 119)			return ::snikket::EventResult_obj::EventHandled_dyn();
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_5, ::snikket::Client,_gthis,::Dynamic,persistence) HXARGC(1)
+            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_4, ::snikket::Client,_gthis,::Dynamic,persistence) HXARGC(1)
             		 ::snikket::EventResult _hx_run( ::Dynamic data){
-            			HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_4, ::snikket::Client,_gthis) HXARGC(1)
+            			HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_3, ::snikket::Client,_gthis) HXARGC(1)
             			void _hx_run( ::snikket::ChatMessage m){
             				HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_127_new)
 HXLINE( 127)				_gthis->notifyMessageHandlers(m,3);
@@ -578,14 +586,14 @@ HXLINE( 127)				_gthis->notifyMessageHandlers(m,3);
             			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_122_new)
 HXLINE( 123)			::Dynamic persistence1 = persistence;
 HXLINE( 124)			::String _hx_tmp = _gthis->accountId();
-HXLINE( 123)			::snikket::Persistence_obj::updateMessageStatus(persistence1,_hx_tmp, ::Dynamic(data->__Field(HX_("id",db,5b,00,00),::hx::paccDynamic)),1, ::Dynamic(new _hx_Closure_4(_gthis)));
+HXLINE( 123)			::snikket::Persistence_obj::updateMessageStatus(persistence1,_hx_tmp, ::Dynamic(data->__Field(HX_("id",db,5b,00,00),::hx::paccDynamic)),1, ::Dynamic(new _hx_Closure_3(_gthis)));
 HXLINE( 129)			return ::snikket::EventResult_obj::EventHandled_dyn();
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_7, ::snikket::Client,_gthis,::Dynamic,persistence) HXARGC(1)
+            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_6, ::snikket::Client,_gthis,::Dynamic,persistence) HXARGC(1)
             		 ::snikket::EventResult _hx_run( ::Dynamic data){
-            			HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_6, ::snikket::Client,_gthis) HXARGC(1)
+            			HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_5, ::snikket::Client,_gthis) HXARGC(1)
             			void _hx_run( ::snikket::ChatMessage m){
             				HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_137_new)
 HXLINE( 137)				_gthis->notifyMessageHandlers(m,3);
@@ -595,14 +603,14 @@ HXLINE( 137)				_gthis->notifyMessageHandlers(m,3);
             			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_132_new)
 HXLINE( 133)			::Dynamic persistence1 = persistence;
 HXLINE( 134)			::String _hx_tmp = _gthis->accountId();
-HXLINE( 133)			::snikket::Persistence_obj::updateMessageStatus(persistence1,_hx_tmp, ::Dynamic(data->__Field(HX_("id",db,5b,00,00),::hx::paccDynamic)),3, ::Dynamic(new _hx_Closure_6(_gthis)));
+HXLINE( 133)			::snikket::Persistence_obj::updateMessageStatus(persistence1,_hx_tmp, ::Dynamic(data->__Field(HX_("id",db,5b,00,00),::hx::paccDynamic)),3, ::Dynamic(new _hx_Closure_5(_gthis)));
 HXLINE( 139)			return ::snikket::EventResult_obj::EventHandled_dyn();
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_19, ::snikket::Client,_gthis,::Dynamic,persistence) HXARGC(1)
+            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_18, ::snikket::Client,_gthis,::Dynamic,persistence) HXARGC(1)
             		 ::snikket::EventResult _hx_run( ::Dynamic event){
-            			HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_8, ::snikket::Client,_gthis) HXARGC(2)
+            			HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_7, ::snikket::Client,_gthis) HXARGC(2)
             			 ::snikket::ChatMessageBuilder _hx_run( ::snikket::ChatMessageBuilder builder, ::snikket::Stanza stanza){
             				HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_167_new)
 HXLINE( 168)				 ::snikket::Client _gthis1 = _gthis;
@@ -676,7 +684,7 @@ HXLINE( 163)						fwd = null();
             					}
             				}
             			}
-HXLINE( 167)			 ::snikket::Message message = ::snikket::Message_obj::fromStanza(stanza,_gthis->jid, ::Dynamic(new _hx_Closure_8(_gthis)));
+HXLINE( 167)			 ::snikket::Message message = ::snikket::Message_obj::fromStanza(stanza,_gthis->jid, ::Dynamic(new _hx_Closure_7(_gthis)));
 HXLINE( 173)			{
 HXLINE( 173)				 ::snikket::MessageStanza _g = message->parsed;
 HXDLIN( 173)				switch((int)(_g->_hx_getIndex())){
@@ -695,7 +703,7 @@ HXLINE( 176)									_gthis->fetchMediaByHash(::Array_obj< ::Dynamic>::__new(1)-
 HXLINE( 178)							 ::snikket::Client _gthis2 = _gthis;
 HXDLIN( 178)							 ::snikket::Chat chat1 = _gthis2->getChat(chatMessage->chatId());
 HXLINE( 179)							if (::hx::IsNotNull( chat1 )) {
-            								HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_9, ::snikket::Client,_gthis, ::snikket::Chat,chat1) HXARGC(1)
+            								HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_8, ::snikket::Client,_gthis, ::snikket::Chat,chat1) HXARGC(1)
             								void _hx_run( ::snikket::ChatMessage chatMessage){
             									HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_180_new)
 HXLINE( 181)									int updateChat;
@@ -740,26 +748,26 @@ HXLINE( 185)										_gthis->chatActivity(chat1,null());
             								}
             								HX_END_LOCAL_FUNC1((void))
 
-HXLINE( 180)								 ::Dynamic updateChat =  ::Dynamic(new _hx_Closure_9(_gthis,chat1));
+HXLINE( 180)								 ::Dynamic updateChat =  ::Dynamic(new _hx_Closure_8(_gthis,chat1));
 HXLINE( 188)								if (::hx::IsNull( chatMessage->serverId )) {
 HXLINE( 189)									updateChat(chatMessage);
             								}
             								else {
-            									HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_10, ::Dynamic,updateChat) HXARGC(1)
+            									HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_9, ::Dynamic,updateChat) HXARGC(1)
             									void _hx_run(::Array< ::Dynamic> stored){
             										HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_191_new)
 HXLINE( 191)										updateChat(stored->__get(0).StaticCast<  ::snikket::ChatMessage >());
             									}
             									HX_END_LOCAL_FUNC1((void))
 
-HXLINE( 191)									_gthis->storeMessages(::Array_obj< ::Dynamic>::__new(1)->init(0,chatMessage), ::Dynamic(new _hx_Closure_10(updateChat)));
+HXLINE( 191)									_gthis->storeMessages(::Array_obj< ::Dynamic>::__new(1)->init(0,chatMessage), ::Dynamic(new _hx_Closure_9(updateChat)));
             								}
             							}
             						}
             					}
             					break;
             					case (int)2: {
-            						HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_11, ::snikket::Client,_gthis) HXARGC(1)
+            						HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_10, ::snikket::Client,_gthis) HXARGC(1)
             						void _hx_run( ::snikket::ChatMessage stored){
             							HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_200_new)
 HXLINE( 200)							if (::hx::IsNotNull( stored )) {
@@ -769,13 +777,13 @@ HXLINE( 200)								_gthis->notifyMessageHandlers(stored,1);
             						HX_END_LOCAL_FUNC1((void))
 
 HXLINE( 199)						 ::snikket::ModerationAction action = _g->_hx_getObject(0).StaticCast<  ::snikket::ModerationAction >();
-HXLINE( 200)						::thenshim::_Promise::Promise_Impl__obj::then(_gthis->moderateMessage(action), ::Dynamic(new _hx_Closure_11(_gthis)),null());
+HXLINE( 200)						::thenshim::_Promise::Promise_Impl__obj::then(_gthis->moderateMessage(action), ::Dynamic(new _hx_Closure_10(_gthis)),null());
             					}
             					break;
             					case (int)3: {
 HXLINE( 194)						 ::snikket::ReactionUpdate update = _g->_hx_getObject(0).StaticCast<  ::snikket::ReactionUpdate >();
 HXDLIN( 194)						{
-            							HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_12, ::snikket::Client,_gthis) HXARGC(1)
+            							HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_11, ::snikket::Client,_gthis) HXARGC(1)
             							void _hx_run( ::snikket::ChatMessage stored){
             								HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_198_new)
 HXLINE( 198)								if (::hx::IsNotNull( stored )) {
@@ -794,7 +802,7 @@ HXLINE( 196)									_gthis->fetchMediaByHash(::Array_obj< ::Dynamic>::__new(1)-
             								}
             							}
 HXLINE( 198)							::Dynamic persistence1 = persistence;
-HXDLIN( 198)							::snikket::Persistence_obj::storeReaction(persistence1,_gthis->accountId(),update, ::Dynamic(new _hx_Closure_12(_gthis)));
+HXDLIN( 198)							::snikket::Persistence_obj::storeReaction(persistence1,_gthis->accountId(),update, ::Dynamic(new _hx_Closure_11(_gthis)));
             						}
             					}
             					break;
@@ -948,28 +956,28 @@ HXLINE( 262)					userState = null();
 HXLINE( 262)					::String _hx_switch_0 = _g6;
             					if (  (_hx_switch_0==HX_("active",c6,41,46,16)) ){
 HXLINE( 262)						userState = 2;
-HXDLIN( 262)						goto _hx_goto_2;
+HXDLIN( 262)						goto _hx_goto_3;
             					}
             					if (  (_hx_switch_0==HX_("composing",cf,0a,a5,12)) ){
 HXLINE( 262)						userState = 3;
-HXDLIN( 262)						goto _hx_goto_2;
+HXDLIN( 262)						goto _hx_goto_3;
             					}
             					if (  (_hx_switch_0==HX_("gone",5f,94,69,44)) ){
 HXLINE( 262)						userState = 0;
-HXDLIN( 262)						goto _hx_goto_2;
+HXDLIN( 262)						goto _hx_goto_3;
             					}
             					if (  (_hx_switch_0==HX_("inactive",6b,17,30,6a)) ){
 HXLINE( 262)						userState = 1;
-HXDLIN( 262)						goto _hx_goto_2;
+HXDLIN( 262)						goto _hx_goto_3;
             					}
             					if (  (_hx_switch_0==HX_("paused",ae,40,84,ef)) ){
 HXLINE( 262)						userState = 4;
-HXDLIN( 262)						goto _hx_goto_2;
+HXDLIN( 262)						goto _hx_goto_3;
             					}
             					/* default */{
 HXLINE( 262)						userState = null();
             					}
-            					_hx_goto_2:;
+            					_hx_goto_3:;
             				}
 HXLINE( 270)				if (::hx::IsNotNull( userState )) {
 HXLINE( 271)					 ::snikket::Client _gthis9 = _gthis;
@@ -1041,16 +1049,16 @@ HXLINE( 290)						mime[0] = ( (::String)(::Reflect_obj::field(info->attr,HX_("ty
             					}
             				}
 HXLINE( 293)				if (::hx::IsNotNull( avatarSha1 )) {
-            					HX_BEGIN_LOCAL_FUNC_S6(::hx::LocalFunc,_hx_Closure_15, ::snikket::DirectChat,chat8, ::snikket::Client,_gthis,::Array< ::String >,mime,::String,avatarSha1Hex, ::snikket::PubsubEvent,pubsubEvent,::Dynamic,persistence) HXARGC(1)
+            					HX_BEGIN_LOCAL_FUNC_S6(::hx::LocalFunc,_hx_Closure_14, ::snikket::DirectChat,chat8, ::snikket::Client,_gthis,::Array< ::String >,mime,::String,avatarSha1Hex, ::snikket::PubsubEvent,pubsubEvent,::Dynamic,persistence) HXARGC(1)
             					void _hx_run(bool has){
             						HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_298_new)
 HXLINE( 298)						if (has) {
 HXLINE( 299)							_gthis->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,chat8));
             						}
             						else {
-            							HX_BEGIN_LOCAL_FUNC_S5(::hx::LocalFunc,_hx_Closure_14, ::snikket::Client,_gthis, ::snikket::DirectChat,chat8,::Array< ::String >,mime,::Dynamic,persistence, ::snikket::queries::PubsubGet,pubsubGet1) HXARGC(0)
+            							HX_BEGIN_LOCAL_FUNC_S5(::hx::LocalFunc,_hx_Closure_13, ::snikket::Client,_gthis, ::snikket::DirectChat,chat8,::Array< ::String >,mime,::Dynamic,persistence, ::snikket::queries::PubsubGet,pubsubGet1) HXARGC(0)
             							void _hx_run(){
-            								HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_13, ::snikket::DirectChat,chat8, ::snikket::Client,_gthis) HXARGC(0)
+            								HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_12, ::snikket::DirectChat,chat8, ::snikket::Client,_gthis) HXARGC(0)
             								void _hx_run(){
             									HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_308_new)
 HXLINE( 308)									_gthis->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,chat8));
@@ -1068,13 +1076,13 @@ HXLINE( 306)									return;
             								}
 HXLINE( 307)								::Dynamic persistence1 = persistence;
 HXDLIN( 307)								::String mime1 = mime->__get(0);
-HXDLIN( 307)								::snikket::Persistence_obj::storeMedia(persistence1,mime1,::haxe::crypto::Base64_obj::decode(::StringTools_obj::replace(dataNode->getText(),HX_("\n",0a,00,00,00),HX_("",00,00,00,00)),null())->b, ::Dynamic(new _hx_Closure_13(chat8,_gthis)));
+HXDLIN( 307)								::snikket::Persistence_obj::storeMedia(persistence1,mime1,::haxe::crypto::Base64_obj::decode(::StringTools_obj::replace(dataNode->getText(),HX_("\n",0a,00,00,00),HX_("",00,00,00,00)),null())->b, ::Dynamic(new _hx_Closure_12(chat8,_gthis)));
             							}
             							HX_END_LOCAL_FUNC0((void))
 
 HXLINE( 301)							::String pubsubGet = pubsubEvent->getFrom();
 HXDLIN( 301)							 ::snikket::queries::PubsubGet pubsubGet1 =  ::snikket::queries::PubsubGet_obj::__alloc( HX_CTX ,pubsubGet,HX_("urn:xmpp:avatar:data",0f,7e,01,4e),avatarSha1Hex);
-HXLINE( 302)							pubsubGet1->onFinished( ::Dynamic(new _hx_Closure_14(_gthis,chat8,mime,persistence,pubsubGet1)));
+HXLINE( 302)							pubsubGet1->onFinished( ::Dynamic(new _hx_Closure_13(_gthis,chat8,mime,persistence,pubsubGet1)));
 HXLINE( 311)							_gthis->sendQuery(pubsubGet1);
             						}
             					}
@@ -1086,7 +1094,7 @@ HXLINE( 295)					chat8->setAvatarSha1(avatarSha1);
 HXLINE( 296)					::Dynamic persistence2 = persistence;
 HXDLIN( 296)					::String _hx_tmp13 = _gthis->accountId();
 HXDLIN( 296)					::snikket::Persistence_obj::storeChats(persistence2,_hx_tmp13,::Array_obj< ::Dynamic>::__new(1)->init(0,chat8));
-HXLINE( 297)					::snikket::Persistence_obj::hasMedia(persistence,HX_("sha-1",90,a8,1c,7c),avatarSha1, ::Dynamic(new _hx_Closure_15(chat8,_gthis,mime,avatarSha1Hex,pubsubEvent,persistence)));
+HXLINE( 297)					::snikket::Persistence_obj::hasMedia(persistence,HX_("sha-1",90,a8,1c,7c),avatarSha1, ::Dynamic(new _hx_Closure_14(chat8,_gthis,mime,avatarSha1Hex,pubsubEvent,persistence)));
             				}
             			}
 HXLINE( 317)			bool _hx_tmp14;
@@ -1169,14 +1177,14 @@ HXLINE( 324)							upTo = null();
 HXLINE( 325)						 ::snikket::Client _gthis12 = _gthis;
 HXDLIN( 325)						 ::snikket::Chat chat9 = _gthis12->getChat(( (::String)(::Reflect_obj::field(item1->attr,HX_("id",db,5b,00,00))) ));
 HXLINE( 326)						if (::hx::IsNull( chat9 )) {
-            							HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_16) HXARGC(1)
+            							HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_15) HXARGC(1)
             							int _hx_run( ::snikket::Caps caps){
             								HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_327_new)
 HXLINE( 327)								return 2;
             							}
             							HX_END_LOCAL_FUNC1(return)
 
-            							HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_17, ::snikket::Stanza,upTo) HXARGC(1)
+            							HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_16, ::snikket::Stanza,upTo) HXARGC(1)
             							void _hx_run( ::snikket::Chat chat){
             								HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_327_new)
 HXLINE( 327)								::String _hx_tmp = ( (::String)(::Reflect_obj::field(upTo->attr,HX_("id",db,5b,00,00))) );
@@ -1185,10 +1193,10 @@ HXDLIN( 327)								chat->markReadUpToId(_hx_tmp,( (::String)(::Reflect_obj::fie
             							HX_END_LOCAL_FUNC1((void))
 
 HXLINE( 327)							 ::snikket::Client _gthis13 = _gthis;
-HXDLIN( 327)							_gthis13->startChatWith(( (::String)(::Reflect_obj::field(item1->attr,HX_("id",db,5b,00,00))) ), ::Dynamic(new _hx_Closure_16()), ::Dynamic(new _hx_Closure_17(upTo)));
+HXDLIN( 327)							_gthis13->startChatWith(( (::String)(::Reflect_obj::field(item1->attr,HX_("id",db,5b,00,00))) ), ::Dynamic(new _hx_Closure_15()), ::Dynamic(new _hx_Closure_16(upTo)));
             						}
             						else {
-            							HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_18, ::snikket::Client,_gthis,::Dynamic,persistence, ::snikket::Chat,chat9) HXARGC(0)
+            							HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_17, ::snikket::Client,_gthis,::Dynamic,persistence, ::snikket::Chat,chat9) HXARGC(0)
             							void _hx_run(){
             								HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_329_new)
 HXLINE( 330)								::Dynamic persistence1 = persistence;
@@ -1200,7 +1208,7 @@ HXLINE( 331)								_gthis->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::Virtu
 
 HXLINE( 329)							 ::snikket::Chat chat10 = chat9;
 HXDLIN( 329)							::String _hx_tmp24 = ( (::String)(::Reflect_obj::field(upTo->attr,HX_("id",db,5b,00,00))) );
-HXDLIN( 329)							chat10->markReadUpToId(_hx_tmp24,( (::String)(::Reflect_obj::field(upTo->attr,HX_("by",d7,55,00,00))) ), ::Dynamic(new _hx_Closure_18(_gthis,persistence,chat9)));
+HXDLIN( 329)							chat10->markReadUpToId(_hx_tmp24,( (::String)(::Reflect_obj::field(upTo->attr,HX_("by",d7,55,00,00))) ), ::Dynamic(new _hx_Closure_17(_gthis,persistence,chat9)));
             						}
             					}
             				}
@@ -1209,7 +1217,7 @@ HXLINE( 338)			return ::snikket::EventResult_obj::EventUnhandled_dyn();
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_20, ::snikket::Client,_gthis) HXARGC(1)
+            		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_19, ::snikket::Client,_gthis) HXARGC(1)
             		 ::snikket::IqResult _hx_run( ::snikket::Stanza stanza){
             			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_341_new)
 HXLINE( 342)			 ::snikket::JID from;
@@ -1342,14 +1350,14 @@ HXLINE( 389)			return ::snikket::IqResult_obj::IqResult_dyn();
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_21, ::snikket::Client,_gthis) HXARGC(1)
+            		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_20, ::snikket::Client,_gthis) HXARGC(1)
             		 ::snikket::IqResult _hx_run( ::snikket::Stanza stanza){
             			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_393_new)
 HXLINE( 393)			return ::snikket::IqResult_obj::IqResultElement(_gthis->caps->discoReply());
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_22, ::snikket::Client,_gthis,::Dynamic,persistence) HXARGC(1)
+            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_21, ::snikket::Client,_gthis,::Dynamic,persistence) HXARGC(1)
             		 ::snikket::IqResult _hx_run( ::snikket::Stanza stanza){
             			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_396_new)
 HXLINE( 398)			bool _hx_tmp;
@@ -1389,7 +1397,7 @@ HXLINE( 420)			return ::snikket::IqResult_obj::IqResult_dyn();
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_23, ::snikket::Client,_gthis) HXARGC(1)
+            		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_22, ::snikket::Client,_gthis) HXARGC(1)
             		 ::snikket::IqResult _hx_run( ::snikket::Stanza stanza){
             			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_423_new)
 HXLINE( 425)			bool _hx_tmp;
@@ -1433,7 +1441,7 @@ HXLINE( 435)			return ::snikket::IqResult_obj::IqResult_dyn();
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_24, ::snikket::Client,_gthis) HXARGC(1)
+            		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_23, ::snikket::Client,_gthis) HXARGC(1)
             		 ::snikket::IqResult _hx_run( ::snikket::Stanza stanza){
             			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_438_new)
 HXLINE( 440)			bool _hx_tmp;
@@ -1484,7 +1492,7 @@ HXLINE( 458)			return ::snikket::IqResult_obj::IqResult_dyn();
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_32, ::snikket::Client,_gthis,::Dynamic,persistence) HXARGC(1)
+            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_31, ::snikket::Client,_gthis,::Dynamic,persistence) HXARGC(1)
             		 ::snikket::EventResult _hx_run( ::Dynamic event){
             			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_461_new)
 HXLINE( 462)			 ::snikket::Stanza stanza = ( ( ::snikket::Stanza)(event->__Field(HX_("stanza",f5,5d,f7,05),::hx::paccDynamic)) );
@@ -1519,7 +1527,7 @@ HXLINE( 475)						_gthis->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::Virtual
             					}
             				}
             				else {
-            					HX_BEGIN_LOCAL_FUNC_S5(::hx::LocalFunc,_hx_Closure_25, ::snikket::Client,_gthis, ::snikket::Stanza,mucUser,::Dynamic,persistence, ::snikket::Chat,chat, ::snikket::Stanza,stanza) HXARGC(1)
+            					HX_BEGIN_LOCAL_FUNC_S5(::hx::LocalFunc,_hx_Closure_24, ::snikket::Client,_gthis, ::snikket::Stanza,mucUser,::Dynamic,persistence, ::snikket::Chat,chat, ::snikket::Stanza,stanza) HXARGC(1)
             					 ::snikket::Chat _hx_run( ::snikket::Caps caps){
             						HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_477_new)
 HXLINE( 478)						 ::snikket::Chat chat1 = chat;
@@ -1541,16 +1549,16 @@ HXLINE( 480)						return chat;
             					}
             					HX_END_LOCAL_FUNC1(return)
 
-            					HX_BEGIN_LOCAL_FUNC_S5(::hx::LocalFunc,_hx_Closure_28, ::snikket::Client,_gthis,::Dynamic,persistence, ::Dynamic,handleCaps, ::snikket::Stanza,stanza, ::snikket::Stanza,c) HXARGC(1)
+            					HX_BEGIN_LOCAL_FUNC_S5(::hx::LocalFunc,_hx_Closure_27, ::snikket::Client,_gthis,::Dynamic,persistence, ::Dynamic,handleCaps, ::snikket::Stanza,stanza, ::snikket::Stanza,c) HXARGC(1)
             					void _hx_run( ::snikket::Caps caps){
             						HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_484_new)
 HXLINE( 484)						if (::hx::IsNull( caps )) {
 HXLINE( 485)							::Dynamic this1 = _gthis->pendingCaps;
 HXDLIN( 485)							::Array< ::Dynamic> pending = ( (::Array< ::Dynamic>)(( ( ::haxe::ds::StringMap)(this1) )->get(( (::String)(::Reflect_obj::field(c->attr,HX_("ver",63,e2,59,00))) ))) );
 HXLINE( 486)							if (::hx::IsNull( pending )) {
-            								HX_BEGIN_LOCAL_FUNC_S4(::hx::LocalFunc,_hx_Closure_27, ::snikket::Client,_gthis,::Dynamic,persistence, ::snikket::queries::DiscoInfoGet,discoGet2, ::snikket::Stanza,c) HXARGC(0)
+            								HX_BEGIN_LOCAL_FUNC_S4(::hx::LocalFunc,_hx_Closure_26, ::snikket::Client,_gthis,::Dynamic,persistence, ::snikket::queries::DiscoInfoGet,discoGet2, ::snikket::Stanza,c) HXARGC(0)
             								void _hx_run(){
-            									HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_26, ::haxe::ds::StringMap,chatsToUpdate) HXARGC(0)
+            									HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_25, ::haxe::ds::StringMap,chatsToUpdate) HXARGC(0)
             									 ::Dynamic _hx_run(){
             										HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_498_new)
 HXLINE( 498)										return chatsToUpdate->iterator();
@@ -1589,7 +1597,7 @@ HXLINE( 496)												chatsToUpdate->set(c1->chatId,c1);
             									}
 HXLINE( 498)									 ::snikket::Client _gthis1 = _gthis;
 HXDLIN( 498)									_gthis1->trigger(HX_("chats/update",3d,8e,1d,14),::Lambda_obj::array( ::Dynamic(::hx::Anon_obj::Create(1)
-            										->setFixed(0,HX_("iterator",ee,49,9a,93), ::Dynamic(new _hx_Closure_26(chatsToUpdate))))));
+            										->setFixed(0,HX_("iterator",ee,49,9a,93), ::Dynamic(new _hx_Closure_25(chatsToUpdate))))));
             								}
             								HX_END_LOCAL_FUNC0((void))
 
@@ -1601,7 +1609,7 @@ HXDLIN( 487)									( ( ::haxe::ds::StringMap)(this2) )->set(key,::Array_obj< :
 HXLINE( 488)								::String discoGet = ( (::String)(::Reflect_obj::field(stanza->attr,HX_("from",6a,a5,c2,43))) );
 HXDLIN( 488)								::String discoGet1 = (( (::String)(::Reflect_obj::field(c->attr,HX_("node",02,0a,0a,49))) ) + HX_("#",23,00,00,00));
 HXDLIN( 488)								 ::snikket::queries::DiscoInfoGet discoGet2 =  ::snikket::queries::DiscoInfoGet_obj::__alloc( HX_CTX ,discoGet,(discoGet1 + ( (::String)(::Reflect_obj::field(c->attr,HX_("ver",63,e2,59,00))) )));
-HXLINE( 489)								discoGet2->onFinished( ::Dynamic(new _hx_Closure_27(_gthis,persistence,discoGet2,c)));
+HXLINE( 489)								discoGet2->onFinished( ::Dynamic(new _hx_Closure_26(_gthis,persistence,discoGet2,c)));
 HXLINE( 500)								_gthis->sendQuery(discoGet2);
             							}
             							else {
@@ -1614,14 +1622,14 @@ HXLINE( 505)							handleCaps(caps);
             					}
             					HX_END_LOCAL_FUNC1((void))
 
-HXLINE( 477)					 ::Dynamic handleCaps =  ::Dynamic(new _hx_Closure_25(_gthis,mucUser,persistence,chat,stanza));
+HXLINE( 477)					 ::Dynamic handleCaps =  ::Dynamic(new _hx_Closure_24(_gthis,mucUser,persistence,chat,stanza));
 HXLINE( 483)					::Dynamic persistence2 = persistence;
-HXDLIN( 483)					::snikket::Persistence_obj::getCaps(persistence2,( (::String)(::Reflect_obj::field(c->attr,HX_("ver",63,e2,59,00))) ), ::Dynamic(new _hx_Closure_28(_gthis,persistence,handleCaps,stanza,c)));
+HXDLIN( 483)					::snikket::Persistence_obj::getCaps(persistence2,( (::String)(::Reflect_obj::field(c->attr,HX_("ver",63,e2,59,00))) ), ::Dynamic(new _hx_Closure_27(_gthis,persistence,handleCaps,stanza,c)));
             				}
 HXLINE( 509)				if (from->isBare()) {
 HXLINE( 510)					::String avatarSha1Hex = stanza->findText(HX_("{vcard-temp:x:update}x/photo#",f6,a1,33,28));
 HXLINE( 511)					if (::hx::IsNotNull( avatarSha1Hex )) {
-            						HX_BEGIN_LOCAL_FUNC_S4(::hx::LocalFunc,_hx_Closure_31, ::snikket::Client,_gthis, ::snikket::JID,from,::Dynamic,persistence, ::snikket::Chat,chat) HXARGC(1)
+            						HX_BEGIN_LOCAL_FUNC_S4(::hx::LocalFunc,_hx_Closure_30, ::snikket::Client,_gthis, ::snikket::JID,from,::Dynamic,persistence, ::snikket::Chat,chat) HXARGC(1)
             						void _hx_run(bool has){
             							HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_516_new)
 HXLINE( 516)							if (has) {
@@ -1630,9 +1638,9 @@ HXLINE( 517)									_gthis->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::Virt
             								}
             							}
             							else {
-            								HX_BEGIN_LOCAL_FUNC_S4(::hx::LocalFunc,_hx_Closure_30, ::snikket::Client,_gthis, ::snikket::queries::VcardTempGet,vcardGet,::Dynamic,persistence, ::snikket::Chat,chat) HXARGC(0)
+            								HX_BEGIN_LOCAL_FUNC_S4(::hx::LocalFunc,_hx_Closure_29, ::snikket::Client,_gthis, ::snikket::queries::VcardTempGet,vcardGet,::Dynamic,persistence, ::snikket::Chat,chat) HXARGC(0)
             								void _hx_run(){
-            									HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_29, ::snikket::Client,_gthis, ::snikket::Chat,chat) HXARGC(0)
+            									HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_28, ::snikket::Client,_gthis, ::snikket::Chat,chat) HXARGC(0)
             									void _hx_run(){
             										HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_524_new)
 HXLINE( 524)										_gthis->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,chat));
@@ -1644,12 +1652,12 @@ HXLINE( 521)									 ::Dynamic vcard = vcardGet->getResult();
 HXLINE( 522)									if (::hx::IsNull( vcard->__Field(HX_("photo",b2,c8,f3,c1),::hx::paccDynamic) )) {
 HXLINE( 522)										return;
             									}
-HXLINE( 523)									::snikket::Persistence_obj::storeMedia(persistence, ::Dynamic( ::Dynamic(vcard->__Field(HX_("photo",b2,c8,f3,c1),::hx::paccDynamic))->__Field(HX_("mime",b4,4d,5c,48),::hx::paccDynamic)),( ( ::haxe::io::Bytes)( ::Dynamic(vcard->__Field(HX_("photo",b2,c8,f3,c1),::hx::paccDynamic))->__Field(HX_("data",2a,56,63,42),::hx::paccDynamic)) )->b, ::Dynamic(new _hx_Closure_29(_gthis,chat)));
+HXLINE( 523)									::snikket::Persistence_obj::storeMedia(persistence, ::Dynamic( ::Dynamic(vcard->__Field(HX_("photo",b2,c8,f3,c1),::hx::paccDynamic))->__Field(HX_("mime",b4,4d,5c,48),::hx::paccDynamic)),( ( ::haxe::io::Bytes)( ::Dynamic(vcard->__Field(HX_("photo",b2,c8,f3,c1),::hx::paccDynamic))->__Field(HX_("data",2a,56,63,42),::hx::paccDynamic)) )->b, ::Dynamic(new _hx_Closure_28(_gthis,chat)));
             								}
             								HX_END_LOCAL_FUNC0((void))
 
 HXLINE( 519)								 ::snikket::queries::VcardTempGet vcardGet =  ::snikket::queries::VcardTempGet_obj::__alloc( HX_CTX ,from);
-HXLINE( 520)								vcardGet->onFinished( ::Dynamic(new _hx_Closure_30(_gthis,vcardGet,persistence,chat)));
+HXLINE( 520)								vcardGet->onFinished( ::Dynamic(new _hx_Closure_29(_gthis,vcardGet,persistence,chat)));
 HXLINE( 527)								_gthis->sendQuery(vcardGet);
             							}
             						}
@@ -1667,7 +1675,7 @@ HXLINE( 513)						chat->setAvatarSha1(avatarSha1);
 HXLINE( 514)						::Dynamic persistence3 = persistence;
 HXDLIN( 514)						::String _hx_tmp5 = _gthis->accountId();
 HXDLIN( 514)						::snikket::Persistence_obj::storeChats(persistence3,_hx_tmp5,::Array_obj< ::Dynamic>::__new(1)->init(0,chat));
-HXLINE( 515)						::snikket::Persistence_obj::hasMedia(persistence,HX_("sha-1",90,a8,1c,7c),avatarSha1, ::Dynamic(new _hx_Closure_31(_gthis,from,persistence,chat)));
+HXLINE( 515)						::snikket::Persistence_obj::hasMedia(persistence,HX_("sha-1",90,a8,1c,7c),avatarSha1, ::Dynamic(new _hx_Closure_30(_gthis,from,persistence,chat)));
             					}
             				}
 HXLINE( 532)				return ::snikket::EventResult_obj::EventHandled_dyn();
@@ -1698,13 +1706,13 @@ HXLINE( 547)			return ::snikket::EventResult_obj::EventUnhandled_dyn();
             		HX_END_LOCAL_FUNC1(return)
 
             	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_51_new)
-HXLINE( 982)		this->enabledPushData = null();
+HXLINE( 986)		this->enabledPushData = null();
 HXLINE(  89)		this->inSync = false;
 HXLINE(  87)		this->pendingCaps =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
 HXLINE(  86)		this->fastCount = null();
 HXLINE(  85)		this->token = null();
 HXLINE(  84)		this->fastMechanism = null();
-HXLINE(  64)		this->caps =  ::snikket::Caps_obj::__alloc( HX_CTX ,HX_("https://sdk.snikket.org",d0,c9,43,f0),::Array_obj< ::Dynamic>::__new(0),::Array_obj< ::String >::fromData( _hx_array_data_7c06fe3c_45,13));
+HXLINE(  64)		this->caps =  ::snikket::Caps_obj::__alloc( HX_CTX ,HX_("https://sdk.snikket.org",d0,c9,43,f0),::Array_obj< ::Dynamic>::__new(0),::Array_obj< ::String >::fromData( _hx_array_data_7c06fe3c_45,13),null());
 HXLINE(  62)		this->chats = ::Array_obj< ::Dynamic>::__new(0);
 HXLINE(  59)		this->chatStateHandlers = ::Array_obj< ::Dynamic>::__new(0);
 HXLINE(  58)		this->syncMessageHandlers = ::Array_obj< ::Dynamic>::__new(0);
@@ -1721,16 +1729,16 @@ HXLINE( 104)		this->stream =  ::snikket::streams::XmppStropheStream_obj::__alloc
 HXLINE( 105)		this->stream->on(HX_("status/online",10,05,0e,d2),this->onConnected_dyn());
 HXLINE( 106)		this->stream->on(HX_("status/offline",c6,eb,eb,54), ::Dynamic(new _hx_Closure_0(_gthis)));
 HXLINE( 110)		this->stream->on(HX_("fast-token",48,5f,c2,26), ::Dynamic(new _hx_Closure_1(_gthis,persistence)));
-HXLINE( 116)		this->stream->on(HX_("sm/update",1e,16,63,46), ::Dynamic(new _hx_Closure_3(_gthis,persistence)));
-HXLINE( 122)		this->stream->on(HX_("sm/ack",14,b2,12,dd), ::Dynamic(new _hx_Closure_5(_gthis,persistence)));
-HXLINE( 132)		this->stream->on(HX_("sm/fail",b3,aa,95,96), ::Dynamic(new _hx_Closure_7(_gthis,persistence)));
-HXLINE( 142)		this->stream->on(HX_("message",c7,35,11,9a), ::Dynamic(new _hx_Closure_19(_gthis,persistence)));
-HXLINE( 341)		this->stream->onIq(::snikket::IqRequestType_obj::Set_dyn(),HX_("jingle",31,27,eb,1f),HX_("urn:xmpp:jingle:1",44,c4,fe,f7), ::Dynamic(new _hx_Closure_20(_gthis)));
-HXLINE( 392)		this->stream->onIq(::snikket::IqRequestType_obj::Get_dyn(),HX_("query",08,8b,ea,5d),HX_("http://jabber.org/protocol/disco#info",cb,2b,7f,0b), ::Dynamic(new _hx_Closure_21(_gthis)));
-HXLINE( 396)		this->stream->onIq(::snikket::IqRequestType_obj::Set_dyn(),HX_("query",08,8b,ea,5d),HX_("jabber:iq:roster",47,76,6e,06), ::Dynamic(new _hx_Closure_22(_gthis,persistence)));
-HXLINE( 423)		this->stream->onIq(::snikket::IqRequestType_obj::Set_dyn(),HX_("block",4d,75,fc,b4),HX_("urn:xmpp:blocking",d1,a1,46,c3), ::Dynamic(new _hx_Closure_23(_gthis)));
-HXLINE( 438)		this->stream->onIq(::snikket::IqRequestType_obj::Set_dyn(),HX_("unblock",54,6c,8d,b1),HX_("urn:xmpp:blocking",d1,a1,46,c3), ::Dynamic(new _hx_Closure_24(_gthis)));
-HXLINE( 461)		this->stream->on(HX_("presence",3b,52,d7,66), ::Dynamic(new _hx_Closure_32(_gthis,persistence)));
+HXLINE( 116)		this->stream->on(HX_("sm/update",1e,16,63,46), ::Dynamic(new _hx_Closure_2(_gthis,persistence)));
+HXLINE( 122)		this->stream->on(HX_("sm/ack",14,b2,12,dd), ::Dynamic(new _hx_Closure_4(_gthis,persistence)));
+HXLINE( 132)		this->stream->on(HX_("sm/fail",b3,aa,95,96), ::Dynamic(new _hx_Closure_6(_gthis,persistence)));
+HXLINE( 142)		this->stream->on(HX_("message",c7,35,11,9a), ::Dynamic(new _hx_Closure_18(_gthis,persistence)));
+HXLINE( 341)		this->stream->onIq(::snikket::IqRequestType_obj::Set_dyn(),HX_("jingle",31,27,eb,1f),HX_("urn:xmpp:jingle:1",44,c4,fe,f7), ::Dynamic(new _hx_Closure_19(_gthis)));
+HXLINE( 392)		this->stream->onIq(::snikket::IqRequestType_obj::Get_dyn(),HX_("query",08,8b,ea,5d),HX_("http://jabber.org/protocol/disco#info",cb,2b,7f,0b), ::Dynamic(new _hx_Closure_20(_gthis)));
+HXLINE( 396)		this->stream->onIq(::snikket::IqRequestType_obj::Set_dyn(),HX_("query",08,8b,ea,5d),HX_("jabber:iq:roster",47,76,6e,06), ::Dynamic(new _hx_Closure_21(_gthis,persistence)));
+HXLINE( 423)		this->stream->onIq(::snikket::IqRequestType_obj::Set_dyn(),HX_("block",4d,75,fc,b4),HX_("urn:xmpp:blocking",d1,a1,46,c3), ::Dynamic(new _hx_Closure_22(_gthis)));
+HXLINE( 438)		this->stream->onIq(::snikket::IqRequestType_obj::Set_dyn(),HX_("unblock",54,6c,8d,b1),HX_("urn:xmpp:blocking",d1,a1,46,c3), ::Dynamic(new _hx_Closure_23(_gthis)));
+HXLINE( 461)		this->stream->on(HX_("presence",3b,52,d7,66), ::Dynamic(new _hx_Closure_31(_gthis,persistence)));
             	}
 
 Dynamic Client_obj::__CreateEmpty() { return new Client_obj; }
@@ -1866,76 +1874,78 @@ void Client_obj::startOffline( ::Dynamic ready){
             			void _hx_run(::Array< ::Dynamic> protoChats){
             				HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0, ::snikket::Client,_gthis, ::Dynamic,ready) HXARGC(1)
             				void _hx_run(::Array< ::Dynamic> details){
-            					HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_597_startOffline)
-HXLINE( 598)					{
-HXLINE( 598)						int _g = 0;
-HXDLIN( 598)						while((_g < details->length)){
-HXLINE( 598)							 ::Dynamic detail = details->__get(_g);
-HXDLIN( 598)							_g = (_g + 1);
-HXLINE( 599)							 ::snikket::Chat chat = _gthis->getChat(( (::String)(detail->__Field(HX_("chatId",d3,04,77,b7),::hx::paccDynamic)) ));
-HXLINE( 600)							if (::hx::IsNotNull( chat )) {
-HXLINE( 601)								chat->setLastMessage(( ( ::snikket::ChatMessage)(detail->__Field(HX_("message",c7,35,11,9a),::hx::paccDynamic)) ));
-HXLINE( 602)								chat->setUnreadCount(( (int)(detail->__Field(HX_("unreadCount",20,18,f1,a0),::hx::paccDynamic)) ));
+            					HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_601_startOffline)
+HXLINE( 602)					{
+HXLINE( 602)						int _g = 0;
+HXDLIN( 602)						while((_g < details->length)){
+HXLINE( 602)							 ::Dynamic detail = details->__get(_g);
+HXDLIN( 602)							_g = (_g + 1);
+HXLINE( 603)							 ::snikket::Chat chat = _gthis->getChat(( (::String)(detail->__Field(HX_("chatId",d3,04,77,b7),::hx::paccDynamic)) ));
+HXLINE( 604)							if (::hx::IsNotNull( chat )) {
+HXLINE( 605)								chat->setLastMessage(( ( ::snikket::ChatMessage)(detail->__Field(HX_("message",c7,35,11,9a),::hx::paccDynamic)) ));
+HXLINE( 606)								chat->setUnreadCount(( (int)(detail->__Field(HX_("unreadCount",20,18,f1,a0),::hx::paccDynamic)) ));
             							}
             						}
             					}
-HXLINE( 605)					_gthis->sortChats();
-HXLINE( 606)					_gthis->trigger(HX_("chats/update",3d,8e,1d,14),_gthis->chats);
-HXLINE( 607)					ready();
+HXLINE( 609)					_gthis->sortChats();
+HXLINE( 610)					_gthis->trigger(HX_("chats/update",3d,8e,1d,14),_gthis->chats);
+HXLINE( 611)					ready();
             				}
             				HX_END_LOCAL_FUNC1((void))
 
-            				HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_592_startOffline)
-HXLINE( 593)				{
-HXLINE( 593)					int _g = 0;
-HXDLIN( 593)					while((_g < protoChats->length)){
-HXLINE( 593)						 ::snikket::SerializedChat protoChat = protoChats->__get(_g).StaticCast<  ::snikket::SerializedChat >();
-HXDLIN( 593)						_g = (_g + 1);
-HXLINE( 594)						::Array< ::Dynamic> _gthis1 = _gthis->chats;
-HXDLIN( 594)						_gthis1->push(protoChat->toChat(_gthis,_gthis->stream,_gthis->persistence));
+            				HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_596_startOffline)
+HXLINE( 597)				 ::snikket::SerializedChat oneProtoChat = null();
+HXLINE( 598)				while(true){
+HXLINE( 598)					oneProtoChat = protoChats->pop().StaticCast<  ::snikket::SerializedChat >();
+HXDLIN( 598)					if (!(::hx::IsNotNull( oneProtoChat ))) {
+HXLINE( 598)						goto _hx_goto_53;
             					}
+HXLINE( 599)					::Array< ::Dynamic> _gthis1 = _gthis->chats;
+HXDLIN( 599)					_gthis1->push(oneProtoChat->toChat(_gthis,_gthis->stream,_gthis->persistence));
             				}
-HXLINE( 597)				::Dynamic _gthis2 = _gthis->persistence;
-HXDLIN( 597)				::String _hx_tmp = _gthis->accountId();
-HXDLIN( 597)				::snikket::Persistence_obj::getChatsUnreadDetails(_gthis2,_hx_tmp,_gthis->chats, ::Dynamic(new _hx_Closure_0(_gthis,ready)));
+            				_hx_goto_53:;
+HXLINE( 601)				::Dynamic _gthis2 = _gthis->persistence;
+HXDLIN( 601)				::String _hx_tmp = _gthis->accountId();
+HXDLIN( 601)				::snikket::Persistence_obj::getChatsUnreadDetails(_gthis2,_hx_tmp,_gthis->chats, ::Dynamic(new _hx_Closure_0(_gthis,ready)));
             			}
             			HX_END_LOCAL_FUNC1((void))
 
-            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_583_startOffline)
-HXLINE( 584)			_gthis->token = loadedToken;
-HXLINE( 585)			_gthis->fastCount = loadedFastCount;
-HXLINE( 586)			::String tmp = clientId;
-HXDLIN( 586)			::String _hx_tmp;
-HXDLIN( 586)			if (::hx::IsNotNull( tmp )) {
-HXLINE( 586)				_hx_tmp = tmp;
+            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_587_startOffline)
+HXLINE( 588)			_gthis->token = loadedToken;
+HXLINE( 589)			_gthis->fastCount = loadedFastCount;
+HXLINE( 590)			::String tmp = clientId;
+HXDLIN( 590)			::String _hx_tmp;
+HXDLIN( 590)			if (::hx::IsNotNull( tmp )) {
+HXLINE( 590)				_hx_tmp = tmp;
             			}
             			else {
-HXLINE( 586)				_hx_tmp = ::snikket::ID_obj::_hx_long();
+HXLINE( 590)				_hx_tmp = ::snikket::ID_obj::_hx_long();
             			}
-HXDLIN( 586)			_gthis->stream->clientId = _hx_tmp;
-HXLINE( 587)			_gthis->jid = _gthis->jid->withResource(_gthis->stream->clientId);
-HXLINE( 588)			bool _hx_tmp1;
-HXDLIN( 588)			if (!(_gthis->updateDisplayName(displayName))) {
-HXLINE( 588)				_hx_tmp1 = ::hx::IsNull( clientId );
+HXDLIN( 590)			_gthis->stream->clientId = _hx_tmp;
+HXLINE( 591)			_gthis->jid = _gthis->jid->withResource(_gthis->stream->clientId);
+HXLINE( 592)			bool _hx_tmp1;
+HXDLIN( 592)			if (!(_gthis->updateDisplayName(displayName))) {
+HXLINE( 592)				_hx_tmp1 = ::hx::IsNull( clientId );
             			}
             			else {
-HXLINE( 588)				_hx_tmp1 = false;
+HXLINE( 592)				_hx_tmp1 = false;
             			}
-HXDLIN( 588)			if (_hx_tmp1) {
-HXLINE( 589)				::Dynamic _gthis1 = _gthis->persistence;
-HXDLIN( 589)				::String _hx_tmp2 = _gthis->jid->asBare()->asString();
-HXDLIN( 589)				::String _gthis2 = _gthis->stream->clientId;
-HXDLIN( 589)				::snikket::Persistence_obj::storeLogin(_gthis1,_hx_tmp2,_gthis2,_gthis->displayName(),null());
+HXDLIN( 592)			if (_hx_tmp1) {
+HXLINE( 593)				::Dynamic _gthis1 = _gthis->persistence;
+HXDLIN( 593)				::String _hx_tmp2 = _gthis->jid->asBare()->asString();
+HXDLIN( 593)				::String _gthis2 = _gthis->stream->clientId;
+HXDLIN( 593)				::snikket::Persistence_obj::storeLogin(_gthis1,_hx_tmp2,_gthis2,_gthis->displayName(),null());
             			}
-HXLINE( 592)			::Dynamic _gthis3 = _gthis->persistence;
-HXDLIN( 592)			::snikket::Persistence_obj::getChats(_gthis3,_gthis->accountId(), ::Dynamic(new _hx_Closure_1(_gthis,ready)));
+HXLINE( 596)			::Dynamic _gthis3 = _gthis->persistence;
+HXDLIN( 596)			::snikket::Persistence_obj::getChats(_gthis3,_gthis->accountId(), ::Dynamic(new _hx_Closure_1(_gthis,ready)));
             		}
             		HX_END_LOCAL_FUNC4((void))
 
             	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_582_startOffline)
 HXDLIN( 582)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 583)		::Dynamic _hx_tmp = this->persistence;
-HXDLIN( 583)		::snikket::Persistence_obj::getLogin(_hx_tmp,this->accountId(), ::Dynamic(new _hx_Closure_2(_gthis,ready)));
+HXLINE( 585)		__hxcpp_collect(true);
+HXLINE( 587)		::Dynamic _hx_tmp = this->persistence;
+HXDLIN( 587)		::snikket::Persistence_obj::getLogin(_hx_tmp,this->accountId(), ::Dynamic(new _hx_Closure_2(_gthis,ready)));
             	}
 
 
@@ -1957,26 +1967,26 @@ HXDLIN( 252)		this->startOffline( ::Dynamic(new _hx_Closure_0(ready,ready__conte
 void Client_obj::logout(bool completely){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::Client,_gthis) HXARGC(0)
             		void _hx_run(){
-            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_622_logout)
-HXLINE( 622)			_gthis->stream->disconnect();
+            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_626_logout)
+HXLINE( 626)			_gthis->stream->disconnect();
             		}
             		HX_END_LOCAL_FUNC0((void))
 
-            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_618_logout)
-HXDLIN( 618)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 619)		::Dynamic _hx_tmp = this->persistence;
-HXDLIN( 619)		::snikket::Persistence_obj::removeAccount(_hx_tmp,this->accountId(),completely);
-HXLINE( 620)		 ::snikket::queries::Push2Disable disable =  ::snikket::queries::Push2Disable_obj::__alloc( HX_CTX ,this->jid->asBare()->asString());
-HXLINE( 621)		disable->onFinished( ::Dynamic(new _hx_Closure_0(_gthis)));
-HXLINE( 624)		this->sendQuery(disable);
+            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_622_logout)
+HXDLIN( 622)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 623)		::Dynamic _hx_tmp = this->persistence;
+HXDLIN( 623)		::snikket::Persistence_obj::removeAccount(_hx_tmp,this->accountId(),completely);
+HXLINE( 624)		 ::snikket::queries::Push2Disable disable =  ::snikket::queries::Push2Disable_obj::__alloc( HX_CTX ,this->jid->asBare()->asString());
+HXLINE( 625)		disable->onFinished( ::Dynamic(new _hx_Closure_0(_gthis)));
+HXLINE( 628)		this->sendQuery(disable);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Client_obj,logout,(void))
 
 void Client_obj::usePassword(::String password){
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_634_usePassword)
-HXDLIN( 634)		this->stream->trigger(HX_("auth/password",e2,5d,98,00), ::Dynamic(::hx::Anon_obj::Create(2)
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_638_usePassword)
+HXDLIN( 638)		this->stream->trigger(HX_("auth/password",e2,5d,98,00), ::Dynamic(::hx::Anon_obj::Create(2)
             			->setFixed(0,HX_("requestToken",2a,35,fd,af),this->fastMechanism)
             			->setFixed(1,HX_("password",1b,23,d0,48),password)));
             	}
@@ -1985,16 +1995,16 @@ HXDLIN( 634)		this->stream->trigger(HX_("auth/password",e2,5d,98,00), ::Dynamic(
 HX_DEFINE_DYNAMIC_FUNC1(Client_obj,usePassword,(void))
 
 ::String Client_obj::accountId(){
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_643_accountId)
-HXDLIN( 643)		return this->jid->asBare()->asString();
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_647_accountId)
+HXDLIN( 647)		return this->jid->asBare()->asString();
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Client_obj,accountId,return )
 
 ::String Client_obj::displayName(){
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_652_displayName)
-HXDLIN( 652)		return this->_displayName;
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_656_displayName)
+HXDLIN( 656)		return this->_displayName;
             	}
 
 
@@ -2003,30 +2013,30 @@ HX_DEFINE_DYNAMIC_FUNC0(Client_obj,displayName,return )
 void Client_obj::setDisplayName(::String displayName){
             		HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_0) HXARGC(1)
             		void _hx_run( ::snikket::Stanza response){
-            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_670_setDisplayName)
+            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_674_setDisplayName)
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_660_setDisplayName)
-HXLINE( 661)		bool _hx_tmp;
-HXDLIN( 661)		bool _hx_tmp1;
-HXDLIN( 661)		if (::hx::IsNotNull( displayName )) {
-HXLINE( 661)			_hx_tmp1 = (displayName == HX_("",00,00,00,00));
+            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_664_setDisplayName)
+HXLINE( 665)		bool _hx_tmp;
+HXDLIN( 665)		bool _hx_tmp1;
+HXDLIN( 665)		if (::hx::IsNotNull( displayName )) {
+HXLINE( 665)			_hx_tmp1 = (displayName == HX_("",00,00,00,00));
             		}
             		else {
-HXLINE( 661)			_hx_tmp1 = true;
+HXLINE( 665)			_hx_tmp1 = true;
             		}
-HXDLIN( 661)		if (!(_hx_tmp1)) {
-HXLINE( 661)			_hx_tmp = (displayName == this->displayName());
+HXDLIN( 665)		if (!(_hx_tmp1)) {
+HXLINE( 665)			_hx_tmp = (displayName == this->displayName());
             		}
             		else {
-HXLINE( 661)			_hx_tmp = true;
+HXLINE( 665)			_hx_tmp = true;
             		}
-HXDLIN( 661)		if (_hx_tmp) {
-HXLINE( 661)			return;
+HXDLIN( 665)		if (_hx_tmp) {
+HXLINE( 665)			return;
             		}
-HXLINE( 663)		 ::snikket::GenericStream _hx_tmp2 = this->stream;
-HXDLIN( 663)		_hx_tmp2->sendIq( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("iq",e8,5b,00,00), ::Dynamic(::hx::Anon_obj::Create(1)
+HXLINE( 667)		 ::snikket::GenericStream _hx_tmp2 = this->stream;
+HXDLIN( 667)		_hx_tmp2->sendIq( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("iq",e8,5b,00,00), ::Dynamic(::hx::Anon_obj::Create(1)
             			->setFixed(0,HX_("type",ba,f2,08,4d),HX_("set",a2,9b,57,00))))->tag(HX_("pubsub",e3,da,f8,66), ::Dynamic(::hx::Anon_obj::Create(1)
             			->setFixed(0,HX_("xmlns",dc,31,74,60),HX_("http://jabber.org/protocol/pubsub",57,94,3c,f2))))->tag(HX_("publish",8f,21,1d,ae), ::Dynamic(::hx::Anon_obj::Create(1)
             			->setFixed(0,HX_("node",02,0a,0a,49),HX_("http://jabber.org/protocol/nick",17,30,dc,e9))))->tag(HX_("item",13,c5,bf,45),null())->textTag(HX_("nick",a3,7b,05,49),displayName, ::Dynamic(::hx::Anon_obj::Create(1)
@@ -2037,38 +2047,38 @@ HXDLIN( 663)		_hx_tmp2->sendIq( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("iq"
 HX_DEFINE_DYNAMIC_FUNC1(Client_obj,setDisplayName,(void))
 
 bool Client_obj::updateDisplayName(::String fn){
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_674_updateDisplayName)
-HXLINE( 675)		bool _hx_tmp;
-HXDLIN( 675)		bool _hx_tmp1;
-HXDLIN( 675)		if (::hx::IsNotNull( fn )) {
-HXLINE( 675)			_hx_tmp1 = (fn == HX_("",00,00,00,00));
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_678_updateDisplayName)
+HXLINE( 679)		bool _hx_tmp;
+HXDLIN( 679)		bool _hx_tmp1;
+HXDLIN( 679)		if (::hx::IsNotNull( fn )) {
+HXLINE( 679)			_hx_tmp1 = (fn == HX_("",00,00,00,00));
             		}
             		else {
-HXLINE( 675)			_hx_tmp1 = true;
+HXLINE( 679)			_hx_tmp1 = true;
             		}
-HXDLIN( 675)		if (!(_hx_tmp1)) {
-HXLINE( 675)			_hx_tmp = (fn == this->displayName());
+HXDLIN( 679)		if (!(_hx_tmp1)) {
+HXLINE( 679)			_hx_tmp = (fn == this->displayName());
             		}
             		else {
-HXLINE( 675)			_hx_tmp = true;
+HXLINE( 679)			_hx_tmp = true;
             		}
-HXDLIN( 675)		if (_hx_tmp) {
-HXLINE( 675)			return false;
+HXDLIN( 679)		if (_hx_tmp) {
+HXLINE( 679)			return false;
             		}
-HXLINE( 676)		this->_displayName = fn;
-HXLINE( 677)		::Dynamic _hx_tmp2 = this->persistence;
-HXDLIN( 677)		::String _hx_tmp3 = this->jid->asBare()->asString();
-HXDLIN( 677)		::String tmp = this->stream->clientId;
-HXDLIN( 677)		::String _hx_tmp4;
-HXDLIN( 677)		if (::hx::IsNotNull( tmp )) {
-HXLINE( 677)			_hx_tmp4 = tmp;
+HXLINE( 680)		this->_displayName = fn;
+HXLINE( 681)		::Dynamic _hx_tmp2 = this->persistence;
+HXDLIN( 681)		::String _hx_tmp3 = this->jid->asBare()->asString();
+HXDLIN( 681)		::String tmp = this->stream->clientId;
+HXDLIN( 681)		::String _hx_tmp4;
+HXDLIN( 681)		if (::hx::IsNotNull( tmp )) {
+HXLINE( 681)			_hx_tmp4 = tmp;
             		}
             		else {
-HXLINE( 677)			_hx_tmp4 = this->jid->resource;
+HXLINE( 681)			_hx_tmp4 = this->jid->resource;
             		}
-HXDLIN( 677)		::snikket::Persistence_obj::storeLogin(_hx_tmp2,_hx_tmp3,_hx_tmp4,fn,null());
-HXLINE( 678)		this->pingAllChannels(false);
-HXLINE( 679)		return true;
+HXDLIN( 681)		::snikket::Persistence_obj::storeLogin(_hx_tmp2,_hx_tmp3,_hx_tmp4,fn,null());
+HXLINE( 682)		this->pingAllChannels(false);
+HXLINE( 683)		return true;
             	}
 
 
@@ -2077,11 +2087,11 @@ HX_DEFINE_DYNAMIC_FUNC1(Client_obj,updateDisplayName,return )
  ::snikket::EventResult Client_obj::onConnected( ::Dynamic data){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::Client,_gthis) HXARGC(2)
             		void _hx_run( ::Dynamic service, ::snikket::Caps caps){
-            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_696_onConnected)
-HXLINE( 696)			::Dynamic _gthis1 = _gthis->persistence;
-HXDLIN( 696)			::String _hx_tmp = _gthis->accountId();
-HXDLIN( 696)			::String _hx_tmp1 = ( ( ::snikket::JID)(service->__Field(HX_("jid",c5,ca,50,00),::hx::paccDynamic)) )->asString();
-HXDLIN( 696)			::snikket::Persistence_obj::storeService(_gthis1,_hx_tmp,_hx_tmp1, ::Dynamic(service->__Field(HX_("name",4b,72,ff,48),::hx::paccDynamic)), ::Dynamic(service->__Field(HX_("node",02,0a,0a,49),::hx::paccDynamic)),caps);
+            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_700_onConnected)
+HXLINE( 700)			::Dynamic _gthis1 = _gthis->persistence;
+HXDLIN( 700)			::String _hx_tmp = _gthis->accountId();
+HXDLIN( 700)			::String _hx_tmp1 = ( ( ::snikket::JID)(service->__Field(HX_("jid",c5,ca,50,00),::hx::paccDynamic)) )->asString();
+HXDLIN( 700)			::snikket::Persistence_obj::storeService(_gthis1,_hx_tmp,_hx_tmp1, ::Dynamic(service->__Field(HX_("name",4b,72,ff,48),::hx::paccDynamic)), ::Dynamic(service->__Field(HX_("node",02,0a,0a,49),::hx::paccDynamic)),caps);
             		}
             		HX_END_LOCAL_FUNC2((void))
 
@@ -2091,109 +2101,109 @@ HXDLIN( 696)			::snikket::Persistence_obj::storeService(_gthis1,_hx_tmp,_hx_tmp1
             			void _hx_run(bool syncFinished){
             				HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_1, ::snikket::Client,_gthis) HXARGC(1)
             				void _hx_run(::Array< ::Dynamic> details){
-            					HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_713_onConnected)
-HXLINE( 714)					{
-HXLINE( 714)						int _g = 0;
-HXDLIN( 714)						while((_g < details->length)){
-HXLINE( 714)							 ::Dynamic detail = details->__get(_g);
-HXDLIN( 714)							_g = (_g + 1);
-HXLINE( 715)							 ::snikket::Chat chat;
-HXDLIN( 715)							 ::snikket::Chat tmp = _gthis->getChat(( (::String)(detail->__Field(HX_("chatId",d3,04,77,b7),::hx::paccDynamic)) ));
-HXDLIN( 715)							if (::hx::IsNotNull( tmp )) {
-HXLINE( 715)								chat = tmp;
+            					HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_717_onConnected)
+HXLINE( 718)					{
+HXLINE( 718)						int _g = 0;
+HXDLIN( 718)						while((_g < details->length)){
+HXLINE( 718)							 ::Dynamic detail = details->__get(_g);
+HXDLIN( 718)							_g = (_g + 1);
+HXLINE( 719)							 ::snikket::Chat chat;
+HXDLIN( 719)							 ::snikket::Chat tmp = _gthis->getChat(( (::String)(detail->__Field(HX_("chatId",d3,04,77,b7),::hx::paccDynamic)) ));
+HXDLIN( 719)							if (::hx::IsNotNull( tmp )) {
+HXLINE( 719)								chat = tmp;
             							}
             							else {
-HXLINE( 715)								chat = _gthis->getDirectChat(( (::String)(detail->__Field(HX_("chatId",d3,04,77,b7),::hx::paccDynamic)) ),false);
+HXLINE( 719)								chat = _gthis->getDirectChat(( (::String)(detail->__Field(HX_("chatId",d3,04,77,b7),::hx::paccDynamic)) ),false);
             							}
-HXLINE( 716)							::String initialLastId = chat->lastMessageId();
-HXLINE( 717)							chat->setLastMessage(( ( ::snikket::ChatMessage)(detail->__Field(HX_("message",c7,35,11,9a),::hx::paccDynamic)) ));
-HXLINE( 718)							chat->setUnreadCount(( (int)(detail->__Field(HX_("unreadCount",20,18,f1,a0),::hx::paccDynamic)) ));
-HXLINE( 719)							bool _hx_tmp;
-HXDLIN( 719)							if (::hx::IsGreater( detail->__Field(HX_("unreadCount",20,18,f1,a0),::hx::paccDynamic),0 )) {
-HXLINE( 719)								_hx_tmp = (initialLastId != chat->lastMessageId());
+HXLINE( 720)							::String initialLastId = chat->lastMessageId();
+HXLINE( 721)							chat->setLastMessage(( ( ::snikket::ChatMessage)(detail->__Field(HX_("message",c7,35,11,9a),::hx::paccDynamic)) ));
+HXLINE( 722)							chat->setUnreadCount(( (int)(detail->__Field(HX_("unreadCount",20,18,f1,a0),::hx::paccDynamic)) ));
+HXLINE( 723)							bool _hx_tmp;
+HXDLIN( 723)							if (::hx::IsGreater( detail->__Field(HX_("unreadCount",20,18,f1,a0),::hx::paccDynamic),0 )) {
+HXLINE( 723)								_hx_tmp = (initialLastId != chat->lastMessageId());
             							}
             							else {
-HXLINE( 719)								_hx_tmp = false;
+HXLINE( 723)								_hx_tmp = false;
             							}
-HXDLIN( 719)							if (_hx_tmp) {
-HXLINE( 720)								_gthis->chatActivity(chat,false);
+HXDLIN( 723)							if (_hx_tmp) {
+HXLINE( 724)								_gthis->chatActivity(chat,false);
             							}
             						}
             					}
-HXLINE( 723)					_gthis->sortChats();
-HXLINE( 724)					_gthis->trigger(HX_("chats/update",3d,8e,1d,14),_gthis->chats);
-HXLINE( 726)					if (_gthis->sendAvailable) {
-HXLINE( 728)						 ::snikket::Client _gthis1 = _gthis;
-HXLINE( 729)						::String _hx_tmp1 = ::snikket::ID_obj::_hx_short();
-HXLINE( 728)						_gthis1->sendStanza( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("iq",e8,5b,00,00), ::Dynamic(::hx::Anon_obj::Create(2)
+HXLINE( 727)					_gthis->sortChats();
+HXLINE( 728)					_gthis->trigger(HX_("chats/update",3d,8e,1d,14),_gthis->chats);
+HXLINE( 730)					if (_gthis->sendAvailable) {
+HXLINE( 732)						 ::snikket::Client _gthis1 = _gthis;
+HXLINE( 733)						::String _hx_tmp1 = ::snikket::ID_obj::_hx_short();
+HXLINE( 732)						_gthis1->sendStanza( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("iq",e8,5b,00,00), ::Dynamic(::hx::Anon_obj::Create(2)
             							->setFixed(0,HX_("id",db,5b,00,00),_hx_tmp1)
             							->setFixed(1,HX_("type",ba,f2,08,4d),HX_("set",a2,9b,57,00))))->tag(HX_("enable",83,ae,87,f8), ::Dynamic(::hx::Anon_obj::Create(1)
             							->setFixed(0,HX_("xmlns",dc,31,74,60),HX_("urn:xmpp:carbons:2",02,86,9e,df))))->up());
-HXLINE( 733)						_gthis->sendPresence(null(),null());
-HXLINE( 734)						_gthis->joinAllChannels();
+HXLINE( 737)						_gthis->sendPresence(null(),null());
+HXLINE( 738)						_gthis->joinAllChannels();
             					}
-HXLINE( 736)					_gthis->trigger(HX_("status/online",10,05,0e,d2), ::Dynamic(::hx::Anon_obj::Create(0)));
-HXLINE( 737)					::haxe::Log_obj::trace(HX_("SYNC: done",c3,a6,82,dd),::hx::SourceInfo(HX_("snikket/Client.hx",e1,49,02,18),737,HX_("snikket.Client",3c,fe,06,7c),HX_("onConnected",aa,c5,39,c5)));
+HXLINE( 740)					_gthis->trigger(HX_("status/online",10,05,0e,d2), ::Dynamic(::hx::Anon_obj::Create(0)));
+HXLINE( 741)					::haxe::Log_obj::trace(HX_("SYNC: done",c3,a6,82,dd),::hx::SourceInfo(HX_("snikket/Client.hx",e1,49,02,18),741,HX_("snikket.Client",3c,fe,06,7c),HX_("onConnected",aa,c5,39,c5)));
             				}
             				HX_END_LOCAL_FUNC1((void))
 
-            				HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_702_onConnected)
-HXLINE( 703)				if (!(syncFinished)) {
-HXLINE( 704)					::haxe::Log_obj::trace(HX_("SYNC: failed",3e,4e,5e,fa),::hx::SourceInfo(HX_("snikket/Client.hx",e1,49,02,18),704,HX_("snikket.Client",3c,fe,06,7c),HX_("onConnected",aa,c5,39,c5)));
-HXLINE( 705)					_gthis->inSync = false;
-HXLINE( 706)					_gthis->stream->disconnect();
-HXLINE( 708)					return;
+            				HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_706_onConnected)
+HXLINE( 707)				if (!(syncFinished)) {
+HXLINE( 708)					::haxe::Log_obj::trace(HX_("SYNC: failed",3e,4e,5e,fa),::hx::SourceInfo(HX_("snikket/Client.hx",e1,49,02,18),708,HX_("snikket.Client",3c,fe,06,7c),HX_("onConnected",aa,c5,39,c5)));
+HXLINE( 709)					_gthis->inSync = false;
+HXLINE( 710)					_gthis->stream->disconnect();
+HXLINE( 712)					return;
             				}
-HXLINE( 711)				::haxe::Log_obj::trace(HX_("SYNC: details",21,c5,8e,ac),::hx::SourceInfo(HX_("snikket/Client.hx",e1,49,02,18),711,HX_("snikket.Client",3c,fe,06,7c),HX_("onConnected",aa,c5,39,c5)));
-HXLINE( 712)				_gthis->inSync = true;
-HXLINE( 713)				::Dynamic _gthis1 = _gthis->persistence;
-HXDLIN( 713)				::String _hx_tmp = _gthis->accountId();
-HXDLIN( 713)				::snikket::Persistence_obj::getChatsUnreadDetails(_gthis1,_hx_tmp,_gthis->chats, ::Dynamic(new _hx_Closure_1(_gthis)));
+HXLINE( 715)				::haxe::Log_obj::trace(HX_("SYNC: details",21,c5,8e,ac),::hx::SourceInfo(HX_("snikket/Client.hx",e1,49,02,18),715,HX_("snikket.Client",3c,fe,06,7c),HX_("onConnected",aa,c5,39,c5)));
+HXLINE( 716)				_gthis->inSync = true;
+HXLINE( 717)				::Dynamic _gthis1 = _gthis->persistence;
+HXDLIN( 717)				::String _hx_tmp = _gthis->accountId();
+HXDLIN( 717)				::snikket::Persistence_obj::getChatsUnreadDetails(_gthis1,_hx_tmp,_gthis->chats, ::Dynamic(new _hx_Closure_1(_gthis)));
             			}
             			HX_END_LOCAL_FUNC1((void))
 
-            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_700_onConnected)
-HXLINE( 701)			::haxe::Log_obj::trace(HX_("SYNC: MAM",58,33,e1,36),::hx::SourceInfo(HX_("snikket/Client.hx",e1,49,02,18),701,HX_("snikket.Client",3c,fe,06,7c),HX_("onConnected",aa,c5,39,c5)));
-HXLINE( 702)			_gthis->sync( ::Dynamic(new _hx_Closure_2(_gthis)));
+            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_704_onConnected)
+HXLINE( 705)			::haxe::Log_obj::trace(HX_("SYNC: MAM",58,33,e1,36),::hx::SourceInfo(HX_("snikket/Client.hx",e1,49,02,18),705,HX_("snikket.Client",3c,fe,06,7c),HX_("onConnected",aa,c5,39,c5)));
+HXLINE( 706)			_gthis->sync( ::Dynamic(new _hx_Closure_2(_gthis)));
             		}
             		HX_END_LOCAL_FUNC0((void))
 
-            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_682_onConnected)
-HXDLIN( 682)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 683)		bool _hx_tmp;
-HXDLIN( 683)		if (::hx::IsNotNull( data )) {
-HXLINE( 683)			_hx_tmp = ::hx::IsNotNull( data->__Field(HX_("jid",c5,ca,50,00),::hx::paccDynamic) );
+            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_686_onConnected)
+HXDLIN( 686)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 687)		bool _hx_tmp;
+HXDLIN( 687)		if (::hx::IsNotNull( data )) {
+HXLINE( 687)			_hx_tmp = ::hx::IsNotNull( data->__Field(HX_("jid",c5,ca,50,00),::hx::paccDynamic) );
             		}
             		else {
-HXLINE( 683)			_hx_tmp = false;
+HXLINE( 687)			_hx_tmp = false;
             		}
-HXDLIN( 683)		if (_hx_tmp) {
-HXLINE( 684)			this->jid = ::snikket::JID_obj::parse(( (::String)(data->__Field(HX_("jid",c5,ca,50,00),::hx::paccDynamic)) ));
-HXLINE( 685)			bool _hx_tmp1;
-HXDLIN( 685)			if (::hx::IsNull( this->stream->clientId )) {
-HXLINE( 685)				_hx_tmp1 = !(this->jid->isBare());
+HXDLIN( 687)		if (_hx_tmp) {
+HXLINE( 688)			this->jid = ::snikket::JID_obj::parse(( (::String)(data->__Field(HX_("jid",c5,ca,50,00),::hx::paccDynamic)) ));
+HXLINE( 689)			bool _hx_tmp1;
+HXDLIN( 689)			if (::hx::IsNull( this->stream->clientId )) {
+HXLINE( 689)				_hx_tmp1 = !(this->jid->isBare());
             			}
             			else {
-HXLINE( 685)				_hx_tmp1 = false;
-            			}
-HXDLIN( 685)			if (_hx_tmp1) {
-HXLINE( 685)				::Dynamic _hx_tmp2 = this->persistence;
-HXDLIN( 685)				::String _hx_tmp3 = this->jid->asBare()->asString();
-HXDLIN( 685)				::String _hx_tmp4 = this->jid->resource;
-HXDLIN( 685)				::snikket::Persistence_obj::storeLogin(_hx_tmp2,_hx_tmp3,_hx_tmp4,this->displayName(),null());
-            			}
-            		}
-HXLINE( 688)		if (( (bool)(data->__Field(HX_("resumed",17,0e,58,6b),::hx::paccDynamic)) )) {
-HXLINE( 689)			this->inSync = true;
-HXLINE( 690)			this->trigger(HX_("status/online",10,05,0e,d2), ::Dynamic(::hx::Anon_obj::Create(0)));
-HXLINE( 691)			return ::snikket::EventResult_obj::EventHandled_dyn();
-            		}
-HXLINE( 695)		this->discoverServices( ::snikket::JID_obj::__alloc( HX_CTX ,null(),this->jid->domain,null()),null(), ::Dynamic(new _hx_Closure_0(_gthis)));
-HXLINE( 698)		this->rosterGet();
-HXLINE( 699)		::haxe::Log_obj::trace(HX_("SYNC: bookmarks",1c,91,b3,0d),::hx::SourceInfo(HX_("snikket/Client.hx",e1,49,02,18),699,HX_("snikket.Client",3c,fe,06,7c),HX_("onConnected",aa,c5,39,c5)));
-HXLINE( 700)		this->bookmarksGet( ::Dynamic(new _hx_Closure_3(_gthis)));
-HXLINE( 742)		this->trigger(HX_("session-started",0a,96,19,bc), ::Dynamic(::hx::Anon_obj::Create(0)));
-HXLINE( 744)		return ::snikket::EventResult_obj::EventHandled_dyn();
+HXLINE( 689)				_hx_tmp1 = false;
+            			}
+HXDLIN( 689)			if (_hx_tmp1) {
+HXLINE( 689)				::Dynamic _hx_tmp2 = this->persistence;
+HXDLIN( 689)				::String _hx_tmp3 = this->jid->asBare()->asString();
+HXDLIN( 689)				::String _hx_tmp4 = this->jid->resource;
+HXDLIN( 689)				::snikket::Persistence_obj::storeLogin(_hx_tmp2,_hx_tmp3,_hx_tmp4,this->displayName(),null());
+            			}
+            		}
+HXLINE( 692)		if (( (bool)(data->__Field(HX_("resumed",17,0e,58,6b),::hx::paccDynamic)) )) {
+HXLINE( 693)			this->inSync = true;
+HXLINE( 694)			this->trigger(HX_("status/online",10,05,0e,d2), ::Dynamic(::hx::Anon_obj::Create(0)));
+HXLINE( 695)			return ::snikket::EventResult_obj::EventHandled_dyn();
+            		}
+HXLINE( 699)		this->discoverServices( ::snikket::JID_obj::__alloc( HX_CTX ,null(),this->jid->domain,null(),null()),null(), ::Dynamic(new _hx_Closure_0(_gthis)));
+HXLINE( 702)		this->rosterGet();
+HXLINE( 703)		::haxe::Log_obj::trace(HX_("SYNC: bookmarks",1c,91,b3,0d),::hx::SourceInfo(HX_("snikket/Client.hx",e1,49,02,18),703,HX_("snikket.Client",3c,fe,06,7c),HX_("onConnected",aa,c5,39,c5)));
+HXLINE( 704)		this->bookmarksGet( ::Dynamic(new _hx_Closure_3(_gthis)));
+HXLINE( 746)		this->trigger(HX_("session-started",0a,96,19,bc), ::Dynamic(::hx::Anon_obj::Create(0)));
+HXLINE( 748)		return ::snikket::EventResult_obj::EventHandled_dyn();
             	}
 
 
@@ -2202,66 +2212,66 @@ HX_DEFINE_DYNAMIC_FUNC1(Client_obj,onConnected,return )
 void Client_obj::prepareAttachment( ::snikket::AttachmentSource source, ::Dynamic callback){
             		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_2, ::snikket::Client,_gthis, ::snikket::AttachmentSource,source, ::Dynamic,callback) HXARGC(1)
             		void _hx_run(::Array< ::Dynamic> services){
-            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_751_prepareAttachment)
-HXLINE( 752)			 ::sha::SHA256 sha256 =  ::sha::SHA256_obj::__alloc( HX_CTX );
-HXLINE( 753)			{
+            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_755_prepareAttachment)
+HXLINE( 756)			 ::sha::SHA256 sha256 =  ::sha::SHA256_obj::__alloc( HX_CTX );
+HXLINE( 757)			{
             				HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::sha::SHA256,sha256) HXARGC(1)
             				 ::tink::streams::Handled _hx_run(::Dynamic chunk){
-            					HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_753_prepareAttachment)
-HXLINE( 754)					 ::sha::SHA256 sha2561 = sha256;
-HXDLIN( 754)					sha2561->update(::tink::chunk::ChunkObject_obj::toBytes(chunk));
-HXLINE( 755)					return ::tink::streams::Handled_obj::Resume_dyn();
+            					HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_757_prepareAttachment)
+HXLINE( 758)					 ::sha::SHA256 sha2561 = sha256;
+HXDLIN( 758)					sha2561->update(::tink::chunk::ChunkObject_obj::toBytes(chunk));
+HXLINE( 759)					return ::tink::streams::Handled_obj::Resume_dyn();
             				}
             				HX_END_LOCAL_FUNC1(return)
 
             				HX_BEGIN_LOCAL_FUNC_S5(::hx::LocalFunc,_hx_Closure_1, ::snikket::AttachmentSource,source, ::snikket::Client,_gthis,::Array< ::Dynamic>,services, ::sha::SHA256,sha256, ::Dynamic,callback) HXARGC(1)
             				void _hx_run( ::tink::streams::Conclusion o){
-            					HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_756_prepareAttachment)
-HXLINE( 756)					if ((o->_hx_getIndex() == 3)) {
-HXLINE( 758)						 ::snikket::Client _gthis1 = _gthis;
-HXDLIN( 758)						 ::snikket::AttachmentSource source1 = source;
-HXDLIN( 758)						::Array< ::Dynamic> services1 = services;
-HXDLIN( 758)						::Array< unsigned char > _hx_tmp = sha256->digest()->b;
-HXDLIN( 758)						_gthis1->prepareAttachmentFor(source1,services1,::Array_obj< ::Dynamic>::__new(1)->init(0, ::snikket::Hash_obj::__alloc( HX_CTX ,HX_("sha-256",32,dd,04,3b),_hx_tmp)),callback);
+            					HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_760_prepareAttachment)
+HXLINE( 760)					if ((o->_hx_getIndex() == 3)) {
+HXLINE( 762)						 ::snikket::Client _gthis1 = _gthis;
+HXDLIN( 762)						 ::snikket::AttachmentSource source1 = source;
+HXDLIN( 762)						::Array< ::Dynamic> services1 = services;
+HXDLIN( 762)						::Array< unsigned char > _hx_tmp = sha256->digest()->b;
+HXDLIN( 762)						_gthis1->prepareAttachmentFor(source1,services1,::Array_obj< ::Dynamic>::__new(1)->init(0, ::snikket::Hash_obj::__alloc( HX_CTX ,HX_("sha-256",32,dd,04,3b),_hx_tmp)),callback);
             					}
             					else {
-HXLINE( 760)						::haxe::Log_obj::trace(HX_("Error computing attachment hash",07,33,1d,57), ::Dynamic(::hx::Anon_obj::Create(5)
+HXLINE( 764)						::haxe::Log_obj::trace(HX_("Error computing attachment hash",07,33,1d,57), ::Dynamic(::hx::Anon_obj::Create(5)
             							->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.Client",3c,fe,06,7c))
             							->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(1)->init(0,o))
             							->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("prepareAttachment",4a,6c,4b,52))
             							->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/Client.hx",e1,49,02,18))
-            							->setFixed(4,HX_("lineNumber",dd,81,22,76),760)));
-HXLINE( 761)						callback(null());
+            							->setFixed(4,HX_("lineNumber",dd,81,22,76),764)));
+HXLINE( 765)						callback(null());
             					}
             				}
             				HX_END_LOCAL_FUNC1((void))
 
-HXLINE( 753)				::String name = source->name;
-HXDLIN( 753)				 ::haxe::io::Input input = ::sys::io::File_obj::read(source->path,null());
-HXDLIN( 753)				 ::Dynamic options = null();
-HXDLIN( 753)				if (::hx::IsNull( options )) {
-HXLINE( 753)					options =  ::Dynamic(::hx::Anon_obj::Create(0));
+HXLINE( 757)				::String name = source->name;
+HXDLIN( 757)				 ::haxe::io::Input input = ::sys::io::File_obj::read(source->path,null());
+HXDLIN( 757)				 ::Dynamic options = null();
+HXDLIN( 757)				if (::hx::IsNull( options )) {
+HXLINE( 757)					options =  ::Dynamic(::hx::Anon_obj::Create(0));
             				}
-HXDLIN( 753)				::Dynamic this1 = ::tink::io::_Worker::Worker_Impl__obj::ensure( ::Dynamic(options->__Field(HX_("worker",7e,30,9e,c9),::hx::paccDynamic)));
-HXDLIN( 753)				 ::Dynamic _g = options->__Field(HX_("chunkSize",ce,cd,77,9f),::hx::paccDynamic);
-HXDLIN( 753)				int this2;
-HXDLIN( 753)				if (::hx::IsNull( _g )) {
-HXLINE( 753)					this2 = 65536;
+HXDLIN( 757)				::Dynamic this1 = ::tink::io::_Worker::Worker_Impl__obj::ensure( ::Dynamic(options->__Field(HX_("worker",7e,30,9e,c9),::hx::paccDynamic)));
+HXDLIN( 757)				 ::Dynamic _g = options->__Field(HX_("chunkSize",ce,cd,77,9f),::hx::paccDynamic);
+HXDLIN( 757)				int this2;
+HXDLIN( 757)				if (::hx::IsNull( _g )) {
+HXLINE( 757)					this2 = 65536;
             				}
             				else {
-HXLINE( 753)					 ::Dynamic v = _g;
-HXDLIN( 753)					this2 = ( (int)(v) );
+HXLINE( 757)					 ::Dynamic v = _g;
+HXDLIN( 757)					this2 = ( (int)(v) );
             				}
-HXDLIN( 753)				::Dynamic this3 = ::tink::io::_Source::Source_Impl__obj::chunked( ::tink::io::std::InputSource_obj::__alloc( HX_CTX ,name,input,this1,::haxe::io::Bytes_obj::alloc(this2),0));
-HXDLIN( 753)				::tink::streams::StreamObject_obj::forEach(this3,::tink::streams::_Stream::Handler_Impl__obj::ofSafeSync( ::Dynamic(new _hx_Closure_0(sha256))))->handle( ::Dynamic(new _hx_Closure_1(source,_gthis,services,sha256,callback)));
+HXDLIN( 757)				::Dynamic this3 = ::tink::io::_Source::Source_Impl__obj::chunked( ::tink::io::std::InputSource_obj::__alloc( HX_CTX ,name,input,this1,::haxe::io::Bytes_obj::alloc(this2),0));
+HXDLIN( 757)				::tink::streams::StreamObject_obj::forEach(this3,::tink::streams::_Stream::Handler_Impl__obj::ofSafeSync( ::Dynamic(new _hx_Closure_0(sha256))))->handle( ::Dynamic(new _hx_Closure_1(source,_gthis,services,sha256,callback)));
             			}
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_750_prepareAttachment)
-HXDLIN( 750)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 751)		::Dynamic _hx_tmp = this->persistence;
-HXDLIN( 751)		::snikket::Persistence_obj::findServicesWithFeature(_hx_tmp,this->accountId(),HX_("urn:xmpp:http:upload:0",0d,db,46,68), ::Dynamic(new _hx_Closure_2(_gthis,source,callback)));
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_754_prepareAttachment)
+HXDLIN( 754)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 755)		::Dynamic _hx_tmp = this->persistence;
+HXDLIN( 755)		::snikket::Persistence_obj::findServicesWithFeature(_hx_tmp,this->accountId(),HX_("urn:xmpp:http:upload:0",0d,db,46,68), ::Dynamic(new _hx_Closure_2(_gthis,source,callback)));
             	}
 
 
@@ -2298,75 +2308,75 @@ HXDLIN( 252)		this->prepareAttachment(source, ::Dynamic(new _hx_Closure_0(callba
 void Client_obj::prepareAttachmentFor( ::snikket::AttachmentSource source,::Array< ::Dynamic> services,::Array< ::Dynamic> hashes, ::Dynamic callback){
             		HX_BEGIN_LOCAL_FUNC_S6(::hx::LocalFunc,_hx_Closure_2, ::snikket::AttachmentSource,source, ::snikket::Client,_gthis,::Array< ::Dynamic>,hashes,::Array< ::Dynamic>,services, ::snikket::queries::HttpUploadSlot,httpUploadSlot, ::Dynamic,callback) HXARGC(0)
             		void _hx_run(){
-            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_773_prepareAttachmentFor)
-HXLINE( 774)			 ::Dynamic slot = httpUploadSlot->getResult();
-HXLINE( 775)			if (::hx::IsNull( slot )) {
-HXLINE( 776)				 ::snikket::Client _gthis1 = _gthis;
-HXDLIN( 776)				 ::snikket::AttachmentSource source1 = source;
-HXDLIN( 776)				::Array< ::Dynamic> _hx_tmp = services->slice(1,null());
-HXDLIN( 776)				_gthis1->prepareAttachmentFor(source1,_hx_tmp,hashes,callback);
+            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_777_prepareAttachmentFor)
+HXLINE( 778)			 ::Dynamic slot = httpUploadSlot->getResult();
+HXLINE( 779)			if (::hx::IsNull( slot )) {
+HXLINE( 780)				 ::snikket::Client _gthis1 = _gthis;
+HXDLIN( 780)				 ::snikket::AttachmentSource source1 = source;
+HXDLIN( 780)				::Array< ::Dynamic> _hx_tmp = services->slice(1,null());
+HXDLIN( 780)				_gthis1->prepareAttachmentFor(source1,_hx_tmp,hashes,callback);
             			}
             			else {
             				HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_0) HXARGC(1)
             				::Dynamic _hx_run( ::tink::core::TypedError e){
-            					HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_778_prepareAttachmentFor)
-HXLINE( 778)					::haxe::Log_obj::trace(HX_("WUT",76,4e,42,00), ::Dynamic(::hx::Anon_obj::Create(5)
+            					HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_782_prepareAttachmentFor)
+HXLINE( 782)					::haxe::Log_obj::trace(HX_("WUT",76,4e,42,00), ::Dynamic(::hx::Anon_obj::Create(5)
             						->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.Client",3c,fe,06,7c))
             						->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(1)->init(0,e))
             						->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("prepareAttachmentFor",df,5c,bf,82))
             						->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/Client.hx",e1,49,02,18))
-            						->setFixed(4,HX_("lineNumber",dd,81,22,76),778)));
-HXDLIN( 778)					HX_STACK_DO_THROW(e);
-HXDLIN( 778)					return null();
+            						->setFixed(4,HX_("lineNumber",dd,81,22,76),782)));
+HXDLIN( 782)					HX_STACK_DO_THROW(e);
+HXDLIN( 782)					return null();
             				}
             				HX_END_LOCAL_FUNC1(return)
 
             				HX_BEGIN_LOCAL_FUNC_S6(::hx::LocalFunc,_hx_Closure_1, ::snikket::Client,_gthis, ::Dynamic,slot, ::snikket::AttachmentSource,source,::Array< ::Dynamic>,hashes,::Array< ::Dynamic>,services, ::Dynamic,callback) HXARGC(1)
             				void _hx_run( ::tink::core::Outcome o){
-            					HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_779_prepareAttachmentFor)
-HXLINE( 779)					if ((o->_hx_getIndex() == 0)) {
-HXLINE( 780)						 ::tink::http::Message res = ( ( ::tink::http::Message)(o->_hx_getObject(0)) );
-HXDLIN( 780)						if ((( ( ::tink::http::ResponseHeaderBase)(res->header) )->statusCode == 201)) {
-HXLINE( 781)							 ::Dynamic callback1 = callback;
-HXDLIN( 781)							callback1( ::snikket::ChatAttachment_obj::__alloc( HX_CTX ,source->name,source->type,source->size,::Array_obj< ::String >::__new(1)->init(0, ::Dynamic(slot->__Field(HX_("get",96,80,4e,00),::hx::paccDynamic))),hashes));
+            					HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_783_prepareAttachmentFor)
+HXLINE( 783)					if ((o->_hx_getIndex() == 0)) {
+HXLINE( 784)						 ::tink::http::Message res = ( ( ::tink::http::Message)(o->_hx_getObject(0)) );
+HXDLIN( 784)						if ((( ( ::tink::http::ResponseHeaderBase)(res->header) )->statusCode == 201)) {
+HXLINE( 785)							 ::Dynamic callback1 = callback;
+HXDLIN( 785)							callback1( ::snikket::ChatAttachment_obj::__alloc( HX_CTX ,source->name,source->type,source->size,::Array_obj< ::String >::__new(1)->init(0, ::Dynamic(slot->__Field(HX_("get",96,80,4e,00),::hx::paccDynamic))),hashes));
             						}
             						else {
-HXLINE( 783)							 ::snikket::Client _gthis1 = _gthis;
-HXDLIN( 783)							 ::snikket::AttachmentSource source1 = source;
-HXDLIN( 783)							::Array< ::Dynamic> _hx_tmp = services->slice(1,null());
-HXDLIN( 783)							_gthis1->prepareAttachmentFor(source1,_hx_tmp,hashes,callback);
+HXLINE( 787)							 ::snikket::Client _gthis1 = _gthis;
+HXDLIN( 787)							 ::snikket::AttachmentSource source1 = source;
+HXDLIN( 787)							::Array< ::Dynamic> _hx_tmp = services->slice(1,null());
+HXDLIN( 787)							_gthis1->prepareAttachmentFor(source1,_hx_tmp,hashes,callback);
             						}
             					}
             					else {
-HXLINE( 783)						 ::snikket::Client _gthis2 = _gthis;
-HXDLIN( 783)						 ::snikket::AttachmentSource source2 = source;
-HXDLIN( 783)						::Array< ::Dynamic> _hx_tmp1 = services->slice(1,null());
-HXDLIN( 783)						_gthis2->prepareAttachmentFor(source2,_hx_tmp1,hashes,callback);
+HXLINE( 787)						 ::snikket::Client _gthis2 = _gthis;
+HXDLIN( 787)						 ::snikket::AttachmentSource source2 = source;
+HXDLIN( 787)						::Array< ::Dynamic> _hx_tmp1 = services->slice(1,null());
+HXDLIN( 787)						_gthis2->prepareAttachmentFor(source2,_hx_tmp1,hashes,callback);
             					}
             				}
             				HX_END_LOCAL_FUNC1((void))
 
-HXLINE( 778)				 ::Dynamic url = ::tink::_Url::Url_Impl__obj::fromString(( (::String)(slot->__Field(HX_("put",cf,62,55,00),::hx::paccDynamic)) ));
-HXDLIN( 778)				::Array< ::Dynamic> slot1 = ( (::Array< ::Dynamic>)(slot->__Field(HX_("putHeaders",37,9f,1e,a4),::hx::paccDynamic)) );
-HXDLIN( 778)				::String this1 = HX_("Content-Length",fa,f8,b6,65).toLowerCase();
-HXDLIN( 778)				::Array< ::Dynamic> options = slot1->concat(::Array_obj< ::Dynamic>::__new(1)->init(0, ::tink::http::HeaderField_obj::__alloc( HX_CTX ,this1,::tink::http::_Header::HeaderValue_Impl__obj::ofInt(source->size))));
-HXDLIN( 778)				::String name = source->name;
-HXDLIN( 778)				 ::haxe::io::Input input = ::sys::io::File_obj::read(source->path,null());
-HXDLIN( 778)				 ::Dynamic options1 = null();
-HXDLIN( 778)				if (::hx::IsNull( options1 )) {
-HXLINE( 778)					options1 =  ::Dynamic(::hx::Anon_obj::Create(0));
-            				}
-HXDLIN( 778)				::Dynamic options2 = ::tink::io::_Worker::Worker_Impl__obj::ensure( ::Dynamic(options1->__Field(HX_("worker",7e,30,9e,c9),::hx::paccDynamic)));
-HXDLIN( 778)				 ::Dynamic _g = options1->__Field(HX_("chunkSize",ce,cd,77,9f),::hx::paccDynamic);
-HXDLIN( 778)				int options3;
-HXDLIN( 778)				if (::hx::IsNull( _g )) {
-HXLINE( 778)					options3 = 65536;
+HXLINE( 782)				 ::Dynamic url = ::tink::_Url::Url_Impl__obj::fromString(( (::String)(slot->__Field(HX_("put",cf,62,55,00),::hx::paccDynamic)) ));
+HXDLIN( 782)				::Array< ::Dynamic> slot1 = ( (::Array< ::Dynamic>)(slot->__Field(HX_("putHeaders",37,9f,1e,a4),::hx::paccDynamic)) );
+HXDLIN( 782)				::String this1 = HX_("Content-Length",fa,f8,b6,65).toLowerCase();
+HXDLIN( 782)				::Array< ::Dynamic> options = slot1->concat(::Array_obj< ::Dynamic>::__new(1)->init(0, ::tink::http::HeaderField_obj::__alloc( HX_CTX ,this1,::tink::http::_Header::HeaderValue_Impl__obj::ofInt(source->size))));
+HXDLIN( 782)				::String name = source->name;
+HXDLIN( 782)				 ::haxe::io::Input input = ::sys::io::File_obj::read(source->path,null());
+HXDLIN( 782)				 ::Dynamic options1 = null();
+HXDLIN( 782)				if (::hx::IsNull( options1 )) {
+HXLINE( 782)					options1 =  ::Dynamic(::hx::Anon_obj::Create(0));
+            				}
+HXDLIN( 782)				::Dynamic options2 = ::tink::io::_Worker::Worker_Impl__obj::ensure( ::Dynamic(options1->__Field(HX_("worker",7e,30,9e,c9),::hx::paccDynamic)));
+HXDLIN( 782)				 ::Dynamic _g = options1->__Field(HX_("chunkSize",ce,cd,77,9f),::hx::paccDynamic);
+HXDLIN( 782)				int options3;
+HXDLIN( 782)				if (::hx::IsNull( _g )) {
+HXLINE( 782)					options3 = 65536;
             				}
             				else {
-HXLINE( 778)					 ::Dynamic v = _g;
-HXDLIN( 778)					options3 = ( (int)(v) );
+HXLINE( 782)					 ::Dynamic v = _g;
+HXDLIN( 782)					options3 = ( (int)(v) );
             				}
-HXDLIN( 778)				::tink::http::_Fetch::FetchResponse_Impl__obj::all(::tink::http::Fetch_obj::fetch(url, ::Dynamic(::hx::Anon_obj::Create(3)
+HXDLIN( 782)				::tink::http::_Fetch::FetchResponse_Impl__obj::all(::tink::http::Fetch_obj::fetch(url, ::Dynamic(::hx::Anon_obj::Create(3)
             					->setFixed(0,HX_("method",e1,f6,5a,09),HX_("PUT",af,fe,3c,00))
             					->setFixed(1,HX_("body",a2,7a,1b,41),::tink::io::RealSourceTools_obj::idealize( ::tink::io::std::InputSource_obj::__alloc( HX_CTX ,name,input,options2,::haxe::io::Bytes_obj::alloc(options3),0), ::Dynamic(new _hx_Closure_0())))
             					->setFixed(2,HX_("headers",46,52,08,63),options))))->handle( ::Dynamic(new _hx_Closure_1(_gthis,slot,source,hashes,services,callback)));
@@ -2374,36 +2384,36 @@ HXDLIN( 778)				::tink::http::_Fetch::FetchResponse_Impl__obj::all(::tink::http:
             		}
             		HX_END_LOCAL_FUNC0((void))
 
-            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_766_prepareAttachmentFor)
-HXDLIN( 766)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 767)		if ((services->length < 1)) {
-HXLINE( 768)			::haxe::Log_obj::trace(HX_("No HTTP upload service found",d1,5a,61,46),::hx::SourceInfo(HX_("snikket/Client.hx",e1,49,02,18),768,HX_("snikket.Client",3c,fe,06,7c),HX_("prepareAttachmentFor",df,5c,bf,82)));
-HXLINE( 769)			callback(null());
-HXLINE( 770)			return;
+            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_770_prepareAttachmentFor)
+HXDLIN( 770)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 771)		if ((services->length < 1)) {
+HXLINE( 772)			::haxe::Log_obj::trace(HX_("No HTTP upload service found",d1,5a,61,46),::hx::SourceInfo(HX_("snikket/Client.hx",e1,49,02,18),772,HX_("snikket.Client",3c,fe,06,7c),HX_("prepareAttachmentFor",df,5c,bf,82)));
+HXLINE( 773)			callback(null());
+HXLINE( 774)			return;
             		}
-HXLINE( 772)		 ::snikket::queries::HttpUploadSlot httpUploadSlot =  ::snikket::queries::HttpUploadSlot_obj::__alloc( HX_CTX ,( (::String)(services->__get(0)->__Field(HX_("serviceId",70,93,d4,bc),::hx::paccDynamic)) ),source->name,source->size,source->type,hashes);
-HXLINE( 773)		httpUploadSlot->onFinished( ::Dynamic(new _hx_Closure_2(source,_gthis,hashes,services,httpUploadSlot,callback)));
-HXLINE( 787)		this->sendQuery(httpUploadSlot);
+HXLINE( 776)		 ::snikket::queries::HttpUploadSlot httpUploadSlot =  ::snikket::queries::HttpUploadSlot_obj::__alloc( HX_CTX ,( (::String)(services->__get(0)->__Field(HX_("serviceId",70,93,d4,bc),::hx::paccDynamic)) ),source->name,source->size,source->type,hashes);
+HXLINE( 777)		httpUploadSlot->onFinished( ::Dynamic(new _hx_Closure_2(source,_gthis,hashes,services,httpUploadSlot,callback)));
+HXLINE( 791)		this->sendQuery(httpUploadSlot);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC4(Client_obj,prepareAttachmentFor,(void))
 
 ::Array< ::Dynamic> Client_obj::getChats(){
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_794_getChats)
-HXDLIN( 794)		::Array< ::Dynamic> _g = ::Array_obj< ::Dynamic>::__new(0);
-HXDLIN( 794)		{
-HXDLIN( 794)			int _g1 = 0;
-HXDLIN( 794)			::Array< ::Dynamic> _g2 = this->chats;
-HXDLIN( 794)			while((_g1 < _g2->length)){
-HXDLIN( 794)				 ::snikket::Chat v = _g2->__get(_g1).StaticCast<  ::snikket::Chat >();
-HXDLIN( 794)				_g1 = (_g1 + 1);
-HXDLIN( 794)				if ((v->uiState != 2)) {
-HXDLIN( 794)					_g->push(v);
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_798_getChats)
+HXDLIN( 798)		::Array< ::Dynamic> _g = ::Array_obj< ::Dynamic>::__new(0);
+HXDLIN( 798)		{
+HXDLIN( 798)			int _g1 = 0;
+HXDLIN( 798)			::Array< ::Dynamic> _g2 = this->chats;
+HXDLIN( 798)			while((_g1 < _g2->length)){
+HXDLIN( 798)				 ::snikket::Chat v = _g2->__get(_g1).StaticCast<  ::snikket::Chat >();
+HXDLIN( 798)				_g1 = (_g1 + 1);
+HXDLIN( 798)				if ((v->uiState != 2)) {
+HXDLIN( 798)					_g->push(v);
             				}
             			}
             		}
-HXDLIN( 794)		return _g;
+HXDLIN( 798)		return _g;
             	}
 
 
@@ -2461,239 +2471,239 @@ void Client_obj::findAvailableChats(::String q, ::Dynamic callback){
             		void _hx_run( ::Dynamic jid, ::Dynamic __o_prepend){
             			HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0,::Array< ::Dynamic>,results,bool,prepend) HXARGC(1)
             			void _hx_run( ::snikket::AvailableChat item){
-            				HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_807_findAvailableChats)
-HXLINE( 807)				if (prepend) {
-HXLINE( 807)					results->unshift(item);
+            				HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_811_findAvailableChats)
+HXLINE( 811)				if (prepend) {
+HXLINE( 811)					results->unshift(item);
             				}
             				else {
-HXLINE( 807)					results->push(item);
+HXLINE( 811)					results->push(item);
             				}
             			}
             			HX_END_LOCAL_FUNC1((void))
 
             			HX_BEGIN_LOCAL_FUNC_S8(::hx::LocalFunc,_hx_Closure_1,::String,q, ::snikket::Client,_gthis,::Array< ::Dynamic>,results, ::Dynamic,add,::String,query, ::snikket::queries::DiscoInfoGet,discoGet, ::Dynamic,callback, ::Dynamic,jid) HXARGC(0)
             			void _hx_run(){
-            				HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_809_findAvailableChats)
-HXLINE( 810)				 ::snikket::Caps resultCaps = discoGet->getResult();
-HXLINE( 811)				if (::hx::IsNull( resultCaps )) {
-HXLINE( 812)					 ::snikket::Stanza tmp = discoGet->responseStanza;
-HXDLIN( 812)					 ::snikket::Stanza tmp1;
-HXDLIN( 812)					if (::hx::IsNotNull( tmp )) {
-HXLINE( 812)						tmp1 = tmp->getChild(HX_("error",c8,cb,29,73),null());
+            				HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_813_findAvailableChats)
+HXLINE( 814)				 ::snikket::Caps resultCaps = discoGet->getResult();
+HXLINE( 815)				if (::hx::IsNull( resultCaps )) {
+HXLINE( 816)					 ::snikket::Stanza tmp = discoGet->responseStanza;
+HXDLIN( 816)					 ::snikket::Stanza tmp1;
+HXDLIN( 816)					if (::hx::IsNotNull( tmp )) {
+HXLINE( 816)						tmp1 = tmp->getChild(HX_("error",c8,cb,29,73),null());
             					}
             					else {
-HXLINE( 812)						tmp1 = null();
+HXLINE( 816)						tmp1 = null();
             					}
-HXDLIN( 812)					 ::snikket::Stanza err;
-HXDLIN( 812)					if (::hx::IsNotNull( tmp1 )) {
-HXLINE( 812)						err = tmp1->getChild(null(),HX_("urn:ietf:params:xml:ns:xmpp-stanzas",27,f2,3d,30));
+HXDLIN( 816)					 ::snikket::Stanza err;
+HXDLIN( 816)					if (::hx::IsNotNull( tmp1 )) {
+HXLINE( 816)						err = tmp1->getChild(null(),HX_("urn:ietf:params:xml:ns:xmpp-stanzas",27,f2,3d,30));
             					}
             					else {
-HXLINE( 812)						err = null();
+HXLINE( 816)						err = null();
             					}
-HXLINE( 813)					bool checkAndAdd;
-HXDLIN( 813)					bool checkAndAdd1;
-HXDLIN( 813)					if (::hx::IsNotNull( err )) {
-HXLINE( 813)						::String checkAndAdd2;
-HXDLIN( 813)						if (::hx::IsNotNull( err )) {
-HXLINE( 813)							checkAndAdd2 = err->name;
+HXLINE( 817)					bool checkAndAdd;
+HXDLIN( 817)					bool checkAndAdd1;
+HXDLIN( 817)					if (::hx::IsNotNull( err )) {
+HXLINE( 817)						::String checkAndAdd2;
+HXDLIN( 817)						if (::hx::IsNotNull( err )) {
+HXLINE( 817)							checkAndAdd2 = err->name;
             						}
             						else {
-HXLINE( 813)							checkAndAdd2 = null();
+HXLINE( 817)							checkAndAdd2 = null();
             						}
-HXDLIN( 813)						checkAndAdd1 = (checkAndAdd2 == HX_("service-unavailable",f8,3c,11,1c));
+HXDLIN( 817)						checkAndAdd1 = (checkAndAdd2 == HX_("service-unavailable",f8,3c,11,1c));
             					}
             					else {
-HXLINE( 813)						checkAndAdd1 = true;
+HXLINE( 817)						checkAndAdd1 = true;
             					}
-HXDLIN( 813)					if (!(checkAndAdd1)) {
-HXLINE( 813)						::String checkAndAdd3;
-HXDLIN( 813)						if (::hx::IsNotNull( err )) {
-HXLINE( 813)							checkAndAdd3 = err->name;
+HXDLIN( 817)					if (!(checkAndAdd1)) {
+HXLINE( 817)						::String checkAndAdd3;
+HXDLIN( 817)						if (::hx::IsNotNull( err )) {
+HXLINE( 817)							checkAndAdd3 = err->name;
             						}
             						else {
-HXLINE( 813)							checkAndAdd3 = null();
+HXLINE( 817)							checkAndAdd3 = null();
             						}
-HXDLIN( 813)						checkAndAdd = (checkAndAdd3 == HX_("feature-not-implemented",71,20,2e,96));
+HXDLIN( 817)						checkAndAdd = (checkAndAdd3 == HX_("feature-not-implemented",71,20,2e,96));
             					}
             					else {
-HXLINE( 813)						checkAndAdd = true;
+HXLINE( 817)						checkAndAdd = true;
             					}
-HXDLIN( 813)					if (checkAndAdd) {
-HXLINE( 814)						 ::Dynamic add1 = add;
-HXDLIN( 814)						::String checkAndAdd4 = ( (::String)(jid->__Field(HX_("asString",63,33,06,a0),::hx::paccDynamic)()) );
-HXDLIN( 814)						::String query1 = query;
-HXDLIN( 814)						::String checkAndAdd5 = ( (::String)(jid->__Field(HX_("asString",63,33,06,a0),::hx::paccDynamic)()) );
-HXDLIN( 814)						add1( ::snikket::AvailableChat_obj::__alloc( HX_CTX ,checkAndAdd4,query1,checkAndAdd5, ::snikket::Caps_obj::__alloc( HX_CTX ,HX_("",00,00,00,00),::Array_obj< ::Dynamic>::__new(0),::Array_obj< ::String >::__new(0))));
+HXDLIN( 817)					if (checkAndAdd) {
+HXLINE( 818)						 ::Dynamic add1 = add;
+HXDLIN( 818)						::String checkAndAdd4 = ( (::String)(jid->__Field(HX_("asString",63,33,06,a0),::hx::paccDynamic)()) );
+HXDLIN( 818)						::String query1 = query;
+HXDLIN( 818)						::String checkAndAdd5 = ( (::String)(jid->__Field(HX_("asString",63,33,06,a0),::hx::paccDynamic)()) );
+HXDLIN( 818)						add1( ::snikket::AvailableChat_obj::__alloc( HX_CTX ,checkAndAdd4,query1,checkAndAdd5, ::snikket::Caps_obj::__alloc( HX_CTX ,HX_("",00,00,00,00),::Array_obj< ::Dynamic>::__new(0),::Array_obj< ::String >::__new(0),null())));
             					}
             				}
             				else {
-HXLINE( 817)					::snikket::Persistence_obj::storeCaps(_gthis->persistence,resultCaps);
-HXLINE( 818)					 ::snikket::Identity identity = resultCaps->identities->__get(0).StaticCast<  ::snikket::Identity >();
-HXLINE( 819)					::String displayName;
-HXDLIN( 819)					::String tmp2;
-HXDLIN( 819)					if (::hx::IsNotNull( identity )) {
-HXLINE( 819)						tmp2 = identity->name;
+HXLINE( 821)					::snikket::Persistence_obj::storeCaps(_gthis->persistence,resultCaps);
+HXLINE( 822)					 ::snikket::Identity identity = resultCaps->identities->__get(0).StaticCast<  ::snikket::Identity >();
+HXLINE( 823)					::String displayName;
+HXDLIN( 823)					::String tmp2;
+HXDLIN( 823)					if (::hx::IsNotNull( identity )) {
+HXLINE( 823)						tmp2 = identity->name;
             					}
             					else {
-HXLINE( 819)						tmp2 = null();
+HXLINE( 823)						tmp2 = null();
             					}
-HXDLIN( 819)					if (::hx::IsNotNull( tmp2 )) {
-HXLINE( 819)						displayName = tmp2;
+HXDLIN( 823)					if (::hx::IsNotNull( tmp2 )) {
+HXLINE( 823)						displayName = tmp2;
             					}
             					else {
-HXLINE( 819)						displayName = query;
+HXLINE( 823)						displayName = query;
             					}
-HXLINE( 820)					::String note = ( (::String)(jid->__Field(HX_("asString",63,33,06,a0),::hx::paccDynamic)()) );
-HXDLIN( 820)					::String note1;
-HXDLIN( 820)					if (::hx::IsNull( identity )) {
-HXLINE( 820)						note1 = HX_("",00,00,00,00);
+HXLINE( 824)					::String note = ( (::String)(jid->__Field(HX_("asString",63,33,06,a0),::hx::paccDynamic)()) );
+HXDLIN( 824)					::String note1;
+HXDLIN( 824)					if (::hx::IsNull( identity )) {
+HXLINE( 824)						note1 = HX_("",00,00,00,00);
             					}
             					else {
-HXLINE( 820)						note1 = ((HX_(" (",08,1c,00,00) + identity->type) + HX_(")",29,00,00,00));
+HXLINE( 824)						note1 = ((HX_(" (",08,1c,00,00) + identity->type) + HX_(")",29,00,00,00));
             					}
-HXDLIN( 820)					::String note2 = (note + note1);
-HXLINE( 821)					 ::Dynamic add2 = add;
-HXDLIN( 821)					add2( ::snikket::AvailableChat_obj::__alloc( HX_CTX ,( (::String)(jid->__Field(HX_("asString",63,33,06,a0),::hx::paccDynamic)()) ),displayName,note2,resultCaps));
+HXDLIN( 824)					::String note2 = (note + note1);
+HXLINE( 825)					 ::Dynamic add2 = add;
+HXDLIN( 825)					add2( ::snikket::AvailableChat_obj::__alloc( HX_CTX ,( (::String)(jid->__Field(HX_("asString",63,33,06,a0),::hx::paccDynamic)()) ),displayName,note2,resultCaps));
             				}
-HXLINE( 823)				callback(q,results);
+HXLINE( 827)				callback(q,results);
             			}
             			HX_END_LOCAL_FUNC0((void))
 
             		bool prepend = __o_prepend.Default(false);
-            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_806_findAvailableChats)
-HXLINE( 807)			 ::Dynamic add =  ::Dynamic(new _hx_Closure_0(results,prepend));
-HXLINE( 808)			 ::snikket::queries::DiscoInfoGet discoGet =  ::snikket::queries::DiscoInfoGet_obj::__alloc( HX_CTX ,( (::String)(jid->__Field(HX_("asString",63,33,06,a0),::hx::paccDynamic)()) ),null());
-HXLINE( 809)			discoGet->onFinished( ::Dynamic(new _hx_Closure_1(q,_gthis,results,add,query,discoGet,callback,jid)));
-HXLINE( 825)			_gthis->sendQuery(discoGet);
+            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_810_findAvailableChats)
+HXLINE( 811)			 ::Dynamic add =  ::Dynamic(new _hx_Closure_0(results,prepend));
+HXLINE( 812)			 ::snikket::queries::DiscoInfoGet discoGet =  ::snikket::queries::DiscoInfoGet_obj::__alloc( HX_CTX ,( (::String)(jid->__Field(HX_("asString",63,33,06,a0),::hx::paccDynamic)()) ),null());
+HXLINE( 813)			discoGet->onFinished( ::Dynamic(new _hx_Closure_1(q,_gthis,results,add,query,discoGet,callback,jid)));
+HXLINE( 829)			_gthis->sendQuery(discoGet);
             		}
             		HX_END_LOCAL_FUNC2((void))
 
-            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_803_findAvailableChats)
-HXDLIN( 803)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 804)		::Array< ::Dynamic> results = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE( 805)		::String query = ::StringTools_obj::trim(q);
-HXLINE( 806)		 ::Dynamic checkAndAdd =  ::Dynamic(new _hx_Closure_2(_gthis,q,results,query,callback));
-HXLINE( 827)		 ::snikket::JID jid;
-HXDLIN( 827)		if (::StringTools_obj::startsWith(query,HX_("xmpp:",65,3c,77,60))) {
-HXLINE( 827)			jid = ::snikket::JID_obj::parse(query.substr(5,null()));
+            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_807_findAvailableChats)
+HXDLIN( 807)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 808)		::Array< ::Dynamic> results = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE( 809)		::String query = ::StringTools_obj::trim(q);
+HXLINE( 810)		 ::Dynamic checkAndAdd =  ::Dynamic(new _hx_Closure_2(_gthis,q,results,query,callback));
+HXLINE( 831)		 ::snikket::JID jid;
+HXDLIN( 831)		if (::StringTools_obj::startsWith(query,HX_("xmpp:",65,3c,77,60))) {
+HXLINE( 831)			jid = ::snikket::JID_obj::parse(query.substr(5,null()));
             		}
             		else {
-HXLINE( 827)			jid = ::snikket::JID_obj::parse(query);
-            		}
-HXLINE( 832)		if (jid->isValid()) {
-HXLINE( 833)			checkAndAdd(jid,true);
-            		}
-HXLINE( 835)		{
-HXLINE( 835)			int _g = 0;
-HXDLIN( 835)			::Array< ::Dynamic> _g1 = this->chats;
-HXDLIN( 835)			while((_g < _g1->length)){
-HXLINE( 835)				 ::snikket::Chat chat = _g1->__get(_g).StaticCast<  ::snikket::Chat >();
-HXDLIN( 835)				_g = (_g + 1);
-HXLINE( 836)				::String chat1 = chat->chatId;
-HXDLIN( 836)				if ((chat1 != jid->asBare()->asString())) {
-HXLINE( 837)					bool _hx_tmp;
-HXDLIN( 837)					::String s = chat->chatId;
-HXDLIN( 837)					if ((s.indexOf(query.toLowerCase(),null()) == -1)) {
-HXLINE( 837)						::String s1 = chat->getDisplayName().toLowerCase();
-HXDLIN( 837)						_hx_tmp = (s1.indexOf(query.toLowerCase(),null()) != -1);
+HXLINE( 831)			jid = ::snikket::JID_obj::parse(query);
+            		}
+HXLINE( 836)		if (jid->isValid()) {
+HXLINE( 837)			checkAndAdd(jid,true);
+            		}
+HXLINE( 839)		{
+HXLINE( 839)			int _g = 0;
+HXDLIN( 839)			::Array< ::Dynamic> _g1 = this->chats;
+HXDLIN( 839)			while((_g < _g1->length)){
+HXLINE( 839)				 ::snikket::Chat chat = _g1->__get(_g).StaticCast<  ::snikket::Chat >();
+HXDLIN( 839)				_g = (_g + 1);
+HXLINE( 840)				::String chat1 = chat->chatId;
+HXDLIN( 840)				if ((chat1 != jid->asBare()->asString())) {
+HXLINE( 841)					bool _hx_tmp;
+HXDLIN( 841)					::String s = chat->chatId;
+HXDLIN( 841)					if ((s.indexOf(query.toLowerCase(),null()) == -1)) {
+HXLINE( 841)						::String s1 = chat->getDisplayName().toLowerCase();
+HXDLIN( 841)						_hx_tmp = (s1.indexOf(query.toLowerCase(),null()) != -1);
             					}
             					else {
-HXLINE( 837)						_hx_tmp = true;
+HXLINE( 841)						_hx_tmp = true;
             					}
-HXDLIN( 837)					if (_hx_tmp) {
-HXLINE( 838)						 ::snikket::Channel channel = ( ( ::snikket::Channel)(::snikket::_Util::Util_Fields__obj::downcast(chat,::hx::ClassOf< ::snikket::Channel >())) );
-HXLINE( 839)						::Array< ::Dynamic> results1 = results;
-HXDLIN( 839)						::String chat2 = chat->chatId;
-HXDLIN( 839)						::String _hx_tmp1 = chat->getDisplayName();
-HXDLIN( 839)						::String chat3 = chat->chatId;
-HXDLIN( 839)						 ::snikket::Caps _hx_tmp2;
-HXDLIN( 839)						bool _hx_tmp3;
-HXDLIN( 839)						if (::hx::IsNotNull( channel )) {
-HXLINE( 839)							_hx_tmp3 = ::hx::IsNull( channel->disco );
+HXDLIN( 841)					if (_hx_tmp) {
+HXLINE( 842)						 ::snikket::Channel channel = ( ( ::snikket::Channel)(::snikket::_Util::Util_Fields__obj::downcast(chat,::hx::ClassOf< ::snikket::Channel >())) );
+HXLINE( 843)						::Array< ::Dynamic> results1 = results;
+HXDLIN( 843)						::String chat2 = chat->chatId;
+HXDLIN( 843)						::String _hx_tmp1 = chat->getDisplayName();
+HXDLIN( 843)						::String chat3 = chat->chatId;
+HXDLIN( 843)						 ::snikket::Caps _hx_tmp2;
+HXDLIN( 843)						bool _hx_tmp3;
+HXDLIN( 843)						if (::hx::IsNotNull( channel )) {
+HXLINE( 843)							_hx_tmp3 = ::hx::IsNull( channel->disco );
             						}
             						else {
-HXLINE( 839)							_hx_tmp3 = true;
+HXLINE( 843)							_hx_tmp3 = true;
             						}
-HXDLIN( 839)						if (_hx_tmp3) {
-HXLINE( 839)							_hx_tmp2 =  ::snikket::Caps_obj::__alloc( HX_CTX ,HX_("",00,00,00,00),::Array_obj< ::Dynamic>::__new(0),::Array_obj< ::String >::__new(0));
+HXDLIN( 843)						if (_hx_tmp3) {
+HXLINE( 843)							_hx_tmp2 =  ::snikket::Caps_obj::__alloc( HX_CTX ,HX_("",00,00,00,00),::Array_obj< ::Dynamic>::__new(0),::Array_obj< ::String >::__new(0),null());
             						}
             						else {
-HXLINE( 839)							_hx_tmp2 = channel->disco;
+HXLINE( 843)							_hx_tmp2 = channel->disco;
             						}
-HXDLIN( 839)						results1->push( ::snikket::AvailableChat_obj::__alloc( HX_CTX ,chat2,_hx_tmp1,chat3,_hx_tmp2));
+HXDLIN( 843)						results1->push( ::snikket::AvailableChat_obj::__alloc( HX_CTX ,chat2,_hx_tmp1,chat3,_hx_tmp2));
             					}
             				}
-HXLINE( 842)				if (chat->isTrusted()) {
-HXLINE( 843)					 ::haxe::ds::StringMap resources =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
-HXLINE( 844)					{
-HXLINE( 844)						int _g2 = 0;
-HXDLIN( 844)						::Array< ::String > _g3 = ::snikket::Caps_obj::withIdentity(chat->getCaps(),HX_("gateway",04,40,59,91),null());
-HXDLIN( 844)						while((_g2 < _g3->length)){
-HXLINE( 844)							::String resource = _g3->__get(_g2);
-HXDLIN( 844)							_g2 = (_g2 + 1);
-HXLINE( 845)							resources->set(resource,true);
+HXLINE( 846)				if (chat->isTrusted()) {
+HXLINE( 847)					 ::haxe::ds::StringMap resources =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
+HXLINE( 848)					{
+HXLINE( 848)						int _g2 = 0;
+HXDLIN( 848)						::Array< ::String > _g3 = ::snikket::Caps_obj::withIdentity(chat->getCaps(),HX_("gateway",04,40,59,91),null());
+HXDLIN( 848)						while((_g2 < _g3->length)){
+HXLINE( 848)							::String resource = _g3->__get(_g2);
+HXDLIN( 848)							_g2 = (_g2 + 1);
+HXLINE( 849)							resources->set(resource,true);
             						}
             					}
-HXLINE( 847)					{
-HXLINE( 847)						int _g4 = 0;
-HXDLIN( 847)						::Array< ::String > _g5 = ::snikket::Caps_obj::withFeature(chat->getCaps(),HX_("jabber:iq:gateway",c8,db,57,c1));
-HXDLIN( 847)						while((_g4 < _g5->length)){
-HXLINE( 847)							::String resource1 = _g5->__get(_g4);
-HXDLIN( 847)							_g4 = (_g4 + 1);
-HXLINE( 848)							resources->set(resource1,true);
+HXLINE( 851)					{
+HXLINE( 851)						int _g4 = 0;
+HXDLIN( 851)						::Array< ::String > _g5 = ::snikket::Caps_obj::withFeature(chat->getCaps(),HX_("jabber:iq:gateway",c8,db,57,c1));
+HXDLIN( 851)						while((_g4 < _g5->length)){
+HXLINE( 851)							::String resource1 = _g5->__get(_g4);
+HXDLIN( 851)							_g4 = (_g4 + 1);
+HXLINE( 852)							resources->set(resource1,true);
             						}
             					}
-HXLINE( 850)					bool _hx_tmp4;
-HXDLIN( 850)					if (!(this->sendAvailable)) {
-HXLINE( 850)						_hx_tmp4 = ::snikket::JID_obj::parse(chat->chatId)->isDomain();
+HXLINE( 854)					bool _hx_tmp4;
+HXDLIN( 854)					if (!(this->sendAvailable)) {
+HXLINE( 854)						_hx_tmp4 = ::snikket::JID_obj::parse(chat->chatId)->isDomain();
             					}
             					else {
-HXLINE( 850)						_hx_tmp4 = false;
+HXLINE( 854)						_hx_tmp4 = false;
             					}
-HXDLIN( 850)					if (_hx_tmp4) {
-HXLINE( 851)						::String k = null();
-HXDLIN( 851)						resources->set(k,true);
+HXDLIN( 854)					if (_hx_tmp4) {
+HXLINE( 855)						::String k = null();
+HXDLIN( 855)						resources->set(k,true);
             					}
-HXLINE( 853)					{
-HXLINE( 853)						 ::Dynamic resource2 = resources->keys();
-HXDLIN( 853)						while(( (bool)(resource2->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE( 857)					{
+HXLINE( 857)						 ::Dynamic resource2 = resources->keys();
+HXDLIN( 857)						while(( (bool)(resource2->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
             							HX_BEGIN_LOCAL_FUNC_S6(::hx::LocalFunc,_hx_Closure_3, ::snikket::queries::JabberIqGatewayGet,jigGet1,::String,resource3,::String,query, ::snikket::JID,bareJid, ::snikket::Chat,chat, ::Dynamic,checkAndAdd) HXARGC(0)
             							void _hx_run(){
-            								HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_858_findAvailableChats)
-HXLINE( 858)								if (::hx::IsNull( jigGet1->getResult() )) {
-HXLINE( 859)									 ::snikket::Caps caps = chat->getResourceCaps(resource3);
-HXLINE( 860)									bool _hx_tmp;
-HXDLIN( 860)									if (bareJid->isDomain()) {
-HXLINE( 860)										_hx_tmp = caps->features->contains(HX_("jid\\20escaping",73,c5,d2,4a));
+            								HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_862_findAvailableChats)
+HXLINE( 862)								if (::hx::IsNull( jigGet1->getResult() )) {
+HXLINE( 863)									 ::snikket::Caps caps = chat->getResourceCaps(resource3);
+HXLINE( 864)									bool _hx_tmp;
+HXDLIN( 864)									if (bareJid->isDomain()) {
+HXLINE( 864)										_hx_tmp = caps->features->contains(HX_("jid\\20escaping",73,c5,d2,4a));
             									}
             									else {
-HXLINE( 860)										_hx_tmp = false;
+HXLINE( 864)										_hx_tmp = false;
             									}
-HXDLIN( 860)									if (_hx_tmp) {
-HXLINE( 861)										 ::Dynamic checkAndAdd1 = checkAndAdd;
-HXDLIN( 861)										checkAndAdd1( ::snikket::JID_obj::__alloc( HX_CTX ,query,bareJid->domain,null()),null());
+HXDLIN( 864)									if (_hx_tmp) {
+HXLINE( 865)										 ::Dynamic checkAndAdd1 = checkAndAdd;
+HXDLIN( 865)										checkAndAdd1( ::snikket::JID_obj::__alloc( HX_CTX ,query,bareJid->domain,null(),null()),null());
             									}
             									else {
-HXLINE( 862)										if (bareJid->isDomain()) {
-HXLINE( 863)											 ::Dynamic checkAndAdd2 = checkAndAdd;
-HXDLIN( 863)											::String _hx_tmp1 = ::StringTools_obj::replace(query,HX_("@",40,00,00,00),HX_("%",25,00,00,00));
-HXDLIN( 863)											checkAndAdd2( ::snikket::JID_obj::__alloc( HX_CTX ,_hx_tmp1,bareJid->domain,null()),null());
+HXLINE( 866)										if (bareJid->isDomain()) {
+HXLINE( 867)											 ::Dynamic checkAndAdd2 = checkAndAdd;
+HXDLIN( 867)											::String _hx_tmp1 = ::StringTools_obj::replace(query,HX_("@",40,00,00,00),HX_("%",25,00,00,00));
+HXDLIN( 867)											checkAndAdd2( ::snikket::JID_obj::__alloc( HX_CTX ,_hx_tmp1,bareJid->domain,null(),null()),null());
             										}
             									}
             								}
             								else {
-HXLINE( 866)									 ::haxe::ds::Either _g = jigGet1->getResult();
-HXDLIN( 866)									switch((int)(_g->_hx_getIndex())){
+HXLINE( 870)									 ::haxe::ds::Either _g = jigGet1->getResult();
+HXDLIN( 870)									switch((int)(_g->_hx_getIndex())){
             										case (int)0: {
-HXLINE( 867)											::String error = ( (::String)(_g->_hx_getObject(0)) );
-HXDLIN( 867)											return;
+HXLINE( 871)											::String error = ( (::String)(_g->_hx_getObject(0)) );
+HXDLIN( 871)											return;
             										}
             										break;
             										case (int)1: {
-HXLINE( 868)											::String result = ( (::String)(_g->_hx_getObject(0)) );
-HXLINE( 869)											 ::Dynamic checkAndAdd3 = checkAndAdd;
-HXDLIN( 869)											checkAndAdd3(::snikket::JID_obj::parse(result),null());
+HXLINE( 872)											::String result = ( (::String)(_g->_hx_getObject(0)) );
+HXLINE( 873)											 ::Dynamic checkAndAdd3 = checkAndAdd;
+HXDLIN( 873)											checkAndAdd3(::snikket::JID_obj::parse(result),null());
             										}
             										break;
             									}
@@ -2701,27 +2711,27 @@ HXDLIN( 869)											checkAndAdd3(::snikket::JID_obj::parse(result),null());
             							}
             							HX_END_LOCAL_FUNC0((void))
 
-HXLINE( 853)							::String resource3 = ( (::String)(resource2->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
-HXLINE( 854)							 ::snikket::JID bareJid = ::snikket::JID_obj::parse(chat->chatId);
-HXLINE( 855)							 ::snikket::JID fullJid =  ::snikket::JID_obj::__alloc( HX_CTX ,bareJid->node,bareJid->domain,resource3);
-HXLINE( 856)							::String jigGet = fullJid->asString();
-HXDLIN( 856)							 ::snikket::queries::JabberIqGatewayGet jigGet1 =  ::snikket::queries::JabberIqGatewayGet_obj::__alloc( HX_CTX ,jigGet,query);
-HXLINE( 857)							jigGet1->onFinished( ::Dynamic(new _hx_Closure_3(jigGet1,resource3,query,bareJid,chat,checkAndAdd)));
-HXLINE( 873)							this->sendQuery(jigGet1);
+HXLINE( 857)							::String resource3 = ( (::String)(resource2->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
+HXLINE( 858)							 ::snikket::JID bareJid = ::snikket::JID_obj::parse(chat->chatId);
+HXLINE( 859)							 ::snikket::JID fullJid =  ::snikket::JID_obj::__alloc( HX_CTX ,bareJid->node,bareJid->domain,resource3,null());
+HXLINE( 860)							::String jigGet = fullJid->asString();
+HXDLIN( 860)							 ::snikket::queries::JabberIqGatewayGet jigGet1 =  ::snikket::queries::JabberIqGatewayGet_obj::__alloc( HX_CTX ,jigGet,query);
+HXLINE( 861)							jigGet1->onFinished( ::Dynamic(new _hx_Closure_3(jigGet1,resource3,query,bareJid,chat,checkAndAdd)));
+HXLINE( 877)							this->sendQuery(jigGet1);
             						}
             					}
             				}
             			}
             		}
-HXLINE( 877)		bool _hx_tmp5;
-HXDLIN( 877)		if (!(jid->isValid())) {
-HXLINE( 877)			_hx_tmp5 = (results->length > 0);
+HXLINE( 881)		bool _hx_tmp5;
+HXDLIN( 881)		if (!(jid->isValid())) {
+HXLINE( 881)			_hx_tmp5 = (results->length > 0);
             		}
             		else {
-HXLINE( 877)			_hx_tmp5 = false;
+HXLINE( 881)			_hx_tmp5 = false;
             		}
-HXDLIN( 877)		if (_hx_tmp5) {
-HXLINE( 878)			callback(q,results);
+HXDLIN( 881)		if (_hx_tmp5) {
+HXLINE( 882)			callback(q,results);
             		}
             	}
 
@@ -2793,86 +2803,93 @@ HXDLIN( 252)		this->findAvailableChats(q, ::Dynamic(new _hx_Closure_0(callback__
 
 
  ::snikket::Chat Client_obj::startChat( ::snikket::AvailableChat availableChat){
-            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_887_startChat)
-HXLINE( 888)		 ::snikket::Chat existingChat = this->getChat(availableChat->chatId);
-HXLINE( 889)		if (::hx::IsNotNull( existingChat )) {
-HXLINE( 890)			 ::snikket::Channel channel = ( ( ::snikket::Channel)(::Std_obj::downcast(existingChat,::hx::ClassOf< ::snikket::Channel >())) );
-HXLINE( 891)			bool _hx_tmp;
-HXDLIN( 891)			bool _hx_tmp1;
-HXDLIN( 891)			if (::hx::IsNull( channel )) {
-HXLINE( 891)				_hx_tmp1 = availableChat->isChannel();
+            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_891_startChat)
+HXLINE( 892)		 ::snikket::Chat existingChat = this->getChat(availableChat->chatId);
+HXLINE( 893)		if (::hx::IsNotNull( existingChat )) {
+HXLINE( 894)			 ::snikket::Channel channel = ( ( ::snikket::Channel)(::Std_obj::downcast(existingChat,::hx::ClassOf< ::snikket::Channel >())) );
+HXLINE( 895)			bool _hx_tmp;
+HXDLIN( 895)			bool _hx_tmp1;
+HXDLIN( 895)			if (::hx::IsNull( channel )) {
+HXLINE( 895)				_hx_tmp1 = availableChat->isChannel();
             			}
             			else {
-HXLINE( 891)				_hx_tmp1 = false;
+HXLINE( 895)				_hx_tmp1 = false;
             			}
-HXDLIN( 891)			if (!(_hx_tmp1)) {
-HXLINE( 891)				if (::hx::IsNotNull( channel )) {
-HXLINE( 891)					_hx_tmp = !(availableChat->isChannel());
+HXDLIN( 895)			if (!(_hx_tmp1)) {
+HXLINE( 895)				if (::hx::IsNotNull( channel )) {
+HXLINE( 895)					_hx_tmp = !(availableChat->isChannel());
             				}
             				else {
-HXLINE( 891)					_hx_tmp = false;
+HXLINE( 895)					_hx_tmp = false;
             				}
             			}
             			else {
-HXLINE( 891)				_hx_tmp = true;
-            			}
-HXDLIN( 891)			if (_hx_tmp) {
-HXLINE( 892)				::Array< ::Dynamic> _g = ::Array_obj< ::Dynamic>::__new(0);
-HXDLIN( 892)				{
-HXLINE( 892)					int _g1 = 0;
-HXDLIN( 892)					::Array< ::Dynamic> _g2 = this->chats;
-HXDLIN( 892)					while((_g1 < _g2->length)){
-HXLINE( 892)						 ::snikket::Chat v = _g2->__get(_g1).StaticCast<  ::snikket::Chat >();
-HXDLIN( 892)						_g1 = (_g1 + 1);
-HXDLIN( 892)						if ((v->chatId != availableChat->chatId)) {
-HXLINE( 892)							_g->push(v);
+HXLINE( 895)				_hx_tmp = true;
+            			}
+HXDLIN( 895)			if (_hx_tmp) {
+HXLINE( 896)				::Array< ::Dynamic> _g = ::Array_obj< ::Dynamic>::__new(0);
+HXDLIN( 896)				{
+HXLINE( 896)					int _g1 = 0;
+HXDLIN( 896)					::Array< ::Dynamic> _g2 = this->chats;
+HXDLIN( 896)					while((_g1 < _g2->length)){
+HXLINE( 896)						 ::snikket::Chat v = _g2->__get(_g1).StaticCast<  ::snikket::Chat >();
+HXDLIN( 896)						_g1 = (_g1 + 1);
+HXDLIN( 896)						if ((v->chatId != availableChat->chatId)) {
+HXLINE( 896)							_g->push(v);
             						}
             					}
             				}
-HXDLIN( 892)				this->chats = _g;
+HXDLIN( 896)				this->chats = _g;
             			}
             			else {
-HXLINE( 894)				if ((existingChat->uiState == 2)) {
-HXLINE( 894)					existingChat->uiState = 1;
+HXLINE( 898)				if ((existingChat->uiState == 2)) {
+HXLINE( 898)					existingChat->uiState = 1;
             				}
-HXLINE( 895)				if (::hx::IsNotNull( channel )) {
-HXLINE( 895)					channel->selfPing(true);
+HXLINE( 899)				if (::hx::IsNotNull( channel )) {
+HXLINE( 899)					channel->selfPing(true);
             				}
-HXLINE( 896)				::Dynamic _hx_tmp2 = this->persistence;
-HXDLIN( 896)				::snikket::Persistence_obj::storeChats(_hx_tmp2,this->accountId(),::Array_obj< ::Dynamic>::__new(1)->init(0,existingChat));
-HXLINE( 897)				this->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,existingChat));
-HXLINE( 898)				return existingChat;
+HXLINE( 900)				::Dynamic _hx_tmp2 = this->persistence;
+HXDLIN( 900)				::snikket::Persistence_obj::storeChats(_hx_tmp2,this->accountId(),::Array_obj< ::Dynamic>::__new(1)->init(0,existingChat));
+HXLINE( 901)				this->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,existingChat));
+HXLINE( 902)				return existingChat;
             			}
             		}
-HXLINE( 902)		 ::snikket::Chat chat;
-HXDLIN( 902)		if (availableChat->isChannel()) {
-HXLINE( 903)			 ::snikket::Channel channel1 =  ::snikket::Channel_obj::__alloc( HX_CTX ,::hx::ObjectPtr<OBJ_>(this),this->stream,this->persistence,availableChat->chatId,1,false,null(),null(),null(),availableChat->caps);
-HXLINE( 904)			this->chats->unshift(channel1);
-HXLINE( 905)			channel1->selfPing(false);
-HXLINE( 902)			chat = channel1;
+HXLINE( 906)		 ::snikket::Chat chat;
+HXDLIN( 906)		if (availableChat->isChannel()) {
+HXLINE( 907)			 ::snikket::Channel channel1 =  ::snikket::Channel_obj::__alloc( HX_CTX ,::hx::ObjectPtr<OBJ_>(this),this->stream,this->persistence,availableChat->chatId,1,false,null(),null(),null(),availableChat->caps);
+HXLINE( 908)			this->chats->unshift(channel1);
+HXLINE( 909)			channel1->selfPing(false);
+HXLINE( 906)			chat = channel1;
             		}
             		else {
-HXLINE( 902)			chat = this->getDirectChat(availableChat->chatId,false);
+HXLINE( 906)			chat = this->getDirectChat(availableChat->chatId,false);
             		}
-HXLINE( 910)		::Dynamic _hx_tmp3 = this->persistence;
-HXDLIN( 910)		::snikket::Persistence_obj::storeChats(_hx_tmp3,this->accountId(),::Array_obj< ::Dynamic>::__new(1)->init(0,chat));
-HXLINE( 911)		this->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,chat));
-HXLINE( 912)		return chat;
+HXLINE( 914)		::Dynamic _hx_tmp3 = this->persistence;
+HXDLIN( 914)		::snikket::Persistence_obj::storeChats(_hx_tmp3,this->accountId(),::Array_obj< ::Dynamic>::__new(1)->init(0,chat));
+HXLINE( 915)		this->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,chat));
+HXLINE( 916)		return chat;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Client_obj,startChat,return )
 
  ::snikket::Chat Client_obj::getChat(::String chatId){
-            		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0,::String,chatId) HXARGC(1)
-            		bool _hx_run( ::snikket::Chat chat){
-            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_921_getChat)
-HXDLIN( 921)			return (chat->chatId == chatId);
-            		}
-            		HX_END_LOCAL_FUNC1(return)
-
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_921_getChat)
-HXDLIN( 921)		return ( ( ::snikket::Chat)(::Lambda_obj::find(this->chats, ::Dynamic(new _hx_Closure_0(chatId)))) );
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_925_getChat)
+HXDLIN( 925)		::Array< ::Dynamic> it = this->chats;
+HXDLIN( 925)		 ::snikket::Chat result = null();
+HXDLIN( 925)		{
+HXDLIN( 925)			int _g = 0;
+HXDLIN( 925)			while((_g < it->length)){
+HXDLIN( 925)				 ::snikket::Chat v = it->__get(_g).StaticCast<  ::snikket::Chat >();
+HXDLIN( 925)				_g = (_g + 1);
+HXDLIN( 925)				if ((v->chatId == chatId)) {
+HXDLIN( 925)					result = v;
+HXDLIN( 925)					goto _hx_goto_103;
+            				}
+            			}
+            			_hx_goto_103:;
+            		}
+HXDLIN( 925)		return result;
             	}
 
 
@@ -2883,45 +2900,45 @@ HX_DEFINE_DYNAMIC_FUNC1(Client_obj,getChat,return )
             		void _hx_run( ::Dynamic resolve, ::Dynamic reject){
             			HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_0, ::snikket::Client,_gthis, ::snikket::ModerationAction,action, ::Dynamic,resolve) HXARGC(1)
             			void _hx_run( ::snikket::ChatMessage moderateMessage){
-            				HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_927_moderateMessage)
-HXLINE( 928)				if (::hx::IsNull( moderateMessage )) {
-HXLINE( 928)					resolve(null());
-HXDLIN( 928)					return;
-            				}
-HXLINE( 929)				{
-HXLINE( 929)					int _g = 0;
-HXDLIN( 929)					::Array< ::Dynamic> _g1 = moderateMessage->attachments;
-HXDLIN( 929)					while((_g < _g1->length)){
-HXLINE( 929)						 ::snikket::ChatAttachment attachment = _g1->__get(_g).StaticCast<  ::snikket::ChatAttachment >();
-HXDLIN( 929)						_g = (_g + 1);
-HXLINE( 930)						{
-HXLINE( 930)							int _g2 = 0;
-HXDLIN( 930)							::Array< ::Dynamic> _g3 = attachment->hashes;
-HXDLIN( 930)							while((_g2 < _g3->length)){
-HXLINE( 930)								 ::snikket::Hash hash = _g3->__get(_g2).StaticCast<  ::snikket::Hash >();
-HXDLIN( 930)								_g2 = (_g2 + 1);
-HXLINE( 931)								::snikket::Persistence_obj::removeMedia(_gthis->persistence,hash->algorithm,hash->hash);
+            				HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_931_moderateMessage)
+HXLINE( 932)				if (::hx::IsNull( moderateMessage )) {
+HXLINE( 932)					resolve(null());
+HXDLIN( 932)					return;
+            				}
+HXLINE( 933)				{
+HXLINE( 933)					int _g = 0;
+HXDLIN( 933)					::Array< ::Dynamic> _g1 = moderateMessage->attachments;
+HXDLIN( 933)					while((_g < _g1->length)){
+HXLINE( 933)						 ::snikket::ChatAttachment attachment = _g1->__get(_g).StaticCast<  ::snikket::ChatAttachment >();
+HXDLIN( 933)						_g = (_g + 1);
+HXLINE( 934)						{
+HXLINE( 934)							int _g2 = 0;
+HXDLIN( 934)							::Array< ::Dynamic> _g3 = attachment->hashes;
+HXDLIN( 934)							while((_g2 < _g3->length)){
+HXLINE( 934)								 ::snikket::Hash hash = _g3->__get(_g2).StaticCast<  ::snikket::Hash >();
+HXDLIN( 934)								_g2 = (_g2 + 1);
+HXLINE( 935)								::snikket::Persistence_obj::removeMedia(_gthis->persistence,hash->algorithm,hash->hash);
             							}
             						}
             					}
             				}
-HXLINE( 934)				moderateMessage = ::snikket::ChatMessageBuilder_obj::makeModerated(moderateMessage,action->timestamp,action->moderatorId,action->reason);
-HXLINE( 935)				::Dynamic _gthis1 = _gthis->persistence;
-HXDLIN( 935)				::snikket::Persistence_obj::updateMessage(_gthis1,_gthis->accountId(),moderateMessage);
-HXLINE( 936)				resolve(moderateMessage);
+HXLINE( 938)				moderateMessage = ::snikket::ChatMessageBuilder_obj::makeModerated(moderateMessage,action->timestamp,action->moderatorId,action->reason);
+HXLINE( 939)				::Dynamic _gthis1 = _gthis->persistence;
+HXDLIN( 939)				::snikket::Persistence_obj::updateMessage(_gthis1,_gthis->accountId(),moderateMessage);
+HXLINE( 940)				resolve(moderateMessage);
             			}
             			HX_END_LOCAL_FUNC1((void))
 
-            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_927_moderateMessage)
-HXLINE( 927)			::Dynamic _gthis1 = _gthis->persistence;
-HXDLIN( 927)			::String _hx_tmp = _gthis->accountId();
-HXDLIN( 927)			::snikket::Persistence_obj::getMessage(_gthis1,_hx_tmp,action->chatId,action->moderateServerId,null(), ::Dynamic(new _hx_Closure_0(_gthis,action,resolve)));
+            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_931_moderateMessage)
+HXLINE( 931)			::Dynamic _gthis1 = _gthis->persistence;
+HXDLIN( 931)			::String _hx_tmp = _gthis->accountId();
+HXDLIN( 931)			::snikket::Persistence_obj::getMessage(_gthis1,_hx_tmp,action->chatId,action->moderateServerId,null(), ::Dynamic(new _hx_Closure_0(_gthis,action,resolve)));
             		}
             		HX_END_LOCAL_FUNC2((void))
 
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_925_moderateMessage)
-HXDLIN( 925)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 926)		return ::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_1(_gthis,action)));
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_929_moderateMessage)
+HXDLIN( 929)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 930)		return ::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_1(_gthis,action)));
             	}
 
 
@@ -2929,49 +2946,49 @@ HX_DEFINE_DYNAMIC_FUNC1(Client_obj,moderateMessage,return )
 
  ::snikket::DirectChat Client_obj::getDirectChat(::String chatId,::hx::Null< bool >  __o_triggerIfNew){
             		bool triggerIfNew = __o_triggerIfNew.Default(true);
-            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_942_getDirectChat)
-HXLINE( 943)		{
-HXLINE( 943)			int _g = 0;
-HXDLIN( 943)			::Array< ::Dynamic> _g1 = this->chats;
-HXDLIN( 943)			while((_g < _g1->length)){
-HXLINE( 943)				 ::snikket::Chat chat = _g1->__get(_g).StaticCast<  ::snikket::Chat >();
-HXDLIN( 943)				_g = (_g + 1);
-HXLINE( 944)				bool _hx_tmp;
-HXDLIN( 944)				if (::Std_obj::isOfType(chat,::hx::ClassOf< ::snikket::DirectChat >())) {
-HXLINE( 944)					_hx_tmp = (chat->chatId == chatId);
+            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_946_getDirectChat)
+HXLINE( 947)		{
+HXLINE( 947)			int _g = 0;
+HXDLIN( 947)			::Array< ::Dynamic> _g1 = this->chats;
+HXDLIN( 947)			while((_g < _g1->length)){
+HXLINE( 947)				 ::snikket::Chat chat = _g1->__get(_g).StaticCast<  ::snikket::Chat >();
+HXDLIN( 947)				_g = (_g + 1);
+HXLINE( 948)				bool _hx_tmp;
+HXDLIN( 948)				if (::Std_obj::isOfType(chat,::hx::ClassOf< ::snikket::DirectChat >())) {
+HXLINE( 948)					_hx_tmp = (chat->chatId == chatId);
             				}
             				else {
-HXLINE( 944)					_hx_tmp = false;
+HXLINE( 948)					_hx_tmp = false;
             				}
-HXDLIN( 944)				if (_hx_tmp) {
-HXLINE( 945)					return ( ( ::snikket::DirectChat)(::Std_obj::downcast(chat,::hx::ClassOf< ::snikket::DirectChat >())) );
+HXDLIN( 948)				if (_hx_tmp) {
+HXLINE( 949)					return ( ( ::snikket::DirectChat)(::Std_obj::downcast(chat,::hx::ClassOf< ::snikket::DirectChat >())) );
             				}
             			}
             		}
-HXLINE( 948)		 ::snikket::DirectChat chat1 =  ::snikket::DirectChat_obj::__alloc( HX_CTX ,::hx::ObjectPtr<OBJ_>(this),this->stream,this->persistence,chatId,null(),null(),null(),null(),null());
-HXLINE( 949)		::Dynamic _hx_tmp1 = this->persistence;
-HXDLIN( 949)		::snikket::Persistence_obj::storeChats(_hx_tmp1,this->accountId(),::Array_obj< ::Dynamic>::__new(1)->init(0,chat1));
-HXLINE( 950)		this->chats->unshift(chat1);
-HXLINE( 951)		if (triggerIfNew) {
-HXLINE( 951)			this->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,chat1));
+HXLINE( 952)		 ::snikket::DirectChat chat1 =  ::snikket::DirectChat_obj::__alloc( HX_CTX ,::hx::ObjectPtr<OBJ_>(this),this->stream,this->persistence,chatId,null(),null(),null(),null(),null());
+HXLINE( 953)		::Dynamic _hx_tmp1 = this->persistence;
+HXDLIN( 953)		::snikket::Persistence_obj::storeChats(_hx_tmp1,this->accountId(),::Array_obj< ::Dynamic>::__new(1)->init(0,chat1));
+HXLINE( 954)		this->chats->unshift(chat1);
+HXLINE( 955)		if (triggerIfNew) {
+HXLINE( 955)			this->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,chat1));
             		}
-HXLINE( 952)		return chat1;
+HXLINE( 956)		return chat1;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC2(Client_obj,getDirectChat,return )
 
 void Client_obj::enablePush(::String push_service,::String endpoint,::Array< unsigned char > p256dh,::Array< unsigned char > auth,int grace,::Array< unsigned char > vapid_private_pkcs8,::Array< ::String > claims){
-            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_995_enablePush)
-HXLINE( 996)		::Array< ::String > tmp = claims;
-HXDLIN( 996)		::Array< ::String > _hx_tmp;
-HXDLIN( 996)		if (::hx::IsNotNull( tmp )) {
-HXLINE( 996)			_hx_tmp = tmp;
+            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_999_enablePush)
+HXLINE(1000)		::Array< ::String > tmp = claims;
+HXDLIN(1000)		::Array< ::String > _hx_tmp;
+HXDLIN(1000)		if (::hx::IsNotNull( tmp )) {
+HXLINE(1000)			_hx_tmp = tmp;
             		}
             		else {
-HXLINE( 996)			_hx_tmp = ::Array_obj< ::String >::__new(0);
+HXLINE(1000)			_hx_tmp = ::Array_obj< ::String >::__new(0);
             		}
-HXDLIN( 996)		this->enabledPushData =  ::Dynamic(::hx::Anon_obj::Create(7)
+HXDLIN(1000)		this->enabledPushData =  ::Dynamic(::hx::Anon_obj::Create(7)
             			->setFixed(0,HX_("grace",f8,03,ea,99),grace)
             			->setFixed(1,HX_("p256dh",e7,0a,33,b5),p256dh)
             			->setFixed(2,HX_("push_service",90,f1,d2,f8),push_service)
@@ -2979,64 +2996,64 @@ HXDLIN( 996)		this->enabledPushData =  ::Dynamic(::hx::Anon_obj::Create(7)
             			->setFixed(4,HX_("claims",77,1d,09,05),_hx_tmp)
             			->setFixed(5,HX_("endpoint",95,d6,5f,31),endpoint)
             			->setFixed(6,HX_("auth",68,df,76,40),auth));
-HXLINE( 998)		::Array< ::Dynamic> filters = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE( 999)		{
-HXLINE( 999)			int _g = 0;
-HXDLIN( 999)			::Array< ::Dynamic> _g1 = this->chats;
-HXDLIN( 999)			while((_g < _g1->length)){
-HXLINE( 999)				 ::snikket::Chat chat = _g1->__get(_g).StaticCast<  ::snikket::Chat >();
-HXDLIN( 999)				_g = (_g + 1);
-HXLINE(1000)				if (chat->notificationsFiltered()) {
-HXLINE(1001)					::String chat1 = chat->chatId;
-HXDLIN(1001)					bool _hx_tmp1 = chat->notifyMention();
-HXDLIN(1001)					filters->push( ::Dynamic(::hx::Anon_obj::Create(3)
+HXLINE(1002)		::Array< ::Dynamic> filters = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE(1003)		{
+HXLINE(1003)			int _g = 0;
+HXDLIN(1003)			::Array< ::Dynamic> _g1 = this->chats;
+HXDLIN(1003)			while((_g < _g1->length)){
+HXLINE(1003)				 ::snikket::Chat chat = _g1->__get(_g).StaticCast<  ::snikket::Chat >();
+HXDLIN(1003)				_g = (_g + 1);
+HXLINE(1004)				if (chat->notificationsFiltered()) {
+HXLINE(1005)					::String chat1 = chat->chatId;
+HXDLIN(1005)					bool _hx_tmp1 = chat->notifyMention();
+HXDLIN(1005)					filters->push( ::Dynamic(::hx::Anon_obj::Create(3)
             						->setFixed(0,HX_("mention",ea,9e,bf,b9),_hx_tmp1)
             						->setFixed(1,HX_("reply",2a,09,c6,e6),chat->notifyReply())
             						->setFixed(2,HX_("jid",c5,ca,50,00),chat1)));
             				}
             			}
             		}
-HXLINE(1005)		 ::haxe::ds::StringMap _g2 =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
-HXDLIN(1005)		_g2->set(HX_("aud",f0,00,4a,00),( (::Array< ::String >)(::tink::_Url::Url_Impl__obj::parse(endpoint,null())->__Field(HX_("hosts",0b,ac,62,2b),::hx::paccDynamic)) )->__get(0));
-HXDLIN(1005)		 ::haxe::ds::StringMap claimMap = _g2;
-HXLINE(1006)		{
-HXLINE(1006)			int _g3 = 0;
-HXDLIN(1006)			::Array< ::String > tmp1 = claims;
-HXDLIN(1006)			::Array< ::String > _g4;
-HXDLIN(1006)			if (::hx::IsNotNull( tmp1 )) {
-HXLINE(1006)				_g4 = tmp1;
+HXLINE(1009)		 ::haxe::ds::StringMap _g2 =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
+HXDLIN(1009)		_g2->set(HX_("aud",f0,00,4a,00),( (::Array< ::String >)(::tink::_Url::Url_Impl__obj::parse(endpoint,null())->__Field(HX_("hosts",0b,ac,62,2b),::hx::paccDynamic)) )->__get(0));
+HXDLIN(1009)		 ::haxe::ds::StringMap claimMap = _g2;
+HXLINE(1010)		{
+HXLINE(1010)			int _g3 = 0;
+HXDLIN(1010)			::Array< ::String > tmp1 = claims;
+HXDLIN(1010)			::Array< ::String > _g4;
+HXDLIN(1010)			if (::hx::IsNotNull( tmp1 )) {
+HXLINE(1010)				_g4 = tmp1;
             			}
             			else {
-HXLINE(1006)				_g4 = ::Array_obj< ::String >::__new(0);
+HXLINE(1010)				_g4 = ::Array_obj< ::String >::__new(0);
             			}
-HXDLIN(1006)			int _g5 = _g4->length;
-HXDLIN(1006)			while((_g3 < _g5)){
-HXLINE(1006)				_g3 = (_g3 + 1);
-HXDLIN(1006)				int i = (_g3 - 1);
-HXLINE(1007)				if ((::hx::Mod(i,2) == 0)) {
-HXLINE(1008)					::String v = claims->__get((i + 1));
-HXDLIN(1008)					claimMap->set(claims->__get(i),v);
+HXDLIN(1010)			int _g5 = _g4->length;
+HXDLIN(1010)			while((_g3 < _g5)){
+HXLINE(1010)				_g3 = (_g3 + 1);
+HXDLIN(1010)				int i = (_g3 - 1);
+HXLINE(1011)				if ((::hx::Mod(i,2) == 0)) {
+HXLINE(1012)					::String v = claims->__get((i + 1));
+HXDLIN(1012)					claimMap->set(claims->__get(i),v);
             				}
             			}
             		}
-HXLINE(1013)		::String _hx_tmp2 = this->jid->asBare()->asString();
-HXLINE(1016)		 ::haxe::io::Bytes _hx_tmp3 = ::haxe::io::Bytes_obj::ofData(p256dh);
-HXLINE(1017)		 ::haxe::io::Bytes _hx_tmp4 = ::haxe::io::Bytes_obj::ofData(auth);
-HXLINE(1018)		::String _hx_tmp5;
-HXDLIN(1018)		if (::hx::IsNull( vapid_private_pkcs8 )) {
-HXLINE(1018)			_hx_tmp5 = null();
+HXLINE(1017)		::String _hx_tmp2 = this->jid->asBare()->asString();
+HXLINE(1020)		 ::haxe::io::Bytes _hx_tmp3 = ::haxe::io::Bytes_obj::ofData(p256dh);
+HXLINE(1021)		 ::haxe::io::Bytes _hx_tmp4 = ::haxe::io::Bytes_obj::ofData(auth);
+HXLINE(1022)		::String _hx_tmp5;
+HXDLIN(1022)		if (::hx::IsNull( vapid_private_pkcs8 )) {
+HXLINE(1022)			_hx_tmp5 = null();
             		}
             		else {
-HXLINE(1018)			_hx_tmp5 = HX_("ES256",65,db,a8,f1);
+HXLINE(1022)			_hx_tmp5 = HX_("ES256",65,db,a8,f1);
             		}
-HXLINE(1019)		 ::haxe::io::Bytes _hx_tmp6;
-HXDLIN(1019)		if (::hx::IsNull( vapid_private_pkcs8 )) {
-HXLINE(1019)			_hx_tmp6 = null();
+HXLINE(1023)		 ::haxe::io::Bytes _hx_tmp6;
+HXDLIN(1023)		if (::hx::IsNull( vapid_private_pkcs8 )) {
+HXLINE(1023)			_hx_tmp6 = null();
             		}
             		else {
-HXLINE(1019)			_hx_tmp6 = ::haxe::io::Bytes_obj::ofData(vapid_private_pkcs8);
+HXLINE(1023)			_hx_tmp6 = ::haxe::io::Bytes_obj::ofData(vapid_private_pkcs8);
             		}
-HXLINE(1012)		this->sendQuery( ::snikket::queries::Push2Enable_obj::__alloc( HX_CTX ,_hx_tmp2,push_service,endpoint,_hx_tmp3,_hx_tmp4,_hx_tmp5,_hx_tmp6,claimMap,grace,filters));
+HXLINE(1016)		this->sendQuery( ::snikket::queries::Push2Enable_obj::__alloc( HX_CTX ,_hx_tmp2,push_service,endpoint,_hx_tmp3,_hx_tmp4,_hx_tmp5,_hx_tmp6,claimMap,grace,filters));
             	}
 
 
@@ -3111,11 +3128,11 @@ HXLINE( 252)		this->enablePush(push_service,endpoint,_hx_tmp,_hx_tmp1,grace,_hx_
 HX_DEFINE_DYNAMIC_FUNC11(Client_obj,enablePush__fromC,(void))
 
 void Client_obj::updatePushIfEnabled(){
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1027_updatePushIfEnabled)
-HXLINE(1028)		if (::hx::IsNull( this->enabledPushData )) {
-HXLINE(1028)			return;
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1031_updatePushIfEnabled)
+HXLINE(1032)		if (::hx::IsNull( this->enabledPushData )) {
+HXLINE(1032)			return;
             		}
-HXLINE(1029)		this->enablePush(( (::String)(this->enabledPushData->__Field(HX_("push_service",90,f1,d2,f8),::hx::paccDynamic)) ),( (::String)(this->enabledPushData->__Field(HX_("endpoint",95,d6,5f,31),::hx::paccDynamic)) ),( (::Array< unsigned char >)(this->enabledPushData->__Field(HX_("p256dh",e7,0a,33,b5),::hx::paccDynamic)) ),( (::Array< unsigned char >)(this->enabledPushData->__Field(HX_("auth",68,df,76,40),::hx::paccDynamic)) ),( (int)(this->enabledPushData->__Field(HX_("grace",f8,03,ea,99),::hx::paccDynamic)) ),( (::Array< unsigned char >)(this->enabledPushData->__Field(HX_("vapid_private_pkcs8",32,d7,0a,03),::hx::paccDynamic)) ),( (::Array< ::String >)(this->enabledPushData->__Field(HX_("claims",77,1d,09,05),::hx::paccDynamic)) ));
+HXLINE(1033)		this->enablePush(( (::String)(this->enabledPushData->__Field(HX_("push_service",90,f1,d2,f8),::hx::paccDynamic)) ),( (::String)(this->enabledPushData->__Field(HX_("endpoint",95,d6,5f,31),::hx::paccDynamic)) ),( (::Array< unsigned char >)(this->enabledPushData->__Field(HX_("p256dh",e7,0a,33,b5),::hx::paccDynamic)) ),( (::Array< unsigned char >)(this->enabledPushData->__Field(HX_("auth",68,df,76,40),::hx::paccDynamic)) ),( (int)(this->enabledPushData->__Field(HX_("grace",f8,03,ea,99),::hx::paccDynamic)) ),( (::Array< unsigned char >)(this->enabledPushData->__Field(HX_("vapid_private_pkcs8",32,d7,0a,03),::hx::paccDynamic)) ),( (::Array< ::String >)(this->enabledPushData->__Field(HX_("claims",77,1d,09,05),::hx::paccDynamic)) ));
             	}
 
 
@@ -3124,15 +3141,15 @@ HX_DEFINE_DYNAMIC_FUNC0(Client_obj,updatePushIfEnabled,(void))
 void Client_obj::addPasswordNeededListener( ::Dynamic handler){
             		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0, ::snikket::Client,_gthis, ::Dynamic,handler) HXARGC(1)
             		 ::snikket::EventResult _hx_run( ::Dynamic data){
-            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1038_addPasswordNeededListener)
-HXLINE(1039)			handler(_gthis);
-HXLINE(1040)			return ::snikket::EventResult_obj::EventHandled_dyn();
+            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1042_addPasswordNeededListener)
+HXLINE(1043)			handler(_gthis);
+HXLINE(1044)			return ::snikket::EventResult_obj::EventHandled_dyn();
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1037_addPasswordNeededListener)
-HXDLIN(1037)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE(1038)		this->on(HX_("auth/password-needed",80,f0,74,49), ::Dynamic(new _hx_Closure_0(_gthis,handler)));
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1041_addPasswordNeededListener)
+HXDLIN(1041)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE(1042)		this->on(HX_("auth/password-needed",80,f0,74,49), ::Dynamic(new _hx_Closure_0(_gthis,handler)));
             	}
 
 
@@ -3169,14 +3186,14 @@ HXDLIN( 252)		this->addPasswordNeededListener( ::Dynamic(new _hx_Closure_0(handl
 void Client_obj::addStatusOnlineListener( ::Dynamic handler){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::Dynamic,handler) HXARGC(1)
             		 ::snikket::EventResult _hx_run( ::Dynamic data){
-            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1050_addStatusOnlineListener)
-HXLINE(1051)			handler();
-HXLINE(1052)			return ::snikket::EventResult_obj::EventHandled_dyn();
+            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1054_addStatusOnlineListener)
+HXLINE(1055)			handler();
+HXLINE(1056)			return ::snikket::EventResult_obj::EventHandled_dyn();
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1050_addStatusOnlineListener)
-HXDLIN(1050)		this->on(HX_("status/online",10,05,0e,d2), ::Dynamic(new _hx_Closure_0(handler)));
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1054_addStatusOnlineListener)
+HXDLIN(1054)		this->on(HX_("status/online",10,05,0e,d2), ::Dynamic(new _hx_Closure_0(handler)));
             	}
 
 
@@ -3198,14 +3215,14 @@ HXDLIN( 252)		this->addStatusOnlineListener( ::Dynamic(new _hx_Closure_0(handler
 void Client_obj::addStatusOfflineListener( ::Dynamic handler){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::Dynamic,handler) HXARGC(1)
             		 ::snikket::EventResult _hx_run( ::Dynamic data){
-            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1062_addStatusOfflineListener)
-HXLINE(1063)			handler();
-HXLINE(1064)			return ::snikket::EventResult_obj::EventHandled_dyn();
+            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1066_addStatusOfflineListener)
+HXLINE(1067)			handler();
+HXLINE(1068)			return ::snikket::EventResult_obj::EventHandled_dyn();
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1062_addStatusOfflineListener)
-HXDLIN(1062)		this->on(HX_("status/offline",c6,eb,eb,54), ::Dynamic(new _hx_Closure_0(handler)));
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1066_addStatusOfflineListener)
+HXDLIN(1066)		this->on(HX_("status/offline",c6,eb,eb,54), ::Dynamic(new _hx_Closure_0(handler)));
             	}
 
 
@@ -3227,14 +3244,14 @@ HXDLIN( 252)		this->addStatusOfflineListener( ::Dynamic(new _hx_Closure_0(handle
 void Client_obj::addConnectionFailedListener( ::Dynamic handler){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::Dynamic,handler) HXARGC(1)
             		 ::snikket::EventResult _hx_run( ::Dynamic data){
-            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1074_addConnectionFailedListener)
-HXLINE(1075)			handler();
-HXLINE(1076)			return ::snikket::EventResult_obj::EventHandled_dyn();
+            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1078_addConnectionFailedListener)
+HXLINE(1079)			handler();
+HXLINE(1080)			return ::snikket::EventResult_obj::EventHandled_dyn();
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1074_addConnectionFailedListener)
-HXDLIN(1074)		this->stream->on(HX_("status/error",eb,19,84,6f), ::Dynamic(new _hx_Closure_0(handler)));
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1078_addConnectionFailedListener)
+HXDLIN(1078)		this->stream->on(HX_("status/error",eb,19,84,6f), ::Dynamic(new _hx_Closure_0(handler)));
             	}
 
 
@@ -3256,13 +3273,13 @@ HXDLIN( 252)		this->addConnectionFailedListener( ::Dynamic(new _hx_Closure_0(han
 void Client_obj::addChatMessageListener( ::Dynamic handler){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::Dynamic,handler) HXARGC(2)
             		void _hx_run( ::snikket::ChatMessage m,int e){
-            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1099_addChatMessageListener)
-HXDLIN(1099)			handler(m,e);
+            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1103_addChatMessageListener)
+HXDLIN(1103)			handler(m,e);
             		}
             		HX_END_LOCAL_FUNC2((void))
 
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1099_addChatMessageListener)
-HXDLIN(1099)		this->chatMessageHandlers->push( ::Dynamic(new _hx_Closure_0(handler)));
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1103_addChatMessageListener)
+HXDLIN(1103)		this->chatMessageHandlers->push( ::Dynamic(new _hx_Closure_0(handler)));
             	}
 
 
@@ -3297,8 +3314,8 @@ HXDLIN( 252)		this->addChatMessageListener( ::Dynamic(new _hx_Closure_0(handler,
 
 
 void Client_obj::addSyncMessageListener( ::Dynamic handler){
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1113_addSyncMessageListener)
-HXDLIN(1113)		this->syncMessageHandlers->push(handler);
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1117_addSyncMessageListener)
+HXDLIN(1117)		this->syncMessageHandlers->push(handler);
             	}
 
 
@@ -3335,14 +3352,14 @@ HXDLIN( 252)		this->addSyncMessageListener( ::Dynamic(new _hx_Closure_0(handler,
 void Client_obj::addChatsUpdatedListener( ::Dynamic handler){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::Dynamic,handler) HXARGC(1)
             		 ::snikket::EventResult _hx_run(::Array< ::Dynamic> data){
-            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1122_addChatsUpdatedListener)
-HXLINE(1123)			handler(data);
-HXLINE(1124)			return ::snikket::EventResult_obj::EventHandled_dyn();
+            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1126_addChatsUpdatedListener)
+HXLINE(1127)			handler(data);
+HXLINE(1128)			return ::snikket::EventResult_obj::EventHandled_dyn();
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1122_addChatsUpdatedListener)
-HXDLIN(1122)		this->on(HX_("chats/update",3d,8e,1d,14), ::Dynamic(new _hx_Closure_0(handler)));
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1126_addChatsUpdatedListener)
+HXDLIN(1126)		this->on(HX_("chats/update",3d,8e,1d,14), ::Dynamic(new _hx_Closure_0(handler)));
             	}
 
 
@@ -3401,24 +3418,24 @@ HXDLIN( 252)		this->addChatsUpdatedListener( ::Dynamic(new _hx_Closure_0(handler
 void Client_obj::addCallRingListener( ::Dynamic handler){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::Dynamic,handler) HXARGC(1)
             		 ::snikket::EventResult _hx_run( ::Dynamic data){
-            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1134_addCallRingListener)
-HXLINE(1135)			handler( ::Dynamic(data->__Field(HX_("session",56,17,98,93),::hx::paccDynamic)), ::Dynamic(data->__Field(HX_("chatId",d3,04,77,b7),::hx::paccDynamic)));
-HXLINE(1136)			return ::snikket::EventResult_obj::EventHandled_dyn();
+            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1138_addCallRingListener)
+HXLINE(1139)			handler( ::Dynamic(data->__Field(HX_("session",56,17,98,93),::hx::paccDynamic)));
+HXLINE(1140)			return ::snikket::EventResult_obj::EventHandled_dyn();
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1134_addCallRingListener)
-HXDLIN(1134)		this->on(HX_("call/ring",01,8e,91,54), ::Dynamic(new _hx_Closure_0(handler)));
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1138_addCallRingListener)
+HXDLIN(1138)		this->on(HX_("call/ring",01,8e,91,54), ::Dynamic(new _hx_Closure_0(handler)));
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Client_obj,addCallRingListener,(void))
 
-void Client_obj::addCallRingListener__fromC(::cpp::Function< void  (void*,const char*,void*) > handler,void* handler__context){
-            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0,::cpp::Function< void  (void* HX_COMMA const char* HX_COMMA void*) >,handler,void*,handler__context) HXARGC(2)
-            		void _hx_run(::Dynamic a0,::String a1){
+void Client_obj::addCallRingListener__fromC(::cpp::Function< void  (void*,void*) > handler,void* handler__context){
+            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0,::cpp::Function< void  (void* HX_COMMA void*) >,handler,void*,handler__context) HXARGC(1)
+            		void _hx_run(::Dynamic a0){
             			HX_GC_STACKFRAME(&_hx_pos_e44af0c967c6b6e2_221_addCallRingListener__fromC)
-HXLINE( 221)			::cpp::Function< void  (void*,const char*,void*) > handler1 = handler;
+HXLINE( 221)			::cpp::Function< void  (void*,void*) > handler1 = handler;
 HXLINE( 215)			 ::Dynamic haxeObject = a0;
 HXDLIN( 215)			void* ptr = haxeObject.mPtr;
 HXDLIN( 215)			::cpp::Int64 ptrInt64 = reinterpret_cast<int64_t>(ptr);
@@ -3433,22 +3450,9 @@ HXDLIN( 215)					this1->set(low,highMap);
             				}
 HXDLIN( 215)				highMap->set(high,haxeObject);
             			}
-HXLINE( 213)			const char* cStrPtr = a1.utf8_str();
-HXDLIN( 213)			::cpp::Int64 ptrInt641 = reinterpret_cast<int64_t>(cStrPtr);
-HXDLIN( 213)			{
-HXLINE( 213)				 ::haxe::ds::IntMap this2 = ::_HaxeCBridge::Internal_obj::gcRetainMap;
-HXDLIN( 213)				int low1 = ptrInt641 & 0xffffffff;
-HXDLIN( 213)				int high1 = ptrInt641 >> 32;
-HXDLIN( 213)				 ::haxe::ds::IntMap highMap1 = ( ( ::haxe::ds::IntMap)(this2->get(low1)) );
-HXDLIN( 213)				if (::hx::IsNull( highMap1 )) {
-HXLINE( 213)					highMap1 =  ::haxe::ds::IntMap_obj::__alloc( HX_CTX );
-HXDLIN( 213)					this2->set(low1,highMap1);
-            				}
-HXDLIN( 213)				highMap1->set(high1,a1);
-            			}
-HXLINE( 221)			handler1(ptr,cStrPtr,handler__context);
+HXLINE( 221)			handler1(ptr,handler__context);
             		}
-            		HX_END_LOCAL_FUNC2((void))
+            		HX_END_LOCAL_FUNC1((void))
 
             	HX_STACKFRAME(&_hx_pos_e44af0c967c6b6e2_252_addCallRingListener__fromC)
 HXDLIN( 252)		this->addCallRingListener( ::Dynamic(new _hx_Closure_0(handler,handler__context)));
@@ -3458,24 +3462,24 @@ HXDLIN( 252)		this->addCallRingListener( ::Dynamic(new _hx_Closure_0(handler,han
 void Client_obj::addCallRetractListener( ::Dynamic handler){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::Dynamic,handler) HXARGC(1)
             		 ::snikket::EventResult _hx_run( ::Dynamic data){
-            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1146_addCallRetractListener)
-HXLINE(1147)			handler( ::Dynamic(data->__Field(HX_("chatId",d3,04,77,b7),::hx::paccDynamic)));
-HXLINE(1148)			return ::snikket::EventResult_obj::EventHandled_dyn();
+            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1150_addCallRetractListener)
+HXLINE(1151)			handler( ::Dynamic(data->__Field(HX_("chatId",d3,04,77,b7),::hx::paccDynamic)), ::Dynamic(data->__Field(HX_("sid",0e,9f,57,00),::hx::paccDynamic)));
+HXLINE(1152)			return ::snikket::EventResult_obj::EventHandled_dyn();
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1146_addCallRetractListener)
-HXDLIN(1146)		this->on(HX_("call/retract",50,bc,8d,db), ::Dynamic(new _hx_Closure_0(handler)));
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1150_addCallRetractListener)
+HXDLIN(1150)		this->on(HX_("call/retract",50,bc,8d,db), ::Dynamic(new _hx_Closure_0(handler)));
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Client_obj,addCallRetractListener,(void))
 
-void Client_obj::addCallRetractListener__fromC(::cpp::Function< void  (const char*,void*) > handler,void* handler__context){
-            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0,::cpp::Function< void  (const char* HX_COMMA void*) >,handler,void*,handler__context) HXARGC(1)
-            		void _hx_run(::String a0){
+void Client_obj::addCallRetractListener__fromC(::cpp::Function< void  (const char*,const char*,void*) > handler,void* handler__context){
+            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0,::cpp::Function< void  (const char* HX_COMMA const char* HX_COMMA void*) >,handler,void*,handler__context) HXARGC(2)
+            		void _hx_run(::String a0,::String a1){
             			HX_GC_STACKFRAME(&_hx_pos_e44af0c967c6b6e2_221_addCallRetractListener__fromC)
-HXLINE( 221)			::cpp::Function< void  (const char*,void*) > handler1 = handler;
+HXLINE( 221)			::cpp::Function< void  (const char*,const char*,void*) > handler1 = handler;
 HXLINE( 213)			const char* cStrPtr = a0.utf8_str();
 HXDLIN( 213)			::cpp::Int64 ptrInt64 = reinterpret_cast<int64_t>(cStrPtr);
 HXDLIN( 213)			{
@@ -3489,9 +3493,22 @@ HXDLIN( 213)					this1->set(low,highMap);
             				}
 HXDLIN( 213)				highMap->set(high,a0);
             			}
-HXLINE( 221)			handler1(cStrPtr,handler__context);
+HXDLIN( 213)			const char* cStrPtr1 = a1.utf8_str();
+HXDLIN( 213)			::cpp::Int64 ptrInt641 = reinterpret_cast<int64_t>(cStrPtr1);
+HXDLIN( 213)			{
+HXLINE( 213)				 ::haxe::ds::IntMap this2 = ::_HaxeCBridge::Internal_obj::gcRetainMap;
+HXDLIN( 213)				int low1 = ptrInt641 & 0xffffffff;
+HXDLIN( 213)				int high1 = ptrInt641 >> 32;
+HXDLIN( 213)				 ::haxe::ds::IntMap highMap1 = ( ( ::haxe::ds::IntMap)(this2->get(low1)) );
+HXDLIN( 213)				if (::hx::IsNull( highMap1 )) {
+HXLINE( 213)					highMap1 =  ::haxe::ds::IntMap_obj::__alloc( HX_CTX );
+HXDLIN( 213)					this2->set(low1,highMap1);
+            				}
+HXDLIN( 213)				highMap1->set(high1,a1);
+            			}
+HXLINE( 221)			handler1(cStrPtr,cStrPtr1,handler__context);
             		}
-            		HX_END_LOCAL_FUNC1((void))
+            		HX_END_LOCAL_FUNC2((void))
 
             	HX_STACKFRAME(&_hx_pos_e44af0c967c6b6e2_252_addCallRetractListener__fromC)
 HXDLIN( 252)		this->addCallRetractListener( ::Dynamic(new _hx_Closure_0(handler,handler__context)));
@@ -3501,24 +3518,24 @@ HXDLIN( 252)		this->addCallRetractListener( ::Dynamic(new _hx_Closure_0(handler,
 void Client_obj::addCallRingingListener( ::Dynamic handler){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::Dynamic,handler) HXARGC(1)
             		 ::snikket::EventResult _hx_run( ::Dynamic data){
-            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1158_addCallRingingListener)
-HXLINE(1159)			handler( ::Dynamic(data->__Field(HX_("chatId",d3,04,77,b7),::hx::paccDynamic)));
-HXLINE(1160)			return ::snikket::EventResult_obj::EventHandled_dyn();
+            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1162_addCallRingingListener)
+HXLINE(1163)			handler( ::Dynamic(data->__Field(HX_("chatId",d3,04,77,b7),::hx::paccDynamic)), ::Dynamic(data->__Field(HX_("sid",0e,9f,57,00),::hx::paccDynamic)));
+HXLINE(1164)			return ::snikket::EventResult_obj::EventHandled_dyn();
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1158_addCallRingingListener)
-HXDLIN(1158)		this->on(HX_("call/ringing",81,75,54,f9), ::Dynamic(new _hx_Closure_0(handler)));
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1162_addCallRingingListener)
+HXDLIN(1162)		this->on(HX_("call/ringing",81,75,54,f9), ::Dynamic(new _hx_Closure_0(handler)));
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Client_obj,addCallRingingListener,(void))
 
-void Client_obj::addCallRingingListener__fromC(::cpp::Function< void  (const char*,void*) > handler,void* handler__context){
-            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0,::cpp::Function< void  (const char* HX_COMMA void*) >,handler,void*,handler__context) HXARGC(1)
-            		void _hx_run(::String a0){
+void Client_obj::addCallRingingListener__fromC(::cpp::Function< void  (const char*,const char*,void*) > handler,void* handler__context){
+            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0,::cpp::Function< void  (const char* HX_COMMA const char* HX_COMMA void*) >,handler,void*,handler__context) HXARGC(2)
+            		void _hx_run(::String a0,::String a1){
             			HX_GC_STACKFRAME(&_hx_pos_e44af0c967c6b6e2_221_addCallRingingListener__fromC)
-HXLINE( 221)			::cpp::Function< void  (const char*,void*) > handler1 = handler;
+HXLINE( 221)			::cpp::Function< void  (const char*,const char*,void*) > handler1 = handler;
 HXLINE( 213)			const char* cStrPtr = a0.utf8_str();
 HXDLIN( 213)			::cpp::Int64 ptrInt64 = reinterpret_cast<int64_t>(cStrPtr);
 HXDLIN( 213)			{
@@ -3532,9 +3549,22 @@ HXDLIN( 213)					this1->set(low,highMap);
             				}
 HXDLIN( 213)				highMap->set(high,a0);
             			}
-HXLINE( 221)			handler1(cStrPtr,handler__context);
+HXDLIN( 213)			const char* cStrPtr1 = a1.utf8_str();
+HXDLIN( 213)			::cpp::Int64 ptrInt641 = reinterpret_cast<int64_t>(cStrPtr1);
+HXDLIN( 213)			{
+HXLINE( 213)				 ::haxe::ds::IntMap this2 = ::_HaxeCBridge::Internal_obj::gcRetainMap;
+HXDLIN( 213)				int low1 = ptrInt641 & 0xffffffff;
+HXDLIN( 213)				int high1 = ptrInt641 >> 32;
+HXDLIN( 213)				 ::haxe::ds::IntMap highMap1 = ( ( ::haxe::ds::IntMap)(this2->get(low1)) );
+HXDLIN( 213)				if (::hx::IsNull( highMap1 )) {
+HXLINE( 213)					highMap1 =  ::haxe::ds::IntMap_obj::__alloc( HX_CTX );
+HXDLIN( 213)					this2->set(low1,highMap1);
+            				}
+HXDLIN( 213)				highMap1->set(high1,a1);
+            			}
+HXLINE( 221)			handler1(cStrPtr,cStrPtr1,handler__context);
             		}
-            		HX_END_LOCAL_FUNC1((void))
+            		HX_END_LOCAL_FUNC2((void))
 
             	HX_STACKFRAME(&_hx_pos_e44af0c967c6b6e2_252_addCallRingingListener__fromC)
 HXDLIN( 252)		this->addCallRingingListener( ::Dynamic(new _hx_Closure_0(handler,handler__context)));
@@ -3544,14 +3574,14 @@ HXDLIN( 252)		this->addCallRingingListener( ::Dynamic(new _hx_Closure_0(handler,
 void Client_obj::addCallMediaListener( ::Dynamic handler){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::Dynamic,handler) HXARGC(1)
             		 ::snikket::EventResult _hx_run( ::Dynamic data){
-            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1172_addCallMediaListener)
-HXLINE(1173)			handler( ::Dynamic(data->__Field(HX_("session",56,17,98,93),::hx::paccDynamic)), ::Dynamic(data->__Field(HX_("audio",d6,78,80,27),::hx::paccDynamic)), ::Dynamic(data->__Field(HX_("video",7b,14,fc,36),::hx::paccDynamic)));
-HXLINE(1174)			return ::snikket::EventResult_obj::EventHandled_dyn();
+            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1176_addCallMediaListener)
+HXLINE(1177)			handler( ::Dynamic(data->__Field(HX_("session",56,17,98,93),::hx::paccDynamic)), ::Dynamic(data->__Field(HX_("audio",d6,78,80,27),::hx::paccDynamic)), ::Dynamic(data->__Field(HX_("video",7b,14,fc,36),::hx::paccDynamic)));
+HXLINE(1178)			return ::snikket::EventResult_obj::EventHandled_dyn();
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1172_addCallMediaListener)
-HXDLIN(1172)		this->on(HX_("call/media",73,5d,1d,c7), ::Dynamic(new _hx_Closure_0(handler)));
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1176_addCallMediaListener)
+HXDLIN(1176)		this->on(HX_("call/media",73,5d,1d,c7), ::Dynamic(new _hx_Closure_0(handler)));
             	}
 
 
@@ -3588,14 +3618,14 @@ HXDLIN( 252)		this->addCallMediaListener( ::Dynamic(new _hx_Closure_0(handler,ha
 void Client_obj::addCallTrackListener( ::Dynamic handler){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::Dynamic,handler) HXARGC(1)
             		 ::snikket::EventResult _hx_run( ::Dynamic data){
-            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1185_addCallTrackListener)
-HXLINE(1186)			handler( ::Dynamic(data->__Field(HX_("chatId",d3,04,77,b7),::hx::paccDynamic)), ::Dynamic(data->__Field(HX_("track",8b,8e,1f,16),::hx::paccDynamic)), ::Dynamic(data->__Field(HX_("streams",f3,db,44,f6),::hx::paccDynamic)));
-HXLINE(1187)			return ::snikket::EventResult_obj::EventHandled_dyn();
+            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1189_addCallTrackListener)
+HXLINE(1190)			handler( ::Dynamic(data->__Field(HX_("chatId",d3,04,77,b7),::hx::paccDynamic)), ::Dynamic(data->__Field(HX_("track",8b,8e,1f,16),::hx::paccDynamic)), ::Dynamic(data->__Field(HX_("streams",f3,db,44,f6),::hx::paccDynamic)));
+HXLINE(1191)			return ::snikket::EventResult_obj::EventHandled_dyn();
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1185_addCallTrackListener)
-HXDLIN(1185)		this->on(HX_("call/track",1a,e7,80,d7), ::Dynamic(new _hx_Closure_0(handler)));
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1189_addCallTrackListener)
+HXDLIN(1189)		this->on(HX_("call/track",1a,e7,80,d7), ::Dynamic(new _hx_Closure_0(handler)));
             	}
 
 
@@ -3681,12 +3711,12 @@ HXDLIN( 252)		this->addCallTrackListener( ::Dynamic(new _hx_Closure_0(handler,ha
 
 
 void Client_obj::setInForeground(){
-            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1194_setInForeground)
-HXLINE(1195)		if (!(this->stream->csi)) {
-HXLINE(1195)			return;
+            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1198_setInForeground)
+HXLINE(1199)		if (!(this->stream->csi)) {
+HXLINE(1199)			return;
             		}
-HXLINE(1196)		 ::snikket::GenericStream _hx_tmp = this->stream;
-HXDLIN(1196)		_hx_tmp->sendStanza( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("active",c6,41,46,16), ::Dynamic(::hx::Anon_obj::Create(1)
+HXLINE(1200)		 ::snikket::GenericStream _hx_tmp = this->stream;
+HXDLIN(1200)		_hx_tmp->sendStanza( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("active",c6,41,46,16), ::Dynamic(::hx::Anon_obj::Create(1)
             			->setFixed(0,HX_("xmlns",dc,31,74,60),HX_("urn:xmpp:csi:0",13,f1,6d,24)))));
             	}
 
@@ -3694,12 +3724,12 @@ HXDLIN(1196)		_hx_tmp->sendStanza( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("
 HX_DEFINE_DYNAMIC_FUNC0(Client_obj,setInForeground,(void))
 
 void Client_obj::setNotInForeground(){
-            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1202_setNotInForeground)
-HXLINE(1203)		if (!(this->stream->csi)) {
-HXLINE(1203)			return;
+            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1206_setNotInForeground)
+HXLINE(1207)		if (!(this->stream->csi)) {
+HXLINE(1207)			return;
             		}
-HXLINE(1204)		 ::snikket::GenericStream _hx_tmp = this->stream;
-HXDLIN(1204)		_hx_tmp->sendStanza( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("inactive",6b,17,30,6a), ::Dynamic(::hx::Anon_obj::Create(1)
+HXLINE(1208)		 ::snikket::GenericStream _hx_tmp = this->stream;
+HXDLIN(1208)		_hx_tmp->sendStanza( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("inactive",6b,17,30,6a), ::Dynamic(::hx::Anon_obj::Create(1)
             			->setFixed(0,HX_("xmlns",dc,31,74,60),HX_("urn:xmpp:csi:0",13,f1,6d,24)))));
             	}
 
@@ -3709,33 +3739,33 @@ HX_DEFINE_DYNAMIC_FUNC0(Client_obj,setNotInForeground,(void))
 ::Dynamic Client_obj::fetchMediaByHash(::Array< ::Dynamic> hashes,::Array< ::Dynamic> counterparts){
             		HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_0) HXARGC(1)
             		 ::Dynamic _hx_run( ::Dynamic x){
-            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1212_fetchMediaByHash)
-HXLINE(1212)			return x;
+            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1216_fetchMediaByHash)
+HXLINE(1216)			return x;
             		}
             		HX_END_LOCAL_FUNC1(return)
 
             		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_1, ::snikket::Client,_gthis,::Array< ::Dynamic>,hashes,::Array< ::Dynamic>,counterparts) HXARGC(1)
             		::Dynamic _hx_run( ::Dynamic _){
-            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1212_fetchMediaByHash)
-HXLINE(1212)			 ::snikket::Client _gthis1 = _gthis;
-HXDLIN(1212)			::Array< ::Dynamic> hashes1 = hashes;
-HXDLIN(1212)			return _gthis1->fetchMediaByHash(hashes1,counterparts->slice(1,null()));
+            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1216_fetchMediaByHash)
+HXLINE(1216)			 ::snikket::Client _gthis1 = _gthis;
+HXDLIN(1216)			::Array< ::Dynamic> hashes1 = hashes;
+HXDLIN(1216)			return _gthis1->fetchMediaByHash(hashes1,counterparts->slice(1,null()));
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1208_fetchMediaByHash)
-HXDLIN(1208)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE(1211)		bool _hx_tmp;
-HXDLIN(1211)		if ((hashes->length >= 1)) {
-HXLINE(1211)			_hx_tmp = (counterparts->length < 1);
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1212_fetchMediaByHash)
+HXDLIN(1212)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE(1215)		bool _hx_tmp;
+HXDLIN(1215)		if ((hashes->length >= 1)) {
+HXLINE(1215)			_hx_tmp = (counterparts->length < 1);
             		}
             		else {
-HXLINE(1211)			_hx_tmp = true;
+HXLINE(1215)			_hx_tmp = true;
             		}
-HXDLIN(1211)		if (_hx_tmp) {
-HXLINE(1211)			return ::thenshim::_Promise::Promise_Impl__obj::reject(HX_("no counterparts left",64,15,a4,38));
+HXDLIN(1215)		if (_hx_tmp) {
+HXLINE(1215)			return ::thenshim::_Promise::Promise_Impl__obj::reject(HX_("no counterparts left",64,15,a4,38));
             		}
-HXLINE(1212)		return ::thenshim::_Promise::Promise_Impl__obj::then(this->fetchMediaByHashOneCounterpart(hashes,counterparts->__get(0).StaticCast<  ::snikket::JID >()), ::Dynamic(new _hx_Closure_0()), ::Dynamic(new _hx_Closure_1(_gthis,hashes,counterparts)));
+HXLINE(1216)		return ::thenshim::_Promise::Promise_Impl__obj::then(this->fetchMediaByHashOneCounterpart(hashes,counterparts->__get(0).StaticCast<  ::snikket::JID >()), ::Dynamic(new _hx_Closure_0()), ::Dynamic(new _hx_Closure_1(_gthis,hashes,counterparts)));
             	}
 
 
@@ -3744,8 +3774,8 @@ HX_DEFINE_DYNAMIC_FUNC2(Client_obj,fetchMediaByHash,return )
 ::Dynamic Client_obj::fetchMediaByHashOneCounterpart(::Array< ::Dynamic> hashes, ::snikket::JID counterpart){
             		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0, ::snikket::Client,_gthis,::Array< ::Dynamic>,hashes) HXARGC(2)
             		void _hx_run( ::Dynamic resolve, ::Dynamic reject){
-            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1219_fetchMediaByHashOneCounterpart)
-HXLINE(1219)			::snikket::Persistence_obj::hasMedia(_gthis->persistence,hashes->__get(0).StaticCast<  ::snikket::Hash >()->algorithm,hashes->__get(0).StaticCast<  ::snikket::Hash >()->hash,resolve);
+            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1223_fetchMediaByHashOneCounterpart)
+HXLINE(1223)			::snikket::Persistence_obj::hasMedia(_gthis->persistence,hashes->__get(0).StaticCast<  ::snikket::Hash >()->algorithm,hashes->__get(0).StaticCast<  ::snikket::Hash >()->hash,resolve);
             		}
             		HX_END_LOCAL_FUNC2((void))
 
@@ -3755,62 +3785,62 @@ HXLINE(1219)			::snikket::Persistence_obj::hasMedia(_gthis->persistence,hashes->
             			void _hx_run( ::Dynamic resolve, ::Dynamic reject){
             				HX_BEGIN_LOCAL_FUNC_S4(::hx::LocalFunc,_hx_Closure_2, ::snikket::Client,_gthis, ::Dynamic,resolve, ::Dynamic,reject, ::snikket::queries::BoB,q1) HXARGC(0)
             				void _hx_run(){
-            					HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1225_fetchMediaByHashOneCounterpart)
-HXLINE(1226)					 ::Dynamic r = q1->getResult();
-HXLINE(1227)					if (::hx::IsNull( r )) {
-HXLINE(1228)						reject(HX_("bad or no result from BoB query",ad,e0,04,ee));
+            					HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1229_fetchMediaByHashOneCounterpart)
+HXLINE(1230)					 ::Dynamic r = q1->getResult();
+HXLINE(1231)					if (::hx::IsNull( r )) {
+HXLINE(1232)						reject(HX_("bad or no result from BoB query",ad,e0,04,ee));
             					}
             					else {
             						HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_1, ::Dynamic,resolve) HXARGC(0)
             						void _hx_run(){
-            							HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1230_fetchMediaByHashOneCounterpart)
-HXLINE(1230)							resolve(null());
+            							HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1234_fetchMediaByHashOneCounterpart)
+HXLINE(1234)							resolve(null());
             						}
             						HX_END_LOCAL_FUNC0((void))
 
-HXLINE(1230)						::snikket::Persistence_obj::storeMedia(_gthis->persistence, ::Dynamic(r->__Field(HX_("type",ba,f2,08,4d),::hx::paccDynamic)),( ( ::haxe::io::Bytes)(r->__Field(HX_("bytes",6b,08,98,bd),::hx::paccDynamic)) )->b, ::Dynamic(new _hx_Closure_1(resolve)));
+HXLINE(1234)						::snikket::Persistence_obj::storeMedia(_gthis->persistence, ::Dynamic(r->__Field(HX_("type",ba,f2,08,4d),::hx::paccDynamic)),( ( ::haxe::io::Bytes)(r->__Field(HX_("bytes",6b,08,98,bd),::hx::paccDynamic)) )->b, ::Dynamic(new _hx_Closure_1(resolve)));
             					}
             				}
             				HX_END_LOCAL_FUNC0((void))
 
-            				HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1223_fetchMediaByHashOneCounterpart)
-HXLINE(1224)				::String q = counterpart->asString();
-HXDLIN(1224)				 ::snikket::queries::BoB q1 = ::snikket::queries::BoB_obj::forHash(q,hashes->__get(0).StaticCast<  ::snikket::Hash >());
-HXLINE(1225)				q1->onFinished( ::Dynamic(new _hx_Closure_2(_gthis,resolve,reject,q1)));
-HXLINE(1233)				_gthis->sendQuery(q1);
+            				HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1227_fetchMediaByHashOneCounterpart)
+HXLINE(1228)				::String q = counterpart->asString();
+HXDLIN(1228)				 ::snikket::queries::BoB q1 = ::snikket::queries::BoB_obj::forHash(q,hashes->__get(0).StaticCast<  ::snikket::Hash >());
+HXLINE(1229)				q1->onFinished( ::Dynamic(new _hx_Closure_2(_gthis,resolve,reject,q1)));
+HXLINE(1237)				_gthis->sendQuery(q1);
             			}
             			HX_END_LOCAL_FUNC2((void))
 
             			HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_4) HXARGC(1)
             			 ::Dynamic _hx_run( ::Dynamic x){
-            				HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1234_fetchMediaByHashOneCounterpart)
-HXLINE(1234)				return x;
+            				HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1238_fetchMediaByHashOneCounterpart)
+HXLINE(1238)				return x;
             			}
             			HX_END_LOCAL_FUNC1(return)
 
             			HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_5, ::snikket::JID,counterpart, ::snikket::Client,_gthis,::Array< ::Dynamic>,hashes) HXARGC(1)
             			::Dynamic _hx_run( ::Dynamic _){
-            				HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1234_fetchMediaByHashOneCounterpart)
-HXLINE(1234)				 ::snikket::Client _gthis1 = _gthis;
-HXDLIN(1234)				::Array< ::Dynamic> _hx_tmp = hashes->slice(1,null());
-HXDLIN(1234)				return _gthis1->fetchMediaByHashOneCounterpart(_hx_tmp,counterpart);
+            				HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1238_fetchMediaByHashOneCounterpart)
+HXLINE(1238)				 ::snikket::Client _gthis1 = _gthis;
+HXDLIN(1238)				::Array< ::Dynamic> _hx_tmp = hashes->slice(1,null());
+HXDLIN(1238)				return _gthis1->fetchMediaByHashOneCounterpart(_hx_tmp,counterpart);
             			}
             			HX_END_LOCAL_FUNC1(return)
 
-            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1220_fetchMediaByHashOneCounterpart)
-HXLINE(1221)			if (has) {
-HXLINE(1221)				return ::thenshim::_Promise::Promise_Impl__obj::resolve(null());
+            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1224_fetchMediaByHashOneCounterpart)
+HXLINE(1225)			if (has) {
+HXLINE(1225)				return ::thenshim::_Promise::Promise_Impl__obj::resolve(null());
             			}
-HXLINE(1223)			return ::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_3(counterpart,_gthis,hashes))), ::Dynamic(new _hx_Closure_4()), ::Dynamic(new _hx_Closure_5(counterpart,_gthis,hashes)));
+HXLINE(1227)			return ::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_3(counterpart,_gthis,hashes))), ::Dynamic(new _hx_Closure_4()), ::Dynamic(new _hx_Closure_5(counterpart,_gthis,hashes)));
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1215_fetchMediaByHashOneCounterpart)
-HXDLIN(1215)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE(1216)		if ((hashes->length < 1)) {
-HXLINE(1216)			return ::thenshim::_Promise::Promise_Impl__obj::reject(HX_("no hashes left",8c,68,e6,69));
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1219_fetchMediaByHashOneCounterpart)
+HXDLIN(1219)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE(1220)		if ((hashes->length < 1)) {
+HXLINE(1220)			return ::thenshim::_Promise::Promise_Impl__obj::reject(HX_("no hashes left",8c,68,e6,69));
             		}
-HXLINE(1218)		return ::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_0(_gthis,hashes))), ::Dynamic(new _hx_Closure_6(counterpart,_gthis,hashes)),null());
+HXLINE(1222)		return ::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_0(_gthis,hashes))), ::Dynamic(new _hx_Closure_6(counterpart,_gthis,hashes)),null());
             	}
 
 
@@ -3818,43 +3848,43 @@ HX_DEFINE_DYNAMIC_FUNC2(Client_obj,fetchMediaByHashOneCounterpart,return )
 
 void Client_obj::chatActivity( ::snikket::Chat chat,::hx::Null< bool >  __o_trigger){
             		bool trigger = __o_trigger.Default(true);
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1239_chatActivity)
-HXLINE(1240)		if (chat->isBlocked) {
-HXLINE(1240)			return;
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1243_chatActivity)
+HXLINE(1244)		if (chat->isBlocked) {
+HXLINE(1244)			return;
             		}
-HXLINE(1241)		if ((chat->uiState == 2)) {
-HXLINE(1242)			chat->uiState = 1;
-HXLINE(1243)			::Dynamic _hx_tmp = this->persistence;
-HXDLIN(1243)			::snikket::Persistence_obj::storeChats(_hx_tmp,this->accountId(),::Array_obj< ::Dynamic>::__new(1)->init(0,chat));
+HXLINE(1245)		if ((chat->uiState == 2)) {
+HXLINE(1246)			chat->uiState = 1;
+HXLINE(1247)			::Dynamic _hx_tmp = this->persistence;
+HXDLIN(1247)			::snikket::Persistence_obj::storeChats(_hx_tmp,this->accountId(),::Array_obj< ::Dynamic>::__new(1)->init(0,chat));
             		}
-HXLINE(1245)		int pinnedCount;
-HXDLIN(1245)		if ((chat->uiState == 0)) {
-HXLINE(1245)			pinnedCount = 0;
+HXLINE(1249)		int pinnedCount;
+HXDLIN(1249)		if ((chat->uiState == 0)) {
+HXLINE(1249)			pinnedCount = 0;
             		}
             		else {
             			HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_0) HXARGC(2)
             			int _hx_run( ::snikket::Chat item,int result){
-            				HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1245_chatActivity)
-HXLINE(1245)				int pinnedCount;
-HXDLIN(1245)				if ((item->uiState == 0)) {
-HXLINE(1245)					pinnedCount = 1;
+            				HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1249_chatActivity)
+HXLINE(1249)				int pinnedCount;
+HXDLIN(1249)				if ((item->uiState == 0)) {
+HXLINE(1249)					pinnedCount = 1;
             				}
             				else {
-HXLINE(1245)					pinnedCount = 0;
+HXLINE(1249)					pinnedCount = 0;
             				}
-HXDLIN(1245)				return (result + pinnedCount);
+HXDLIN(1249)				return (result + pinnedCount);
             			}
             			HX_END_LOCAL_FUNC2(return)
 
-HXLINE(1245)			pinnedCount = ( (int)(::Lambda_obj::fold(this->chats, ::Dynamic(new _hx_Closure_0()),0)) );
+HXLINE(1249)			pinnedCount = ( (int)(::Lambda_obj::fold(this->chats, ::Dynamic(new _hx_Closure_0()),0)) );
             		}
-HXLINE(1246)		int idx = this->chats->indexOf(chat,null());
-HXLINE(1247)		if ((idx > pinnedCount)) {
-HXLINE(1248)			this->chats->removeRange(idx,1);
-HXLINE(1249)			this->chats->insert(pinnedCount,chat);
+HXLINE(1250)		int idx = this->chats->indexOf(chat,null());
+HXLINE(1251)		if ((idx > pinnedCount)) {
+HXLINE(1252)			this->chats->removeRange(idx,1);
+HXLINE(1253)			this->chats->insert(pinnedCount,chat);
             		}
-HXLINE(1251)		if (trigger) {
-HXLINE(1251)			this->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,chat));
+HXLINE(1255)		if (trigger) {
+HXLINE(1255)			this->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,chat));
             		}
             	}
 
@@ -3864,129 +3894,129 @@ HX_DEFINE_DYNAMIC_FUNC2(Client_obj,chatActivity,(void))
 void Client_obj::sortChats(){
             		HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_0) HXARGC(2)
             		int _hx_run( ::snikket::Chat a, ::snikket::Chat b){
-            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1256_sortChats)
-HXLINE(1257)			bool _hx_tmp;
-HXDLIN(1257)			if ((a->uiState == 0)) {
-HXLINE(1257)				_hx_tmp = (b->uiState != 0);
+            			HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1260_sortChats)
+HXLINE(1261)			bool _hx_tmp;
+HXDLIN(1261)			if ((a->uiState == 0)) {
+HXLINE(1261)				_hx_tmp = (b->uiState != 0);
             			}
             			else {
-HXLINE(1257)				_hx_tmp = false;
+HXLINE(1261)				_hx_tmp = false;
             			}
-HXDLIN(1257)			if (_hx_tmp) {
-HXLINE(1257)				return -1;
+HXDLIN(1261)			if (_hx_tmp) {
+HXLINE(1261)				return -1;
             			}
-HXLINE(1258)			bool _hx_tmp1;
-HXDLIN(1258)			if ((b->uiState == 0)) {
-HXLINE(1258)				_hx_tmp1 = (a->uiState != 0);
+HXLINE(1262)			bool _hx_tmp1;
+HXDLIN(1262)			if ((b->uiState == 0)) {
+HXLINE(1262)				_hx_tmp1 = (a->uiState != 0);
             			}
             			else {
-HXLINE(1258)				_hx_tmp1 = false;
+HXLINE(1262)				_hx_tmp1 = false;
             			}
-HXDLIN(1258)			if (_hx_tmp1) {
-HXLINE(1258)				return 1;
+HXDLIN(1262)			if (_hx_tmp1) {
+HXLINE(1262)				return 1;
             			}
-HXLINE(1259)			::String _hx_tmp2;
-HXDLIN(1259)			::String tmp = a->lastMessageTimestamp();
-HXDLIN(1259)			if (::hx::IsNotNull( tmp )) {
-HXLINE(1259)				_hx_tmp2 = tmp;
+HXLINE(1263)			::String _hx_tmp2;
+HXDLIN(1263)			::String tmp = a->lastMessageTimestamp();
+HXDLIN(1263)			if (::hx::IsNotNull( tmp )) {
+HXLINE(1263)				_hx_tmp2 = tmp;
             			}
             			else {
-HXLINE(1259)				_hx_tmp2 = HX_("0",30,00,00,00);
+HXLINE(1263)				_hx_tmp2 = HX_("0",30,00,00,00);
             			}
-HXDLIN(1259)			::String tmp1 = b->lastMessageTimestamp();
-HXDLIN(1259)			::String _hx_tmp3;
-HXDLIN(1259)			if (::hx::IsNotNull( tmp1 )) {
-HXLINE(1259)				_hx_tmp3 = tmp1;
+HXDLIN(1263)			::String tmp1 = b->lastMessageTimestamp();
+HXDLIN(1263)			::String _hx_tmp3;
+HXDLIN(1263)			if (::hx::IsNotNull( tmp1 )) {
+HXLINE(1263)				_hx_tmp3 = tmp1;
             			}
             			else {
-HXLINE(1259)				_hx_tmp3 = HX_("0",30,00,00,00);
+HXLINE(1263)				_hx_tmp3 = HX_("0",30,00,00,00);
             			}
-HXDLIN(1259)			return -(::Reflect_obj::compare(_hx_tmp2,_hx_tmp3));
+HXDLIN(1263)			return -(::Reflect_obj::compare(_hx_tmp2,_hx_tmp3));
             		}
             		HX_END_LOCAL_FUNC2(return)
 
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1256_sortChats)
-HXDLIN(1256)		this->chats->sort( ::Dynamic(new _hx_Closure_0()));
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1260_sortChats)
+HXDLIN(1260)		this->chats->sort( ::Dynamic(new _hx_Closure_0()));
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Client_obj,sortChats,(void))
 
 void Client_obj::storeMessages(::Array< ::Dynamic> messages, ::Dynamic callback){
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1265_storeMessages)
-HXDLIN(1265)		::Dynamic _hx_tmp = this->persistence;
-HXDLIN(1265)		::String _hx_tmp1 = this->accountId();
-HXDLIN(1265)		 ::Dynamic tmp = callback;
-HXDLIN(1265)		 ::Dynamic _hx_tmp2;
-HXDLIN(1265)		if (::hx::IsNotNull( tmp )) {
-HXDLIN(1265)			_hx_tmp2 = tmp;
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1269_storeMessages)
+HXDLIN(1269)		::Dynamic _hx_tmp = this->persistence;
+HXDLIN(1269)		::String _hx_tmp1 = this->accountId();
+HXDLIN(1269)		 ::Dynamic tmp = callback;
+HXDLIN(1269)		 ::Dynamic _hx_tmp2;
+HXDLIN(1269)		if (::hx::IsNotNull( tmp )) {
+HXDLIN(1269)			_hx_tmp2 = tmp;
             		}
             		else {
             			HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_0) HXARGC(1)
             			void _hx_run(::Array< ::Dynamic> _){
-            				HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1265_storeMessages)
+            				HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1269_storeMessages)
             			}
             			HX_END_LOCAL_FUNC1((void))
 
-HXDLIN(1265)			_hx_tmp2 =  ::Dynamic(new _hx_Closure_0());
+HXDLIN(1269)			_hx_tmp2 =  ::Dynamic(new _hx_Closure_0());
             		}
-HXDLIN(1265)		::snikket::Persistence_obj::storeMessages(_hx_tmp,_hx_tmp1,messages,_hx_tmp2);
+HXDLIN(1269)		::snikket::Persistence_obj::storeMessages(_hx_tmp,_hx_tmp1,messages,_hx_tmp2);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC2(Client_obj,storeMessages,(void))
 
 void Client_obj::sendQuery( ::snikket::queries::GenericQuery query){
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1270_sendQuery)
-HXDLIN(1270)		 ::snikket::GenericStream _hx_tmp = this->stream;
-HXDLIN(1270)		_hx_tmp->sendIq(query->getQueryStanza(),query->handleResponse_dyn());
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1274_sendQuery)
+HXDLIN(1274)		 ::snikket::GenericStream _hx_tmp = this->stream;
+HXDLIN(1274)		_hx_tmp->sendIq(query->getQueryStanza(),query->handleResponse_dyn());
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Client_obj,sendQuery,(void))
 
 void Client_obj::sendStanza( ::snikket::Stanza stanza){
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1274_sendStanza)
-HXLINE(1275)		if (::hx::IsNull( ( (::String)(::Reflect_obj::field(stanza->attr,HX_("id",db,5b,00,00))) ) )) {
-HXLINE(1275)			 ::Dynamic this1 = stanza->attr;
-HXDLIN(1275)			::String value = ::snikket::ID_obj::_hx_long();
-HXDLIN(1275)			::Reflect_obj::setField(this1,HX_("id",db,5b,00,00),value);
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1278_sendStanza)
+HXLINE(1279)		if (::hx::IsNull( ( (::String)(::Reflect_obj::field(stanza->attr,HX_("id",db,5b,00,00))) ) )) {
+HXLINE(1279)			 ::Dynamic this1 = stanza->attr;
+HXDLIN(1279)			::String value = ::snikket::ID_obj::_hx_long();
+HXDLIN(1279)			::Reflect_obj::setField(this1,HX_("id",db,5b,00,00),value);
             		}
-HXLINE(1276)		this->stream->sendStanza(stanza);
+HXLINE(1280)		this->stream->sendStanza(stanza);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Client_obj,sendStanza,(void))
 
 void Client_obj::sendPresence(::String to, ::Dynamic augment){
-            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1281_sendPresence)
-HXLINE(1282)		 ::Dynamic tmp = augment;
-HXDLIN(1282)		 ::Dynamic _hx_tmp;
-HXDLIN(1282)		if (::hx::IsNotNull( tmp )) {
-HXLINE(1282)			_hx_tmp = tmp;
+            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1285_sendPresence)
+HXLINE(1286)		 ::Dynamic tmp = augment;
+HXDLIN(1286)		 ::Dynamic _hx_tmp;
+HXDLIN(1286)		if (::hx::IsNotNull( tmp )) {
+HXLINE(1286)			_hx_tmp = tmp;
             		}
             		else {
             			HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_0) HXARGC(1)
             			 ::snikket::Stanza _hx_run( ::snikket::Stanza s){
-            				HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1282_sendPresence)
-HXLINE(1282)				return s;
+            				HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1286_sendPresence)
+HXLINE(1286)				return s;
             			}
             			HX_END_LOCAL_FUNC1(return)
 
-HXLINE(1282)			_hx_tmp =  ::Dynamic(new _hx_Closure_0());
+HXLINE(1286)			_hx_tmp =  ::Dynamic(new _hx_Closure_0());
             		}
-HXLINE(1283)		 ::snikket::Caps _hx_tmp1 = this->caps;
-HXDLIN(1283)		 ::Dynamic _hx_tmp2;
-HXDLIN(1283)		if (::hx::IsNull( to )) {
-HXLINE(1283)			_hx_tmp2 =  ::Dynamic(::hx::Anon_obj::Create(0));
+HXLINE(1287)		 ::snikket::Caps _hx_tmp1 = this->caps;
+HXDLIN(1287)		 ::Dynamic _hx_tmp2;
+HXDLIN(1287)		if (::hx::IsNull( to )) {
+HXLINE(1287)			_hx_tmp2 =  ::Dynamic(::hx::Anon_obj::Create(0));
             		}
             		else {
-HXLINE(1283)			_hx_tmp2 =  ::Dynamic(::hx::Anon_obj::Create(1)
+HXLINE(1287)			_hx_tmp2 =  ::Dynamic(::hx::Anon_obj::Create(1)
             				->setFixed(0,HX_("to",7b,65,00,00),to));
             		}
-HXDLIN(1283)		 ::snikket::Stanza _hx_tmp3 = _hx_tmp1->addC( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("presence",3b,52,d7,66),_hx_tmp2));
-HXLINE(1284)		::String _hx_tmp4 = this->displayName();
-HXLINE(1281)		this->sendStanza(( ( ::snikket::Stanza)(_hx_tmp(_hx_tmp3->textTag(HX_("nick",a3,7b,05,49),_hx_tmp4, ::Dynamic(::hx::Anon_obj::Create(1)
+HXDLIN(1287)		 ::snikket::Stanza _hx_tmp3 = _hx_tmp1->addC( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("presence",3b,52,d7,66),_hx_tmp2));
+HXLINE(1288)		::String _hx_tmp4 = this->displayName();
+HXLINE(1285)		this->sendStanza(( ( ::snikket::Stanza)(_hx_tmp(_hx_tmp3->textTag(HX_("nick",a3,7b,05,49),_hx_tmp4, ::Dynamic(::hx::Anon_obj::Create(1)
             			->setFixed(0,HX_("xmlns",dc,31,74,60),HX_("http://jabber.org/protocol/nick",17,30,dc,e9)))))) ));
             	}
 
@@ -3996,89 +4026,89 @@ HX_DEFINE_DYNAMIC_FUNC2(Client_obj,sendPresence,(void))
 void Client_obj::getIceServers( ::Dynamic callback){
             		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0, ::snikket::queries::ExtDiscoGet,extDiscoGet, ::Dynamic,callback) HXARGC(0)
             		void _hx_run(){
-            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1292_getIceServers)
-HXLINE(1293)			 ::haxe::ds::StringMap didUrl =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
-HXLINE(1294)			::Array< ::Dynamic> servers = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE(1295)			{
-HXLINE(1295)				int _g = 0;
-HXDLIN(1295)				::Array< ::Dynamic> _g1;
-HXDLIN(1295)				::Array< ::Dynamic> tmp = extDiscoGet->getResult();
-HXDLIN(1295)				if (::hx::IsNotNull( tmp )) {
-HXLINE(1295)					_g1 = tmp;
+            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1296_getIceServers)
+HXLINE(1297)			 ::haxe::ds::StringMap didUrl =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
+HXLINE(1298)			::Array< ::Dynamic> servers = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE(1299)			{
+HXLINE(1299)				int _g = 0;
+HXDLIN(1299)				::Array< ::Dynamic> _g1;
+HXDLIN(1299)				::Array< ::Dynamic> tmp = extDiscoGet->getResult();
+HXDLIN(1299)				if (::hx::IsNotNull( tmp )) {
+HXLINE(1299)					_g1 = tmp;
             				}
             				else {
-HXLINE(1295)					_g1 = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE(1299)					_g1 = ::Array_obj< ::Dynamic>::__new(0);
             				}
-HXDLIN(1295)				while((_g < _g1->length)){
-HXLINE(1295)					 ::snikket::Stanza service = _g1->__get(_g).StaticCast<  ::snikket::Stanza >();
-HXDLIN(1295)					_g = (_g + 1);
-HXLINE(1296)					if (!(::Array_obj< ::String >::fromData( _hx_array_data_7c06fe3c_192,4)->contains(( (::String)(::Reflect_obj::field(service->attr,HX_("type",ba,f2,08,4d))) )))) {
-HXLINE(1296)						continue;
+HXDLIN(1299)				while((_g < _g1->length)){
+HXLINE(1299)					 ::snikket::Stanza service = _g1->__get(_g).StaticCast<  ::snikket::Stanza >();
+HXDLIN(1299)					_g = (_g + 1);
+HXLINE(1300)					if (!(::Array_obj< ::String >::fromData( _hx_array_data_7c06fe3c_192,4)->contains(( (::String)(::Reflect_obj::field(service->attr,HX_("type",ba,f2,08,4d))) )))) {
+HXLINE(1300)						continue;
             					}
-HXLINE(1297)					::String host = ( (::String)(::Reflect_obj::field(service->attr,HX_("host",68,cf,12,45))) );
-HXLINE(1298)					bool _hx_tmp;
-HXDLIN(1298)					if (::hx::IsNotNull( host )) {
-HXLINE(1298)						_hx_tmp = (host == HX_("",00,00,00,00));
+HXLINE(1301)					::String host = ( (::String)(::Reflect_obj::field(service->attr,HX_("host",68,cf,12,45))) );
+HXLINE(1302)					bool _hx_tmp;
+HXDLIN(1302)					if (::hx::IsNotNull( host )) {
+HXLINE(1302)						_hx_tmp = (host == HX_("",00,00,00,00));
             					}
             					else {
-HXLINE(1298)						_hx_tmp = true;
+HXLINE(1302)						_hx_tmp = true;
             					}
-HXDLIN(1298)					if (_hx_tmp) {
-HXLINE(1298)						continue;
+HXDLIN(1302)					if (_hx_tmp) {
+HXLINE(1302)						continue;
             					}
-HXLINE(1299)					 ::Dynamic port = ::Std_obj::parseInt(( (::String)(::Reflect_obj::field(service->attr,HX_("port",81,83,5c,4a))) ));
-HXLINE(1300)					bool _hx_tmp1;
-HXDLIN(1300)					bool _hx_tmp2;
-HXDLIN(1300)					if (::hx::IsNotNull( port )) {
-HXLINE(1300)						_hx_tmp2 = ::hx::IsLess( port,1 );
+HXLINE(1303)					 ::Dynamic port = ::Std_obj::parseInt(( (::String)(::Reflect_obj::field(service->attr,HX_("port",81,83,5c,4a))) ));
+HXLINE(1304)					bool _hx_tmp1;
+HXDLIN(1304)					bool _hx_tmp2;
+HXDLIN(1304)					if (::hx::IsNotNull( port )) {
+HXLINE(1304)						_hx_tmp2 = ::hx::IsLess( port,1 );
             					}
             					else {
-HXLINE(1300)						_hx_tmp2 = true;
+HXLINE(1304)						_hx_tmp2 = true;
             					}
-HXDLIN(1300)					if (!(_hx_tmp2)) {
-HXLINE(1300)						_hx_tmp1 = ::hx::IsGreater( port,65535 );
+HXDLIN(1304)					if (!(_hx_tmp2)) {
+HXLINE(1304)						_hx_tmp1 = ::hx::IsGreater( port,65535 );
             					}
             					else {
-HXLINE(1300)						_hx_tmp1 = true;
+HXLINE(1304)						_hx_tmp1 = true;
             					}
-HXDLIN(1300)					if (_hx_tmp1) {
-HXLINE(1300)						continue;
+HXDLIN(1304)					if (_hx_tmp1) {
+HXLINE(1304)						continue;
             					}
-HXLINE(1301)					bool isTurn = ::Array_obj< ::String >::fromData( _hx_array_data_7c06fe3c_193,2)->contains(( (::String)(::Reflect_obj::field(service->attr,HX_("type",ba,f2,08,4d))) ));
-HXLINE(1302)					::String url = (( (::String)(::Reflect_obj::field(service->attr,HX_("type",ba,f2,08,4d))) ) + HX_(":",3a,00,00,00));
-HXDLIN(1302)					::String url1;
-HXDLIN(1302)					if ((host.indexOf(HX_(":",3a,00,00,00),null()) >= 0)) {
-HXLINE(1302)						url1 = ((HX_("[",5b,00,00,00) + host) + HX_("]",5d,00,00,00));
+HXLINE(1305)					bool isTurn = ::Array_obj< ::String >::fromData( _hx_array_data_7c06fe3c_193,2)->contains(( (::String)(::Reflect_obj::field(service->attr,HX_("type",ba,f2,08,4d))) ));
+HXLINE(1306)					::String url = (( (::String)(::Reflect_obj::field(service->attr,HX_("type",ba,f2,08,4d))) ) + HX_(":",3a,00,00,00));
+HXDLIN(1306)					::String url1;
+HXDLIN(1306)					if ((host.indexOf(HX_(":",3a,00,00,00),null()) >= 0)) {
+HXLINE(1306)						url1 = ((HX_("[",5b,00,00,00) + host) + HX_("]",5d,00,00,00));
             					}
             					else {
-HXLINE(1302)						url1 = host;
+HXLINE(1306)						url1 = host;
             					}
-HXDLIN(1302)					::String url2;
-HXDLIN(1302)					if (isTurn) {
-HXLINE(1302)						url2 = (HX_("?transport=",73,c9,f2,13) + ( (::String)(::Reflect_obj::field(service->attr,HX_("transport",a9,4f,2f,4c))) ));
+HXDLIN(1306)					::String url2;
+HXDLIN(1306)					if (isTurn) {
+HXLINE(1306)						url2 = (HX_("?transport=",73,c9,f2,13) + ( (::String)(::Reflect_obj::field(service->attr,HX_("transport",a9,4f,2f,4c))) ));
             					}
             					else {
-HXLINE(1302)						url2 = HX_("",00,00,00,00);
+HXLINE(1306)						url2 = HX_("",00,00,00,00);
             					}
-HXDLIN(1302)					::String url3 = ((((url + url1) + HX_(":",3a,00,00,00)) + port) + url2);
-HXLINE(1303)					if (!(didUrl->exists(url3))) {
-HXLINE(1305)						::String _hx_tmp3 = ( (::String)(::Reflect_obj::field(service->attr,HX_("username",16,86,eb,20))) );
-HXLINE(1304)						servers->push( ::Dynamic(::hx::Anon_obj::Create(3)
+HXDLIN(1306)					::String url3 = ((((url + url1) + HX_(":",3a,00,00,00)) + port) + url2);
+HXLINE(1307)					if (!(didUrl->exists(url3))) {
+HXLINE(1309)						::String _hx_tmp3 = ( (::String)(::Reflect_obj::field(service->attr,HX_("username",16,86,eb,20))) );
+HXLINE(1308)						servers->push( ::Dynamic(::hx::Anon_obj::Create(3)
             							->setFixed(0,HX_("credential",d7,89,b2,20),( (::String)(::Reflect_obj::field(service->attr,HX_("password",1b,23,d0,48))) ))
             							->setFixed(1,HX_("username",16,86,eb,20),_hx_tmp3)
             							->setFixed(2,HX_("urls",24,d6,ac,4d),::Array_obj< ::String >::__new(1)->init(0,url3))));
-HXLINE(1309)						didUrl->set(url3,true);
+HXLINE(1313)						didUrl->set(url3,true);
             					}
             				}
             			}
-HXLINE(1312)			callback(servers);
+HXLINE(1316)			callback(servers);
             		}
             		HX_END_LOCAL_FUNC0((void))
 
-            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1290_getIceServers)
-HXLINE(1291)		 ::snikket::queries::ExtDiscoGet extDiscoGet =  ::snikket::queries::ExtDiscoGet_obj::__alloc( HX_CTX ,this->jid->domain);
-HXLINE(1292)		extDiscoGet->onFinished( ::Dynamic(new _hx_Closure_0(extDiscoGet,callback)));
-HXLINE(1314)		this->sendQuery(extDiscoGet);
+            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1294_getIceServers)
+HXLINE(1295)		 ::snikket::queries::ExtDiscoGet extDiscoGet =  ::snikket::queries::ExtDiscoGet_obj::__alloc( HX_CTX ,this->jid->domain);
+HXLINE(1296)		extDiscoGet->onFinished( ::Dynamic(new _hx_Closure_0(extDiscoGet,callback)));
+HXLINE(1318)		this->sendQuery(extDiscoGet);
             	}
 
 
@@ -4087,66 +4117,66 @@ HX_DEFINE_DYNAMIC_FUNC1(Client_obj,getIceServers,(void))
 void Client_obj::discoverServices( ::snikket::JID target,::String node, ::Dynamic callback){
             		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_1, ::snikket::Client,_gthis, ::Dynamic,callback, ::snikket::queries::DiscoItemsGet,itemsGet) HXARGC(0)
             		void _hx_run(){
-            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1321_discoverServices)
-HXLINE(1321)			int _g = 0;
-HXDLIN(1321)			::Array< ::Dynamic> _g1;
-HXDLIN(1321)			::Array< ::Dynamic> tmp = itemsGet->getResult();
-HXDLIN(1321)			if (::hx::IsNotNull( tmp )) {
-HXLINE(1321)				_g1 = tmp;
+            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1325_discoverServices)
+HXLINE(1325)			int _g = 0;
+HXDLIN(1325)			::Array< ::Dynamic> _g1;
+HXDLIN(1325)			::Array< ::Dynamic> tmp = itemsGet->getResult();
+HXDLIN(1325)			if (::hx::IsNotNull( tmp )) {
+HXLINE(1325)				_g1 = tmp;
             			}
             			else {
-HXLINE(1321)				_g1 = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE(1325)				_g1 = ::Array_obj< ::Dynamic>::__new(0);
             			}
-HXDLIN(1321)			while((_g < _g1->length)){
+HXDLIN(1325)			while((_g < _g1->length)){
             				HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_0, ::snikket::queries::DiscoInfoGet,infoGet1, ::Dynamic,item, ::Dynamic,callback) HXARGC(0)
             				void _hx_run(){
-            					HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1324_discoverServices)
-HXLINE(1324)					 ::Dynamic callback1 = callback;
-HXDLIN(1324)					 ::Dynamic item1 = item;
-HXDLIN(1324)					callback1(item1,infoGet1->getResult());
+            					HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1328_discoverServices)
+HXLINE(1328)					 ::Dynamic callback1 = callback;
+HXDLIN(1328)					 ::Dynamic item1 = item;
+HXDLIN(1328)					callback1(item1,infoGet1->getResult());
             				}
             				HX_END_LOCAL_FUNC0((void))
 
-HXLINE(1321)				 ::Dynamic item = _g1->__get(_g);
-HXDLIN(1321)				_g = (_g + 1);
-HXLINE(1322)				::String infoGet = ( ( ::snikket::JID)(item->__Field(HX_("jid",c5,ca,50,00),::hx::paccDynamic)) )->asString();
-HXDLIN(1322)				 ::snikket::queries::DiscoInfoGet infoGet1 =  ::snikket::queries::DiscoInfoGet_obj::__alloc( HX_CTX ,infoGet,( (::String)(item->__Field(HX_("node",02,0a,0a,49),::hx::paccDynamic)) ));
-HXLINE(1323)				infoGet1->onFinished( ::Dynamic(new _hx_Closure_0(infoGet1,item,callback)));
-HXLINE(1326)				_gthis->sendQuery(infoGet1);
+HXLINE(1325)				 ::Dynamic item = _g1->__get(_g);
+HXDLIN(1325)				_g = (_g + 1);
+HXLINE(1326)				::String infoGet = ( ( ::snikket::JID)(item->__Field(HX_("jid",c5,ca,50,00),::hx::paccDynamic)) )->asString();
+HXDLIN(1326)				 ::snikket::queries::DiscoInfoGet infoGet1 =  ::snikket::queries::DiscoInfoGet_obj::__alloc( HX_CTX ,infoGet,( (::String)(item->__Field(HX_("node",02,0a,0a,49),::hx::paccDynamic)) ));
+HXLINE(1327)				infoGet1->onFinished( ::Dynamic(new _hx_Closure_0(infoGet1,item,callback)));
+HXLINE(1330)				_gthis->sendQuery(infoGet1);
             			}
             		}
             		HX_END_LOCAL_FUNC0((void))
 
-            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1318_discoverServices)
-HXDLIN(1318)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE(1319)		 ::snikket::queries::DiscoItemsGet itemsGet =  ::snikket::queries::DiscoItemsGet_obj::__alloc( HX_CTX ,target->asString(),node);
-HXLINE(1320)		itemsGet->onFinished( ::Dynamic(new _hx_Closure_1(_gthis,callback,itemsGet)));
-HXLINE(1329)		this->sendQuery(itemsGet);
+            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1322_discoverServices)
+HXDLIN(1322)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE(1323)		 ::snikket::queries::DiscoItemsGet itemsGet =  ::snikket::queries::DiscoItemsGet_obj::__alloc( HX_CTX ,target->asString(),node);
+HXLINE(1324)		itemsGet->onFinished( ::Dynamic(new _hx_Closure_1(_gthis,callback,itemsGet)));
+HXLINE(1333)		this->sendQuery(itemsGet);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC3(Client_obj,discoverServices,(void))
 
 void Client_obj::notifyMessageHandlers( ::snikket::ChatMessage message,int event){
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1333_notifyMessageHandlers)
-HXLINE(1334)		 ::snikket::Chat chat = this->getChat(message->chatId());
-HXLINE(1335)		bool _hx_tmp;
-HXDLIN(1335)		if (::hx::IsNotNull( chat )) {
-HXLINE(1335)			_hx_tmp = chat->isBlocked;
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1337_notifyMessageHandlers)
+HXLINE(1338)		 ::snikket::Chat chat = this->getChat(message->chatId());
+HXLINE(1339)		bool _hx_tmp;
+HXDLIN(1339)		if (::hx::IsNotNull( chat )) {
+HXLINE(1339)			_hx_tmp = chat->isBlocked;
             		}
             		else {
-HXLINE(1335)			_hx_tmp = false;
+HXLINE(1339)			_hx_tmp = false;
             		}
-HXDLIN(1335)		if (_hx_tmp) {
-HXLINE(1335)			return;
+HXDLIN(1339)		if (_hx_tmp) {
+HXLINE(1339)			return;
             		}
-HXLINE(1336)		{
-HXLINE(1336)			int _g = 0;
-HXDLIN(1336)			::Array< ::Dynamic> _g1 = this->chatMessageHandlers;
-HXDLIN(1336)			while((_g < _g1->length)){
-HXLINE(1336)				 ::Dynamic handler = _g1->__get(_g);
-HXDLIN(1336)				_g = (_g + 1);
-HXLINE(1337)				handler(message,event);
+HXLINE(1340)		{
+HXLINE(1340)			int _g = 0;
+HXDLIN(1340)			::Array< ::Dynamic> _g1 = this->chatMessageHandlers;
+HXDLIN(1340)			while((_g < _g1->length)){
+HXLINE(1340)				 ::Dynamic handler = _g1->__get(_g);
+HXDLIN(1340)				_g = (_g + 1);
+HXLINE(1341)				handler(message,event);
             			}
             		}
             	}
@@ -4155,35 +4185,35 @@ HXLINE(1337)				handler(message,event);
 HX_DEFINE_DYNAMIC_FUNC2(Client_obj,notifyMessageHandlers,(void))
 
 void Client_obj::notifySyncMessageHandlers( ::snikket::ChatMessage message){
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1342_notifySyncMessageHandlers)
-HXLINE(1343)		bool _hx_tmp;
-HXDLIN(1343)		if (::hx::IsNotNull( message )) {
-HXLINE(1343)			_hx_tmp = (message->versions->length > 1);
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1346_notifySyncMessageHandlers)
+HXLINE(1347)		bool _hx_tmp;
+HXDLIN(1347)		if (::hx::IsNotNull( message )) {
+HXLINE(1347)			_hx_tmp = (message->versions->length > 1);
             		}
             		else {
-HXLINE(1343)			_hx_tmp = true;
+HXLINE(1347)			_hx_tmp = true;
             		}
-HXDLIN(1343)		if (_hx_tmp) {
-HXLINE(1343)			return;
+HXDLIN(1347)		if (_hx_tmp) {
+HXLINE(1347)			return;
             		}
-HXLINE(1344)		 ::snikket::Chat chat = this->getChat(message->chatId());
-HXLINE(1345)		bool _hx_tmp1;
-HXDLIN(1345)		if (::hx::IsNotNull( chat )) {
-HXLINE(1345)			_hx_tmp1 = chat->isBlocked;
+HXLINE(1348)		 ::snikket::Chat chat = this->getChat(message->chatId());
+HXLINE(1349)		bool _hx_tmp1;
+HXDLIN(1349)		if (::hx::IsNotNull( chat )) {
+HXLINE(1349)			_hx_tmp1 = chat->isBlocked;
             		}
             		else {
-HXLINE(1345)			_hx_tmp1 = false;
+HXLINE(1349)			_hx_tmp1 = false;
             		}
-HXDLIN(1345)		if (_hx_tmp1) {
-HXLINE(1345)			return;
+HXDLIN(1349)		if (_hx_tmp1) {
+HXLINE(1349)			return;
             		}
-HXLINE(1346)		{
-HXLINE(1346)			int _g = 0;
-HXDLIN(1346)			::Array< ::Dynamic> _g1 = this->syncMessageHandlers;
-HXDLIN(1346)			while((_g < _g1->length)){
-HXLINE(1346)				 ::Dynamic handler = _g1->__get(_g);
-HXDLIN(1346)				_g = (_g + 1);
-HXLINE(1347)				handler(message);
+HXLINE(1350)		{
+HXLINE(1350)			int _g = 0;
+HXDLIN(1350)			::Array< ::Dynamic> _g1 = this->syncMessageHandlers;
+HXDLIN(1350)			while((_g < _g1->length)){
+HXLINE(1350)				 ::Dynamic handler = _g1->__get(_g);
+HXDLIN(1350)				_g = (_g + 1);
+HXLINE(1351)				handler(message);
             			}
             		}
             	}
@@ -4194,30 +4224,30 @@ HX_DEFINE_DYNAMIC_FUNC1(Client_obj,notifySyncMessageHandlers,(void))
 void Client_obj::rosterGet(){
             		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0, ::snikket::Client,_gthis, ::snikket::queries::RosterGet,rosterGet) HXARGC(0)
             		void _hx_run(){
-            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1353_rosterGet)
-HXLINE(1354)			::Array< ::Dynamic> chatsToUpdate = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE(1355)			{
-HXLINE(1355)				int _g = 0;
-HXDLIN(1355)				::Array< ::Dynamic> _g1 = rosterGet->getResult();
-HXDLIN(1355)				while((_g < _g1->length)){
-HXLINE(1355)					 ::Dynamic item = _g1->__get(_g);
-HXDLIN(1355)					_g = (_g + 1);
-HXLINE(1356)					 ::snikket::DirectChat chat = _gthis->getDirectChat(( (::String)(item->__Field(HX_("jid",c5,ca,50,00),::hx::paccDynamic)) ),false);
-HXLINE(1357)					chat->updateFromRoster(item);
-HXLINE(1358)					chatsToUpdate->push(chat);
-            				}
-            			}
-HXLINE(1360)			::Dynamic _gthis1 = _gthis->persistence;
-HXDLIN(1360)			::snikket::Persistence_obj::storeChats(_gthis1,_gthis->accountId(),chatsToUpdate);
-HXLINE(1361)			_gthis->trigger(HX_("chats/update",3d,8e,1d,14),chatsToUpdate);
+            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1357_rosterGet)
+HXLINE(1358)			::Array< ::Dynamic> chatsToUpdate = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE(1359)			{
+HXLINE(1359)				int _g = 0;
+HXDLIN(1359)				::Array< ::Dynamic> _g1 = rosterGet->getResult();
+HXDLIN(1359)				while((_g < _g1->length)){
+HXLINE(1359)					 ::Dynamic item = _g1->__get(_g);
+HXDLIN(1359)					_g = (_g + 1);
+HXLINE(1360)					 ::snikket::DirectChat chat = _gthis->getDirectChat(( (::String)(item->__Field(HX_("jid",c5,ca,50,00),::hx::paccDynamic)) ),false);
+HXLINE(1361)					chat->updateFromRoster(item);
+HXLINE(1362)					chatsToUpdate->push(chat);
+            				}
+            			}
+HXLINE(1364)			::Dynamic _gthis1 = _gthis->persistence;
+HXDLIN(1364)			::snikket::Persistence_obj::storeChats(_gthis1,_gthis->accountId(),chatsToUpdate);
+HXLINE(1365)			_gthis->trigger(HX_("chats/update",3d,8e,1d,14),chatsToUpdate);
             		}
             		HX_END_LOCAL_FUNC0((void))
 
-            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1351_rosterGet)
-HXDLIN(1351)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE(1352)		 ::snikket::queries::RosterGet rosterGet =  ::snikket::queries::RosterGet_obj::__alloc( HX_CTX ,null());
-HXLINE(1353)		rosterGet->onFinished( ::Dynamic(new _hx_Closure_0(_gthis,rosterGet)));
-HXLINE(1363)		this->sendQuery(rosterGet);
+            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1355_rosterGet)
+HXDLIN(1355)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE(1356)		 ::snikket::queries::RosterGet rosterGet =  ::snikket::queries::RosterGet_obj::__alloc( HX_CTX ,null());
+HXLINE(1357)		rosterGet->onFinished( ::Dynamic(new _hx_Closure_0(_gthis,rosterGet)));
+HXLINE(1367)		this->sendQuery(rosterGet);
             	}
 
 
@@ -4226,100 +4256,100 @@ HX_DEFINE_DYNAMIC_FUNC0(Client_obj,rosterGet,(void))
 void Client_obj::startChatWith(::String jid, ::Dynamic handleCaps, ::Dynamic handleChat){
             		HX_BEGIN_LOCAL_FUNC_S5(::hx::LocalFunc,_hx_Closure_0, ::snikket::Client,_gthis, ::Dynamic,handleChat, ::Dynamic,handleCaps, ::snikket::queries::DiscoInfoGet,discoGet,::String,jid) HXARGC(0)
             		void _hx_run(){
-            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1368_startChatWith)
-HXLINE(1369)			 ::snikket::Caps resultCaps = discoGet->getResult();
-HXLINE(1370)			if (::hx::IsNull( resultCaps )) {
-HXLINE(1371)				 ::snikket::Stanza tmp = discoGet->responseStanza;
-HXDLIN(1371)				 ::snikket::Stanza tmp1;
-HXDLIN(1371)				if (::hx::IsNotNull( tmp )) {
-HXLINE(1371)					tmp1 = tmp->getChild(HX_("error",c8,cb,29,73),null());
+            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1372_startChatWith)
+HXLINE(1373)			 ::snikket::Caps resultCaps = discoGet->getResult();
+HXLINE(1374)			if (::hx::IsNull( resultCaps )) {
+HXLINE(1375)				 ::snikket::Stanza tmp = discoGet->responseStanza;
+HXDLIN(1375)				 ::snikket::Stanza tmp1;
+HXDLIN(1375)				if (::hx::IsNotNull( tmp )) {
+HXLINE(1375)					tmp1 = tmp->getChild(HX_("error",c8,cb,29,73),null());
             				}
             				else {
-HXLINE(1371)					tmp1 = null();
+HXLINE(1375)					tmp1 = null();
             				}
-HXDLIN(1371)				 ::snikket::Stanza err;
-HXDLIN(1371)				if (::hx::IsNotNull( tmp1 )) {
-HXLINE(1371)					err = tmp1->getChild(null(),HX_("urn:ietf:params:xml:ns:xmpp-stanzas",27,f2,3d,30));
+HXDLIN(1375)				 ::snikket::Stanza err;
+HXDLIN(1375)				if (::hx::IsNotNull( tmp1 )) {
+HXLINE(1375)					err = tmp1->getChild(null(),HX_("urn:ietf:params:xml:ns:xmpp-stanzas",27,f2,3d,30));
             				}
             				else {
-HXLINE(1371)					err = null();
-            				}
-HXLINE(1372)				bool _hx_tmp;
-HXDLIN(1372)				bool _hx_tmp1;
-HXDLIN(1372)				if (::hx::IsNotNull( err )) {
-HXLINE(1372)					::String _hx_tmp2;
-HXDLIN(1372)					if (::hx::IsNotNull( err )) {
-HXLINE(1372)						_hx_tmp2 = err->name;
+HXLINE(1375)					err = null();
+            				}
+HXLINE(1376)				bool _hx_tmp;
+HXDLIN(1376)				bool _hx_tmp1;
+HXDLIN(1376)				if (::hx::IsNotNull( err )) {
+HXLINE(1376)					::String _hx_tmp2;
+HXDLIN(1376)					if (::hx::IsNotNull( err )) {
+HXLINE(1376)						_hx_tmp2 = err->name;
             					}
             					else {
-HXLINE(1372)						_hx_tmp2 = null();
+HXLINE(1376)						_hx_tmp2 = null();
             					}
-HXDLIN(1372)					_hx_tmp1 = (_hx_tmp2 == HX_("service-unavailable",f8,3c,11,1c));
+HXDLIN(1376)					_hx_tmp1 = (_hx_tmp2 == HX_("service-unavailable",f8,3c,11,1c));
             				}
             				else {
-HXLINE(1372)					_hx_tmp1 = true;
+HXLINE(1376)					_hx_tmp1 = true;
             				}
-HXDLIN(1372)				if (!(_hx_tmp1)) {
-HXLINE(1372)					::String _hx_tmp3;
-HXDLIN(1372)					if (::hx::IsNotNull( err )) {
-HXLINE(1372)						_hx_tmp3 = err->name;
+HXDLIN(1376)				if (!(_hx_tmp1)) {
+HXLINE(1376)					::String _hx_tmp3;
+HXDLIN(1376)					if (::hx::IsNotNull( err )) {
+HXLINE(1376)						_hx_tmp3 = err->name;
             					}
             					else {
-HXLINE(1372)						_hx_tmp3 = null();
+HXLINE(1376)						_hx_tmp3 = null();
             					}
-HXDLIN(1372)					_hx_tmp = (_hx_tmp3 == HX_("feature-not-implemented",71,20,2e,96));
+HXDLIN(1376)					_hx_tmp = (_hx_tmp3 == HX_("feature-not-implemented",71,20,2e,96));
             				}
             				else {
-HXLINE(1372)					_hx_tmp = true;
+HXLINE(1376)					_hx_tmp = true;
             				}
-HXDLIN(1372)				if (_hx_tmp) {
-HXLINE(1373)					 ::snikket::DirectChat chat = _gthis->getDirectChat(jid,false);
-HXLINE(1374)					handleChat(chat);
-HXLINE(1375)					::Dynamic _gthis1 = _gthis->persistence;
-HXDLIN(1375)					::snikket::Persistence_obj::storeChats(_gthis1,_gthis->accountId(),::Array_obj< ::Dynamic>::__new(1)->init(0,chat));
+HXDLIN(1376)				if (_hx_tmp) {
+HXLINE(1377)					 ::snikket::DirectChat chat = _gthis->getDirectChat(jid,false);
+HXLINE(1378)					handleChat(chat);
+HXLINE(1379)					::Dynamic _gthis1 = _gthis->persistence;
+HXDLIN(1379)					::snikket::Persistence_obj::storeChats(_gthis1,_gthis->accountId(),::Array_obj< ::Dynamic>::__new(1)->init(0,chat));
             				}
             			}
             			else {
-HXLINE(1378)				::snikket::Persistence_obj::storeCaps(_gthis->persistence,resultCaps);
-HXLINE(1379)				int uiState = ( (int)(handleCaps(resultCaps)) );
-HXLINE(1380)				if (resultCaps->isChannel(jid)) {
-HXLINE(1381)					 ::snikket::Channel chat1 =  ::snikket::Channel_obj::__alloc( HX_CTX ,_gthis,_gthis->stream,_gthis->persistence,jid,uiState,false,null(),null(),null(),resultCaps);
-HXLINE(1382)					handleChat(chat1);
-HXLINE(1383)					_gthis->chats->unshift(chat1);
-HXLINE(1384)					::Dynamic _gthis2 = _gthis->persistence;
-HXDLIN(1384)					::snikket::Persistence_obj::storeChats(_gthis2,_gthis->accountId(),::Array_obj< ::Dynamic>::__new(1)->init(0,chat1));
+HXLINE(1382)				::snikket::Persistence_obj::storeCaps(_gthis->persistence,resultCaps);
+HXLINE(1383)				int uiState = ( (int)(handleCaps(resultCaps)) );
+HXLINE(1384)				if (resultCaps->isChannel(jid)) {
+HXLINE(1385)					 ::snikket::Channel chat1 =  ::snikket::Channel_obj::__alloc( HX_CTX ,_gthis,_gthis->stream,_gthis->persistence,jid,uiState,false,null(),null(),null(),resultCaps);
+HXLINE(1386)					handleChat(chat1);
+HXLINE(1387)					_gthis->chats->unshift(chat1);
+HXLINE(1388)					::Dynamic _gthis2 = _gthis->persistence;
+HXDLIN(1388)					::snikket::Persistence_obj::storeChats(_gthis2,_gthis->accountId(),::Array_obj< ::Dynamic>::__new(1)->init(0,chat1));
             				}
             				else {
-HXLINE(1386)					 ::snikket::DirectChat chat2 = _gthis->getDirectChat(jid,false);
-HXLINE(1387)					handleChat(chat2);
-HXLINE(1388)					::Dynamic _gthis3 = _gthis->persistence;
-HXDLIN(1388)					::snikket::Persistence_obj::storeChats(_gthis3,_gthis->accountId(),::Array_obj< ::Dynamic>::__new(1)->init(0,chat2));
+HXLINE(1390)					 ::snikket::DirectChat chat2 = _gthis->getDirectChat(jid,false);
+HXLINE(1391)					handleChat(chat2);
+HXLINE(1392)					::Dynamic _gthis3 = _gthis->persistence;
+HXDLIN(1392)					::snikket::Persistence_obj::storeChats(_gthis3,_gthis->accountId(),::Array_obj< ::Dynamic>::__new(1)->init(0,chat2));
             				}
             			}
             		}
             		HX_END_LOCAL_FUNC0((void))
 
-            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1366_startChatWith)
-HXDLIN(1366)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE(1367)		 ::snikket::queries::DiscoInfoGet discoGet =  ::snikket::queries::DiscoInfoGet_obj::__alloc( HX_CTX ,jid,null());
-HXLINE(1368)		discoGet->onFinished( ::Dynamic(new _hx_Closure_0(_gthis,handleChat,handleCaps,discoGet,jid)));
-HXLINE(1392)		this->sendQuery(discoGet);
+            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1370_startChatWith)
+HXDLIN(1370)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE(1371)		 ::snikket::queries::DiscoInfoGet discoGet =  ::snikket::queries::DiscoInfoGet_obj::__alloc( HX_CTX ,jid,null());
+HXLINE(1372)		discoGet->onFinished( ::Dynamic(new _hx_Closure_0(_gthis,handleChat,handleCaps,discoGet,jid)));
+HXLINE(1396)		this->sendQuery(discoGet);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC3(Client_obj,startChatWith,(void))
 
 void Client_obj::serverBlocked(::String blocked){
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1395_serverBlocked)
-HXLINE(1396)		 ::snikket::Chat chat;
-HXDLIN(1396)		 ::snikket::Chat tmp = this->getChat(blocked);
-HXDLIN(1396)		if (::hx::IsNotNull( tmp )) {
-HXLINE(1396)			chat = tmp;
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1399_serverBlocked)
+HXLINE(1400)		 ::snikket::Chat chat;
+HXDLIN(1400)		 ::snikket::Chat tmp = this->getChat(blocked);
+HXDLIN(1400)		if (::hx::IsNotNull( tmp )) {
+HXLINE(1400)			chat = tmp;
             		}
             		else {
-HXLINE(1396)			chat = this->getDirectChat(blocked,false);
+HXLINE(1400)			chat = this->getDirectChat(blocked,false);
             		}
-HXLINE(1397)		chat->block(null(),false);
+HXLINE(1401)		chat->block(null(),false);
             	}
 
 
@@ -4328,178 +4358,178 @@ HX_DEFINE_DYNAMIC_FUNC1(Client_obj,serverBlocked,(void))
 void Client_obj::bookmarksGet( ::Dynamic callback){
             		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0, ::snikket::Client,_gthis, ::snikket::queries::BlocklistGet,blockingGet) HXARGC(0)
             		void _hx_run(){
-            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1404_bookmarksGet)
-HXLINE(1404)			int _g = 0;
-HXDLIN(1404)			::Array< ::String > _g1 = blockingGet->getResult();
-HXDLIN(1404)			while((_g < _g1->length)){
-HXLINE(1404)				::String blocked = _g1->__get(_g);
-HXDLIN(1404)				_g = (_g + 1);
-HXLINE(1405)				_gthis->serverBlocked(blocked);
+            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1408_bookmarksGet)
+HXLINE(1408)			int _g = 0;
+HXDLIN(1408)			::Array< ::String > _g1 = blockingGet->getResult();
+HXDLIN(1408)			while((_g < _g1->length)){
+HXLINE(1408)				::String blocked = _g1->__get(_g);
+HXDLIN(1408)				_g = (_g + 1);
+HXLINE(1409)				_gthis->serverBlocked(blocked);
             			}
             		}
             		HX_END_LOCAL_FUNC0((void))
 
             		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_3, ::snikket::Client,_gthis, ::snikket::queries::PubsubGet,mdsGet) HXARGC(0)
             		void _hx_run(){
-            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1411_bookmarksGet)
-HXLINE(1412)			::Array< ::Dynamic> chatsToUpdate = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE(1413)			{
-HXLINE(1413)				int _g = 0;
-HXDLIN(1413)				::Array< ::Dynamic> _g1 = mdsGet->getResult();
-HXDLIN(1413)				while((_g < _g1->length)){
-HXLINE(1413)					 ::snikket::Stanza item = _g1->__get(_g).StaticCast<  ::snikket::Stanza >();
-HXDLIN(1413)					_g = (_g + 1);
-HXLINE(1414)					if (::hx::IsNotNull( ( (::String)(::Reflect_obj::field(item->attr,HX_("id",db,5b,00,00))) ) )) {
-HXLINE(1415)						 ::snikket::Stanza tmp = item->getChild(HX_("displayed",21,17,db,c1),HX_("urn:xmpp:mds:displayed:0",bd,60,cc,fb));
-HXDLIN(1415)						 ::snikket::Stanza upTo;
-HXDLIN(1415)						if (::hx::IsNotNull( tmp )) {
-HXLINE(1415)							upTo = tmp->getChild(HX_("stanza-id",73,8a,54,e9),HX_("urn:xmpp:sid:0",a8,4b,37,54));
+            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1415_bookmarksGet)
+HXLINE(1416)			::Array< ::Dynamic> chatsToUpdate = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE(1417)			{
+HXLINE(1417)				int _g = 0;
+HXDLIN(1417)				::Array< ::Dynamic> _g1 = mdsGet->getResult();
+HXDLIN(1417)				while((_g < _g1->length)){
+HXLINE(1417)					 ::snikket::Stanza item = _g1->__get(_g).StaticCast<  ::snikket::Stanza >();
+HXDLIN(1417)					_g = (_g + 1);
+HXLINE(1418)					if (::hx::IsNotNull( ( (::String)(::Reflect_obj::field(item->attr,HX_("id",db,5b,00,00))) ) )) {
+HXLINE(1419)						 ::snikket::Stanza tmp = item->getChild(HX_("displayed",21,17,db,c1),HX_("urn:xmpp:mds:displayed:0",bd,60,cc,fb));
+HXDLIN(1419)						 ::snikket::Stanza upTo;
+HXDLIN(1419)						if (::hx::IsNotNull( tmp )) {
+HXLINE(1419)							upTo = tmp->getChild(HX_("stanza-id",73,8a,54,e9),HX_("urn:xmpp:sid:0",a8,4b,37,54));
             						}
             						else {
-HXLINE(1415)							upTo = null();
+HXLINE(1419)							upTo = null();
             						}
-HXLINE(1416)						 ::snikket::Client _gthis1 = _gthis;
-HXDLIN(1416)						 ::snikket::Chat chat = _gthis1->getChat(( (::String)(::Reflect_obj::field(item->attr,HX_("id",db,5b,00,00))) ));
-HXLINE(1417)						if (::hx::IsNull( chat )) {
+HXLINE(1420)						 ::snikket::Client _gthis1 = _gthis;
+HXDLIN(1420)						 ::snikket::Chat chat = _gthis1->getChat(( (::String)(::Reflect_obj::field(item->attr,HX_("id",db,5b,00,00))) ));
+HXLINE(1421)						if (::hx::IsNull( chat )) {
             							HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_1) HXARGC(1)
             							int _hx_run( ::snikket::Caps caps){
-            								HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1418_bookmarksGet)
-HXLINE(1418)								return 2;
+            								HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1422_bookmarksGet)
+HXLINE(1422)								return 2;
             							}
             							HX_END_LOCAL_FUNC1(return)
 
             							HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_2, ::snikket::Stanza,upTo) HXARGC(1)
             							void _hx_run( ::snikket::Chat chat){
-            								HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1418_bookmarksGet)
-HXLINE(1418)								::String _hx_tmp = ( (::String)(::Reflect_obj::field(upTo->attr,HX_("id",db,5b,00,00))) );
-HXDLIN(1418)								chat->markReadUpToId(_hx_tmp,( (::String)(::Reflect_obj::field(upTo->attr,HX_("by",d7,55,00,00))) ),null());
+            								HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1422_bookmarksGet)
+HXLINE(1422)								::String _hx_tmp = ( (::String)(::Reflect_obj::field(upTo->attr,HX_("id",db,5b,00,00))) );
+HXDLIN(1422)								chat->markReadUpToId(_hx_tmp,( (::String)(::Reflect_obj::field(upTo->attr,HX_("by",d7,55,00,00))) ),null());
             							}
             							HX_END_LOCAL_FUNC1((void))
 
-HXLINE(1418)							 ::snikket::Client _gthis2 = _gthis;
-HXDLIN(1418)							_gthis2->startChatWith(( (::String)(::Reflect_obj::field(item->attr,HX_("id",db,5b,00,00))) ), ::Dynamic(new _hx_Closure_1()), ::Dynamic(new _hx_Closure_2(upTo)));
+HXLINE(1422)							 ::snikket::Client _gthis2 = _gthis;
+HXDLIN(1422)							_gthis2->startChatWith(( (::String)(::Reflect_obj::field(item->attr,HX_("id",db,5b,00,00))) ), ::Dynamic(new _hx_Closure_1()), ::Dynamic(new _hx_Closure_2(upTo)));
             						}
             						else {
-HXLINE(1420)							::String _hx_tmp = ( (::String)(::Reflect_obj::field(upTo->attr,HX_("id",db,5b,00,00))) );
-HXDLIN(1420)							chat->markReadUpToId(_hx_tmp,( (::String)(::Reflect_obj::field(upTo->attr,HX_("by",d7,55,00,00))) ),null());
-HXLINE(1421)							chatsToUpdate->push(chat);
+HXLINE(1424)							::String _hx_tmp = ( (::String)(::Reflect_obj::field(upTo->attr,HX_("id",db,5b,00,00))) );
+HXDLIN(1424)							chat->markReadUpToId(_hx_tmp,( (::String)(::Reflect_obj::field(upTo->attr,HX_("by",d7,55,00,00))) ),null());
+HXLINE(1425)							chatsToUpdate->push(chat);
             						}
             					}
             				}
             			}
-HXLINE(1425)			::Dynamic _gthis3 = _gthis->persistence;
-HXDLIN(1425)			::snikket::Persistence_obj::storeChats(_gthis3,_gthis->accountId(),chatsToUpdate);
+HXLINE(1429)			::Dynamic _gthis3 = _gthis->persistence;
+HXDLIN(1429)			::snikket::Persistence_obj::storeChats(_gthis3,_gthis->accountId(),chatsToUpdate);
             		}
             		HX_END_LOCAL_FUNC0((void))
 
             		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_6, ::snikket::Client,_gthis, ::snikket::queries::PubsubGet,pubsubGet, ::Dynamic,callback) HXARGC(0)
             		void _hx_run(){
-            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1430_bookmarksGet)
-HXLINE(1431)			::Array< ::Dynamic> chatsToUpdate = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE(1432)			{
-HXLINE(1432)				int _g = 0;
-HXDLIN(1432)				::Array< ::Dynamic> _g1 = pubsubGet->getResult();
-HXDLIN(1432)				while((_g < _g1->length)){
-HXLINE(1432)					 ::snikket::Stanza item = _g1->__get(_g).StaticCast<  ::snikket::Stanza >();
-HXDLIN(1432)					_g = (_g + 1);
-HXLINE(1433)					if (::hx::IsNotNull( ( (::String)(::Reflect_obj::field(item->attr,HX_("id",db,5b,00,00))) ) )) {
-HXLINE(1434)						 ::snikket::Client _gthis1 = _gthis;
-HXDLIN(1434)						 ::snikket::Chat chat = _gthis1->getChat(( (::String)(::Reflect_obj::field(item->attr,HX_("id",db,5b,00,00))) ));
-HXLINE(1435)						if (::hx::IsNull( chat )) {
+            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1434_bookmarksGet)
+HXLINE(1435)			::Array< ::Dynamic> chatsToUpdate = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE(1436)			{
+HXLINE(1436)				int _g = 0;
+HXDLIN(1436)				::Array< ::Dynamic> _g1 = pubsubGet->getResult();
+HXDLIN(1436)				while((_g < _g1->length)){
+HXLINE(1436)					 ::snikket::Stanza item = _g1->__get(_g).StaticCast<  ::snikket::Stanza >();
+HXDLIN(1436)					_g = (_g + 1);
+HXLINE(1437)					if (::hx::IsNotNull( ( (::String)(::Reflect_obj::field(item->attr,HX_("id",db,5b,00,00))) ) )) {
+HXLINE(1438)						 ::snikket::Client _gthis1 = _gthis;
+HXDLIN(1438)						 ::snikket::Chat chat = _gthis1->getChat(( (::String)(::Reflect_obj::field(item->attr,HX_("id",db,5b,00,00))) ));
+HXLINE(1439)						if (::hx::IsNull( chat )) {
             							HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_4, ::snikket::Stanza,item) HXARGC(1)
             							int _hx_run( ::snikket::Caps caps){
-            								HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1438_bookmarksGet)
-HXLINE(1439)								 ::snikket::Identity identity = caps->identities->__get(0).StaticCast<  ::snikket::Identity >();
-HXLINE(1440)								 ::snikket::Stanza conf = item->getChild(HX_("conference",1c,2b,83,41),HX_("urn:xmpp:bookmarks:1",58,3c,53,7d));
-HXLINE(1441)								if (::hx::IsNull( ( (::String)(::Reflect_obj::field(conf->attr,HX_("name",4b,72,ff,48))) ) )) {
-HXLINE(1442)									::String value;
-HXDLIN(1442)									if (::hx::IsNotNull( identity )) {
-HXLINE(1442)										value = identity->name;
+            								HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1442_bookmarksGet)
+HXLINE(1443)								 ::snikket::Identity identity = caps->identities->__get(0).StaticCast<  ::snikket::Identity >();
+HXLINE(1444)								 ::snikket::Stanza conf = item->getChild(HX_("conference",1c,2b,83,41),HX_("urn:xmpp:bookmarks:1",58,3c,53,7d));
+HXLINE(1445)								if (::hx::IsNull( ( (::String)(::Reflect_obj::field(conf->attr,HX_("name",4b,72,ff,48))) ) )) {
+HXLINE(1446)									::String value;
+HXDLIN(1446)									if (::hx::IsNotNull( identity )) {
+HXLINE(1446)										value = identity->name;
             									}
             									else {
-HXLINE(1442)										value = null();
+HXLINE(1446)										value = null();
             									}
-HXDLIN(1442)									::Reflect_obj::setField(conf->attr,HX_("name",4b,72,ff,48),value);
+HXDLIN(1446)									::Reflect_obj::setField(conf->attr,HX_("name",4b,72,ff,48),value);
             								}
-HXLINE(1444)								bool _hx_tmp;
-HXDLIN(1444)								bool _hx_tmp1;
-HXDLIN(1444)								if ((( (::String)(::Reflect_obj::field(conf->attr,HX_("autojoin",d9,f6,b1,3e))) ) != HX_("1",31,00,00,00))) {
-HXLINE(1444)									_hx_tmp1 = (( (::String)(::Reflect_obj::field(conf->attr,HX_("autojoin",d9,f6,b1,3e))) ) == HX_("true",4e,a7,03,4d));
+HXLINE(1448)								bool _hx_tmp;
+HXDLIN(1448)								bool _hx_tmp1;
+HXDLIN(1448)								if ((( (::String)(::Reflect_obj::field(conf->attr,HX_("autojoin",d9,f6,b1,3e))) ) != HX_("1",31,00,00,00))) {
+HXLINE(1448)									_hx_tmp1 = (( (::String)(::Reflect_obj::field(conf->attr,HX_("autojoin",d9,f6,b1,3e))) ) == HX_("true",4e,a7,03,4d));
             								}
             								else {
-HXLINE(1444)									_hx_tmp1 = true;
+HXLINE(1448)									_hx_tmp1 = true;
             								}
-HXDLIN(1444)								if (!(_hx_tmp1)) {
-HXLINE(1444)									_hx_tmp = !(caps->isChannel(( (::String)(::Reflect_obj::field(item->attr,HX_("id",db,5b,00,00))) )));
+HXDLIN(1448)								if (!(_hx_tmp1)) {
+HXLINE(1448)									_hx_tmp = !(caps->isChannel(( (::String)(::Reflect_obj::field(item->attr,HX_("id",db,5b,00,00))) )));
             								}
             								else {
-HXLINE(1444)									_hx_tmp = true;
+HXLINE(1448)									_hx_tmp = true;
             								}
-HXDLIN(1444)								if (_hx_tmp) {
-HXLINE(1444)									return 1;
+HXDLIN(1448)								if (_hx_tmp) {
+HXLINE(1448)									return 1;
             								}
             								else {
-HXLINE(1444)									return 2;
+HXLINE(1448)									return 2;
             								}
-HXDLIN(1444)								return null();
+HXDLIN(1448)								return null();
             							}
             							HX_END_LOCAL_FUNC1(return)
 
             							HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_5, ::snikket::Stanza,item) HXARGC(1)
             							void _hx_run( ::snikket::Chat chat){
-            								HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1447_bookmarksGet)
-HXLINE(1447)								chat->updateFromBookmark(item);
+            								HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1451_bookmarksGet)
+HXLINE(1451)								chat->updateFromBookmark(item);
             							}
             							HX_END_LOCAL_FUNC1((void))
 
-HXLINE(1436)							 ::snikket::Client _gthis2 = _gthis;
-HXDLIN(1436)							_gthis2->startChatWith(( (::String)(::Reflect_obj::field(item->attr,HX_("id",db,5b,00,00))) ), ::Dynamic(new _hx_Closure_4(item)), ::Dynamic(new _hx_Closure_5(item)));
+HXLINE(1440)							 ::snikket::Client _gthis2 = _gthis;
+HXDLIN(1440)							_gthis2->startChatWith(( (::String)(::Reflect_obj::field(item->attr,HX_("id",db,5b,00,00))) ), ::Dynamic(new _hx_Closure_4(item)), ::Dynamic(new _hx_Closure_5(item)));
             						}
             						else {
-HXLINE(1451)							chat->updateFromBookmark(item);
-HXLINE(1452)							chatsToUpdate->push(chat);
+HXLINE(1455)							chat->updateFromBookmark(item);
+HXLINE(1456)							chatsToUpdate->push(chat);
             						}
             					}
             				}
             			}
-HXLINE(1456)			::Dynamic _gthis3 = _gthis->persistence;
-HXDLIN(1456)			::snikket::Persistence_obj::storeChats(_gthis3,_gthis->accountId(),chatsToUpdate);
-HXLINE(1457)			callback();
+HXLINE(1460)			::Dynamic _gthis3 = _gthis->persistence;
+HXDLIN(1460)			::snikket::Persistence_obj::storeChats(_gthis3,_gthis->accountId(),chatsToUpdate);
+HXLINE(1461)			callback();
             		}
             		HX_END_LOCAL_FUNC0((void))
 
-            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1401_bookmarksGet)
-HXDLIN(1401)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE(1402)		 ::snikket::queries::BlocklistGet blockingGet =  ::snikket::queries::BlocklistGet_obj::__alloc( HX_CTX );
-HXLINE(1403)		blockingGet->onFinished( ::Dynamic(new _hx_Closure_0(_gthis,blockingGet)));
-HXLINE(1408)		this->sendQuery(blockingGet);
-HXLINE(1410)		 ::snikket::queries::PubsubGet mdsGet =  ::snikket::queries::PubsubGet_obj::__alloc( HX_CTX ,null(),HX_("urn:xmpp:mds:displayed:0",bd,60,cc,fb),null());
-HXLINE(1411)		mdsGet->onFinished( ::Dynamic(new _hx_Closure_3(_gthis,mdsGet)));
-HXLINE(1427)		this->sendQuery(mdsGet);
-HXLINE(1429)		 ::snikket::queries::PubsubGet pubsubGet =  ::snikket::queries::PubsubGet_obj::__alloc( HX_CTX ,null(),HX_("urn:xmpp:bookmarks:1",58,3c,53,7d),null());
-HXLINE(1430)		pubsubGet->onFinished( ::Dynamic(new _hx_Closure_6(_gthis,pubsubGet,callback)));
-HXLINE(1459)		this->sendQuery(pubsubGet);
+            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1405_bookmarksGet)
+HXDLIN(1405)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE(1406)		 ::snikket::queries::BlocklistGet blockingGet =  ::snikket::queries::BlocklistGet_obj::__alloc( HX_CTX );
+HXLINE(1407)		blockingGet->onFinished( ::Dynamic(new _hx_Closure_0(_gthis,blockingGet)));
+HXLINE(1412)		this->sendQuery(blockingGet);
+HXLINE(1414)		 ::snikket::queries::PubsubGet mdsGet =  ::snikket::queries::PubsubGet_obj::__alloc( HX_CTX ,null(),HX_("urn:xmpp:mds:displayed:0",bd,60,cc,fb),null());
+HXLINE(1415)		mdsGet->onFinished( ::Dynamic(new _hx_Closure_3(_gthis,mdsGet)));
+HXLINE(1431)		this->sendQuery(mdsGet);
+HXLINE(1433)		 ::snikket::queries::PubsubGet pubsubGet =  ::snikket::queries::PubsubGet_obj::__alloc( HX_CTX ,null(),HX_("urn:xmpp:bookmarks:1",58,3c,53,7d),null());
+HXLINE(1434)		pubsubGet->onFinished( ::Dynamic(new _hx_Closure_6(_gthis,pubsubGet,callback)));
+HXLINE(1463)		this->sendQuery(pubsubGet);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Client_obj,bookmarksGet,(void))
 
 void Client_obj::sync( ::Dynamic callback){
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1462_sync)
-HXDLIN(1462)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE(1463)		if (::Std_obj::isOfType(this->persistence,::hx::ClassOf< ::snikket::persistence::Dummy >())) {
-HXLINE(1464)			callback(true);
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1466_sync)
+HXDLIN(1466)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE(1467)		if (::Std_obj::isOfType(this->persistence,::hx::ClassOf< ::snikket::persistence::Dummy >())) {
+HXLINE(1468)			callback(true);
             		}
             		else {
             			HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0, ::snikket::Client,_gthis, ::Dynamic,callback) HXARGC(1)
             			void _hx_run(::String lastId){
-            				HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1466_sync)
-HXLINE(1466)				_gthis->doSync(callback,lastId);
+            				HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1470_sync)
+HXLINE(1470)				_gthis->doSync(callback,lastId);
             			}
             			HX_END_LOCAL_FUNC1((void))
 
-HXLINE(1466)			::Dynamic _hx_tmp = this->persistence;
-HXDLIN(1466)			::snikket::Persistence_obj::lastId(_hx_tmp,this->accountId(),null(), ::Dynamic(new _hx_Closure_0(_gthis,callback)));
+HXLINE(1470)			::Dynamic _hx_tmp = this->persistence;
+HXDLIN(1470)			::snikket::Persistence_obj::lastId(_hx_tmp,this->accountId(),null(), ::Dynamic(new _hx_Closure_0(_gthis,callback)));
             		}
             	}
 
@@ -4507,26 +4537,26 @@ HXDLIN(1466)			::snikket::Persistence_obj::lastId(_hx_tmp,this->accountId(),null
 HX_DEFINE_DYNAMIC_FUNC1(Client_obj,sync,(void))
 
 void Client_obj::onMAMJMI(::String sid, ::snikket::Stanza stanza){
-            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1470_onMAMJMI)
-HXLINE(1471)		if (::hx::IsNull( ( (::String)(::Reflect_obj::field(stanza->attr,HX_("from",6a,a5,c2,43))) ) )) {
-HXLINE(1471)			return;
-            		}
-HXLINE(1472)		 ::snikket::JID from = ::snikket::JID_obj::parse(( (::String)(::Reflect_obj::field(stanza->attr,HX_("from",6a,a5,c2,43))) ));
-HXLINE(1473)		 ::snikket::DirectChat chat = this->getDirectChat(from->asBare()->asString(),null());
-HXLINE(1474)		if (chat->jingleSessions->exists(sid)) {
-HXLINE(1474)			return;
-            		}
-HXLINE(1475)		 ::snikket::Stanza jmiP = stanza->getChild(HX_("propose",fe,fe,e9,f9),HX_("urn:xmpp:jingle-message:0",fd,20,a5,07));
-HXLINE(1476)		if (::hx::IsNull( jmiP )) {
-HXLINE(1476)			return;
-            		}
-HXLINE(1477)		 ::snikket::jingle::IncomingProposedSession session =  ::snikket::jingle::IncomingProposedSession_obj::__alloc( HX_CTX ,::hx::ObjectPtr<OBJ_>(this),from,sid);
-HXLINE(1478)		{
-HXLINE(1478)			::Dynamic this1 = chat->jingleSessions;
-HXDLIN(1478)			( ( ::haxe::ds::StringMap)(this1) )->set(session->get_sid(),session);
-            		}
-HXLINE(1479)		this->chatActivity(chat,null());
-HXLINE(1480)		session->ring();
+            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1474_onMAMJMI)
+HXLINE(1475)		if (::hx::IsNull( ( (::String)(::Reflect_obj::field(stanza->attr,HX_("from",6a,a5,c2,43))) ) )) {
+HXLINE(1475)			return;
+            		}
+HXLINE(1476)		 ::snikket::JID from = ::snikket::JID_obj::parse(( (::String)(::Reflect_obj::field(stanza->attr,HX_("from",6a,a5,c2,43))) ));
+HXLINE(1477)		 ::snikket::DirectChat chat = this->getDirectChat(from->asBare()->asString(),null());
+HXLINE(1478)		if (chat->jingleSessions->exists(sid)) {
+HXLINE(1478)			return;
+            		}
+HXLINE(1479)		 ::snikket::Stanza jmiP = stanza->getChild(HX_("propose",fe,fe,e9,f9),HX_("urn:xmpp:jingle-message:0",fd,20,a5,07));
+HXLINE(1480)		if (::hx::IsNull( jmiP )) {
+HXLINE(1480)			return;
+            		}
+HXLINE(1481)		 ::snikket::jingle::IncomingProposedSession session =  ::snikket::jingle::IncomingProposedSession_obj::__alloc( HX_CTX ,::hx::ObjectPtr<OBJ_>(this),from,sid);
+HXLINE(1482)		{
+HXLINE(1482)			::Dynamic this1 = chat->jingleSessions;
+HXDLIN(1482)			( ( ::haxe::ds::StringMap)(this1) )->set(session->get_sid(),session);
+            		}
+HXLINE(1483)		this->chatActivity(chat,null());
+HXLINE(1484)		session->ring();
             	}
 
 
@@ -4535,9 +4565,9 @@ HX_DEFINE_DYNAMIC_FUNC2(Client_obj,onMAMJMI,(void))
 void Client_obj::doSync( ::Dynamic callback,::String lastId){
             		HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_0) HXARGC(2)
             		 ::snikket::ChatMessageBuilder _hx_run( ::snikket::ChatMessageBuilder builder, ::snikket::Stanza stanza){
-            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1493_doSync)
-HXLINE(1494)			builder->syncPoint = true;
-HXLINE(1495)			return builder;
+            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1497_doSync)
+HXLINE(1498)			builder->syncPoint = true;
+HXLINE(1499)			return builder;
             		}
             		HX_END_LOCAL_FUNC2(return)
 
@@ -4545,68 +4575,68 @@ HXLINE(1495)			return builder;
             		void _hx_run( ::Dynamic messageList){
             			HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_5, ::snikket::Client,_gthis,::Array< ::Dynamic>,chatMessages) HXARGC(2)
             			void _hx_run( ::Dynamic resolve, ::Dynamic reject){
-            				HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1519_doSync)
-HXLINE(1519)				::Dynamic _gthis1 = _gthis->persistence;
-HXDLIN(1519)				::String _hx_tmp = _gthis->accountId();
-HXDLIN(1519)				::snikket::Persistence_obj::storeMessages(_gthis1,_hx_tmp,chatMessages,resolve);
+            				HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1523_doSync)
+HXLINE(1523)				::Dynamic _gthis1 = _gthis->persistence;
+HXDLIN(1523)				::String _hx_tmp = _gthis->accountId();
+HXDLIN(1523)				::snikket::Persistence_obj::storeMessages(_gthis1,_hx_tmp,chatMessages,resolve);
             			}
             			HX_END_LOCAL_FUNC2((void))
 
             			HX_BEGIN_LOCAL_FUNC_S4(::hx::LocalFunc,_hx_Closure_6, ::snikket::Client,_gthis, ::haxe::ds::StringMap,chatIds, ::snikket::MessageSync,sync1, ::Dynamic,callback) HXARGC(1)
             			void _hx_run(::Array< ::Dynamic> results){
-            				HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1522_doSync)
-HXLINE(1523)				if ((_gthis->syncMessageHandlers->length > 0)) {
-HXLINE(1524)					int _g = 0;
-HXDLIN(1524)					while((_g < results->length)){
-HXLINE(1524)						::Array< ::Dynamic> messages = results->__get(_g).StaticCast< ::Array< ::Dynamic> >();
-HXDLIN(1524)						_g = (_g + 1);
-HXLINE(1525)						if (::hx::IsNotNull( messages )) {
-HXLINE(1526)							int _g1 = 0;
-HXDLIN(1526)							while((_g1 < messages->length)){
-HXLINE(1526)								 ::snikket::ChatMessage message = messages->__get(_g1).StaticCast<  ::snikket::ChatMessage >();
-HXDLIN(1526)								_g1 = (_g1 + 1);
-HXLINE(1527)								_gthis->notifySyncMessageHandlers(message);
+            				HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1526_doSync)
+HXLINE(1527)				if ((_gthis->syncMessageHandlers->length > 0)) {
+HXLINE(1528)					int _g = 0;
+HXDLIN(1528)					while((_g < results->length)){
+HXLINE(1528)						::Array< ::Dynamic> messages = results->__get(_g).StaticCast< ::Array< ::Dynamic> >();
+HXDLIN(1528)						_g = (_g + 1);
+HXLINE(1529)						if (::hx::IsNotNull( messages )) {
+HXLINE(1530)							int _g1 = 0;
+HXDLIN(1530)							while((_g1 < messages->length)){
+HXLINE(1530)								 ::snikket::ChatMessage message = messages->__get(_g1).StaticCast<  ::snikket::ChatMessage >();
+HXDLIN(1530)								_g1 = (_g1 + 1);
+HXLINE(1531)								_gthis->notifySyncMessageHandlers(message);
             							}
             						}
             					}
             				}
-HXLINE(1533)				if (sync1->hasMore()) {
-HXLINE(1534)					sync1->fetchNext();
+HXLINE(1537)				if (sync1->hasMore()) {
+HXLINE(1538)					sync1->fetchNext();
             				}
             				else {
-HXLINE(1536)					{
-HXLINE(1536)						::Dynamic map = sync1->jmi;
-HXDLIN(1536)						::Dynamic _g_map = map;
-HXDLIN(1536)						 ::Dynamic _g_keys = ::haxe::IMap_obj::keys(map);
-HXDLIN(1536)						while(( (bool)(_g_keys->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE(1536)							::String key = ( (::String)(_g_keys->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
-HXDLIN(1536)							 ::snikket::Stanza _g_value = ( ( ::snikket::Stanza)(::haxe::IMap_obj::get(_g_map,key)) );
-HXDLIN(1536)							::String _g_key = key;
-HXDLIN(1536)							::String sid = _g_key;
-HXDLIN(1536)							 ::snikket::Stanza stanza = _g_value;
-HXLINE(1537)							_gthis->onMAMJMI(sid,stanza);
+HXLINE(1540)					{
+HXLINE(1540)						::Dynamic map = sync1->jmi;
+HXDLIN(1540)						::Dynamic _g_map = map;
+HXDLIN(1540)						 ::Dynamic _g_keys = ::haxe::IMap_obj::keys(map);
+HXDLIN(1540)						while(( (bool)(_g_keys->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE(1540)							::String key = ( (::String)(_g_keys->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
+HXDLIN(1540)							 ::snikket::Stanza _g_value = ( ( ::snikket::Stanza)(::haxe::IMap_obj::get(_g_map,key)) );
+HXDLIN(1540)							::String _g_key = key;
+HXDLIN(1540)							::String sid = _g_key;
+HXDLIN(1540)							 ::snikket::Stanza stanza = _g_value;
+HXLINE(1541)							_gthis->onMAMJMI(sid,stanza);
             						}
             					}
-HXLINE(1539)					{
-HXLINE(1539)						::Dynamic map1 = chatIds;
-HXDLIN(1539)						::Dynamic _g_map1 = map1;
-HXDLIN(1539)						 ::Dynamic _g_keys1 = ::haxe::IMap_obj::keys(map1);
-HXDLIN(1539)						while(( (bool)(_g_keys1->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE(1539)							::String key1 = ( (::String)(_g_keys1->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
-HXDLIN(1539)							bool _g_value1 = ( (bool)(::haxe::IMap_obj::get(_g_map1,key1)) );
-HXDLIN(1539)							::String _g_key1 = key1;
-HXDLIN(1539)							::String chatId = _g_key1;
-HXDLIN(1539)							bool _ = _g_value1;
-HXDLIN(1539)							{
-HXLINE(1541)								 ::snikket::Chat chat = _gthis->getChat(chatId);
-HXLINE(1542)								if (::hx::IsNull( chat )) {
-HXLINE(1542)									_gthis->getDirectChat(chatId,null());
+HXLINE(1543)					{
+HXLINE(1543)						::Dynamic map1 = chatIds;
+HXDLIN(1543)						::Dynamic _g_map1 = map1;
+HXDLIN(1543)						 ::Dynamic _g_keys1 = ::haxe::IMap_obj::keys(map1);
+HXDLIN(1543)						while(( (bool)(_g_keys1->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE(1543)							::String key1 = ( (::String)(_g_keys1->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
+HXDLIN(1543)							bool _g_value1 = ( (bool)(::haxe::IMap_obj::get(_g_map1,key1)) );
+HXDLIN(1543)							::String _g_key1 = key1;
+HXDLIN(1543)							::String chatId = _g_key1;
+HXDLIN(1543)							bool _ = _g_value1;
+HXDLIN(1543)							{
+HXLINE(1545)								 ::snikket::Chat chat = _gthis->getChat(chatId);
+HXLINE(1546)								if (::hx::IsNull( chat )) {
+HXLINE(1546)									_gthis->getDirectChat(chatId,null());
             								}
             							}
             						}
             					}
-HXLINE(1544)					if (::hx::IsNotNull( callback )) {
-HXLINE(1544)						callback(true);
+HXLINE(1548)					if (::hx::IsNotNull( callback )) {
+HXLINE(1548)						callback(true);
             					}
             				}
             			}
@@ -4614,42 +4644,42 @@ HXLINE(1544)						callback(true);
 
             			HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_7, ::Dynamic,callback) HXARGC(1)
             			void _hx_run( ::Dynamic e){
-            				HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1547_doSync)
-HXLINE(1548)				 ::Dynamic _hx_tmp = ::haxe::Log_obj::trace;
-HXDLIN(1548)				::String _hx_tmp1;
-HXDLIN(1548)				if (::hx::IsNull( e )) {
-HXLINE(1548)					_hx_tmp1 = HX_("null",87,9e,0e,49);
+            				HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1551_doSync)
+HXLINE(1552)				 ::Dynamic _hx_tmp = ::haxe::Log_obj::trace;
+HXDLIN(1552)				::String _hx_tmp1;
+HXDLIN(1552)				if (::hx::IsNull( e )) {
+HXLINE(1552)					_hx_tmp1 = HX_("null",87,9e,0e,49);
             				}
             				else {
-HXLINE(1548)					_hx_tmp1 = ::Std_obj::string(e);
+HXLINE(1552)					_hx_tmp1 = ::Std_obj::string(e);
             				}
-HXDLIN(1548)				_hx_tmp(HX_("SYNC: error",67,8e,34,8a), ::Dynamic(::hx::Anon_obj::Create(5)
+HXDLIN(1552)				_hx_tmp(HX_("SYNC: error",67,8e,34,8a), ::Dynamic(::hx::Anon_obj::Create(5)
             					->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.Client",3c,fe,06,7c))
             					->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(1)->init(0,_hx_tmp1))
             					->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("doSync",86,5f,63,1c))
             					->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/Client.hx",e1,49,02,18))
-            					->setFixed(4,HX_("lineNumber",dd,81,22,76),1548)));
-HXLINE(1549)				callback(false);
+            					->setFixed(4,HX_("lineNumber",dd,81,22,76),1552)));
+HXLINE(1553)				callback(false);
             			}
             			HX_END_LOCAL_FUNC1((void))
 
-            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1498_doSync)
-HXLINE(1499)			::Array< ::Dynamic> promises = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE(1500)			::Array< ::Dynamic> chatMessages = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE(1501)			{
-HXLINE(1501)				int _g = 0;
-HXDLIN(1501)				::Array< ::Dynamic> _g1 = ( (::Array< ::Dynamic>)(messageList->__Field(HX_("messages",cc,d8,fd,34),::hx::paccDynamic)) );
-HXDLIN(1501)				while((_g < _g1->length)){
-HXLINE(1501)					 ::snikket::MessageStanza m = _g1->__get(_g).StaticCast<  ::snikket::MessageStanza >();
-HXDLIN(1501)					_g = (_g + 1);
-HXLINE(1502)					switch((int)(m->_hx_getIndex())){
+            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1502_doSync)
+HXLINE(1503)			::Array< ::Dynamic> promises = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE(1504)			::Array< ::Dynamic> chatMessages = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE(1505)			{
+HXLINE(1505)				int _g = 0;
+HXDLIN(1505)				::Array< ::Dynamic> _g1 = ( (::Array< ::Dynamic>)(messageList->__Field(HX_("messages",cc,d8,fd,34),::hx::paccDynamic)) );
+HXDLIN(1505)				while((_g < _g1->length)){
+HXLINE(1505)					 ::snikket::MessageStanza m = _g1->__get(_g).StaticCast<  ::snikket::MessageStanza >();
+HXDLIN(1505)					_g = (_g + 1);
+HXLINE(1506)					switch((int)(m->_hx_getIndex())){
             						case (int)1: {
-HXLINE(1503)							 ::snikket::ChatMessage message = m->_hx_getObject(0).StaticCast<  ::snikket::ChatMessage >();
-HXDLIN(1503)							{
-HXLINE(1504)								chatMessages->push(message);
-HXLINE(1505)								if ((message->type == 0)) {
-HXLINE(1505)									::String k = message->chatId();
-HXDLIN(1505)									chatIds->set(k,true);
+HXLINE(1507)							 ::snikket::ChatMessage message = m->_hx_getObject(0).StaticCast<  ::snikket::ChatMessage >();
+HXDLIN(1507)							{
+HXLINE(1508)								chatMessages->push(message);
+HXLINE(1509)								if ((message->type == 0)) {
+HXLINE(1509)									::String k = message->chatId();
+HXDLIN(1509)									chatIds->set(k,true);
             								}
             							}
             						}
@@ -4659,18 +4689,18 @@ HXDLIN(1505)									chatIds->set(k,true);
             							void _hx_run( ::Dynamic resolve, ::Dynamic reject){
             								HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_1, ::Dynamic,resolve) HXARGC(1)
             								void _hx_run( ::snikket::ChatMessage _){
-            									HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1512_doSync)
-HXLINE(1512)									resolve(null());
+            									HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1516_doSync)
+HXLINE(1516)									resolve(null());
             								}
             								HX_END_LOCAL_FUNC1((void))
 
-            								HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1512_doSync)
-HXLINE(1512)								::thenshim::_Promise::Promise_Impl__obj::then(_gthis->moderateMessage(action), ::Dynamic(new _hx_Closure_1(resolve)),null());
+            								HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1516_doSync)
+HXLINE(1516)								::thenshim::_Promise::Promise_Impl__obj::then(_gthis->moderateMessage(action), ::Dynamic(new _hx_Closure_1(resolve)),null());
             							}
             							HX_END_LOCAL_FUNC2((void))
 
-HXLINE(1510)							 ::snikket::ModerationAction action = m->_hx_getObject(0).StaticCast<  ::snikket::ModerationAction >();
-HXLINE(1511)							promises->push(::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_2(_gthis,action))));
+HXLINE(1514)							 ::snikket::ModerationAction action = m->_hx_getObject(0).StaticCast<  ::snikket::ModerationAction >();
+HXLINE(1515)							promises->push(::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_2(_gthis,action))));
             						}
             						break;
             						case (int)3: {
@@ -4678,20 +4708,20 @@ HXLINE(1511)							promises->push(::thenshim::_Promise::Promise_Impl__obj::_new(
             							void _hx_run( ::Dynamic resolve, ::Dynamic reject){
             								HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_3, ::Dynamic,resolve) HXARGC(1)
             								void _hx_run( ::snikket::ChatMessage _){
-            									HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1508_doSync)
-HXLINE(1508)									resolve(null());
+            									HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1512_doSync)
+HXLINE(1512)									resolve(null());
             								}
             								HX_END_LOCAL_FUNC1((void))
 
-            								HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1508_doSync)
-HXLINE(1508)								::Dynamic _gthis1 = _gthis->persistence;
-HXDLIN(1508)								::String _hx_tmp = _gthis->accountId();
-HXDLIN(1508)								::snikket::Persistence_obj::storeReaction(_gthis1,_hx_tmp,update, ::Dynamic(new _hx_Closure_3(resolve)));
+            								HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1512_doSync)
+HXLINE(1512)								::Dynamic _gthis1 = _gthis->persistence;
+HXDLIN(1512)								::String _hx_tmp = _gthis->accountId();
+HXDLIN(1512)								::snikket::Persistence_obj::storeReaction(_gthis1,_hx_tmp,update, ::Dynamic(new _hx_Closure_3(resolve)));
             							}
             							HX_END_LOCAL_FUNC2((void))
 
-HXLINE(1506)							 ::snikket::ReactionUpdate update = m->_hx_getObject(0).StaticCast<  ::snikket::ReactionUpdate >();
-HXLINE(1507)							promises->push(::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_4(_gthis,update))));
+HXLINE(1510)							 ::snikket::ReactionUpdate update = m->_hx_getObject(0).StaticCast<  ::snikket::ReactionUpdate >();
+HXLINE(1511)							promises->push(::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_4(_gthis,update))));
             						}
             						break;
             						default:{
@@ -4699,81 +4729,81 @@ HXLINE(1507)							promises->push(::thenshim::_Promise::Promise_Impl__obj::_new(
             					}
             				}
             			}
-HXLINE(1518)			promises->push(::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_5(_gthis,chatMessages))));
-HXLINE(1521)			::haxe::Log_obj::trace(HX_("SYNC: MAM page wait for writes",ad,4c,95,21),::hx::SourceInfo(HX_("snikket/Client.hx",e1,49,02,18),1521,HX_("snikket.Client",3c,fe,06,7c),HX_("doSync",86,5f,63,1c)));
-HXLINE(1522)			::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::PromiseTools_obj::all(promises), ::Dynamic(new _hx_Closure_6(_gthis,chatIds,sync1,callback)), ::Dynamic(new _hx_Closure_7(callback)));
+HXLINE(1522)			promises->push(::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_5(_gthis,chatMessages))));
+HXLINE(1525)			::haxe::Log_obj::trace(HX_("SYNC: MAM page wait for writes",ad,4c,95,21),::hx::SourceInfo(HX_("snikket/Client.hx",e1,49,02,18),1525,HX_("snikket.Client",3c,fe,06,7c),HX_("doSync",86,5f,63,1c)));
+HXLINE(1526)			::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::PromiseTools_obj::all(promises), ::Dynamic(new _hx_Closure_6(_gthis,chatIds,sync1,callback)), ::Dynamic(new _hx_Closure_7(callback)));
             		}
             		HX_END_LOCAL_FUNC1((void))
 
             		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_9, ::snikket::Client,_gthis,::String,lastId, ::Dynamic,callback) HXARGC(1)
             		void _hx_run( ::snikket::Stanza stanza){
-            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1553_doSync)
-HXLINE(1553)			if (::hx::IsNotNull( lastId )) {
-HXLINE(1555)				_gthis->doSync(callback,null());
+            			HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1557_doSync)
+HXLINE(1557)			if (::hx::IsNotNull( lastId )) {
+HXLINE(1559)				_gthis->doSync(callback,null());
             			}
             			else {
-HXLINE(1557)				::haxe::Log_obj::trace(HX_("SYNC: error",67,8e,34,8a), ::Dynamic(::hx::Anon_obj::Create(5)
+HXLINE(1561)				::haxe::Log_obj::trace(HX_("SYNC: error",67,8e,34,8a), ::Dynamic(::hx::Anon_obj::Create(5)
             					->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.Client",3c,fe,06,7c))
             					->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(1)->init(0,stanza))
             					->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("doSync",86,5f,63,1c))
             					->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/Client.hx",e1,49,02,18))
-            					->setFixed(4,HX_("lineNumber",dd,81,22,76),1557)));
-HXLINE(1558)				if (::hx::IsNotNull( callback )) {
-HXLINE(1558)					callback(false);
+            					->setFixed(4,HX_("lineNumber",dd,81,22,76),1561)));
+HXLINE(1562)				if (::hx::IsNotNull( callback )) {
+HXLINE(1562)					callback(false);
             				}
             			}
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1483_doSync)
-HXDLIN(1483)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE(1484)		::String thirtyDaysAgo = ::snikket::Date_obj::format(::Date_obj::fromTime((::Date_obj::now()->getTime() + ((Float)-2592000000.))));
-HXLINE(1490)		 ::Dynamic sync;
-HXDLIN(1490)		if (::hx::IsNull( lastId )) {
-HXLINE(1490)			sync =  ::Dynamic(::hx::Anon_obj::Create(1)
+            	HX_GC_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1487_doSync)
+HXDLIN(1487)		 ::snikket::Client _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE(1488)		::String thirtyDaysAgo = ::snikket::Date_obj::format(::Date_obj::fromTime((::Date_obj::now()->getTime() + ((Float)-2592000000.))));
+HXLINE(1494)		 ::Dynamic sync;
+HXDLIN(1494)		if (::hx::IsNull( lastId )) {
+HXLINE(1494)			sync =  ::Dynamic(::hx::Anon_obj::Create(1)
             				->setFixed(0,HX_("startTime",8f,45,f0,05),thirtyDaysAgo));
             		}
             		else {
-HXLINE(1490)			sync =  ::Dynamic(::hx::Anon_obj::Create(1)
+HXLINE(1494)			sync =  ::Dynamic(::hx::Anon_obj::Create(1)
             				->setFixed(0,HX_("page",4f,da,51,4a), ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("after",1c,66,a2,1d),lastId))));
             		}
-HXLINE(1487)		 ::snikket::MessageSync sync1 =  ::snikket::MessageSync_obj::__alloc( HX_CTX ,::hx::ObjectPtr<OBJ_>(this),this->stream,sync,null());
-HXLINE(1492)		sync1->setNewestPageFirst(false);
-HXLINE(1493)		sync1->addContext( ::Dynamic(new _hx_Closure_0()));
-HXLINE(1497)		 ::haxe::ds::StringMap chatIds =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
-HXLINE(1498)		sync1->onMessages( ::Dynamic(new _hx_Closure_8(_gthis,chatIds,sync1,callback)));
-HXLINE(1552)		sync1->onError( ::Dynamic(new _hx_Closure_9(_gthis,lastId,callback)));
-HXLINE(1561)		sync1->fetchNext();
+HXLINE(1491)		 ::snikket::MessageSync sync1 =  ::snikket::MessageSync_obj::__alloc( HX_CTX ,::hx::ObjectPtr<OBJ_>(this),this->stream,sync,null());
+HXLINE(1496)		sync1->setNewestPageFirst(false);
+HXLINE(1497)		sync1->addContext( ::Dynamic(new _hx_Closure_0()));
+HXLINE(1501)		 ::haxe::ds::StringMap chatIds =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
+HXLINE(1502)		sync1->onMessages( ::Dynamic(new _hx_Closure_8(_gthis,chatIds,sync1,callback)));
+HXLINE(1556)		sync1->onError( ::Dynamic(new _hx_Closure_9(_gthis,lastId,callback)));
+HXLINE(1565)		sync1->fetchNext();
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC2(Client_obj,doSync,(void))
 
 void Client_obj::pingAllChannels(bool refresh){
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1565_pingAllChannels)
-HXDLIN(1565)		int _g = 0;
-HXDLIN(1565)		::Array< ::Dynamic> _g1 = this->getChats();
-HXDLIN(1565)		while((_g < _g1->length)){
-HXDLIN(1565)			 ::snikket::Chat chat = _g1->__get(_g).StaticCast<  ::snikket::Chat >();
-HXDLIN(1565)			_g = (_g + 1);
-HXLINE(1566)			 ::snikket::Channel channel = ( ( ::snikket::Channel)(::Std_obj::downcast(chat,::hx::ClassOf< ::snikket::Channel >())) );
-HXLINE(1567)			if (::hx::IsNotNull( channel )) {
-HXLINE(1567)				bool _hx_tmp;
-HXDLIN(1567)				if (!(refresh)) {
-HXLINE(1567)					 ::snikket::Caps _hx_tmp1;
-HXDLIN(1567)					if (::hx::IsNotNull( channel )) {
-HXLINE(1567)						_hx_tmp1 = channel->disco;
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1569_pingAllChannels)
+HXDLIN(1569)		int _g = 0;
+HXDLIN(1569)		::Array< ::Dynamic> _g1 = this->getChats();
+HXDLIN(1569)		while((_g < _g1->length)){
+HXDLIN(1569)			 ::snikket::Chat chat = _g1->__get(_g).StaticCast<  ::snikket::Chat >();
+HXDLIN(1569)			_g = (_g + 1);
+HXLINE(1570)			 ::snikket::Channel channel = ( ( ::snikket::Channel)(::Std_obj::downcast(chat,::hx::ClassOf< ::snikket::Channel >())) );
+HXLINE(1571)			if (::hx::IsNotNull( channel )) {
+HXLINE(1571)				bool _hx_tmp;
+HXDLIN(1571)				if (!(refresh)) {
+HXLINE(1571)					 ::snikket::Caps _hx_tmp1;
+HXDLIN(1571)					if (::hx::IsNotNull( channel )) {
+HXLINE(1571)						_hx_tmp1 = channel->disco;
             					}
             					else {
-HXLINE(1567)						_hx_tmp1 = null();
+HXLINE(1571)						_hx_tmp1 = null();
             					}
-HXDLIN(1567)					_hx_tmp = ::hx::IsNull( _hx_tmp1 );
+HXDLIN(1571)					_hx_tmp = ::hx::IsNull( _hx_tmp1 );
             				}
             				else {
-HXLINE(1567)					_hx_tmp = true;
+HXLINE(1571)					_hx_tmp = true;
             				}
-HXDLIN(1567)				channel->selfPing(_hx_tmp);
+HXDLIN(1571)				channel->selfPing(_hx_tmp);
             			}
             		}
             	}
@@ -4782,34 +4812,34 @@ HXDLIN(1567)				channel->selfPing(_hx_tmp);
 HX_DEFINE_DYNAMIC_FUNC1(Client_obj,pingAllChannels,(void))
 
 void Client_obj::joinAllChannels(){
-            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1572_joinAllChannels)
-HXDLIN(1572)		int _g = 0;
-HXDLIN(1572)		::Array< ::Dynamic> _g1 = this->getChats();
-HXDLIN(1572)		while((_g < _g1->length)){
-HXDLIN(1572)			 ::snikket::Chat chat = _g1->__get(_g).StaticCast<  ::snikket::Chat >();
-HXDLIN(1572)			_g = (_g + 1);
-HXLINE(1573)			 ::snikket::Channel channel = ( ( ::snikket::Channel)(::Std_obj::downcast(chat,::hx::ClassOf< ::snikket::Channel >())) );
-HXLINE(1574)			if (::hx::IsNotNull( channel )) {
-HXLINE(1575)				if ((channel->disco->identities->length < 1)) {
+            	HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1576_joinAllChannels)
+HXDLIN(1576)		int _g = 0;
+HXDLIN(1576)		::Array< ::Dynamic> _g1 = this->getChats();
+HXDLIN(1576)		while((_g < _g1->length)){
+HXDLIN(1576)			 ::snikket::Chat chat = _g1->__get(_g).StaticCast<  ::snikket::Chat >();
+HXDLIN(1576)			_g = (_g + 1);
+HXLINE(1577)			 ::snikket::Channel channel = ( ( ::snikket::Channel)(::Std_obj::downcast(chat,::hx::ClassOf< ::snikket::Channel >())) );
+HXLINE(1578)			if (::hx::IsNotNull( channel )) {
+HXLINE(1579)				if ((channel->disco->identities->length < 1)) {
             					HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::Channel,channel) HXARGC(0)
             					void _hx_run(){
-            						HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1577_joinAllChannels)
-HXLINE(1577)						channel->join();
+            						HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1581_joinAllChannels)
+HXLINE(1581)						channel->join();
             					}
             					HX_END_LOCAL_FUNC0((void))
 
-HXLINE(1576)					channel->refreshDisco( ::Dynamic(new _hx_Closure_0(channel)));
+HXLINE(1580)					channel->refreshDisco( ::Dynamic(new _hx_Closure_0(channel)));
             				}
             				else {
             					HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_1, ::snikket::Channel,channel) HXARGC(0)
             					void _hx_run(){
-            						HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1581_joinAllChannels)
-HXLINE(1581)						channel->refreshDisco(null());
+            						HX_STACKFRAME(&_hx_pos_ead56881d4bbcaca_1585_joinAllChannels)
+HXLINE(1585)						channel->refreshDisco(null());
             					}
             					HX_END_LOCAL_FUNC0((void))
 
-HXLINE(1580)					channel->join();
-HXLINE(1581)					::haxe::Timer_obj::delay( ::Dynamic(new _hx_Closure_1(channel)),30000);
+HXLINE(1584)					channel->join();
+HXLINE(1585)					::haxe::Timer_obj::delay( ::Dynamic(new _hx_Closure_1(channel)),30000);
             				}
             			}
             		}
diff --git a/Sources/c_snikket/src/snikket/Config.cpp b/Sources/c_snikket/src/snikket/Config.cpp
index 47c2eba..1d57306 100644
--- a/Sources/c_snikket/src/snikket/Config.cpp
+++ b/Sources/c_snikket/src/snikket/Config.cpp
@@ -5,7 +5,12 @@
 #include <snikket/Config.h>
 #endif
 
-HX_LOCAL_STACK_FRAME(_hx_pos_436f82850fb5d17e_11_boot,"snikket.Config","boot",0x250dffcd,"snikket.Config.boot","snikket/Config.hx",11,0x1047a1ca)
+HX_LOCAL_STACK_FRAME(_hx_pos_a6806de73179644b_355_relativeHashUri__fromC,"snikket.Config","relativeHashUri__fromC",0xa3a22842,"snikket.Config.relativeHashUri__fromC","HaxeCBridge.hx",355,0xa18550d8)
+HX_LOCAL_STACK_FRAME(_hx_pos_a6806de73179644b_366_set_relativeHashUri__fromC,"snikket.Config","set_relativeHashUri__fromC",0x09ca09ff,"snikket.Config.set_relativeHashUri__fromC","HaxeCBridge.hx",366,0xa18550d8)
+HX_LOCAL_STACK_FRAME(_hx_pos_436f82850fb5d17e_29_enableConstrainedMemoryMode,"snikket.Config","enableConstrainedMemoryMode",0x9d5d973c,"snikket.Config.enableConstrainedMemoryMode","snikket/Config.hx",29,0x1047a1ca)
+HX_LOCAL_STACK_FRAME(_hx_pos_436f82850fb5d17e_13_boot,"snikket.Config","boot",0x250dffcd,"snikket.Config.boot","snikket/Config.hx",13,0x1047a1ca)
+HX_LOCAL_STACK_FRAME(_hx_pos_436f82850fb5d17e_20_boot,"snikket.Config","boot",0x250dffcd,"snikket.Config.boot","snikket/Config.hx",20,0x1047a1ca)
+HX_LOCAL_STACK_FRAME(_hx_pos_436f82850fb5d17e_23_boot,"snikket.Config","boot",0x250dffcd,"snikket.Config.boot","snikket/Config.hx",23,0x1047a1ca)
 namespace snikket{
 
 void Config_obj::__construct() { }
@@ -27,6 +32,34 @@ bool Config_obj::_hx_isInstanceOf(int inClassId) {
 
 bool Config_obj::relativeHashUri;
 
+bool Config_obj::relativeHashUri__fromC(){
+            	HX_STACKFRAME(&_hx_pos_a6806de73179644b_355_relativeHashUri__fromC)
+HXDLIN( 355)		return ::snikket::Config_obj::relativeHashUri;
+            	}
+
+
+STATIC_HX_DEFINE_DYNAMIC_FUNC0(Config_obj,relativeHashUri__fromC,return )
+
+void Config_obj::set_relativeHashUri__fromC(bool value){
+            	HX_STACKFRAME(&_hx_pos_a6806de73179644b_366_set_relativeHashUri__fromC)
+HXDLIN( 366)		::snikket::Config_obj::relativeHashUri = value;
+            	}
+
+
+STATIC_HX_DEFINE_DYNAMIC_FUNC1(Config_obj,set_relativeHashUri__fromC,(void))
+
+bool Config_obj::constrainedMemoryMode;
+
+void Config_obj::enableConstrainedMemoryMode(){
+            	HX_STACKFRAME(&_hx_pos_436f82850fb5d17e_29_enableConstrainedMemoryMode)
+HXLINE(  30)		__hxcpp_set_minimum_free_space(500000);
+HXLINE(  31)		__hxcpp_set_target_free_space_percentage(5);
+HXLINE(  32)		::snikket::Config_obj::constrainedMemoryMode = true;
+            	}
+
+
+STATIC_HX_DEFINE_DYNAMIC_FUNC0(Config_obj,enableConstrainedMemoryMode,(void))
+
 
 Config_obj::Config_obj()
 {
@@ -37,6 +70,18 @@ bool Config_obj::__GetStatic(const ::String &inName, Dynamic &outValue, ::hx::Pr
 	switch(inName.length) {
 	case 15:
 		if (HX_FIELD_EQ(inName,"relativeHashUri") ) { outValue = ( relativeHashUri ); return true; }
+		break;
+	case 21:
+		if (HX_FIELD_EQ(inName,"constrainedMemoryMode") ) { outValue = ( constrainedMemoryMode ); return true; }
+		break;
+	case 22:
+		if (HX_FIELD_EQ(inName,"relativeHashUri__fromC") ) { outValue = relativeHashUri__fromC_dyn(); return true; }
+		break;
+	case 26:
+		if (HX_FIELD_EQ(inName,"set_relativeHashUri__fromC") ) { outValue = set_relativeHashUri__fromC_dyn(); return true; }
+		break;
+	case 27:
+		if (HX_FIELD_EQ(inName,"enableConstrainedMemoryMode") ) { outValue = enableConstrainedMemoryMode_dyn(); return true; }
 	}
 	return false;
 }
@@ -46,6 +91,9 @@ bool Config_obj::__SetStatic(const ::String &inName,Dynamic &ioValue,::hx::Prope
 	switch(inName.length) {
 	case 15:
 		if (HX_FIELD_EQ(inName,"relativeHashUri") ) { relativeHashUri=ioValue.Cast< bool >(); return true; }
+		break;
+	case 21:
+		if (HX_FIELD_EQ(inName,"constrainedMemoryMode") ) { constrainedMemoryMode=ioValue.Cast< bool >(); return true; }
 	}
 	return false;
 }
@@ -54,17 +102,20 @@ bool Config_obj::__SetStatic(const ::String &inName,Dynamic &ioValue,::hx::Prope
 static ::hx::StorageInfo *Config_obj_sMemberStorageInfo = 0;
 static ::hx::StaticInfo Config_obj_sStaticStorageInfo[] = {
 	{::hx::fsBool,(void *) &Config_obj::relativeHashUri,HX_("relativeHashUri",d2,e4,68,83)},
+	{::hx::fsBool,(void *) &Config_obj::constrainedMemoryMode,HX_("constrainedMemoryMode",fa,2e,3c,85)},
 	{ ::hx::fsUnknown, 0, null()}
 };
 #endif
 
 static void Config_obj_sMarkStatics(HX_MARK_PARAMS) {
 	HX_MARK_MEMBER_NAME(Config_obj::relativeHashUri,"relativeHashUri");
+	HX_MARK_MEMBER_NAME(Config_obj::constrainedMemoryMode,"constrainedMemoryMode");
 };
 
 #ifdef HXCPP_VISIT_ALLOCS
 static void Config_obj_sVisitStatics(HX_VISIT_PARAMS) {
 	HX_VISIT_MEMBER_NAME(Config_obj::relativeHashUri,"relativeHashUri");
+	HX_VISIT_MEMBER_NAME(Config_obj::constrainedMemoryMode,"constrainedMemoryMode");
 };
 
 #endif
@@ -73,6 +124,10 @@ static void Config_obj_sVisitStatics(HX_VISIT_PARAMS) {
 
 static ::String Config_obj_sStaticFields[] = {
 	HX_("relativeHashUri",d2,e4,68,83),
+	HX_("relativeHashUri__fromC",e7,a9,89,83),
+	HX_("set_relativeHashUri__fromC",24,c2,23,1b),
+	HX_("constrainedMemoryMode",fa,2e,3c,85),
+	HX_("enableConstrainedMemoryMode",77,ff,84,ba),
 	::String(null())
 };
 
@@ -106,8 +161,21 @@ void Config_obj::__register()
 void Config_obj::__boot()
 {
 {
-            	HX_STACKFRAME(&_hx_pos_436f82850fb5d17e_11_boot)
-HXDLIN(  11)		relativeHashUri = false;
+            	HX_STACKFRAME(&_hx_pos_436f82850fb5d17e_13_boot)
+HXDLIN(  13)		__mClass->__meta__ =  ::Dynamic(::hx::Anon_obj::Create(1)
+            			->setFixed(0,HX_("statics",05,3c,65,36), ::Dynamic(::hx::Anon_obj::Create(2)
+            				->setFixed(0,HX_("relativeHashUri__fromC",e7,a9,89,83), ::Dynamic(::hx::Anon_obj::Create(1)
+            					->setFixed(0,HX_("HaxeCBridge.wrapper",8b,ea,27,d4),null())))
+            				->setFixed(1,HX_("set_relativeHashUri__fromC",24,c2,23,1b), ::Dynamic(::hx::Anon_obj::Create(1)
+            					->setFixed(0,HX_("HaxeCBridge.wrapper",8b,ea,27,d4),null()))))));
+            	}
+{
+            	HX_STACKFRAME(&_hx_pos_436f82850fb5d17e_20_boot)
+HXDLIN(  20)		relativeHashUri = false;
+            	}
+{
+            	HX_STACKFRAME(&_hx_pos_436f82850fb5d17e_23_boot)
+HXDLIN(  23)		constrainedMemoryMode = false;
             	}
 }
 
diff --git a/Sources/c_snikket/src/snikket/DirectChat.cpp b/Sources/c_snikket/src/snikket/DirectChat.cpp
index 4a94bb6..0092289 100644
--- a/Sources/c_snikket/src/snikket/DirectChat.cpp
+++ b/Sources/c_snikket/src/snikket/DirectChat.cpp
@@ -89,41 +89,41 @@
 #include <snikket/_Stanza/NodeInterface.h>
 #endif
 
-HX_DEFINE_STACK_FRAME(_hx_pos_af7b91d6026813b6_718_new,"snikket.DirectChat","new",0x757e3104,"snikket.DirectChat.new","snikket/Chat.hx",718,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_722_getParticipants,"snikket.DirectChat","getParticipants",0x9f51d1ba,"snikket.DirectChat.getParticipants","snikket/Chat.hx",722,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_732_counterparts,"snikket.DirectChat","counterparts",0x2a527b80,"snikket.DirectChat.counterparts","snikket/Chat.hx",732,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_736_getParticipantDetails,"snikket.DirectChat","getParticipantDetails",0x79208529,"snikket.DirectChat.getParticipantDetails","snikket/Chat.hx",736,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_744_getMessagesBefore,"snikket.DirectChat","getMessagesBefore",0x4909a945,"snikket.DirectChat.getMessagesBefore","snikket/Chat.hx",744,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_742_getMessagesBefore,"snikket.DirectChat","getMessagesBefore",0x4909a945,"snikket.DirectChat.getMessagesBefore","snikket/Chat.hx",742,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_762_getMessagesAfter,"snikket.DirectChat","getMessagesAfter",0x26744c16,"snikket.DirectChat.getMessagesAfter","snikket/Chat.hx",762,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_756_getMessagesAfter,"snikket.DirectChat","getMessagesAfter",0x26744c16,"snikket.DirectChat.getMessagesAfter","snikket/Chat.hx",756,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_776_getMessagesAround,"snikket.DirectChat","getMessagesAround",0x64db4d13,"snikket.DirectChat.getMessagesAround","snikket/Chat.hx",776,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_775_getMessagesAround,"snikket.DirectChat","getMessagesAround",0x64db4d13,"snikket.DirectChat.getMessagesAround","snikket/Chat.hx",775,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_786_prepareIncomingMessage,"snikket.DirectChat","prepareIncomingMessage",0xe7120196,"snikket.DirectChat.prepareIncomingMessage","snikket/Chat.hx",786,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_791_prepareOutgoingMessage,"snikket.DirectChat","prepareOutgoingMessage",0x4d3ec6d0,"snikket.DirectChat.prepareOutgoingMessage","snikket/Chat.hx",791,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_808_correctMessage,"snikket.DirectChat","correctMessage",0x83971059,"snikket.DirectChat.correctMessage","snikket/Chat.hx",808,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_803_correctMessage,"snikket.DirectChat","correctMessage",0x83971059,"snikket.DirectChat.correctMessage","snikket/Chat.hx",803,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_824_sendMessage,"snikket.DirectChat","sendMessage",0x7d4f2e03,"snikket.DirectChat.sendMessage","snikket/Chat.hx",824,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_832_sendMessage,"snikket.DirectChat","sendMessage",0x7d4f2e03,"snikket.DirectChat.sendMessage","snikket/Chat.hx",832,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_848_sendMessage,"snikket.DirectChat","sendMessage",0x7d4f2e03,"snikket.DirectChat.sendMessage","snikket/Chat.hx",848,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_884_removeReaction,"snikket.DirectChat","removeReaction",0x4fdefde9,"snikket.DirectChat.removeReaction","snikket/Chat.hx",884,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_862_removeReaction,"snikket.DirectChat","removeReaction",0x4fdefde9,"snikket.DirectChat.removeReaction","snikket/Chat.hx",862,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_877_removeReaction,"snikket.DirectChat","removeReaction",0x4fdefde9,"snikket.DirectChat.removeReaction","snikket/Chat.hx",877,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_896_lastMessageId,"snikket.DirectChat","lastMessageId",0x6bb7a5f0,"snikket.DirectChat.lastMessageId","snikket/Chat.hx",896,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_901_markReadUpTo,"snikket.DirectChat","markReadUpTo",0xa06bd335,"snikket.DirectChat.markReadUpTo","snikket/Chat.hx",901,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_900_markReadUpTo,"snikket.DirectChat","markReadUpTo",0xa06bd335,"snikket.DirectChat.markReadUpTo","snikket/Chat.hx",900,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_932_bookmark,"snikket.DirectChat","bookmark",0x9ab25992,"snikket.DirectChat.bookmark","snikket/Chat.hx",932,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_922_bookmark,"snikket.DirectChat","bookmark",0x9ab25992,"snikket.DirectChat.bookmark","snikket/Chat.hx",922,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_941_sendChatState,"snikket.DirectChat","sendChatState",0xb2f43755,"snikket.DirectChat.sendChatState","snikket/Chat.hx",941,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_958_close,"snikket.DirectChat","close",0x2561e95c,"snikket.DirectChat.close","snikket/Chat.hx",958,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_715_boot,"snikket.DirectChat","boot",0x5105b30e,"snikket.DirectChat.boot","snikket/Chat.hx",715,0x18616bf4)
+HX_DEFINE_STACK_FRAME(_hx_pos_af7b91d6026813b6_727_new,"snikket.DirectChat","new",0x757e3104,"snikket.DirectChat.new","snikket/Chat.hx",727,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_731_getParticipants,"snikket.DirectChat","getParticipants",0x9f51d1ba,"snikket.DirectChat.getParticipants","snikket/Chat.hx",731,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_741_counterparts,"snikket.DirectChat","counterparts",0x2a527b80,"snikket.DirectChat.counterparts","snikket/Chat.hx",741,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_745_getParticipantDetails,"snikket.DirectChat","getParticipantDetails",0x79208529,"snikket.DirectChat.getParticipantDetails","snikket/Chat.hx",745,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_753_getMessagesBefore,"snikket.DirectChat","getMessagesBefore",0x4909a945,"snikket.DirectChat.getMessagesBefore","snikket/Chat.hx",753,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_751_getMessagesBefore,"snikket.DirectChat","getMessagesBefore",0x4909a945,"snikket.DirectChat.getMessagesBefore","snikket/Chat.hx",751,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_771_getMessagesAfter,"snikket.DirectChat","getMessagesAfter",0x26744c16,"snikket.DirectChat.getMessagesAfter","snikket/Chat.hx",771,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_765_getMessagesAfter,"snikket.DirectChat","getMessagesAfter",0x26744c16,"snikket.DirectChat.getMessagesAfter","snikket/Chat.hx",765,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_785_getMessagesAround,"snikket.DirectChat","getMessagesAround",0x64db4d13,"snikket.DirectChat.getMessagesAround","snikket/Chat.hx",785,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_784_getMessagesAround,"snikket.DirectChat","getMessagesAround",0x64db4d13,"snikket.DirectChat.getMessagesAround","snikket/Chat.hx",784,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_795_prepareIncomingMessage,"snikket.DirectChat","prepareIncomingMessage",0xe7120196,"snikket.DirectChat.prepareIncomingMessage","snikket/Chat.hx",795,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_800_prepareOutgoingMessage,"snikket.DirectChat","prepareOutgoingMessage",0x4d3ec6d0,"snikket.DirectChat.prepareOutgoingMessage","snikket/Chat.hx",800,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_817_correctMessage,"snikket.DirectChat","correctMessage",0x83971059,"snikket.DirectChat.correctMessage","snikket/Chat.hx",817,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_812_correctMessage,"snikket.DirectChat","correctMessage",0x83971059,"snikket.DirectChat.correctMessage","snikket/Chat.hx",812,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_833_sendMessage,"snikket.DirectChat","sendMessage",0x7d4f2e03,"snikket.DirectChat.sendMessage","snikket/Chat.hx",833,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_841_sendMessage,"snikket.DirectChat","sendMessage",0x7d4f2e03,"snikket.DirectChat.sendMessage","snikket/Chat.hx",841,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_857_sendMessage,"snikket.DirectChat","sendMessage",0x7d4f2e03,"snikket.DirectChat.sendMessage","snikket/Chat.hx",857,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_893_removeReaction,"snikket.DirectChat","removeReaction",0x4fdefde9,"snikket.DirectChat.removeReaction","snikket/Chat.hx",893,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_871_removeReaction,"snikket.DirectChat","removeReaction",0x4fdefde9,"snikket.DirectChat.removeReaction","snikket/Chat.hx",871,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_886_removeReaction,"snikket.DirectChat","removeReaction",0x4fdefde9,"snikket.DirectChat.removeReaction","snikket/Chat.hx",886,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_905_lastMessageId,"snikket.DirectChat","lastMessageId",0x6bb7a5f0,"snikket.DirectChat.lastMessageId","snikket/Chat.hx",905,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_910_markReadUpTo,"snikket.DirectChat","markReadUpTo",0xa06bd335,"snikket.DirectChat.markReadUpTo","snikket/Chat.hx",910,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_909_markReadUpTo,"snikket.DirectChat","markReadUpTo",0xa06bd335,"snikket.DirectChat.markReadUpTo","snikket/Chat.hx",909,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_941_bookmark,"snikket.DirectChat","bookmark",0x9ab25992,"snikket.DirectChat.bookmark","snikket/Chat.hx",941,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_931_bookmark,"snikket.DirectChat","bookmark",0x9ab25992,"snikket.DirectChat.bookmark","snikket/Chat.hx",931,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_950_sendChatState,"snikket.DirectChat","sendChatState",0xb2f43755,"snikket.DirectChat.sendChatState","snikket/Chat.hx",950,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_967_close,"snikket.DirectChat","close",0x2561e95c,"snikket.DirectChat.close","snikket/Chat.hx",967,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_af7b91d6026813b6_724_boot,"snikket.DirectChat","boot",0x5105b30e,"snikket.DirectChat.boot","snikket/Chat.hx",724,0x18616bf4)
 namespace snikket{
 
 void DirectChat_obj::__construct( ::snikket::Client client, ::snikket::GenericStream stream,::Dynamic persistence,::String chatId,::hx::Null< int >  __o_uiState,::hx::Null< bool >  __o_isBlocked, ::snikket::Stanza extensions,::String readUpToId,::String readUpToBy){
             		int uiState = __o_uiState.Default(1);
             		bool isBlocked = __o_isBlocked.Default(false);
-            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_718_new)
-HXDLIN( 718)		super::__construct(client,stream,persistence,chatId,uiState,isBlocked,extensions,readUpToId,readUpToBy);
+            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_727_new)
+HXDLIN( 727)		super::__construct(client,stream,persistence,chatId,uiState,isBlocked,extensions,readUpToId,readUpToBy);
             	}
 
 Dynamic DirectChat_obj::__CreateEmpty() { return new DirectChat_obj; }
@@ -146,208 +146,208 @@ bool DirectChat_obj::_hx_isInstanceOf(int inClassId) {
 }
 
 ::Array< ::String > DirectChat_obj::getParticipants(){
-            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_722_getParticipants)
-HXLINE( 723)		::Array< ::String > counters = this->counterparts();
-HXLINE( 724)		bool _hx_tmp;
-HXDLIN( 724)		if ((counters->length < 2)) {
-HXLINE( 724)			 ::snikket::ChatMessage tmp = this->lastMessage;
-HXDLIN( 724)			::Array< ::Dynamic> tmp1;
-HXDLIN( 724)			if (::hx::IsNotNull( tmp )) {
-HXLINE( 724)				tmp1 = tmp->recipients;
+            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_731_getParticipants)
+HXLINE( 732)		::Array< ::String > counters = this->counterparts();
+HXLINE( 733)		bool _hx_tmp;
+HXDLIN( 733)		if ((counters->length < 2)) {
+HXLINE( 733)			 ::snikket::ChatMessage tmp = this->lastMessage;
+HXDLIN( 733)			::Array< ::Dynamic> tmp1;
+HXDLIN( 733)			if (::hx::IsNotNull( tmp )) {
+HXLINE( 733)				tmp1 = tmp->recipients;
             			}
             			else {
-HXLINE( 724)				tmp1 = null();
+HXLINE( 733)				tmp1 = null();
             			}
-HXDLIN( 724)			 ::Dynamic tmp2;
-HXDLIN( 724)			if (::hx::IsNotNull( tmp1 )) {
-HXLINE( 724)				tmp2 = tmp1->length;
+HXDLIN( 733)			 ::Dynamic tmp2;
+HXDLIN( 733)			if (::hx::IsNotNull( tmp1 )) {
+HXLINE( 733)				tmp2 = tmp1->length;
             			}
             			else {
-HXLINE( 724)				tmp2 = null();
+HXLINE( 733)				tmp2 = null();
             			}
-HXDLIN( 724)			int _hx_tmp1;
-HXDLIN( 724)			if (::hx::IsNotNull( tmp2 )) {
-HXLINE( 724)				_hx_tmp1 = ( (int)(tmp2) );
+HXDLIN( 733)			int _hx_tmp1;
+HXDLIN( 733)			if (::hx::IsNotNull( tmp2 )) {
+HXLINE( 733)				_hx_tmp1 = ( (int)(tmp2) );
             			}
             			else {
-HXLINE( 724)				_hx_tmp1 = 0;
+HXLINE( 733)				_hx_tmp1 = 0;
             			}
-HXDLIN( 724)			_hx_tmp = (_hx_tmp1 > 1);
+HXDLIN( 733)			_hx_tmp = (_hx_tmp1 > 1);
             		}
             		else {
-HXLINE( 724)			_hx_tmp = false;
-            		}
-HXDLIN( 724)		if (_hx_tmp) {
-HXLINE( 725)			::Array< ::Dynamic> _this = this->lastMessage->recipients;
-HXDLIN( 725)			::Array< ::String > result = ::Array_obj< ::String >::__new(_this->length);
-HXDLIN( 725)			{
-HXLINE( 725)				int _g = 0;
-HXDLIN( 725)				int _g1 = _this->length;
-HXDLIN( 725)				while((_g < _g1)){
-HXLINE( 725)					_g = (_g + 1);
-HXDLIN( 725)					int i = (_g - 1);
-HXDLIN( 725)					{
-HXLINE( 725)						::String inValue = ( ( ::snikket::JID)(_hx_array_unsafe_get(_this,i)) )->asString();
-HXDLIN( 725)						result->__unsafe_set(i,inValue);
+HXLINE( 733)			_hx_tmp = false;
+            		}
+HXDLIN( 733)		if (_hx_tmp) {
+HXLINE( 734)			::Array< ::Dynamic> _this = this->lastMessage->recipients;
+HXDLIN( 734)			::Array< ::String > result = ::Array_obj< ::String >::__new(_this->length);
+HXDLIN( 734)			{
+HXLINE( 734)				int _g = 0;
+HXDLIN( 734)				int _g1 = _this->length;
+HXDLIN( 734)				while((_g < _g1)){
+HXLINE( 734)					_g = (_g + 1);
+HXDLIN( 734)					int i = (_g - 1);
+HXDLIN( 734)					{
+HXLINE( 734)						::String inValue = ( ( ::snikket::JID)(_hx_array_unsafe_get(_this,i)) )->asString();
+HXDLIN( 734)						result->__unsafe_set(i,inValue);
             					}
             				}
             			}
-HXDLIN( 725)			return result->concat(::Array_obj< ::String >::__new(1)->init(0,this->lastMessage->senderId));
+HXDLIN( 734)			return result->concat(::Array_obj< ::String >::__new(1)->init(0,this->lastMessage->senderId));
             		}
             		else {
-HXLINE( 727)			::Array< ::String > _hx_tmp2 = this->counterparts();
-HXDLIN( 727)			return _hx_tmp2->concat(::Array_obj< ::String >::__new(1)->init(0,this->client->accountId()));
+HXLINE( 736)			::Array< ::String > _hx_tmp2 = this->counterparts();
+HXDLIN( 736)			return _hx_tmp2->concat(::Array_obj< ::String >::__new(1)->init(0,this->client->accountId()));
             		}
-HXLINE( 724)		return null();
+HXLINE( 733)		return null();
             	}
 
 
 ::Array< ::String > DirectChat_obj::counterparts(){
-            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_732_counterparts)
-HXDLIN( 732)		return this->chatId.split(HX_("\n",0a,00,00,00));
+            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_741_counterparts)
+HXDLIN( 741)		return this->chatId.split(HX_("\n",0a,00,00,00));
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(DirectChat_obj,counterparts,return )
 
  ::snikket::Participant DirectChat_obj::getParticipantDetails(::String participantId){
-            	HX_GC_STACKFRAME(&_hx_pos_af7b91d6026813b6_736_getParticipantDetails)
-HXLINE( 737)		 ::snikket::DirectChat chat = this->client->getDirectChat(participantId,null());
-HXLINE( 738)		::String _hx_tmp = chat->getDisplayName();
-HXDLIN( 738)		::String _hx_tmp1 = chat->getPhoto();
-HXDLIN( 738)		::String _hx_tmp2 = chat->getPlaceholder();
-HXDLIN( 738)		::String chat1 = chat->chatId;
-HXDLIN( 738)		return  ::snikket::Participant_obj::__alloc( HX_CTX ,_hx_tmp,_hx_tmp1,_hx_tmp2,(chat1 == this->client->accountId()));
+            	HX_GC_STACKFRAME(&_hx_pos_af7b91d6026813b6_745_getParticipantDetails)
+HXLINE( 746)		 ::snikket::DirectChat chat = this->client->getDirectChat(participantId,null());
+HXLINE( 747)		::String _hx_tmp = chat->getDisplayName();
+HXDLIN( 747)		::String _hx_tmp1 = chat->getPhoto();
+HXDLIN( 747)		::String _hx_tmp2 = chat->getPlaceholder();
+HXDLIN( 747)		::String chat1 = chat->chatId;
+HXDLIN( 747)		return  ::snikket::Participant_obj::__alloc( HX_CTX ,_hx_tmp,_hx_tmp1,_hx_tmp2,(chat1 == this->client->accountId()));
             	}
 
 
 void DirectChat_obj::getMessagesBefore(::String beforeId,::String beforeTime, ::Dynamic handler){
             		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_0, ::snikket::DirectChat,_gthis,::String,beforeId, ::Dynamic,handler) HXARGC(1)
             		void _hx_run(::Array< ::Dynamic> messages){
-            			HX_GC_STACKFRAME(&_hx_pos_af7b91d6026813b6_744_getMessagesBefore)
-HXLINE( 744)			if ((messages->length > 0)) {
-HXLINE( 745)				handler(messages);
+            			HX_GC_STACKFRAME(&_hx_pos_af7b91d6026813b6_753_getMessagesBefore)
+HXLINE( 753)			if ((messages->length > 0)) {
+HXLINE( 754)				handler(messages);
             			}
             			else {
-HXLINE( 747)				 ::Dynamic filter =  ::Dynamic(::hx::Anon_obj::Create(1)
+HXLINE( 756)				 ::Dynamic filter =  ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("with",06,76,f8,4e),_gthis->chatId));
-HXLINE( 748)				if (::hx::IsNotNull( beforeId )) {
-HXLINE( 748)					filter->__SetField(HX_("page",4f,da,51,4a), ::Dynamic(::hx::Anon_obj::Create(1)
+HXLINE( 757)				if (::hx::IsNotNull( beforeId )) {
+HXLINE( 757)					filter->__SetField(HX_("page",4f,da,51,4a), ::Dynamic(::hx::Anon_obj::Create(1)
             						->setFixed(0,HX_("before",7f,54,32,9a),beforeId)),::hx::paccDynamic);
             				}
-HXLINE( 749)				 ::snikket::MessageSync sync =  ::snikket::MessageSync_obj::__alloc( HX_CTX ,_gthis->client,_gthis->stream,filter,null());
-HXLINE( 750)				_gthis->fetchFromSync(sync,handler);
+HXLINE( 758)				 ::snikket::MessageSync sync =  ::snikket::MessageSync_obj::__alloc( HX_CTX ,_gthis->client,_gthis->stream,filter,null());
+HXLINE( 759)				_gthis->fetchFromSync(sync,handler);
             			}
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_742_getMessagesBefore)
-HXDLIN( 742)		 ::snikket::DirectChat _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 743)		::Dynamic _hx_tmp = this->persistence;
-HXDLIN( 743)		::String _hx_tmp1 = this->client->accountId();
-HXDLIN( 743)		::snikket::Persistence_obj::getMessagesBefore(_hx_tmp,_hx_tmp1,this->chatId,beforeId,beforeTime, ::Dynamic(new _hx_Closure_0(_gthis,beforeId,handler)));
+            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_751_getMessagesBefore)
+HXDLIN( 751)		 ::snikket::DirectChat _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 752)		::Dynamic _hx_tmp = this->persistence;
+HXDLIN( 752)		::String _hx_tmp1 = this->client->accountId();
+HXDLIN( 752)		::snikket::Persistence_obj::getMessagesBefore(_hx_tmp,_hx_tmp1,this->chatId,beforeId,beforeTime, ::Dynamic(new _hx_Closure_0(_gthis,beforeId,handler)));
             	}
 
 
 void DirectChat_obj::getMessagesAfter(::String afterId,::String afterTime, ::Dynamic handler){
             		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_0, ::snikket::DirectChat,_gthis,::String,afterId, ::Dynamic,handler) HXARGC(1)
             		void _hx_run(::Array< ::Dynamic> messages){
-            			HX_GC_STACKFRAME(&_hx_pos_af7b91d6026813b6_762_getMessagesAfter)
-HXLINE( 762)			if ((messages->length > 0)) {
-HXLINE( 763)				handler(messages);
+            			HX_GC_STACKFRAME(&_hx_pos_af7b91d6026813b6_771_getMessagesAfter)
+HXLINE( 771)			if ((messages->length > 0)) {
+HXLINE( 772)				handler(messages);
             			}
             			else {
-HXLINE( 765)				 ::Dynamic filter =  ::Dynamic(::hx::Anon_obj::Create(1)
+HXLINE( 774)				 ::Dynamic filter =  ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("with",06,76,f8,4e),_gthis->chatId));
-HXLINE( 766)				if (::hx::IsNotNull( afterId )) {
-HXLINE( 766)					filter->__SetField(HX_("page",4f,da,51,4a), ::Dynamic(::hx::Anon_obj::Create(1)
+HXLINE( 775)				if (::hx::IsNotNull( afterId )) {
+HXLINE( 775)					filter->__SetField(HX_("page",4f,da,51,4a), ::Dynamic(::hx::Anon_obj::Create(1)
             						->setFixed(0,HX_("after",1c,66,a2,1d),afterId)),::hx::paccDynamic);
             				}
-HXLINE( 767)				 ::snikket::MessageSync sync =  ::snikket::MessageSync_obj::__alloc( HX_CTX ,_gthis->client,_gthis->stream,filter,null());
-HXLINE( 768)				_gthis->fetchFromSync(sync,handler);
+HXLINE( 776)				 ::snikket::MessageSync sync =  ::snikket::MessageSync_obj::__alloc( HX_CTX ,_gthis->client,_gthis->stream,filter,null());
+HXLINE( 777)				_gthis->fetchFromSync(sync,handler);
             			}
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_756_getMessagesAfter)
-HXDLIN( 756)		 ::snikket::DirectChat _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 757)		bool _hx_tmp;
-HXDLIN( 757)		::String afterId1 = afterId;
-HXDLIN( 757)		if ((afterId1 == this->lastMessageId())) {
-HXLINE( 757)			_hx_tmp = !(this->syncing());
+            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_765_getMessagesAfter)
+HXDLIN( 765)		 ::snikket::DirectChat _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 766)		bool _hx_tmp;
+HXDLIN( 766)		::String afterId1 = afterId;
+HXDLIN( 766)		if ((afterId1 == this->lastMessageId())) {
+HXLINE( 766)			_hx_tmp = !(this->syncing());
             		}
             		else {
-HXLINE( 757)			_hx_tmp = false;
+HXLINE( 766)			_hx_tmp = false;
             		}
-HXDLIN( 757)		if (_hx_tmp) {
-HXLINE( 758)			handler(::Array_obj< ::Dynamic>::__new(0));
-HXLINE( 759)			return;
+HXDLIN( 766)		if (_hx_tmp) {
+HXLINE( 767)			handler(::Array_obj< ::Dynamic>::__new(0));
+HXLINE( 768)			return;
             		}
-HXLINE( 761)		::Dynamic _hx_tmp1 = this->persistence;
-HXDLIN( 761)		::String _hx_tmp2 = this->client->accountId();
-HXDLIN( 761)		::snikket::Persistence_obj::getMessagesAfter(_hx_tmp1,_hx_tmp2,this->chatId,afterId,afterTime, ::Dynamic(new _hx_Closure_0(_gthis,afterId,handler)));
+HXLINE( 770)		::Dynamic _hx_tmp1 = this->persistence;
+HXDLIN( 770)		::String _hx_tmp2 = this->client->accountId();
+HXDLIN( 770)		::snikket::Persistence_obj::getMessagesAfter(_hx_tmp1,_hx_tmp2,this->chatId,afterId,afterTime, ::Dynamic(new _hx_Closure_0(_gthis,afterId,handler)));
             	}
 
 
 void DirectChat_obj::getMessagesAround(::String aroundId,::String aroundTime, ::Dynamic handler){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::Dynamic,handler) HXARGC(1)
             		void _hx_run(::Array< ::Dynamic> messages){
-            			HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_776_getMessagesAround)
-HXLINE( 776)			if ((messages->length > 0)) {
-HXLINE( 777)				handler(messages);
+            			HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_785_getMessagesAround)
+HXLINE( 785)			if ((messages->length > 0)) {
+HXLINE( 786)				handler(messages);
             			}
             			else {
-HXLINE( 780)				handler(::Array_obj< ::Dynamic>::__new(0));
+HXLINE( 789)				handler(::Array_obj< ::Dynamic>::__new(0));
             			}
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_775_getMessagesAround)
-HXDLIN( 775)		::Dynamic _hx_tmp = this->persistence;
-HXDLIN( 775)		::String _hx_tmp1 = this->client->accountId();
-HXDLIN( 775)		::snikket::Persistence_obj::getMessagesAround(_hx_tmp,_hx_tmp1,this->chatId,aroundId,aroundTime, ::Dynamic(new _hx_Closure_0(handler)));
+            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_784_getMessagesAround)
+HXDLIN( 784)		::Dynamic _hx_tmp = this->persistence;
+HXDLIN( 784)		::String _hx_tmp1 = this->client->accountId();
+HXDLIN( 784)		::snikket::Persistence_obj::getMessagesAround(_hx_tmp,_hx_tmp1,this->chatId,aroundId,aroundTime, ::Dynamic(new _hx_Closure_0(handler)));
             	}
 
 
  ::snikket::ChatMessageBuilder DirectChat_obj::prepareIncomingMessage( ::snikket::ChatMessageBuilder message, ::snikket::Stanza stanza){
-            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_786_prepareIncomingMessage)
-HXLINE( 787)		message->syncPoint = !(this->syncing());
-HXLINE( 788)		return message;
+            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_795_prepareIncomingMessage)
+HXLINE( 796)		message->syncPoint = !(this->syncing());
+HXLINE( 797)		return message;
             	}
 
 
  ::snikket::ChatMessageBuilder DirectChat_obj::prepareOutgoingMessage( ::snikket::ChatMessageBuilder message){
-            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_791_prepareOutgoingMessage)
-HXLINE( 792)		::String tmp = message->timestamp;
-HXDLIN( 792)		::String _hx_tmp;
-HXDLIN( 792)		if (::hx::IsNotNull( tmp )) {
-HXLINE( 792)			_hx_tmp = tmp;
+            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_800_prepareOutgoingMessage)
+HXLINE( 801)		::String tmp = message->timestamp;
+HXDLIN( 801)		::String _hx_tmp;
+HXDLIN( 801)		if (::hx::IsNotNull( tmp )) {
+HXLINE( 801)			_hx_tmp = tmp;
             		}
             		else {
-HXLINE( 792)			_hx_tmp = ::snikket::Date_obj::format(::Date_obj::now());
-            		}
-HXDLIN( 792)		message->timestamp = _hx_tmp;
-HXLINE( 793)		message->direction = 1;
-HXLINE( 794)		message->from = this->client->jid;
-HXLINE( 795)		message->sender = message->from->asBare();
-HXLINE( 796)		message->replyTo = ::Array_obj< ::Dynamic>::__new(1)->init(0,message->sender);
-HXLINE( 797)		::Array< ::String > _this = this->counterparts();
-HXDLIN( 797)		::Array< ::Dynamic> result = ::Array_obj< ::Dynamic>::__new(_this->length);
-HXDLIN( 797)		{
-HXLINE( 797)			int _g = 0;
-HXDLIN( 797)			int _g1 = _this->length;
-HXDLIN( 797)			while((_g < _g1)){
-HXLINE( 797)				_g = (_g + 1);
-HXDLIN( 797)				int i = (_g - 1);
-HXDLIN( 797)				{
-HXLINE( 797)					 ::snikket::JID inValue = ::snikket::JID_obj::parse(( (::String)(_hx_array_unsafe_get(_this,i)) ));
-HXDLIN( 797)					result->__unsafe_set(i,inValue);
+HXLINE( 801)			_hx_tmp = ::snikket::Date_obj::format(::Date_obj::now());
+            		}
+HXDLIN( 801)		message->timestamp = _hx_tmp;
+HXLINE( 802)		message->direction = 1;
+HXLINE( 803)		message->from = this->client->jid;
+HXLINE( 804)		message->sender = message->from->asBare();
+HXLINE( 805)		message->replyTo = ::Array_obj< ::Dynamic>::__new(1)->init(0,message->sender);
+HXLINE( 806)		::Array< ::String > _this = this->counterparts();
+HXDLIN( 806)		::Array< ::Dynamic> result = ::Array_obj< ::Dynamic>::__new(_this->length);
+HXDLIN( 806)		{
+HXLINE( 806)			int _g = 0;
+HXDLIN( 806)			int _g1 = _this->length;
+HXDLIN( 806)			while((_g < _g1)){
+HXLINE( 806)				_g = (_g + 1);
+HXDLIN( 806)				int i = (_g - 1);
+HXDLIN( 806)				{
+HXLINE( 806)					 ::snikket::JID inValue = ::snikket::JID_obj::parse(( (::String)(_hx_array_unsafe_get(_this,i)) ));
+HXDLIN( 806)					result->__unsafe_set(i,inValue);
             				}
             			}
             		}
-HXDLIN( 797)		message->recipients = result;
-HXLINE( 798)		message->to = message->recipients->__get(0).StaticCast<  ::snikket::JID >();
-HXLINE( 799)		return message;
+HXDLIN( 806)		message->recipients = result;
+HXLINE( 807)		message->to = message->recipients->__get(0).StaticCast<  ::snikket::JID >();
+HXLINE( 808)		return message;
             	}
 
 
@@ -356,151 +356,151 @@ HX_DEFINE_DYNAMIC_FUNC1(DirectChat_obj,prepareOutgoingMessage,return )
 void DirectChat_obj::correctMessage(::String localId, ::snikket::ChatMessageBuilder message){
             		HX_BEGIN_LOCAL_FUNC_S4(::hx::LocalFunc,_hx_Closure_0, ::snikket::DirectChat,_gthis,::Array< ::Dynamic>,message1,::String,localId,::String,toSendId) HXARGC(1)
             		void _hx_run(::Array< ::Dynamic> corrected){
-            			HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_808_correctMessage)
-HXLINE( 809)			::Array< ::Dynamic> _hx_tmp;
-HXDLIN( 809)			 ::snikket::ChatMessage tmp = corrected->__get(0).StaticCast<  ::snikket::ChatMessage >()->versions->__get((corrected->__get(0).StaticCast<  ::snikket::ChatMessage >()->versions->length - 1)).StaticCast<  ::snikket::ChatMessage >();
-HXDLIN( 809)			::String _hx_tmp1;
-HXDLIN( 809)			if (::hx::IsNotNull( tmp )) {
-HXLINE( 809)				_hx_tmp1 = tmp->localId;
+            			HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_817_correctMessage)
+HXLINE( 818)			::Array< ::Dynamic> _hx_tmp;
+HXDLIN( 818)			 ::snikket::ChatMessage tmp = corrected->__get(0).StaticCast<  ::snikket::ChatMessage >()->versions->__get((corrected->__get(0).StaticCast<  ::snikket::ChatMessage >()->versions->length - 1)).StaticCast<  ::snikket::ChatMessage >();
+HXDLIN( 818)			::String _hx_tmp1;
+HXDLIN( 818)			if (::hx::IsNotNull( tmp )) {
+HXLINE( 818)				_hx_tmp1 = tmp->localId;
             			}
             			else {
-HXLINE( 809)				_hx_tmp1 = null();
+HXLINE( 818)				_hx_tmp1 = null();
             			}
-HXDLIN( 809)			if ((_hx_tmp1 == localId)) {
-HXLINE( 809)				_hx_tmp = corrected->__get(0).StaticCast<  ::snikket::ChatMessage >()->versions;
+HXDLIN( 818)			if ((_hx_tmp1 == localId)) {
+HXLINE( 818)				_hx_tmp = corrected->__get(0).StaticCast<  ::snikket::ChatMessage >()->versions;
             			}
             			else {
-HXLINE( 809)				_hx_tmp = ::Array_obj< ::Dynamic>::__new(1)->init(0,message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->build());
-            			}
-HXDLIN( 809)			message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->versions = _hx_tmp;
-HXLINE( 810)			message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->localId = toSendId;
-HXLINE( 811)			{
-HXLINE( 811)				int _g = 0;
-HXDLIN( 811)				::Array< ::Dynamic> _g1 = message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->recipients;
-HXDLIN( 811)				while((_g < _g1->length)){
-HXLINE( 811)					 ::snikket::JID recipient = _g1->__get(_g).StaticCast<  ::snikket::JID >();
-HXDLIN( 811)					_g = (_g + 1);
-HXLINE( 812)					message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->to = recipient;
-HXLINE( 813)					 ::snikket::Client _gthis1 = _gthis->client;
-HXDLIN( 813)					_gthis1->sendStanza(message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->build()->asStanza());
+HXLINE( 818)				_hx_tmp = ::Array_obj< ::Dynamic>::__new(1)->init(0,message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->build());
+            			}
+HXDLIN( 818)			message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->versions = _hx_tmp;
+HXLINE( 819)			message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->localId = toSendId;
+HXLINE( 820)			{
+HXLINE( 820)				int _g = 0;
+HXDLIN( 820)				::Array< ::Dynamic> _g1 = message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->recipients;
+HXDLIN( 820)				while((_g < _g1->length)){
+HXLINE( 820)					 ::snikket::JID recipient = _g1->__get(_g).StaticCast<  ::snikket::JID >();
+HXDLIN( 820)					_g = (_g + 1);
+HXLINE( 821)					message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->to = recipient;
+HXLINE( 822)					 ::snikket::Client _gthis1 = _gthis->client;
+HXDLIN( 822)					_gthis1->sendStanza(message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->build()->asStanza());
             				}
             			}
-HXLINE( 815)			 ::snikket::ChatMessage tmp1 = _gthis->lastMessage;
-HXDLIN( 815)			::String _hx_tmp2;
-HXDLIN( 815)			if (::hx::IsNotNull( tmp1 )) {
-HXLINE( 815)				_hx_tmp2 = tmp1->localId;
+HXLINE( 824)			 ::snikket::ChatMessage tmp1 = _gthis->lastMessage;
+HXDLIN( 824)			::String _hx_tmp2;
+HXDLIN( 824)			if (::hx::IsNotNull( tmp1 )) {
+HXLINE( 824)				_hx_tmp2 = tmp1->localId;
             			}
             			else {
-HXLINE( 815)				_hx_tmp2 = null();
+HXLINE( 824)				_hx_tmp2 = null();
             			}
-HXDLIN( 815)			if ((localId == _hx_tmp2)) {
-HXLINE( 816)				_gthis->setLastMessage(corrected->__get(0).StaticCast<  ::snikket::ChatMessage >());
-HXLINE( 817)				_gthis->client->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,_gthis));
+HXDLIN( 824)			if ((localId == _hx_tmp2)) {
+HXLINE( 825)				_gthis->setLastMessage(corrected->__get(0).StaticCast<  ::snikket::ChatMessage >());
+HXLINE( 826)				_gthis->client->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,_gthis));
             			}
-HXLINE( 819)			_gthis->client->notifyMessageHandlers(corrected->__get(0).StaticCast<  ::snikket::ChatMessage >(),1);
+HXLINE( 828)			_gthis->client->notifyMessageHandlers(corrected->__get(0).StaticCast<  ::snikket::ChatMessage >(),1);
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_803_correctMessage)
-HXDLIN( 803)		::Array< ::Dynamic> message1 = ::Array_obj< ::Dynamic>::__new(1)->init(0,message);
-HXDLIN( 803)		 ::snikket::DirectChat _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 804)		::String toSendId = message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->localId;
-HXLINE( 805)		message1[0] = this->prepareOutgoingMessage(message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >());
-HXLINE( 806)		 ::snikket::ChatMessage _hx_tmp = message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->build();
-HXDLIN( 806)		message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->versions = ::Array_obj< ::Dynamic>::__new(1)->init(0,_hx_tmp);
-HXLINE( 807)		message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->localId = localId;
-HXLINE( 808)		 ::snikket::Client _hx_tmp1 = this->client;
-HXDLIN( 808)		_hx_tmp1->storeMessages(::Array_obj< ::Dynamic>::__new(1)->init(0,message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->build()), ::Dynamic(new _hx_Closure_0(_gthis,message1,localId,toSendId)));
+            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_812_correctMessage)
+HXDLIN( 812)		::Array< ::Dynamic> message1 = ::Array_obj< ::Dynamic>::__new(1)->init(0,message);
+HXDLIN( 812)		 ::snikket::DirectChat _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 813)		::String toSendId = message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->localId;
+HXLINE( 814)		message1[0] = this->prepareOutgoingMessage(message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >());
+HXLINE( 815)		 ::snikket::ChatMessage _hx_tmp = message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->build();
+HXDLIN( 815)		message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->versions = ::Array_obj< ::Dynamic>::__new(1)->init(0,_hx_tmp);
+HXLINE( 816)		message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->localId = localId;
+HXLINE( 817)		 ::snikket::Client _hx_tmp1 = this->client;
+HXDLIN( 817)		_hx_tmp1->storeMessages(::Array_obj< ::Dynamic>::__new(1)->init(0,message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->build()), ::Dynamic(new _hx_Closure_0(_gthis,message1,localId,toSendId)));
             	}
 
 
 void DirectChat_obj::sendMessage( ::snikket::ChatMessageBuilder message){
-            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_824_sendMessage)
-HXDLIN( 824)		::Array< ::Dynamic> message1 = ::Array_obj< ::Dynamic>::__new(1)->init(0,message);
-HXDLIN( 824)		 ::snikket::DirectChat _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 825)		if (::hx::IsNotNull( this->typingTimer )) {
-HXLINE( 825)			this->typingTimer->stop();
-            		}
-HXLINE( 826)		this->client->chatActivity(::hx::ObjectPtr<OBJ_>(this),null());
-HXLINE( 827)		message1[0] = this->prepareOutgoingMessage(message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >());
-HXLINE( 828)		message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->to = message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->recipients->__get(0).StaticCast<  ::snikket::JID >();
-HXLINE( 829)		 ::snikket::Stanza fromStanza = message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->build()->asStanza();
-HXDLIN( 829)		 ::snikket::MessageStanza fromStanza1 = ::snikket::Message_obj::fromStanza(fromStanza,this->client->jid,null())->parsed;
-HXLINE( 830)		switch((int)(fromStanza1->_hx_getIndex())){
+            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_833_sendMessage)
+HXDLIN( 833)		::Array< ::Dynamic> message1 = ::Array_obj< ::Dynamic>::__new(1)->init(0,message);
+HXDLIN( 833)		 ::snikket::DirectChat _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 834)		if (::hx::IsNotNull( this->typingTimer )) {
+HXLINE( 834)			this->typingTimer->stop();
+            		}
+HXLINE( 835)		this->client->chatActivity(::hx::ObjectPtr<OBJ_>(this),null());
+HXLINE( 836)		message1[0] = this->prepareOutgoingMessage(message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >());
+HXLINE( 837)		message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->to = message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->recipients->__get(0).StaticCast<  ::snikket::JID >();
+HXLINE( 838)		 ::snikket::Stanza fromStanza = message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->build()->asStanza();
+HXDLIN( 838)		 ::snikket::MessageStanza fromStanza1 = ::snikket::Message_obj::fromStanza(fromStanza,this->client->jid,null())->parsed;
+HXLINE( 839)		switch((int)(fromStanza1->_hx_getIndex())){
             			case (int)1: {
             				HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0, ::snikket::DirectChat,_gthis,::Array< ::Dynamic>,message1) HXARGC(1)
             				void _hx_run(::Array< ::Dynamic> stored){
-            					HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_832_sendMessage)
-HXLINE( 833)					{
-HXLINE( 833)						int _g = 0;
-HXDLIN( 833)						::Array< ::Dynamic> _g1 = message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->recipients;
-HXDLIN( 833)						while((_g < _g1->length)){
-HXLINE( 833)							 ::snikket::JID recipient = _g1->__get(_g).StaticCast<  ::snikket::JID >();
-HXDLIN( 833)							_g = (_g + 1);
-HXLINE( 834)							message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->to = recipient;
-HXLINE( 835)							 ::snikket::Stanza stanza = message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->build()->asStanza();
-HXLINE( 836)							if (::hx::IsNotNull( _gthis->isActive )) {
-HXLINE( 837)								_gthis->isActive = true;
-HXLINE( 838)								_gthis->activeThread = message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->threadId;
-HXLINE( 839)								stanza->tag(HX_("active",c6,41,46,16), ::Dynamic(::hx::Anon_obj::Create(1)
+            					HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_841_sendMessage)
+HXLINE( 842)					{
+HXLINE( 842)						int _g = 0;
+HXDLIN( 842)						::Array< ::Dynamic> _g1 = message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->recipients;
+HXDLIN( 842)						while((_g < _g1->length)){
+HXLINE( 842)							 ::snikket::JID recipient = _g1->__get(_g).StaticCast<  ::snikket::JID >();
+HXDLIN( 842)							_g = (_g + 1);
+HXLINE( 843)							message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->to = recipient;
+HXLINE( 844)							 ::snikket::Stanza stanza = message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->build()->asStanza();
+HXLINE( 845)							if (::hx::IsNotNull( _gthis->isActive )) {
+HXLINE( 846)								_gthis->isActive = true;
+HXLINE( 847)								_gthis->activeThread = message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->threadId;
+HXLINE( 848)								stanza->tag(HX_("active",c6,41,46,16), ::Dynamic(::hx::Anon_obj::Create(1)
             									->setFixed(0,HX_("xmlns",dc,31,74,60),HX_("http://jabber.org/protocol/chatstates",8e,6d,41,6d))))->up();
             							}
-HXLINE( 841)							_gthis->client->sendStanza(stanza);
+HXLINE( 850)							_gthis->client->sendStanza(stanza);
             						}
             					}
-HXLINE( 843)					 ::snikket::DirectChat _gthis1 = _gthis;
-HXDLIN( 843)					_gthis1->setLastMessage(message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->build());
-HXLINE( 844)					_gthis->client->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,_gthis));
-HXLINE( 845)					int _hx_tmp;
-HXDLIN( 845)					if ((stored->__get(0).StaticCast<  ::snikket::ChatMessage >()->versions->length > 1)) {
-HXLINE( 845)						_hx_tmp = 1;
+HXLINE( 852)					 ::snikket::DirectChat _gthis1 = _gthis;
+HXDLIN( 852)					_gthis1->setLastMessage(message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->build());
+HXLINE( 853)					_gthis->client->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,_gthis));
+HXLINE( 854)					int _hx_tmp;
+HXDLIN( 854)					if ((stored->__get(0).StaticCast<  ::snikket::ChatMessage >()->versions->length > 1)) {
+HXLINE( 854)						_hx_tmp = 1;
             					}
             					else {
-HXLINE( 845)						_hx_tmp = 0;
+HXLINE( 854)						_hx_tmp = 0;
             					}
-HXDLIN( 845)					_gthis->client->notifyMessageHandlers(stored->__get(0).StaticCast<  ::snikket::ChatMessage >(),_hx_tmp);
+HXDLIN( 854)					_gthis->client->notifyMessageHandlers(stored->__get(0).StaticCast<  ::snikket::ChatMessage >(),_hx_tmp);
             				}
             				HX_END_LOCAL_FUNC1((void))
 
-HXLINE( 831)				 ::snikket::ChatMessage _g = fromStanza1->_hx_getObject(0).StaticCast<  ::snikket::ChatMessage >();
-HXLINE( 832)				 ::snikket::Client _hx_tmp = this->client;
-HXDLIN( 832)				_hx_tmp->storeMessages(::Array_obj< ::Dynamic>::__new(1)->init(0,message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->build()), ::Dynamic(new _hx_Closure_0(_gthis,message1)));
+HXLINE( 840)				 ::snikket::ChatMessage _g = fromStanza1->_hx_getObject(0).StaticCast<  ::snikket::ChatMessage >();
+HXLINE( 841)				 ::snikket::Client _hx_tmp = this->client;
+HXDLIN( 841)				_hx_tmp->storeMessages(::Array_obj< ::Dynamic>::__new(1)->init(0,message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->build()), ::Dynamic(new _hx_Closure_0(_gthis,message1)));
             			}
             			break;
             			case (int)3: {
             				HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_1, ::snikket::DirectChat,_gthis,::Array< ::Dynamic>,message1) HXARGC(1)
             				void _hx_run( ::snikket::ChatMessage stored){
-            					HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_848_sendMessage)
-HXLINE( 849)					{
-HXLINE( 849)						int _g = 0;
-HXDLIN( 849)						::Array< ::Dynamic> _g1 = message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->recipients;
-HXDLIN( 849)						while((_g < _g1->length)){
-HXLINE( 849)							 ::snikket::JID recipient = _g1->__get(_g).StaticCast<  ::snikket::JID >();
-HXDLIN( 849)							_g = (_g + 1);
-HXLINE( 850)							message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->to = recipient;
-HXLINE( 851)							 ::snikket::Client _gthis1 = _gthis->client;
-HXDLIN( 851)							_gthis1->sendStanza(message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->build()->asStanza());
+            					HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_857_sendMessage)
+HXLINE( 858)					{
+HXLINE( 858)						int _g = 0;
+HXDLIN( 858)						::Array< ::Dynamic> _g1 = message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->recipients;
+HXDLIN( 858)						while((_g < _g1->length)){
+HXLINE( 858)							 ::snikket::JID recipient = _g1->__get(_g).StaticCast<  ::snikket::JID >();
+HXDLIN( 858)							_g = (_g + 1);
+HXLINE( 859)							message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->to = recipient;
+HXLINE( 860)							 ::snikket::Client _gthis1 = _gthis->client;
+HXDLIN( 860)							_gthis1->sendStanza(message1->__get(0).StaticCast<  ::snikket::ChatMessageBuilder >()->build()->asStanza());
             						}
             					}
-HXLINE( 853)					if (::hx::IsNotNull( stored )) {
-HXLINE( 853)						_gthis->client->notifyMessageHandlers(stored,2);
+HXLINE( 862)					if (::hx::IsNotNull( stored )) {
+HXLINE( 862)						_gthis->client->notifyMessageHandlers(stored,2);
             					}
             				}
             				HX_END_LOCAL_FUNC1((void))
 
-HXLINE( 847)				 ::snikket::ReactionUpdate update = fromStanza1->_hx_getObject(0).StaticCast<  ::snikket::ReactionUpdate >();
-HXLINE( 848)				::Dynamic _hx_tmp1 = this->persistence;
-HXDLIN( 848)				::snikket::Persistence_obj::storeReaction(_hx_tmp1,this->client->accountId(),update, ::Dynamic(new _hx_Closure_1(_gthis,message1)));
+HXLINE( 856)				 ::snikket::ReactionUpdate update = fromStanza1->_hx_getObject(0).StaticCast<  ::snikket::ReactionUpdate >();
+HXLINE( 857)				::Dynamic _hx_tmp1 = this->persistence;
+HXDLIN( 857)				::snikket::Persistence_obj::storeReaction(_hx_tmp1,this->client->accountId(),update, ::Dynamic(new _hx_Closure_1(_gthis,message1)));
             			}
             			break;
             			default:{
-HXLINE( 856)				::haxe::Log_obj::trace(HX_("Invalid message",7e,ab,89,95), ::Dynamic(::hx::Anon_obj::Create(5)
+HXLINE( 865)				::haxe::Log_obj::trace(HX_("Invalid message",7e,ab,89,95), ::Dynamic(::hx::Anon_obj::Create(5)
             					->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.DirectChat",12,9f,50,5b))
             					->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(1)->init(0,fromStanza1))
             					->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("sendMessage",5f,89,1d,24))
             					->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/Chat.hx",f4,6b,61,18))
-            					->setFixed(4,HX_("lineNumber",dd,81,22,76),856)));
-HXLINE( 857)				HX_STACK_DO_THROW(HX_("Trying to send invalid message.",dc,74,a0,91));
+            					->setFixed(4,HX_("lineNumber",dd,81,22,76),865)));
+HXLINE( 866)				HX_STACK_DO_THROW(HX_("Trying to send invalid message.",dc,74,a0,91));
             			}
             		}
             	}
@@ -509,165 +509,165 @@ HXLINE( 857)				HX_STACK_DO_THROW(HX_("Trying to send invalid message.",dc,74,a0
 void DirectChat_obj::removeReaction( ::snikket::ChatMessage m, ::snikket::Reaction reaction){
             		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_1, ::snikket::DirectChat,_gthis, ::snikket::ReactionUpdate,update3) HXARGC(1)
             		void _hx_run( ::snikket::ChatMessage stored){
-            			HX_GC_STACKFRAME(&_hx_pos_af7b91d6026813b6_884_removeReaction)
-HXLINE( 885)			 ::snikket::Stanza stanza = update3->asStanza();
-HXLINE( 886)			{
-HXLINE( 886)				int _g = 0;
-HXDLIN( 886)				::Array< ::String > _g1 = _gthis->counterparts();
-HXDLIN( 886)				while((_g < _g1->length)){
-HXLINE( 886)					::String recipient = _g1->__get(_g);
-HXDLIN( 886)					_g = (_g + 1);
-HXLINE( 887)					::Reflect_obj::setField(stanza->attr,HX_("to",7b,65,00,00),recipient);
-HXLINE( 888)					_gthis->client->sendStanza(stanza);
+            			HX_GC_STACKFRAME(&_hx_pos_af7b91d6026813b6_893_removeReaction)
+HXLINE( 894)			 ::snikket::Stanza stanza = update3->asStanza();
+HXLINE( 895)			{
+HXLINE( 895)				int _g = 0;
+HXDLIN( 895)				::Array< ::String > _g1 = _gthis->counterparts();
+HXDLIN( 895)				while((_g < _g1->length)){
+HXLINE( 895)					::String recipient = _g1->__get(_g);
+HXDLIN( 895)					_g = (_g + 1);
+HXLINE( 896)					::Reflect_obj::setField(stanza->attr,HX_("to",7b,65,00,00),recipient);
+HXLINE( 897)					_gthis->client->sendStanza(stanza);
             				}
             			}
-HXLINE( 890)			if (::hx::IsNotNull( stored )) {
-HXLINE( 890)				_gthis->client->notifyMessageHandlers(stored,2);
+HXLINE( 899)			if (::hx::IsNotNull( stored )) {
+HXLINE( 899)				_gthis->client->notifyMessageHandlers(stored,2);
             			}
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_GC_STACKFRAME(&_hx_pos_af7b91d6026813b6_862_removeReaction)
-HXDLIN( 862)		 ::snikket::DirectChat _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 863)		if (::Std_obj::isOfType(reaction,::hx::ClassOf< ::snikket::CustomEmojiReaction >())) {
-HXLINE( 864)			if (::hx::IsNull( reaction->envelopeId )) {
-HXLINE( 864)				HX_STACK_DO_THROW(HX_("Cannot remove custom emoji reaction without envelopeId",90,e6,80,fb));
-            			}
-HXLINE( 865)			 ::snikket::ChatMessageBuilder correct = m->reply();
-HXLINE( 866)			correct->localId = ::snikket::ID_obj::_hx_long();
-HXLINE( 867)			correct->setHtml(HX_("",00,00,00,00));
-HXLINE( 868)			correct->text = null();
-HXLINE( 869)			this->correctMessage(reaction->envelopeId,correct);
-HXLINE( 870)			return;
-            		}
-HXLINE( 874)		::Array< ::Dynamic> reactions = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE( 875)		{
-HXLINE( 875)			::Dynamic map = m->reactions;
-HXDLIN( 875)			::Dynamic _g_map = map;
-HXDLIN( 875)			 ::Dynamic _g_keys = ::haxe::IMap_obj::keys(map);
-HXDLIN( 875)			while(( (bool)(_g_keys->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE( 875)				::String key = ( (::String)(_g_keys->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
-HXDLIN( 875)				::Array< ::Dynamic> _g_value = ( (::Array< ::Dynamic>)(::haxe::IMap_obj::get(_g_map,key)) );
-HXDLIN( 875)				::String _g_key = key;
-HXDLIN( 875)				::String areaction = _g_key;
-HXDLIN( 875)				::Array< ::Dynamic> reacts = _g_value;
-HXLINE( 876)				if ((areaction != reaction->key)) {
+            	HX_GC_STACKFRAME(&_hx_pos_af7b91d6026813b6_871_removeReaction)
+HXDLIN( 871)		 ::snikket::DirectChat _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 872)		if (::Std_obj::isOfType(reaction,::hx::ClassOf< ::snikket::CustomEmojiReaction >())) {
+HXLINE( 873)			if (::hx::IsNull( reaction->envelopeId )) {
+HXLINE( 873)				HX_STACK_DO_THROW(HX_("Cannot remove custom emoji reaction without envelopeId",90,e6,80,fb));
+            			}
+HXLINE( 874)			 ::snikket::ChatMessageBuilder correct = m->reply();
+HXLINE( 875)			correct->localId = ::snikket::ID_obj::_hx_long();
+HXLINE( 876)			correct->setHtml(HX_("",00,00,00,00));
+HXLINE( 877)			correct->text = null();
+HXLINE( 878)			this->correctMessage(reaction->envelopeId,correct);
+HXLINE( 879)			return;
+            		}
+HXLINE( 883)		::Array< ::Dynamic> reactions = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE( 884)		{
+HXLINE( 884)			::Dynamic map = m->reactions;
+HXDLIN( 884)			::Dynamic _g_map = map;
+HXDLIN( 884)			 ::Dynamic _g_keys = ::haxe::IMap_obj::keys(map);
+HXDLIN( 884)			while(( (bool)(_g_keys->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE( 884)				::String key = ( (::String)(_g_keys->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
+HXDLIN( 884)				::Array< ::Dynamic> _g_value = ( (::Array< ::Dynamic>)(::haxe::IMap_obj::get(_g_map,key)) );
+HXDLIN( 884)				::String _g_key = key;
+HXDLIN( 884)				::String areaction = _g_key;
+HXDLIN( 884)				::Array< ::Dynamic> reacts = _g_value;
+HXLINE( 885)				if ((areaction != reaction->key)) {
             					HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::DirectChat,_gthis) HXARGC(1)
             					bool _hx_run( ::snikket::Reaction r){
-            						HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_877_removeReaction)
-HXLINE( 877)						::String r1 = r->senderId;
-HXDLIN( 877)						return (r1 == _gthis->client->accountId());
+            						HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_886_removeReaction)
+HXLINE( 886)						::String r1 = r->senderId;
+HXDLIN( 886)						return (r1 == _gthis->client->accountId());
             					}
             					HX_END_LOCAL_FUNC1(return)
 
-HXLINE( 877)					 ::snikket::Reaction react = ( ( ::snikket::Reaction)(::Lambda_obj::find(reacts, ::Dynamic(new _hx_Closure_0(_gthis)))) );
-HXLINE( 878)					bool _hx_tmp;
-HXDLIN( 878)					if (::hx::IsNotNull( react )) {
-HXLINE( 878)						_hx_tmp = !(::Std_obj::isOfType(react,::hx::ClassOf< ::snikket::CustomEmojiReaction >()));
+HXLINE( 886)					 ::snikket::Reaction react = ( ( ::snikket::Reaction)(::Lambda_obj::find(reacts, ::Dynamic(new _hx_Closure_0(_gthis)))) );
+HXLINE( 887)					bool _hx_tmp;
+HXDLIN( 887)					if (::hx::IsNotNull( react )) {
+HXLINE( 887)						_hx_tmp = !(::Std_obj::isOfType(react,::hx::ClassOf< ::snikket::CustomEmojiReaction >()));
             					}
             					else {
-HXLINE( 878)						_hx_tmp = false;
+HXLINE( 887)						_hx_tmp = false;
             					}
-HXDLIN( 878)					if (_hx_tmp) {
-HXLINE( 879)						reactions->push(react);
+HXDLIN( 887)					if (_hx_tmp) {
+HXLINE( 888)						reactions->push(react);
             					}
             				}
             			}
             		}
-HXLINE( 883)		::String update = ::snikket::ID_obj::_hx_long();
-HXDLIN( 883)		::String m1 = m->localId;
-HXDLIN( 883)		::String update1 = m->chatId();
-HXDLIN( 883)		::String update2 = this->client->accountId();
-HXDLIN( 883)		 ::snikket::ReactionUpdate update3 =  ::snikket::ReactionUpdate_obj::__alloc( HX_CTX ,update,null(),null(),m1,update1,update2,::snikket::Date_obj::format(::Date_obj::now()),reactions,0);
-HXLINE( 884)		::Dynamic _hx_tmp1 = this->persistence;
-HXDLIN( 884)		::String _hx_tmp2 = this->client->accountId();
-HXDLIN( 884)		::snikket::Persistence_obj::storeReaction(_hx_tmp1,_hx_tmp2,update3, ::Dynamic(new _hx_Closure_1(_gthis,update3)));
+HXLINE( 892)		::String update = ::snikket::ID_obj::_hx_long();
+HXDLIN( 892)		::String m1 = m->localId;
+HXDLIN( 892)		::String update1 = m->chatId();
+HXDLIN( 892)		::String update2 = this->client->accountId();
+HXDLIN( 892)		 ::snikket::ReactionUpdate update3 =  ::snikket::ReactionUpdate_obj::__alloc( HX_CTX ,update,null(),null(),m1,update1,update2,::snikket::Date_obj::format(::Date_obj::now()),reactions,0);
+HXLINE( 893)		::Dynamic _hx_tmp1 = this->persistence;
+HXDLIN( 893)		::String _hx_tmp2 = this->client->accountId();
+HXDLIN( 893)		::snikket::Persistence_obj::storeReaction(_hx_tmp1,_hx_tmp2,update3, ::Dynamic(new _hx_Closure_1(_gthis,update3)));
             	}
 
 
 ::String DirectChat_obj::lastMessageId(){
-            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_896_lastMessageId)
-HXDLIN( 896)		 ::snikket::ChatMessage tmp = this->lastMessage;
-HXDLIN( 896)		::String tmp1;
-HXDLIN( 896)		if (::hx::IsNotNull( tmp )) {
-HXDLIN( 896)			tmp1 = tmp->localId;
+            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_905_lastMessageId)
+HXDLIN( 905)		 ::snikket::ChatMessage tmp = this->lastMessage;
+HXDLIN( 905)		::String tmp1;
+HXDLIN( 905)		if (::hx::IsNotNull( tmp )) {
+HXDLIN( 905)			tmp1 = tmp->localId;
             		}
             		else {
-HXDLIN( 896)			tmp1 = null();
+HXDLIN( 905)			tmp1 = null();
             		}
-HXDLIN( 896)		if (::hx::IsNotNull( tmp1 )) {
-HXDLIN( 896)			return tmp1;
+HXDLIN( 905)		if (::hx::IsNotNull( tmp1 )) {
+HXDLIN( 905)			return tmp1;
             		}
             		else {
-HXDLIN( 896)			 ::snikket::ChatMessage tmp2 = this->lastMessage;
-HXDLIN( 896)			if (::hx::IsNotNull( tmp2 )) {
-HXDLIN( 896)				return tmp2->serverId;
+HXDLIN( 905)			 ::snikket::ChatMessage tmp2 = this->lastMessage;
+HXDLIN( 905)			if (::hx::IsNotNull( tmp2 )) {
+HXDLIN( 905)				return tmp2->serverId;
             			}
             			else {
-HXDLIN( 896)				return null();
+HXDLIN( 905)				return null();
             			}
             		}
-HXDLIN( 896)		return null();
+HXDLIN( 905)		return null();
             	}
 
 
 void DirectChat_obj::markReadUpTo( ::snikket::ChatMessage message){
             		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0, ::snikket::DirectChat,_gthis, ::snikket::ChatMessage,message) HXARGC(0)
             		void _hx_run(){
-            			HX_GC_STACKFRAME(&_hx_pos_af7b91d6026813b6_901_markReadUpTo)
-HXLINE( 904)			bool _hx_tmp;
-HXDLIN( 904)			if (message->isIncoming()) {
-HXLINE( 904)				_hx_tmp = ::hx::IsNotNull( message->localId );
+            			HX_GC_STACKFRAME(&_hx_pos_af7b91d6026813b6_910_markReadUpTo)
+HXLINE( 913)			bool _hx_tmp;
+HXDLIN( 913)			if (message->isIncoming()) {
+HXLINE( 913)				_hx_tmp = ::hx::IsNotNull( message->localId );
             			}
             			else {
-HXLINE( 904)				_hx_tmp = false;
-            			}
-HXDLIN( 904)			if (_hx_tmp) {
-HXLINE( 905)				int _g = 0;
-HXDLIN( 905)				::Array< ::String > _g1 = _gthis->counterparts();
-HXDLIN( 905)				while((_g < _g1->length)){
-HXLINE( 905)					::String recipient = _g1->__get(_g);
-HXDLIN( 905)					_g = (_g + 1);
-HXLINE( 907)					::String stanza = ::snikket::ID_obj::_hx_long();
-HXDLIN( 907)					 ::snikket::Stanza stanza1 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("message",c7,35,11,9a), ::Dynamic(::hx::Anon_obj::Create(2)
+HXLINE( 913)				_hx_tmp = false;
+            			}
+HXDLIN( 913)			if (_hx_tmp) {
+HXLINE( 914)				int _g = 0;
+HXDLIN( 914)				::Array< ::String > _g1 = _gthis->counterparts();
+HXDLIN( 914)				while((_g < _g1->length)){
+HXLINE( 914)					::String recipient = _g1->__get(_g);
+HXDLIN( 914)					_g = (_g + 1);
+HXLINE( 916)					::String stanza = ::snikket::ID_obj::_hx_long();
+HXDLIN( 916)					 ::snikket::Stanza stanza1 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("message",c7,35,11,9a), ::Dynamic(::hx::Anon_obj::Create(2)
             						->setFixed(0,HX_("id",db,5b,00,00),stanza)
             						->setFixed(1,HX_("to",7b,65,00,00),recipient)))->tag(HX_("displayed",21,17,db,c1), ::Dynamic(::hx::Anon_obj::Create(2)
             						->setFixed(0,HX_("id",db,5b,00,00),message->localId)
             						->setFixed(1,HX_("xmlns",dc,31,74,60),HX_("urn:xmpp:chat-markers:0",96,b8,66,e7))))->up();
-HXLINE( 909)					if (::hx::IsNotNull( message->threadId )) {
-HXLINE( 910)						stanza1->textTag(HX_("thread",ca,7a,b9,8e),message->threadId,null());
+HXLINE( 918)					if (::hx::IsNotNull( message->threadId )) {
+HXLINE( 919)						stanza1->textTag(HX_("thread",ca,7a,b9,8e),message->threadId,null());
             					}
-HXLINE( 912)					_gthis->client->sendStanza(stanza1);
+HXLINE( 921)					_gthis->client->sendStanza(stanza1);
             				}
             			}
-HXLINE( 916)			_gthis->publishMds();
-HXLINE( 917)			_gthis->client->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,_gthis));
+HXLINE( 925)			_gthis->publishMds();
+HXLINE( 926)			_gthis->client->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,_gthis));
             		}
             		HX_END_LOCAL_FUNC0((void))
 
-            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_900_markReadUpTo)
-HXDLIN( 900)		 ::snikket::DirectChat _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 901)		this->markReadUpToMessage(message, ::Dynamic(new _hx_Closure_0(_gthis,message)));
+            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_909_markReadUpTo)
+HXDLIN( 909)		 ::snikket::DirectChat _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 910)		this->markReadUpToMessage(message, ::Dynamic(new _hx_Closure_0(_gthis,message)));
             	}
 
 
 void DirectChat_obj::bookmark(){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::DirectChat,_gthis) HXARGC(1)
             		void _hx_run( ::snikket::Stanza response){
-            			HX_GC_STACKFRAME(&_hx_pos_af7b91d6026813b6_932_bookmark)
-HXLINE( 933)			if ((( (::String)(::Reflect_obj::field(response->attr,HX_("type",ba,f2,08,4d))) ) == HX_("error",c8,cb,29,73))) {
-HXLINE( 933)				return;
+            			HX_GC_STACKFRAME(&_hx_pos_af7b91d6026813b6_941_bookmark)
+HXLINE( 942)			if ((( (::String)(::Reflect_obj::field(response->attr,HX_("type",ba,f2,08,4d))) ) == HX_("error",c8,cb,29,73))) {
+HXLINE( 942)				return;
             			}
-HXLINE( 934)			 ::snikket::GenericStream _gthis1 = _gthis->stream;
-HXDLIN( 934)			::String _gthis2 = _gthis->chatId;
-HXDLIN( 934)			_gthis1->sendStanza( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("presence",3b,52,d7,66), ::Dynamic(::hx::Anon_obj::Create(3)
+HXLINE( 943)			 ::snikket::GenericStream _gthis1 = _gthis->stream;
+HXDLIN( 943)			::String _gthis2 = _gthis->chatId;
+HXDLIN( 943)			_gthis1->sendStanza( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("presence",3b,52,d7,66), ::Dynamic(::hx::Anon_obj::Create(3)
             				->setFixed(0,HX_("id",db,5b,00,00),::snikket::ID_obj::_hx_short())
             				->setFixed(1,HX_("to",7b,65,00,00),_gthis2)
             				->setFixed(2,HX_("type",ba,f2,08,4d),HX_("subscribe",4a,0b,18,19)))));
-HXLINE( 935)			if (_gthis->isTrusted()) {
-HXLINE( 935)				 ::snikket::GenericStream _gthis3 = _gthis->stream;
-HXDLIN( 935)				::String _gthis4 = _gthis->chatId;
-HXDLIN( 935)				_gthis3->sendStanza( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("presence",3b,52,d7,66), ::Dynamic(::hx::Anon_obj::Create(3)
+HXLINE( 944)			if (_gthis->isTrusted()) {
+HXLINE( 944)				 ::snikket::GenericStream _gthis3 = _gthis->stream;
+HXDLIN( 944)				::String _gthis4 = _gthis->chatId;
+HXDLIN( 944)				_gthis3->sendStanza( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("presence",3b,52,d7,66), ::Dynamic(::hx::Anon_obj::Create(3)
             					->setFixed(0,HX_("id",db,5b,00,00),::snikket::ID_obj::_hx_short())
             					->setFixed(1,HX_("to",7b,65,00,00),_gthis4)
             					->setFixed(2,HX_("type",ba,f2,08,4d),HX_("subscribed",da,d5,f1,db)))));
@@ -675,70 +675,70 @@ HXDLIN( 935)				_gthis3->sendStanza( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_GC_STACKFRAME(&_hx_pos_af7b91d6026813b6_922_bookmark)
-HXDLIN( 922)		 ::snikket::DirectChat _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 923)		 ::Dynamic attr =  ::Dynamic(::hx::Anon_obj::Create(1)
+            	HX_GC_STACKFRAME(&_hx_pos_af7b91d6026813b6_931_bookmark)
+HXDLIN( 931)		 ::snikket::DirectChat _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 932)		 ::Dynamic attr =  ::Dynamic(::hx::Anon_obj::Create(1)
             			->setFixed(0,HX_("jid",c5,ca,50,00),this->chatId));
-HXLINE( 924)		bool _hx_tmp;
-HXDLIN( 924)		bool _hx_tmp1;
-HXDLIN( 924)		if (::hx::IsNotNull( this->displayName )) {
-HXLINE( 924)			_hx_tmp1 = (this->displayName != HX_("",00,00,00,00));
+HXLINE( 933)		bool _hx_tmp;
+HXDLIN( 933)		bool _hx_tmp1;
+HXDLIN( 933)		if (::hx::IsNotNull( this->displayName )) {
+HXLINE( 933)			_hx_tmp1 = (this->displayName != HX_("",00,00,00,00));
             		}
             		else {
-HXLINE( 924)			_hx_tmp1 = false;
+HXLINE( 933)			_hx_tmp1 = false;
             		}
-HXDLIN( 924)		if (_hx_tmp1) {
-HXLINE( 924)			_hx_tmp = (this->displayName != this->chatId);
+HXDLIN( 933)		if (_hx_tmp1) {
+HXLINE( 933)			_hx_tmp = (this->displayName != this->chatId);
             		}
             		else {
-HXLINE( 924)			_hx_tmp = false;
+HXLINE( 933)			_hx_tmp = false;
             		}
-HXDLIN( 924)		if (_hx_tmp) {
-HXLINE( 925)			::String value = this->displayName;
-HXDLIN( 925)			::Reflect_obj::setField(attr,HX_("name",4b,72,ff,48),value);
+HXDLIN( 933)		if (_hx_tmp) {
+HXLINE( 934)			::String value = this->displayName;
+HXDLIN( 934)			::Reflect_obj::setField(attr,HX_("name",4b,72,ff,48),value);
             		}
-HXLINE( 927)		 ::snikket::GenericStream _hx_tmp2 = this->stream;
-HXDLIN( 927)		_hx_tmp2->sendIq( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("iq",e8,5b,00,00), ::Dynamic(::hx::Anon_obj::Create(1)
+HXLINE( 936)		 ::snikket::GenericStream _hx_tmp2 = this->stream;
+HXDLIN( 936)		_hx_tmp2->sendIq( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("iq",e8,5b,00,00), ::Dynamic(::hx::Anon_obj::Create(1)
             			->setFixed(0,HX_("type",ba,f2,08,4d),HX_("set",a2,9b,57,00))))->tag(HX_("query",08,8b,ea,5d), ::Dynamic(::hx::Anon_obj::Create(1)
             			->setFixed(0,HX_("xmlns",dc,31,74,60),HX_("jabber:iq:roster",47,76,6e,06))))->tag(HX_("item",13,c5,bf,45),attr)->up()->up(), ::Dynamic(new _hx_Closure_0(_gthis)));
             	}
 
 
 void DirectChat_obj::sendChatState(::String state,::String threadId){
-            	HX_GC_STACKFRAME(&_hx_pos_af7b91d6026813b6_941_sendChatState)
-HXDLIN( 941)		int _g = 0;
-HXDLIN( 941)		::Array< ::String > _g1 = this->counterparts();
-HXDLIN( 941)		while((_g < _g1->length)){
-HXDLIN( 941)			::String recipient = _g1->__get(_g);
-HXDLIN( 941)			_g = (_g + 1);
-HXLINE( 943)			::String stanza = ::snikket::ID_obj::_hx_long();
-HXLINE( 945)			::String stanza1 = this->client->jid->asString();
-HXLINE( 942)			 ::snikket::Stanza stanza2 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("message",c7,35,11,9a), ::Dynamic(::hx::Anon_obj::Create(4)
+            	HX_GC_STACKFRAME(&_hx_pos_af7b91d6026813b6_950_sendChatState)
+HXDLIN( 950)		int _g = 0;
+HXDLIN( 950)		::Array< ::String > _g1 = this->counterparts();
+HXDLIN( 950)		while((_g < _g1->length)){
+HXDLIN( 950)			::String recipient = _g1->__get(_g);
+HXDLIN( 950)			_g = (_g + 1);
+HXLINE( 952)			::String stanza = ::snikket::ID_obj::_hx_long();
+HXLINE( 954)			::String stanza1 = this->client->jid->asString();
+HXLINE( 951)			 ::snikket::Stanza stanza2 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("message",c7,35,11,9a), ::Dynamic(::hx::Anon_obj::Create(4)
             				->setFixed(0,HX_("id",db,5b,00,00),stanza)
             				->setFixed(1,HX_("to",7b,65,00,00),recipient)
             				->setFixed(2,HX_("from",6a,a5,c2,43),stanza1)
             				->setFixed(3,HX_("type",ba,f2,08,4d),HX_("chat",d8,5e,bf,41))))->tag(state, ::Dynamic(::hx::Anon_obj::Create(1)
             				->setFixed(0,HX_("xmlns",dc,31,74,60),HX_("http://jabber.org/protocol/chatstates",8e,6d,41,6d))))->up();
-HXLINE( 950)			if (::hx::IsNotNull( threadId )) {
-HXLINE( 951)				stanza2->textTag(HX_("thread",ca,7a,b9,8e),threadId,null());
+HXLINE( 959)			if (::hx::IsNotNull( threadId )) {
+HXLINE( 960)				stanza2->textTag(HX_("thread",ca,7a,b9,8e),threadId,null());
             			}
-HXLINE( 953)			this->stream->sendStanza(stanza2);
+HXLINE( 962)			this->stream->sendStanza(stanza2);
             		}
             	}
 
 
 void DirectChat_obj::close(){
-            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_958_close)
-HXLINE( 959)		if (::hx::IsNotNull( this->typingTimer )) {
-HXLINE( 959)			this->typingTimer->stop();
+            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_967_close)
+HXLINE( 968)		if (::hx::IsNotNull( this->typingTimer )) {
+HXLINE( 968)			this->typingTimer->stop();
             		}
-HXLINE( 961)		this->uiState = 2;
-HXLINE( 962)		::Dynamic _hx_tmp = this->persistence;
-HXDLIN( 962)		::snikket::Persistence_obj::storeChats(_hx_tmp,this->client->accountId(),::Array_obj< ::Dynamic>::__new(1)->init(0,::hx::ObjectPtr<OBJ_>(this)));
-HXLINE( 963)		if (!(this->isBlocked)) {
-HXLINE( 963)			this->sendChatState(HX_("gone",5f,94,69,44),null());
+HXLINE( 970)		this->uiState = 2;
+HXLINE( 971)		::Dynamic _hx_tmp = this->persistence;
+HXDLIN( 971)		::snikket::Persistence_obj::storeChats(_hx_tmp,this->client->accountId(),::Array_obj< ::Dynamic>::__new(1)->init(0,::hx::ObjectPtr<OBJ_>(this)));
+HXLINE( 972)		if (!(this->isBlocked)) {
+HXLINE( 972)			this->sendChatState(HX_("gone",5f,94,69,44),null());
             		}
-HXLINE( 964)		this->client->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,::hx::ObjectPtr<OBJ_>(this)));
+HXLINE( 973)		this->client->trigger(HX_("chats/update",3d,8e,1d,14),::cpp::VirtualArray_obj::__new(1)->init(0,::hx::ObjectPtr<OBJ_>(this)));
             	}
 
 
@@ -856,8 +856,8 @@ void DirectChat_obj::__register()
 void DirectChat_obj::__boot()
 {
 {
-            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_715_boot)
-HXDLIN( 715)		__mClass->__meta__ =  ::Dynamic(::hx::Anon_obj::Create(1)
+            	HX_STACKFRAME(&_hx_pos_af7b91d6026813b6_724_boot)
+HXDLIN( 724)		__mClass->__meta__ =  ::Dynamic(::hx::Anon_obj::Create(1)
             			->setFixed(0,HX_("fields",79,8e,8e,80), ::Dynamic(::hx::Anon_obj::Create(12)
             				->setFixed(0,HX_("removeReaction",0d,24,0b,c1), ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("HaxeCBridge.noemit",dc,2c,99,2f),null())))
diff --git a/Sources/c_snikket/src/snikket/Identicon.cpp b/Sources/c_snikket/src/snikket/Identicon.cpp
index 84d9672..315428b 100644
--- a/Sources/c_snikket/src/snikket/Identicon.cpp
+++ b/Sources/c_snikket/src/snikket/Identicon.cpp
@@ -23,7 +23,7 @@
 #include <snikket/Identicon.h>
 #endif
 
-HX_LOCAL_STACK_FRAME(_hx_pos_ff119e3d91e7f580_10_svg,"snikket.Identicon","svg",0xe12e620e,"snikket.Identicon.svg","snikket/Identicon.hx",10,0xd7684427)
+HX_LOCAL_STACK_FRAME(_hx_pos_ff119e3d91e7f580_18_svg,"snikket.Identicon","svg",0xe12e620e,"snikket.Identicon.svg","snikket/Identicon.hx",18,0xd7684427)
 namespace snikket{
 
 void Identicon_obj::__construct() { }
@@ -44,138 +44,138 @@ bool Identicon_obj::_hx_isInstanceOf(int inClassId) {
 }
 
 ::String Identicon_obj::svg(::String source){
-            	HX_GC_STACKFRAME(&_hx_pos_ff119e3d91e7f580_10_svg)
-HXLINE(  11)		 ::haxe::io::Bytes sha = ::haxe::crypto::Sha1_obj::make(::haxe::io::Bytes_obj::ofString(source,null()));
-HXLINE(  12)		 ::haxe::io::BytesInput input =  ::haxe::io::BytesInput_obj::__alloc( HX_CTX ,sha,null(),null());
-HXLINE(  13)		input->set_bigEndian(true);
-HXLINE(  14)		int hash = input->readInt32();
-HXLINE(  15)		::String uri = HX_("data:image/svg+xml,<svg%20xmlns=\"http://www.w3.org/2000/svg\"%20version=\"1.1\"%20width=\"5\"%20height=\"5\"%20viewBox=\"0%200%205%205\">",ab,fb,bd,f4);
-HXLINE(  16)		uri = (uri + ((HX_("<style>rect{fill:%23",3d,8c,37,23) + ::snikket::Color_obj::forString(source).substr(1,null())) + HX_(";}</style>",82,58,20,71)));
-HXLINE(  17)		int i = 0;
-HXLINE(  18)		{
-HXLINE(  19)			{
-HXLINE(  19)				{
-HXLINE(  20)					i = (i + 1);
-HXDLIN(  20)					int value = (hash >> (i - 1));
-HXLINE(  21)					if ((::hx::Mod(value,2) == 0)) {
-HXLINE(  22)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 0) + HX_("\"%20y=\"",5d,64,2d,3b)) + 0) + HX_("\"/>",d1,f5,19,00)));
-HXLINE(  24)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 4) + HX_("\"%20y=\"",5d,64,2d,3b)) + 0) + HX_("\"/>",d1,f5,19,00)));
+            	HX_GC_STACKFRAME(&_hx_pos_ff119e3d91e7f580_18_svg)
+HXLINE(  19)		 ::haxe::io::Bytes sha = ::haxe::crypto::Sha1_obj::make(::haxe::io::Bytes_obj::ofString(source,null()));
+HXLINE(  20)		 ::haxe::io::BytesInput input =  ::haxe::io::BytesInput_obj::__alloc( HX_CTX ,sha,null(),null());
+HXLINE(  21)		input->set_bigEndian(true);
+HXLINE(  22)		int hash = input->readInt32();
+HXLINE(  23)		::String uri = HX_("data:image/svg+xml,<svg%20xmlns=\"http://www.w3.org/2000/svg\"%20version=\"1.1\"%20width=\"5\"%20height=\"5\"%20viewBox=\"0%200%205%205\">",ab,fb,bd,f4);
+HXLINE(  24)		uri = (uri + ((HX_("<style>rect{fill:%23",3d,8c,37,23) + ::snikket::Color_obj::forString(source).substr(1,null())) + HX_(";}</style>",82,58,20,71)));
+HXLINE(  25)		int i = 0;
+HXLINE(  26)		{
+HXLINE(  27)			{
+HXLINE(  27)				{
+HXLINE(  28)					i = (i + 1);
+HXDLIN(  28)					int value = (hash >> (i - 1));
+HXLINE(  29)					if ((::hx::Mod(value,2) == 0)) {
+HXLINE(  30)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 0) + HX_("\"%20y=\"",5d,64,2d,3b)) + 0) + HX_("\"/>",d1,f5,19,00)));
+HXLINE(  32)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 4) + HX_("\"%20y=\"",5d,64,2d,3b)) + 0) + HX_("\"/>",d1,f5,19,00)));
             					}
             				}
-HXLINE(  19)				{
-HXLINE(  20)					i = (i + 1);
-HXDLIN(  20)					int value1 = (hash >> (i - 1));
-HXLINE(  21)					if ((::hx::Mod(value1,2) == 0)) {
-HXLINE(  22)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 0) + HX_("\"%20y=\"",5d,64,2d,3b)) + 1) + HX_("\"/>",d1,f5,19,00)));
-HXLINE(  24)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 4) + HX_("\"%20y=\"",5d,64,2d,3b)) + 1) + HX_("\"/>",d1,f5,19,00)));
+HXLINE(  27)				{
+HXLINE(  28)					i = (i + 1);
+HXDLIN(  28)					int value1 = (hash >> (i - 1));
+HXLINE(  29)					if ((::hx::Mod(value1,2) == 0)) {
+HXLINE(  30)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 0) + HX_("\"%20y=\"",5d,64,2d,3b)) + 1) + HX_("\"/>",d1,f5,19,00)));
+HXLINE(  32)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 4) + HX_("\"%20y=\"",5d,64,2d,3b)) + 1) + HX_("\"/>",d1,f5,19,00)));
             					}
             				}
-HXLINE(  19)				{
-HXLINE(  20)					i = (i + 1);
-HXDLIN(  20)					int value2 = (hash >> (i - 1));
-HXLINE(  21)					if ((::hx::Mod(value2,2) == 0)) {
-HXLINE(  22)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 0) + HX_("\"%20y=\"",5d,64,2d,3b)) + 2) + HX_("\"/>",d1,f5,19,00)));
-HXLINE(  24)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 4) + HX_("\"%20y=\"",5d,64,2d,3b)) + 2) + HX_("\"/>",d1,f5,19,00)));
+HXLINE(  27)				{
+HXLINE(  28)					i = (i + 1);
+HXDLIN(  28)					int value2 = (hash >> (i - 1));
+HXLINE(  29)					if ((::hx::Mod(value2,2) == 0)) {
+HXLINE(  30)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 0) + HX_("\"%20y=\"",5d,64,2d,3b)) + 2) + HX_("\"/>",d1,f5,19,00)));
+HXLINE(  32)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 4) + HX_("\"%20y=\"",5d,64,2d,3b)) + 2) + HX_("\"/>",d1,f5,19,00)));
             					}
             				}
-HXLINE(  19)				{
-HXLINE(  20)					i = (i + 1);
-HXDLIN(  20)					int value3 = (hash >> (i - 1));
-HXLINE(  21)					if ((::hx::Mod(value3,2) == 0)) {
-HXLINE(  22)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 0) + HX_("\"%20y=\"",5d,64,2d,3b)) + 3) + HX_("\"/>",d1,f5,19,00)));
-HXLINE(  24)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 4) + HX_("\"%20y=\"",5d,64,2d,3b)) + 3) + HX_("\"/>",d1,f5,19,00)));
+HXLINE(  27)				{
+HXLINE(  28)					i = (i + 1);
+HXDLIN(  28)					int value3 = (hash >> (i - 1));
+HXLINE(  29)					if ((::hx::Mod(value3,2) == 0)) {
+HXLINE(  30)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 0) + HX_("\"%20y=\"",5d,64,2d,3b)) + 3) + HX_("\"/>",d1,f5,19,00)));
+HXLINE(  32)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 4) + HX_("\"%20y=\"",5d,64,2d,3b)) + 3) + HX_("\"/>",d1,f5,19,00)));
             					}
             				}
-HXLINE(  19)				{
-HXLINE(  20)					i = (i + 1);
-HXDLIN(  20)					int value4 = (hash >> (i - 1));
-HXLINE(  21)					if ((::hx::Mod(value4,2) == 0)) {
-HXLINE(  22)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 0) + HX_("\"%20y=\"",5d,64,2d,3b)) + 4) + HX_("\"/>",d1,f5,19,00)));
-HXLINE(  24)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 4) + HX_("\"%20y=\"",5d,64,2d,3b)) + 4) + HX_("\"/>",d1,f5,19,00)));
+HXLINE(  27)				{
+HXLINE(  28)					i = (i + 1);
+HXDLIN(  28)					int value4 = (hash >> (i - 1));
+HXLINE(  29)					if ((::hx::Mod(value4,2) == 0)) {
+HXLINE(  30)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 0) + HX_("\"%20y=\"",5d,64,2d,3b)) + 4) + HX_("\"/>",d1,f5,19,00)));
+HXLINE(  32)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 4) + HX_("\"%20y=\"",5d,64,2d,3b)) + 4) + HX_("\"/>",d1,f5,19,00)));
             					}
             				}
             			}
-HXLINE(  19)			{
-HXLINE(  19)				{
-HXLINE(  20)					i = (i + 1);
-HXDLIN(  20)					int value5 = (hash >> (i - 1));
-HXLINE(  21)					if ((::hx::Mod(value5,2) == 0)) {
-HXLINE(  22)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 1) + HX_("\"%20y=\"",5d,64,2d,3b)) + 0) + HX_("\"/>",d1,f5,19,00)));
-HXLINE(  24)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 3) + HX_("\"%20y=\"",5d,64,2d,3b)) + 0) + HX_("\"/>",d1,f5,19,00)));
+HXLINE(  27)			{
+HXLINE(  27)				{
+HXLINE(  28)					i = (i + 1);
+HXDLIN(  28)					int value5 = (hash >> (i - 1));
+HXLINE(  29)					if ((::hx::Mod(value5,2) == 0)) {
+HXLINE(  30)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 1) + HX_("\"%20y=\"",5d,64,2d,3b)) + 0) + HX_("\"/>",d1,f5,19,00)));
+HXLINE(  32)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 3) + HX_("\"%20y=\"",5d,64,2d,3b)) + 0) + HX_("\"/>",d1,f5,19,00)));
             					}
             				}
-HXLINE(  19)				{
-HXLINE(  20)					i = (i + 1);
-HXDLIN(  20)					int value6 = (hash >> (i - 1));
-HXLINE(  21)					if ((::hx::Mod(value6,2) == 0)) {
-HXLINE(  22)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 1) + HX_("\"%20y=\"",5d,64,2d,3b)) + 1) + HX_("\"/>",d1,f5,19,00)));
-HXLINE(  24)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 3) + HX_("\"%20y=\"",5d,64,2d,3b)) + 1) + HX_("\"/>",d1,f5,19,00)));
+HXLINE(  27)				{
+HXLINE(  28)					i = (i + 1);
+HXDLIN(  28)					int value6 = (hash >> (i - 1));
+HXLINE(  29)					if ((::hx::Mod(value6,2) == 0)) {
+HXLINE(  30)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 1) + HX_("\"%20y=\"",5d,64,2d,3b)) + 1) + HX_("\"/>",d1,f5,19,00)));
+HXLINE(  32)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 3) + HX_("\"%20y=\"",5d,64,2d,3b)) + 1) + HX_("\"/>",d1,f5,19,00)));
             					}
             				}
-HXLINE(  19)				{
-HXLINE(  20)					i = (i + 1);
-HXDLIN(  20)					int value7 = (hash >> (i - 1));
-HXLINE(  21)					if ((::hx::Mod(value7,2) == 0)) {
-HXLINE(  22)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 1) + HX_("\"%20y=\"",5d,64,2d,3b)) + 2) + HX_("\"/>",d1,f5,19,00)));
-HXLINE(  24)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 3) + HX_("\"%20y=\"",5d,64,2d,3b)) + 2) + HX_("\"/>",d1,f5,19,00)));
+HXLINE(  27)				{
+HXLINE(  28)					i = (i + 1);
+HXDLIN(  28)					int value7 = (hash >> (i - 1));
+HXLINE(  29)					if ((::hx::Mod(value7,2) == 0)) {
+HXLINE(  30)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 1) + HX_("\"%20y=\"",5d,64,2d,3b)) + 2) + HX_("\"/>",d1,f5,19,00)));
+HXLINE(  32)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 3) + HX_("\"%20y=\"",5d,64,2d,3b)) + 2) + HX_("\"/>",d1,f5,19,00)));
             					}
             				}
-HXLINE(  19)				{
-HXLINE(  20)					i = (i + 1);
-HXDLIN(  20)					int value8 = (hash >> (i - 1));
-HXLINE(  21)					if ((::hx::Mod(value8,2) == 0)) {
-HXLINE(  22)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 1) + HX_("\"%20y=\"",5d,64,2d,3b)) + 3) + HX_("\"/>",d1,f5,19,00)));
-HXLINE(  24)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 3) + HX_("\"%20y=\"",5d,64,2d,3b)) + 3) + HX_("\"/>",d1,f5,19,00)));
+HXLINE(  27)				{
+HXLINE(  28)					i = (i + 1);
+HXDLIN(  28)					int value8 = (hash >> (i - 1));
+HXLINE(  29)					if ((::hx::Mod(value8,2) == 0)) {
+HXLINE(  30)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 1) + HX_("\"%20y=\"",5d,64,2d,3b)) + 3) + HX_("\"/>",d1,f5,19,00)));
+HXLINE(  32)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 3) + HX_("\"%20y=\"",5d,64,2d,3b)) + 3) + HX_("\"/>",d1,f5,19,00)));
             					}
             				}
-HXLINE(  19)				{
-HXLINE(  20)					i = (i + 1);
-HXDLIN(  20)					int value9 = (hash >> (i - 1));
-HXLINE(  21)					if ((::hx::Mod(value9,2) == 0)) {
-HXLINE(  22)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 1) + HX_("\"%20y=\"",5d,64,2d,3b)) + 4) + HX_("\"/>",d1,f5,19,00)));
-HXLINE(  24)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 3) + HX_("\"%20y=\"",5d,64,2d,3b)) + 4) + HX_("\"/>",d1,f5,19,00)));
+HXLINE(  27)				{
+HXLINE(  28)					i = (i + 1);
+HXDLIN(  28)					int value9 = (hash >> (i - 1));
+HXLINE(  29)					if ((::hx::Mod(value9,2) == 0)) {
+HXLINE(  30)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 1) + HX_("\"%20y=\"",5d,64,2d,3b)) + 4) + HX_("\"/>",d1,f5,19,00)));
+HXLINE(  32)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 3) + HX_("\"%20y=\"",5d,64,2d,3b)) + 4) + HX_("\"/>",d1,f5,19,00)));
             					}
             				}
             			}
-HXLINE(  19)			{
-HXLINE(  19)				{
-HXLINE(  20)					i = (i + 1);
-HXDLIN(  20)					int value10 = (hash >> (i - 1));
-HXLINE(  21)					if ((::hx::Mod(value10,2) == 0)) {
-HXLINE(  22)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 2) + HX_("\"%20y=\"",5d,64,2d,3b)) + 0) + HX_("\"/>",d1,f5,19,00)));
+HXLINE(  27)			{
+HXLINE(  27)				{
+HXLINE(  28)					i = (i + 1);
+HXDLIN(  28)					int value10 = (hash >> (i - 1));
+HXLINE(  29)					if ((::hx::Mod(value10,2) == 0)) {
+HXLINE(  30)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 2) + HX_("\"%20y=\"",5d,64,2d,3b)) + 0) + HX_("\"/>",d1,f5,19,00)));
             					}
             				}
-HXLINE(  19)				{
-HXLINE(  20)					i = (i + 1);
-HXDLIN(  20)					int value11 = (hash >> (i - 1));
-HXLINE(  21)					if ((::hx::Mod(value11,2) == 0)) {
-HXLINE(  22)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 2) + HX_("\"%20y=\"",5d,64,2d,3b)) + 1) + HX_("\"/>",d1,f5,19,00)));
+HXLINE(  27)				{
+HXLINE(  28)					i = (i + 1);
+HXDLIN(  28)					int value11 = (hash >> (i - 1));
+HXLINE(  29)					if ((::hx::Mod(value11,2) == 0)) {
+HXLINE(  30)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 2) + HX_("\"%20y=\"",5d,64,2d,3b)) + 1) + HX_("\"/>",d1,f5,19,00)));
             					}
             				}
-HXLINE(  19)				{
-HXLINE(  20)					i = (i + 1);
-HXDLIN(  20)					int value12 = (hash >> (i - 1));
-HXLINE(  21)					if ((::hx::Mod(value12,2) == 0)) {
-HXLINE(  22)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 2) + HX_("\"%20y=\"",5d,64,2d,3b)) + 2) + HX_("\"/>",d1,f5,19,00)));
+HXLINE(  27)				{
+HXLINE(  28)					i = (i + 1);
+HXDLIN(  28)					int value12 = (hash >> (i - 1));
+HXLINE(  29)					if ((::hx::Mod(value12,2) == 0)) {
+HXLINE(  30)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 2) + HX_("\"%20y=\"",5d,64,2d,3b)) + 2) + HX_("\"/>",d1,f5,19,00)));
             					}
             				}
-HXLINE(  19)				{
-HXLINE(  20)					i = (i + 1);
-HXDLIN(  20)					int value13 = (hash >> (i - 1));
-HXLINE(  21)					if ((::hx::Mod(value13,2) == 0)) {
-HXLINE(  22)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 2) + HX_("\"%20y=\"",5d,64,2d,3b)) + 3) + HX_("\"/>",d1,f5,19,00)));
+HXLINE(  27)				{
+HXLINE(  28)					i = (i + 1);
+HXDLIN(  28)					int value13 = (hash >> (i - 1));
+HXLINE(  29)					if ((::hx::Mod(value13,2) == 0)) {
+HXLINE(  30)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 2) + HX_("\"%20y=\"",5d,64,2d,3b)) + 3) + HX_("\"/>",d1,f5,19,00)));
             					}
             				}
-HXLINE(  19)				{
-HXLINE(  20)					i = (i + 1);
-HXDLIN(  20)					int value14 = (hash >> (i - 1));
-HXLINE(  21)					if ((::hx::Mod(value14,2) == 0)) {
-HXLINE(  22)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 2) + HX_("\"%20y=\"",5d,64,2d,3b)) + 4) + HX_("\"/>",d1,f5,19,00)));
+HXLINE(  27)				{
+HXLINE(  28)					i = (i + 1);
+HXDLIN(  28)					int value14 = (hash >> (i - 1));
+HXLINE(  29)					if ((::hx::Mod(value14,2) == 0)) {
+HXLINE(  30)						uri = (uri + ((((HX_("<rect%20width=\"1\"%20height=\"1\"%20x=\"",81,8b,c1,f0) + 2) + HX_("\"%20y=\"",5d,64,2d,3b)) + 4) + HX_("\"/>",d1,f5,19,00)));
             					}
             				}
             			}
             		}
-HXLINE(  29)		return (uri + HX_("</svg>",4d,57,9c,59));
+HXLINE(  37)		return (uri + HX_("</svg>",4d,57,9c,59));
             	}
 
 
diff --git a/Sources/c_snikket/src/snikket/Identity.cpp b/Sources/c_snikket/src/snikket/Identity.cpp
index 18f9133..83cefc1 100644
--- a/Sources/c_snikket/src/snikket/Identity.cpp
+++ b/Sources/c_snikket/src/snikket/Identity.cpp
@@ -11,16 +11,16 @@
 #include <snikket/_Stanza/NodeInterface.h>
 #endif
 
-HX_DEFINE_STACK_FRAME(_hx_pos_913c0fa79e603d10_108_new,"snikket.Identity","new",0xf59d9be1,"snikket.Identity.new","snikket/Caps.hx",108,0xee3b624b)
-HX_LOCAL_STACK_FRAME(_hx_pos_913c0fa79e603d10_115_addToDisco,"snikket.Identity","addToDisco",0x16a0927d,"snikket.Identity.addToDisco","snikket/Caps.hx",115,0xee3b624b)
-HX_LOCAL_STACK_FRAME(_hx_pos_913c0fa79e603d10_119_ver,"snikket.Identity","ver",0xf5a3ade4,"snikket.Identity.ver","snikket/Caps.hx",119,0xee3b624b)
+HX_DEFINE_STACK_FRAME(_hx_pos_913c0fa79e603d10_112_new,"snikket.Identity","new",0xf59d9be1,"snikket.Identity.new","snikket/Caps.hx",112,0xee3b624b)
+HX_LOCAL_STACK_FRAME(_hx_pos_913c0fa79e603d10_119_addToDisco,"snikket.Identity","addToDisco",0x16a0927d,"snikket.Identity.addToDisco","snikket/Caps.hx",119,0xee3b624b)
+HX_LOCAL_STACK_FRAME(_hx_pos_913c0fa79e603d10_123_ver,"snikket.Identity","ver",0xf5a3ade4,"snikket.Identity.ver","snikket/Caps.hx",123,0xee3b624b)
 namespace snikket{
 
 void Identity_obj::__construct(::String category,::String type,::String name){
-            	HX_STACKFRAME(&_hx_pos_913c0fa79e603d10_108_new)
-HXLINE( 109)		this->category = category;
-HXLINE( 110)		this->type = type;
-HXLINE( 111)		this->name = name;
+            	HX_STACKFRAME(&_hx_pos_913c0fa79e603d10_112_new)
+HXLINE( 113)		this->category = category;
+HXLINE( 114)		this->type = type;
+HXLINE( 115)		this->name = name;
             	}
 
 Dynamic Identity_obj::__CreateEmpty() { return new Identity_obj; }
@@ -39,8 +39,8 @@ bool Identity_obj::_hx_isInstanceOf(int inClassId) {
 }
 
 void Identity_obj::addToDisco( ::snikket::Stanza stanza){
-            	HX_STACKFRAME(&_hx_pos_913c0fa79e603d10_115_addToDisco)
-HXDLIN( 115)		stanza->tag(HX_("identity",3e,45,2f,b9), ::Dynamic(::hx::Anon_obj::Create(3)
+            	HX_STACKFRAME(&_hx_pos_913c0fa79e603d10_119_addToDisco)
+HXDLIN( 119)		stanza->tag(HX_("identity",3e,45,2f,b9), ::Dynamic(::hx::Anon_obj::Create(3)
             			->setFixed(0,HX_("category",fe,2a,6c,ad),this->category)
             			->setFixed(1,HX_("name",4b,72,ff,48),this->name)
             			->setFixed(2,HX_("type",ba,f2,08,4d),this->type)))->up();
@@ -50,8 +50,8 @@ HXDLIN( 115)		stanza->tag(HX_("identity",3e,45,2f,b9), ::Dynamic(::hx::Anon_obj:
 HX_DEFINE_DYNAMIC_FUNC1(Identity_obj,addToDisco,(void))
 
 ::String Identity_obj::ver(){
-            	HX_STACKFRAME(&_hx_pos_913c0fa79e603d10_119_ver)
-HXDLIN( 119)		return ((((this->category + HX_("/",2f,00,00,00)) + this->type) + HX_("//",20,29,00,00)) + this->name);
+            	HX_STACKFRAME(&_hx_pos_913c0fa79e603d10_123_ver)
+HXDLIN( 123)		return ((((this->category + HX_("/",2f,00,00,00)) + this->type) + HX_("//",20,29,00,00)) + this->name);
             	}
 
 
diff --git a/Sources/c_snikket/src/snikket/JID.cpp b/Sources/c_snikket/src/snikket/JID.cpp
index 4264050..60bdbba 100644
--- a/Sources/c_snikket/src/snikket/JID.cpp
+++ b/Sources/c_snikket/src/snikket/JID.cpp
@@ -9,21 +9,30 @@
 #endif
 
 HX_DEFINE_STACK_FRAME(_hx_pos_72d6039c98e7ca24_9_new,"snikket.JID","new",0xbc81d526,"snikket.JID.new","snikket/JID.hx",9,0x327707cb)
-HX_LOCAL_STACK_FRAME(_hx_pos_72d6039c98e7ca24_55_asBare,"snikket.JID","asBare",0xe7e9843e,"snikket.JID.asBare","snikket/JID.hx",55,0x327707cb)
-HX_LOCAL_STACK_FRAME(_hx_pos_72d6039c98e7ca24_59_withResource,"snikket.JID","withResource",0x5ce3376e,"snikket.JID.withResource","snikket/JID.hx",59,0x327707cb)
-HX_LOCAL_STACK_FRAME(_hx_pos_72d6039c98e7ca24_63_isValid,"snikket.JID","isValid",0xd514f878,"snikket.JID.isValid","snikket/JID.hx",63,0x327707cb)
-HX_LOCAL_STACK_FRAME(_hx_pos_72d6039c98e7ca24_67_isDomain,"snikket.JID","isDomain",0x7b173a48,"snikket.JID.isDomain","snikket/JID.hx",67,0x327707cb)
-HX_LOCAL_STACK_FRAME(_hx_pos_72d6039c98e7ca24_71_isBare,"snikket.JID","isBare",0x1ac46736,"snikket.JID.isBare","snikket/JID.hx",71,0x327707cb)
-HX_LOCAL_STACK_FRAME(_hx_pos_72d6039c98e7ca24_75_equals,"snikket.JID","equals",0x7c3fa939,"snikket.JID.equals","snikket/JID.hx",75,0x327707cb)
-HX_LOCAL_STACK_FRAME(_hx_pos_72d6039c98e7ca24_83_asString,"snikket.JID","asString",0x953320dd,"snikket.JID.asString","snikket/JID.hx",83,0x327707cb)
+HX_LOCAL_STACK_FRAME(_hx_pos_72d6039c98e7ca24_56_asBare,"snikket.JID","asBare",0xe7e9843e,"snikket.JID.asBare","snikket/JID.hx",56,0x327707cb)
+HX_LOCAL_STACK_FRAME(_hx_pos_72d6039c98e7ca24_60_withResource,"snikket.JID","withResource",0x5ce3376e,"snikket.JID.withResource","snikket/JID.hx",60,0x327707cb)
+HX_LOCAL_STACK_FRAME(_hx_pos_72d6039c98e7ca24_64_isValid,"snikket.JID","isValid",0xd514f878,"snikket.JID.isValid","snikket/JID.hx",64,0x327707cb)
+HX_LOCAL_STACK_FRAME(_hx_pos_72d6039c98e7ca24_68_isDomain,"snikket.JID","isDomain",0x7b173a48,"snikket.JID.isDomain","snikket/JID.hx",68,0x327707cb)
+HX_LOCAL_STACK_FRAME(_hx_pos_72d6039c98e7ca24_72_isBare,"snikket.JID","isBare",0x1ac46736,"snikket.JID.isBare","snikket/JID.hx",72,0x327707cb)
+HX_LOCAL_STACK_FRAME(_hx_pos_72d6039c98e7ca24_76_equals,"snikket.JID","equals",0x7c3fa939,"snikket.JID.equals","snikket/JID.hx",76,0x327707cb)
+HX_LOCAL_STACK_FRAME(_hx_pos_72d6039c98e7ca24_84_asString,"snikket.JID","asString",0x953320dd,"snikket.JID.asString","snikket/JID.hx",84,0x327707cb)
 HX_LOCAL_STACK_FRAME(_hx_pos_72d6039c98e7ca24_41_parse,"snikket.JID","parse",0x64a2d279,"snikket.JID.parse","snikket/JID.hx",41,0x327707cb)
 namespace snikket{
 
-void JID_obj::__construct(::String node,::String domain,::String resource){
+void JID_obj::__construct(::String node,::String domain,::String resource, ::Dynamic __o_raw){
+            		 ::Dynamic raw = __o_raw;
+            		if (::hx::IsNull(__o_raw)) raw = false;
             	HX_STACKFRAME(&_hx_pos_72d6039c98e7ca24_9_new)
 HXLINE(  10)		::String _hx_tmp;
-HXDLIN(  10)		if (::hx::IsNull( node )) {
-HXLINE(  10)			_hx_tmp = null();
+HXDLIN(  10)		bool _hx_tmp1;
+HXDLIN(  10)		if (::hx::IsNotNull( node )) {
+HXLINE(  10)			_hx_tmp1 = ::hx::IsEq( raw,true );
+            		}
+            		else {
+HXLINE(  10)			_hx_tmp1 = true;
+            		}
+HXDLIN(  10)		if (_hx_tmp1) {
+HXLINE(  10)			_hx_tmp = node;
             		}
             		else {
 HXLINE(  10)			_hx_tmp = ::StringTools_obj::replace(::StringTools_obj::replace(::StringTools_obj::replace(::StringTools_obj::replace(::StringTools_obj::replace(::StringTools_obj::replace(::StringTools_obj::replace(::StringTools_obj::replace(::StringTools_obj::replace(::StringTools_obj::replace(::StringTools_obj::replace(::StringTools_obj::replace(::StringTools_obj::replace(::StringTools_obj::replace(::StringTools_obj::replace(::StringTools_obj::replace(::StringTools_obj::replace(::StringTools_obj::replace(::StringTools_obj::replace(::StringTools_obj::trim(node),HX_("\\5c",ea,fd,45,00),HX_("\\5c5c",f8,fa,30,1c)),HX_("\\20",1a,fb,45,00),HX_("\\5c20",28,f8,30,1c)),HX_("\\22",1c,fb,45,00),HX_("\\5c22",2a,f8,30,1c)),HX_("\\26",20,fb,45,00),HX_("\\5c26",2e,f8,30,1c)),HX_("\\27",21,fb,45,00),HX_("\\5c27",2f,f8,30,1c)),HX_("\\2f",50,fb,45,00),HX_("\\5c2f",5e,f8,30,1c)),HX_("\\3a",2a,fc,45,00),HX_("\\5c3a",38,f9,30,1c)),HX_("\\3c",2c,fc,45,00),HX_("\\5c3c",3a,f9,30,1c)),HX_("\\3e",2e,fc,45,00),HX_("\\5c3e",3c,f9,30,1c)),HX_("\\40",d8,fc,45,00),HX_("\\5c40",e6,f9,30,1c)),HX_(" ",20,00,00,00),HX_("\\20",1a,fb,45,00)),HX_("\"",22,00,00,00),HX_("\\22",1c,fb,45,00)),HX_("&",26,00,00,00),HX_("\\26",20,fb,45,00)),HX_("'",27,00,00,00),HX_("\\27",21,fb,45,00)),HX_("/",2f,00,00,00),HX_("\\2f",50,fb,45,00)),HX_(":",3a,00,00,00),HX_("\\3a",2a,fc,45,00)),HX_("<",3c,00,00,00),HX_("\\3c",2c,fc,45,00)),HX_(">",3e,00,00,00),HX_("\\3e",2e,fc,45,00)),HX_("@",40,00,00,00),HX_("\\40",d8,fc,45,00));
@@ -40,7 +49,7 @@ void *JID_obj::_hx_vtable = 0;
 Dynamic JID_obj::__Create(::hx::DynamicArray inArgs)
 {
 	::hx::ObjectPtr< JID_obj > _hx_result = new JID_obj();
-	_hx_result->__construct(inArgs[0],inArgs[1],inArgs[2]);
+	_hx_result->__construct(inArgs[0],inArgs[1],inArgs[2],inArgs[3]);
 	return _hx_result;
 }
 
@@ -49,83 +58,83 @@ bool JID_obj::_hx_isInstanceOf(int inClassId) {
 }
 
  ::snikket::JID JID_obj::asBare(){
-            	HX_GC_STACKFRAME(&_hx_pos_72d6039c98e7ca24_55_asBare)
-HXDLIN(  55)		return  ::snikket::JID_obj::__alloc( HX_CTX ,this->node,this->domain,null());
+            	HX_GC_STACKFRAME(&_hx_pos_72d6039c98e7ca24_56_asBare)
+HXDLIN(  56)		return  ::snikket::JID_obj::__alloc( HX_CTX ,this->node,this->domain,null(),true);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(JID_obj,asBare,return )
 
  ::snikket::JID JID_obj::withResource(::String resource){
-            	HX_GC_STACKFRAME(&_hx_pos_72d6039c98e7ca24_59_withResource)
-HXDLIN(  59)		return  ::snikket::JID_obj::__alloc( HX_CTX ,this->node,this->domain,resource);
+            	HX_GC_STACKFRAME(&_hx_pos_72d6039c98e7ca24_60_withResource)
+HXDLIN(  60)		return  ::snikket::JID_obj::__alloc( HX_CTX ,this->node,this->domain,resource,true);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(JID_obj,withResource,return )
 
 bool JID_obj::isValid(){
-            	HX_STACKFRAME(&_hx_pos_72d6039c98e7ca24_63_isValid)
-HXDLIN(  63)		return (this->domain.indexOf(HX_(".",2e,00,00,00),null()) >= 0);
+            	HX_STACKFRAME(&_hx_pos_72d6039c98e7ca24_64_isValid)
+HXDLIN(  64)		return (this->domain.indexOf(HX_(".",2e,00,00,00),null()) >= 0);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(JID_obj,isValid,return )
 
 bool JID_obj::isDomain(){
-            	HX_STACKFRAME(&_hx_pos_72d6039c98e7ca24_67_isDomain)
-HXDLIN(  67)		return ::hx::IsNull( this->node );
+            	HX_STACKFRAME(&_hx_pos_72d6039c98e7ca24_68_isDomain)
+HXDLIN(  68)		return ::hx::IsNull( this->node );
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(JID_obj,isDomain,return )
 
 bool JID_obj::isBare(){
-            	HX_STACKFRAME(&_hx_pos_72d6039c98e7ca24_71_isBare)
-HXDLIN(  71)		return ::hx::IsNull( this->resource );
+            	HX_STACKFRAME(&_hx_pos_72d6039c98e7ca24_72_isBare)
+HXDLIN(  72)		return ::hx::IsNull( this->resource );
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(JID_obj,isBare,return )
 
 bool JID_obj::equals( ::snikket::JID rhs){
-            	HX_STACKFRAME(&_hx_pos_72d6039c98e7ca24_75_equals)
-HXLINE(  76)		bool _hx_tmp;
-HXDLIN(  76)		if ((this->node == rhs->node)) {
-HXLINE(  76)			_hx_tmp = (this->domain == rhs->domain);
+            	HX_STACKFRAME(&_hx_pos_72d6039c98e7ca24_76_equals)
+HXLINE(  77)		bool _hx_tmp;
+HXDLIN(  77)		if ((this->node == rhs->node)) {
+HXLINE(  77)			_hx_tmp = (this->domain == rhs->domain);
             		}
             		else {
-HXLINE(  76)			_hx_tmp = false;
+HXLINE(  77)			_hx_tmp = false;
             		}
-HXLINE(  75)		if (_hx_tmp) {
-HXLINE(  78)			return (this->resource == rhs->resource);
+HXLINE(  76)		if (_hx_tmp) {
+HXLINE(  79)			return (this->resource == rhs->resource);
             		}
             		else {
-HXDLIN(  75)			return false;
+HXDLIN(  76)			return false;
             		}
-HXDLIN(  75)		return false;
+HXDLIN(  76)		return false;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(JID_obj,equals,return )
 
 ::String JID_obj::asString(){
-            	HX_STACKFRAME(&_hx_pos_72d6039c98e7ca24_83_asString)
-HXLINE(  84)		::String _hx_tmp;
-HXDLIN(  84)		if (::hx::IsNotNull( this->node )) {
-HXLINE(  84)			_hx_tmp = (this->node + HX_("@",40,00,00,00));
+            	HX_STACKFRAME(&_hx_pos_72d6039c98e7ca24_84_asString)
+HXLINE(  85)		::String _hx_tmp;
+HXDLIN(  85)		if (::hx::IsNotNull( this->node )) {
+HXLINE(  85)			_hx_tmp = (this->node + HX_("@",40,00,00,00));
             		}
             		else {
-HXLINE(  84)			_hx_tmp = HX_("",00,00,00,00);
+HXLINE(  85)			_hx_tmp = HX_("",00,00,00,00);
             		}
-HXLINE(  86)		::String _hx_tmp1;
-HXDLIN(  86)		if (::hx::IsNotNull( this->resource )) {
-HXLINE(  86)			_hx_tmp1 = (HX_("/",2f,00,00,00) + this->resource);
+HXLINE(  87)		::String _hx_tmp1;
+HXDLIN(  87)		if (::hx::IsNotNull( this->resource )) {
+HXLINE(  87)			_hx_tmp1 = (HX_("/",2f,00,00,00) + this->resource);
             		}
             		else {
-HXLINE(  86)			_hx_tmp1 = HX_("",00,00,00,00);
+HXLINE(  87)			_hx_tmp1 = HX_("",00,00,00,00);
             		}
-HXLINE(  83)		return ((_hx_tmp + this->domain) + _hx_tmp1);
+HXLINE(  84)		return ((_hx_tmp + this->domain) + _hx_tmp1);
             	}
 
 
@@ -174,23 +183,23 @@ HXLINE(  50)			_hx_tmp5 = null();
             		else {
 HXLINE(  50)			_hx_tmp5 = jid.substring((resourceDelimiter + 1),null());
             		}
-HXLINE(  47)		return  ::snikket::JID_obj::__alloc( HX_CTX ,_hx_tmp1,_hx_tmp4,_hx_tmp5);
+HXLINE(  47)		return  ::snikket::JID_obj::__alloc( HX_CTX ,_hx_tmp1,_hx_tmp4,_hx_tmp5,true);
             	}
 
 
 STATIC_HX_DEFINE_DYNAMIC_FUNC1(JID_obj,parse,return )
 
 
-::hx::ObjectPtr< JID_obj > JID_obj::__new(::String node,::String domain,::String resource) {
+::hx::ObjectPtr< JID_obj > JID_obj::__new(::String node,::String domain,::String resource, ::Dynamic __o_raw) {
 	::hx::ObjectPtr< JID_obj > __this = new JID_obj();
-	__this->__construct(node,domain,resource);
+	__this->__construct(node,domain,resource,__o_raw);
 	return __this;
 }
 
-::hx::ObjectPtr< JID_obj > JID_obj::__alloc(::hx::Ctx *_hx_ctx,::String node,::String domain,::String resource) {
+::hx::ObjectPtr< JID_obj > JID_obj::__alloc(::hx::Ctx *_hx_ctx,::String node,::String domain,::String resource, ::Dynamic __o_raw) {
 	JID_obj *__this = (JID_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(JID_obj), true, "snikket.JID"));
 	*(void **)__this = JID_obj::_hx_vtable;
-	__this->__construct(node,domain,resource);
+	__this->__construct(node,domain,resource,__o_raw);
 	return __this;
 }
 
diff --git a/Sources/c_snikket/src/snikket/Message.cpp b/Sources/c_snikket/src/snikket/Message.cpp
index 6097aac..de44b49 100644
--- a/Sources/c_snikket/src/snikket/Message.cpp
+++ b/Sources/c_snikket/src/snikket/Message.cpp
@@ -4,9 +4,6 @@
 #ifndef INCLUDED_Date
 #include <Date.h>
 #endif
-#ifndef INCLUDED_Lambda
-#include <Lambda.h>
-#endif
 #ifndef INCLUDED_Reflect
 #include <Reflect.h>
 #endif
@@ -77,7 +74,7 @@ HX_LOCAL_STACK_FRAME(_hx_pos_a0bea8386b958531_152_fromStanza,"snikket.Message","
 HX_LOCAL_STACK_FRAME(_hx_pos_a0bea8386b958531_153_fromStanza,"snikket.Message","fromStanza",0xc7afa3b7,"snikket.Message.fromStanza","snikket/Message.hx",153,0x9fc78f09)
 HX_LOCAL_STACK_FRAME(_hx_pos_a0bea8386b958531_154_fromStanza,"snikket.Message","fromStanza",0xc7afa3b7,"snikket.Message.fromStanza","snikket/Message.hx",154,0x9fc78f09)
 HX_LOCAL_STACK_FRAME(_hx_pos_a0bea8386b958531_48_fromStanza,"snikket.Message","fromStanza",0xc7afa3b7,"snikket.Message.fromStanza","snikket/Message.hx",48,0x9fc78f09)
-HX_LOCAL_STACK_FRAME(_hx_pos_a0bea8386b958531_157_fromStanza,"snikket.Message","fromStanza",0xc7afa3b7,"snikket.Message.fromStanza","snikket/Message.hx",157,0x9fc78f09)
+HX_LOCAL_STACK_FRAME(_hx_pos_a0bea8386b958531_158_fromStanza,"snikket.Message","fromStanza",0xc7afa3b7,"snikket.Message.fromStanza","snikket/Message.hx",158,0x9fc78f09)
 namespace snikket{
 
 void Message_obj::__construct(::String chatId,::String senderId,::String threadId, ::snikket::MessageStanza parsed){
@@ -482,525 +479,540 @@ HXDLIN( 153)			_g5->push(::snikket::JID_obj::parse(x3));
 HXDLIN( 153)		msg->replyTo = _g5;
 HXLINE( 154)		msg->replyTo->sort( ::Dynamic(new _hx_Closure_3()));
 HXLINE( 156)		 ::snikket::JID msgFrom = msg->from;
-HXLINE( 157)		bool _hx_tmp23;
-HXDLIN( 157)		bool _hx_tmp24;
-HXDLIN( 157)		if ((msg->direction == 0)) {
-HXLINE( 157)			_hx_tmp24 = ::hx::IsNotNull( msgFrom );
+HXLINE( 158)		bool _hx_tmp23;
+HXDLIN( 158)		bool _hx_tmp24;
+HXDLIN( 158)		if ((msg->direction == 0)) {
+HXLINE( 158)			_hx_tmp24 = ::hx::IsNotNull( msgFrom );
             		}
             		else {
-HXLINE( 157)			_hx_tmp24 = false;
+HXLINE( 158)			_hx_tmp24 = false;
             		}
-HXDLIN( 157)		if (_hx_tmp24) {
+HXDLIN( 158)		if (_hx_tmp24) {
             			HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_4, ::snikket::JID,msgFrom) HXARGC(1)
             			bool _hx_run( ::snikket::JID r){
-            				HX_GC_STACKFRAME(&_hx_pos_a0bea8386b958531_157_fromStanza)
-HXLINE( 157)				 ::snikket::JID _hx_tmp = r->asBare();
-HXDLIN( 157)				return _hx_tmp->equals(msgFrom->asBare());
+            				HX_GC_STACKFRAME(&_hx_pos_a0bea8386b958531_158_fromStanza)
+HXLINE( 158)				 ::snikket::JID f = r->asBare();
+HXDLIN( 158)				return f->equals(msgFrom->asBare());
             			}
             			HX_END_LOCAL_FUNC1(return)
 
-HXLINE( 157)			_hx_tmp23 = ::hx::IsNull( ::Lambda_obj::find(msg->replyTo, ::Dynamic(new _hx_Closure_4(msgFrom))) );
+HXLINE( 158)			::Array< ::Dynamic> it = msg->replyTo;
+HXDLIN( 158)			 ::Dynamic f =  ::Dynamic(new _hx_Closure_4(msgFrom));
+HXDLIN( 158)			 ::snikket::JID result = null();
+HXDLIN( 158)			{
+HXLINE( 158)				int _g6 = 0;
+HXDLIN( 158)				while((_g6 < it->length)){
+HXLINE( 158)					 ::snikket::JID v = it->__get(_g6).StaticCast<  ::snikket::JID >();
+HXDLIN( 158)					_g6 = (_g6 + 1);
+HXDLIN( 158)					if (( (bool)(f(v)) )) {
+HXLINE(  36)						result = v;
+HXLINE( 158)						goto _hx_goto_5;
+            					}
+            				}
+            				_hx_goto_5:;
+            			}
+HXDLIN( 158)			_hx_tmp23 = ::hx::IsNull( result );
             		}
             		else {
-HXLINE( 157)			_hx_tmp23 = false;
+HXLINE( 158)			_hx_tmp23 = false;
             		}
-HXDLIN( 157)		if (_hx_tmp23) {
-HXLINE( 158)			::haxe::Log_obj::trace(HX_("Don't know what chat message without from in replyTo belongs in",f3,47,ba,0d), ::Dynamic(::hx::Anon_obj::Create(5)
+HXDLIN( 158)		if (_hx_tmp23) {
+HXLINE( 159)			::haxe::Log_obj::trace(HX_("Don't know what chat message without from in replyTo belongs in",f3,47,ba,0d), ::Dynamic(::hx::Anon_obj::Create(5)
             				->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.Message",b6,74,a7,a8))
             				->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(1)->init(0,stanza))
             				->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("fromStanza",ff,62,3b,49))
             				->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/Message.hx",09,8f,c7,9f))
-            				->setFixed(4,HX_("lineNumber",dd,81,22,76),158)));
-HXLINE( 159)			::String _hx_tmp25 = msg->chatId();
-HXDLIN( 159)			::String _hx_tmp26 = msg->get_senderId();
-HXDLIN( 159)			return  ::snikket::Message_obj::__alloc( HX_CTX ,_hx_tmp25,_hx_tmp26,msg->threadId,::snikket::MessageStanza_obj::UnknownMessageStanza(stanza));
+            				->setFixed(4,HX_("lineNumber",dd,81,22,76),159)));
+HXLINE( 160)			::String _hx_tmp25 = msg->chatId();
+HXDLIN( 160)			::String _hx_tmp26 = msg->get_senderId();
+HXDLIN( 160)			return  ::snikket::Message_obj::__alloc( HX_CTX ,_hx_tmp25,_hx_tmp26,msg->threadId,::snikket::MessageStanza_obj::UnknownMessageStanza(stanza));
             		}
-HXLINE( 162)		if (::hx::IsNotNull( addContext )) {
-HXLINE( 162)			msg = ( ( ::snikket::ChatMessageBuilder)(addContext(msg,stanza)) );
+HXLINE( 163)		if (::hx::IsNotNull( addContext )) {
+HXLINE( 163)			msg = ( ( ::snikket::ChatMessageBuilder)(addContext(msg,stanza)) );
             		}
-HXLINE( 163)		::String timestamp;
-HXDLIN( 163)		::String tmp4 = msg->timestamp;
-HXDLIN( 163)		if (::hx::IsNotNull( tmp4 )) {
-HXLINE( 163)			timestamp = tmp4;
+HXLINE( 164)		::String timestamp;
+HXDLIN( 164)		::String tmp4 = msg->timestamp;
+HXDLIN( 164)		if (::hx::IsNotNull( tmp4 )) {
+HXLINE( 164)			timestamp = tmp4;
             		}
             		else {
-HXLINE( 163)			timestamp = ::snikket::Date_obj::format(::Date_obj::now());
-            		}
-HXLINE( 164)		msg->timestamp = timestamp;
-HXLINE( 166)		 ::snikket::Stanza reactionsEl = stanza->getChild(HX_("reactions",aa,cc,95,e7),HX_("urn:xmpp:reactions:0",44,fb,42,53));
-HXLINE( 167)		if (::hx::IsNotNull( reactionsEl )) {
-HXLINE( 169)			::Array< ::Dynamic> _this = reactionsEl->allTags(HX_("reaction",a9,e7,b4,f6),null());
-HXDLIN( 169)			::Array< ::String > result = ::Array_obj< ::String >::__new(_this->length);
-HXDLIN( 169)			{
-HXLINE( 169)				int _g6 = 0;
-HXDLIN( 169)				int _g7 = _this->length;
-HXDLIN( 169)				while((_g6 < _g7)){
-HXLINE( 169)					_g6 = (_g6 + 1);
-HXDLIN( 169)					int i = (_g6 - 1);
-HXDLIN( 169)					{
-HXLINE( 169)						::String inValue = ( ( ::snikket::Stanza)(_hx_array_unsafe_get(_this,i)) )->getText();
-HXDLIN( 169)						result->__unsafe_set(i,inValue);
+HXLINE( 164)			timestamp = ::snikket::Date_obj::format(::Date_obj::now());
+            		}
+HXLINE( 165)		msg->timestamp = timestamp;
+HXLINE( 167)		 ::snikket::Stanza reactionsEl = stanza->getChild(HX_("reactions",aa,cc,95,e7),HX_("urn:xmpp:reactions:0",44,fb,42,53));
+HXLINE( 168)		if (::hx::IsNotNull( reactionsEl )) {
+HXLINE( 170)			::Array< ::Dynamic> _this = reactionsEl->allTags(HX_("reaction",a9,e7,b4,f6),null());
+HXDLIN( 170)			::Array< ::String > result1 = ::Array_obj< ::String >::__new(_this->length);
+HXDLIN( 170)			{
+HXLINE( 170)				int _g7 = 0;
+HXDLIN( 170)				int _g8 = _this->length;
+HXDLIN( 170)				while((_g7 < _g8)){
+HXLINE( 170)					_g7 = (_g7 + 1);
+HXDLIN( 170)					int i = (_g7 - 1);
+HXDLIN( 170)					{
+HXLINE( 170)						::String inValue = ( ( ::snikket::Stanza)(_hx_array_unsafe_get(_this,i)) )->getText();
+HXDLIN( 170)						result1->__unsafe_set(i,inValue);
             					}
             				}
             			}
-HXDLIN( 169)			::Array< ::String > reactions = result;
-HXLINE( 170)			::String reactionId = ( (::String)(::Reflect_obj::field(reactionsEl->attr,HX_("id",db,5b,00,00))) );
-HXLINE( 171)			if (::hx::IsNotNull( reactionId )) {
-HXLINE( 172)				::String _hx_tmp27 = msg->chatId();
-HXDLIN( 172)				::String _hx_tmp28 = msg->get_senderId();
-HXDLIN( 172)				::String msg3 = msg->threadId;
-HXLINE( 173)				::String _hx_tmp29;
-HXDLIN( 173)				::String tmp5 = ( (::String)(::Reflect_obj::field(stanza->attr,HX_("id",db,5b,00,00))) );
-HXDLIN( 173)				if (::hx::IsNotNull( tmp5 )) {
-HXLINE( 173)					_hx_tmp29 = tmp5;
+HXDLIN( 170)			::Array< ::String > reactions = result1;
+HXLINE( 171)			::String reactionId = ( (::String)(::Reflect_obj::field(reactionsEl->attr,HX_("id",db,5b,00,00))) );
+HXLINE( 172)			if (::hx::IsNotNull( reactionId )) {
+HXLINE( 173)				::String _hx_tmp27 = msg->chatId();
+HXDLIN( 173)				::String _hx_tmp28 = msg->get_senderId();
+HXDLIN( 173)				::String msg3 = msg->threadId;
+HXLINE( 174)				::String _hx_tmp29;
+HXDLIN( 174)				::String tmp5 = ( (::String)(::Reflect_obj::field(stanza->attr,HX_("id",db,5b,00,00))) );
+HXDLIN( 174)				if (::hx::IsNotNull( tmp5 )) {
+HXLINE( 174)					_hx_tmp29 = tmp5;
             				}
             				else {
-HXLINE( 173)					_hx_tmp29 = ::snikket::ID_obj::_hx_long();
+HXLINE( 174)					_hx_tmp29 = ::snikket::ID_obj::_hx_long();
             				}
-HXLINE( 174)				::String _hx_tmp30;
-HXDLIN( 174)				if (isGroupchat) {
-HXLINE( 174)					_hx_tmp30 = reactionId;
+HXLINE( 175)				::String _hx_tmp30;
+HXDLIN( 175)				if (isGroupchat) {
+HXLINE( 175)					_hx_tmp30 = reactionId;
             				}
             				else {
-HXLINE( 174)					_hx_tmp30 = null();
+HXLINE( 175)					_hx_tmp30 = null();
             				}
-HXLINE( 175)				::String _hx_tmp31;
-HXDLIN( 175)				if (isGroupchat) {
-HXLINE( 175)					_hx_tmp31 = msg->chatId();
+HXLINE( 176)				::String _hx_tmp31;
+HXDLIN( 176)				if (isGroupchat) {
+HXLINE( 176)					_hx_tmp31 = msg->chatId();
             				}
             				else {
-HXLINE( 175)					_hx_tmp31 = null();
+HXLINE( 176)					_hx_tmp31 = null();
             				}
-HXLINE( 176)				::String _hx_tmp32;
-HXDLIN( 176)				if (isGroupchat) {
-HXLINE( 176)					_hx_tmp32 = null();
+HXLINE( 177)				::String _hx_tmp32;
+HXDLIN( 177)				if (isGroupchat) {
+HXLINE( 177)					_hx_tmp32 = null();
             				}
             				else {
-HXLINE( 176)					_hx_tmp32 = reactionId;
+HXLINE( 177)					_hx_tmp32 = reactionId;
             				}
-HXLINE( 177)				::String _hx_tmp33 = msg->chatId();
-HXLINE( 178)				::String _hx_tmp34 = msg->get_senderId();
-HXLINE( 180)				::Array< ::Dynamic> result1 = ::Array_obj< ::Dynamic>::__new(reactions->length);
-HXDLIN( 180)				{
-HXLINE( 180)					int _g8 = 0;
-HXDLIN( 180)					int _g9 = reactions->length;
-HXDLIN( 180)					while((_g8 < _g9)){
-HXLINE( 180)						_g8 = (_g8 + 1);
-HXDLIN( 180)						int i1 = (_g8 - 1);
-HXDLIN( 180)						{
-HXLINE( 180)							::String text = ( (::String)(_hx_array_unsafe_get(reactions,i1)) );
-HXDLIN( 180)							 ::snikket::Reaction inValue1 =  ::snikket::Reaction_obj::__alloc( HX_CTX ,msg->get_senderId(),timestamp,text,msg->localId,null());
-HXDLIN( 180)							result1->__unsafe_set(i1,inValue1);
+HXLINE( 178)				::String _hx_tmp33 = msg->chatId();
+HXLINE( 179)				::String _hx_tmp34 = msg->get_senderId();
+HXLINE( 181)				::Array< ::Dynamic> result2 = ::Array_obj< ::Dynamic>::__new(reactions->length);
+HXDLIN( 181)				{
+HXLINE( 181)					int _g9 = 0;
+HXDLIN( 181)					int _g10 = reactions->length;
+HXDLIN( 181)					while((_g9 < _g10)){
+HXLINE( 181)						_g9 = (_g9 + 1);
+HXDLIN( 181)						int i1 = (_g9 - 1);
+HXDLIN( 181)						{
+HXLINE( 181)							::String text = ( (::String)(_hx_array_unsafe_get(reactions,i1)) );
+HXDLIN( 181)							 ::snikket::Reaction inValue1 =  ::snikket::Reaction_obj::__alloc( HX_CTX ,msg->get_senderId(),timestamp,text,msg->localId,null());
+HXDLIN( 181)							result2->__unsafe_set(i1,inValue1);
             						}
             					}
             				}
-HXLINE( 172)				return  ::snikket::Message_obj::__alloc( HX_CTX ,_hx_tmp27,_hx_tmp28,msg3,::snikket::MessageStanza_obj::ReactionUpdateStanza( ::snikket::ReactionUpdate_obj::__alloc( HX_CTX ,_hx_tmp29,_hx_tmp30,_hx_tmp31,_hx_tmp32,_hx_tmp33,_hx_tmp34,timestamp,result1,0)));
+HXLINE( 173)				return  ::snikket::Message_obj::__alloc( HX_CTX ,_hx_tmp27,_hx_tmp28,msg3,::snikket::MessageStanza_obj::ReactionUpdateStanza( ::snikket::ReactionUpdate_obj::__alloc( HX_CTX ,_hx_tmp29,_hx_tmp30,_hx_tmp31,_hx_tmp32,_hx_tmp33,_hx_tmp34,timestamp,result2,0)));
             			}
             		}
-HXLINE( 186)		{
-HXLINE( 186)			int _g10 = 0;
-HXDLIN( 186)			::Array< ::Dynamic> _g11 = stanza->allTags(HX_("reference",cb,07,c5,5a),HX_("urn:xmpp:reference:0",a5,00,10,5d));
-HXDLIN( 186)			while((_g10 < _g11->length)){
-HXLINE( 186)				 ::snikket::Stanza ref = _g11->__get(_g10).StaticCast<  ::snikket::Stanza >();
-HXDLIN( 186)				_g10 = (_g10 + 1);
-HXLINE( 187)				bool _hx_tmp35;
-HXDLIN( 187)				if (::hx::IsNull( ( (::String)(::Reflect_obj::field(ref->attr,HX_("begin",29,ea,55,b0))) ) )) {
-HXLINE( 187)					_hx_tmp35 = ::hx::IsNull( ( (::String)(::Reflect_obj::field(ref->attr,HX_("end",db,03,4d,00))) ) );
+HXLINE( 187)		{
+HXLINE( 187)			int _g11 = 0;
+HXDLIN( 187)			::Array< ::Dynamic> _g12 = stanza->allTags(HX_("reference",cb,07,c5,5a),HX_("urn:xmpp:reference:0",a5,00,10,5d));
+HXDLIN( 187)			while((_g11 < _g12->length)){
+HXLINE( 187)				 ::snikket::Stanza ref = _g12->__get(_g11).StaticCast<  ::snikket::Stanza >();
+HXDLIN( 187)				_g11 = (_g11 + 1);
+HXLINE( 188)				bool _hx_tmp35;
+HXDLIN( 188)				if (::hx::IsNull( ( (::String)(::Reflect_obj::field(ref->attr,HX_("begin",29,ea,55,b0))) ) )) {
+HXLINE( 188)					_hx_tmp35 = ::hx::IsNull( ( (::String)(::Reflect_obj::field(ref->attr,HX_("end",db,03,4d,00))) ) );
             				}
             				else {
-HXLINE( 187)					_hx_tmp35 = false;
+HXLINE( 188)					_hx_tmp35 = false;
             				}
-HXDLIN( 187)				if (_hx_tmp35) {
-HXLINE( 188)					 ::snikket::Stanza sims = ref->getChild(HX_("media-sharing",33,1c,0a,3d),HX_("urn:xmpp:sims:1",4f,1c,49,62));
-HXLINE( 189)					if (::hx::IsNotNull( sims )) {
-HXLINE( 189)						msg->attachSims(sims);
+HXDLIN( 188)				if (_hx_tmp35) {
+HXLINE( 189)					 ::snikket::Stanza sims = ref->getChild(HX_("media-sharing",33,1c,0a,3d),HX_("urn:xmpp:sims:1",4f,1c,49,62));
+HXLINE( 190)					if (::hx::IsNotNull( sims )) {
+HXLINE( 190)						msg->attachSims(sims);
             					}
             				}
             			}
             		}
-HXLINE( 193)		{
-HXLINE( 193)			int _g12 = 0;
-HXDLIN( 193)			::Array< ::Dynamic> _g13 = stanza->allTags(HX_("media-sharing",33,1c,0a,3d),HX_("urn:xmpp:sims:1",4f,1c,49,62));
-HXDLIN( 193)			while((_g12 < _g13->length)){
-HXLINE( 193)				 ::snikket::Stanza sims1 = _g13->__get(_g12).StaticCast<  ::snikket::Stanza >();
-HXDLIN( 193)				_g12 = (_g12 + 1);
-HXLINE( 194)				msg->attachSims(sims1);
+HXLINE( 194)		{
+HXLINE( 194)			int _g13 = 0;
+HXDLIN( 194)			::Array< ::Dynamic> _g14 = stanza->allTags(HX_("media-sharing",33,1c,0a,3d),HX_("urn:xmpp:sims:1",4f,1c,49,62));
+HXDLIN( 194)			while((_g13 < _g14->length)){
+HXLINE( 194)				 ::snikket::Stanza sims1 = _g14->__get(_g13).StaticCast<  ::snikket::Stanza >();
+HXDLIN( 194)				_g13 = (_g13 + 1);
+HXLINE( 195)				msg->attachSims(sims1);
             			}
             		}
-HXLINE( 197)		 ::snikket::Stanza jmi = stanza->getChild(null(),HX_("urn:xmpp:jingle-message:0",fd,20,a5,07));
-HXLINE( 198)		if (::hx::IsNotNull( jmi )) {
-HXLINE( 199)			msg->type = 1;
-HXLINE( 200)			msg->payloads->push(jmi);
-HXLINE( 201)			if (::hx::IsNull( msg->text )) {
-HXLINE( 201)				msg->text = (HX_("call ",c2,71,1b,41) + jmi->name);
+HXLINE( 198)		 ::snikket::Stanza jmi = stanza->getChild(null(),HX_("urn:xmpp:jingle-message:0",fd,20,a5,07));
+HXLINE( 199)		if (::hx::IsNotNull( jmi )) {
+HXLINE( 200)			msg->type = 1;
+HXLINE( 201)			msg->payloads->push(jmi);
+HXLINE( 202)			if (::hx::IsNull( msg->text )) {
+HXLINE( 202)				msg->text = (HX_("call ",c2,71,1b,41) + jmi->name);
             			}
-HXLINE( 202)			if ((jmi->name != HX_("propose",fe,fe,e9,f9))) {
-HXLINE( 203)				msg->versions = ::Array_obj< ::Dynamic>::__new(1)->init(0,msg->build());
+HXLINE( 203)			if ((jmi->name != HX_("propose",fe,fe,e9,f9))) {
+HXLINE( 204)				msg->versions = ::Array_obj< ::Dynamic>::__new(1)->init(0,msg->build());
             			}
-HXLINE( 206)			msg->localId = ( (::String)(::Reflect_obj::field(jmi->attr,HX_("id",db,5b,00,00))) );
+HXLINE( 207)			msg->localId = ( (::String)(::Reflect_obj::field(jmi->attr,HX_("id",db,5b,00,00))) );
             		}
-HXLINE( 209)		 ::snikket::Stanza retract = stanza->getChild(HX_("replace",34,48,28,ab),HX_("urn:xmpp:message-retract:1",16,5e,d8,d5));
-HXLINE( 210)		 ::snikket::Stanza fasten = stanza->getChild(HX_("apply-to",3a,9e,dd,24),HX_("urn:xmpp:fasten:0",17,f4,ed,3d));
-HXLINE( 211)		 ::snikket::Stanza moderated;
-HXDLIN( 211)		 ::snikket::Stanza tmp6;
-HXDLIN( 211)		if (::hx::IsNotNull( retract )) {
-HXLINE( 211)			tmp6 = retract->getChild(HX_("moderated",41,37,3b,22),HX_("urn:xmpp:message-retract:1",16,5e,d8,d5));
+HXLINE( 210)		 ::snikket::Stanza retract = stanza->getChild(HX_("replace",34,48,28,ab),HX_("urn:xmpp:message-retract:1",16,5e,d8,d5));
+HXLINE( 211)		 ::snikket::Stanza fasten = stanza->getChild(HX_("apply-to",3a,9e,dd,24),HX_("urn:xmpp:fasten:0",17,f4,ed,3d));
+HXLINE( 212)		 ::snikket::Stanza moderated;
+HXDLIN( 212)		 ::snikket::Stanza tmp6;
+HXDLIN( 212)		if (::hx::IsNotNull( retract )) {
+HXLINE( 212)			tmp6 = retract->getChild(HX_("moderated",41,37,3b,22),HX_("urn:xmpp:message-retract:1",16,5e,d8,d5));
             		}
             		else {
-HXLINE( 211)			tmp6 = null();
+HXLINE( 212)			tmp6 = null();
             		}
-HXDLIN( 211)		if (::hx::IsNotNull( tmp6 )) {
-HXLINE( 211)			moderated = tmp6;
+HXDLIN( 212)		if (::hx::IsNotNull( tmp6 )) {
+HXLINE( 212)			moderated = tmp6;
             		}
             		else {
-HXLINE( 211)			if (::hx::IsNotNull( fasten )) {
-HXLINE( 211)				moderated = fasten->getChild(HX_("moderated",41,37,3b,22),HX_("urn:xmpp:message-moderate:0",5b,30,1a,b9));
+HXLINE( 212)			if (::hx::IsNotNull( fasten )) {
+HXLINE( 212)				moderated = fasten->getChild(HX_("moderated",41,37,3b,22),HX_("urn:xmpp:message-moderate:0",5b,30,1a,b9));
             			}
             			else {
-HXLINE( 211)				moderated = null();
+HXLINE( 212)				moderated = null();
             			}
             		}
-HXLINE( 212)		::String moderateServerId;
-HXDLIN( 212)		 ::Dynamic tmp7;
-HXDLIN( 212)		if (::hx::IsNotNull( retract )) {
-HXLINE( 212)			tmp7 = retract->attr;
+HXLINE( 213)		::String moderateServerId;
+HXDLIN( 213)		 ::Dynamic tmp7;
+HXDLIN( 213)		if (::hx::IsNotNull( retract )) {
+HXLINE( 213)			tmp7 = retract->attr;
             		}
             		else {
-HXLINE( 212)			tmp7 = null();
+HXLINE( 213)			tmp7 = null();
             		}
-HXDLIN( 212)		::String tmp8;
-HXDLIN( 212)		if (::hx::IsNotNull( tmp7 )) {
-HXLINE( 212)			tmp8 = ( (::String)(::Reflect_obj::field(tmp7,HX_("id",db,5b,00,00))) );
+HXDLIN( 213)		::String tmp8;
+HXDLIN( 213)		if (::hx::IsNotNull( tmp7 )) {
+HXLINE( 213)			tmp8 = ( (::String)(::Reflect_obj::field(tmp7,HX_("id",db,5b,00,00))) );
             		}
             		else {
-HXLINE( 212)			tmp8 = null();
+HXLINE( 213)			tmp8 = null();
             		}
-HXDLIN( 212)		if (::hx::IsNotNull( tmp8 )) {
-HXLINE( 212)			moderateServerId = tmp8;
+HXDLIN( 213)		if (::hx::IsNotNull( tmp8 )) {
+HXLINE( 213)			moderateServerId = tmp8;
             		}
             		else {
-HXLINE( 212)			 ::Dynamic tmp9;
-HXDLIN( 212)			if (::hx::IsNotNull( fasten )) {
-HXLINE( 212)				tmp9 = fasten->attr;
+HXLINE( 213)			 ::Dynamic tmp9;
+HXDLIN( 213)			if (::hx::IsNotNull( fasten )) {
+HXLINE( 213)				tmp9 = fasten->attr;
             			}
             			else {
-HXLINE( 212)				tmp9 = null();
+HXLINE( 213)				tmp9 = null();
             			}
-HXDLIN( 212)			if (::hx::IsNotNull( tmp9 )) {
-HXLINE( 212)				moderateServerId = ( (::String)(::Reflect_obj::field(tmp9,HX_("id",db,5b,00,00))) );
+HXDLIN( 213)			if (::hx::IsNotNull( tmp9 )) {
+HXLINE( 213)				moderateServerId = ( (::String)(::Reflect_obj::field(tmp9,HX_("id",db,5b,00,00))) );
             			}
             			else {
-HXLINE( 212)				moderateServerId = null();
+HXLINE( 213)				moderateServerId = null();
             			}
             		}
-HXLINE( 213)		bool _hx_tmp36;
-HXDLIN( 213)		bool _hx_tmp37;
-HXDLIN( 213)		bool _hx_tmp38;
-HXDLIN( 213)		bool _hx_tmp39;
-HXDLIN( 213)		bool _hx_tmp40;
-HXDLIN( 213)		if (::hx::IsNotNull( moderated )) {
-HXLINE( 213)			_hx_tmp40 = ::hx::IsNotNull( moderateServerId );
+HXLINE( 214)		bool _hx_tmp36;
+HXDLIN( 214)		bool _hx_tmp37;
+HXDLIN( 214)		bool _hx_tmp38;
+HXDLIN( 214)		bool _hx_tmp39;
+HXDLIN( 214)		bool _hx_tmp40;
+HXDLIN( 214)		if (::hx::IsNotNull( moderated )) {
+HXLINE( 214)			_hx_tmp40 = ::hx::IsNotNull( moderateServerId );
             		}
             		else {
-HXLINE( 213)			_hx_tmp40 = false;
+HXLINE( 214)			_hx_tmp40 = false;
             		}
-HXDLIN( 213)		if (_hx_tmp40) {
-HXLINE( 213)			_hx_tmp39 = isGroupchat;
+HXDLIN( 214)		if (_hx_tmp40) {
+HXLINE( 214)			_hx_tmp39 = isGroupchat;
             		}
             		else {
-HXLINE( 213)			_hx_tmp39 = false;
+HXLINE( 214)			_hx_tmp39 = false;
             		}
-HXDLIN( 213)		if (_hx_tmp39) {
-HXLINE( 213)			_hx_tmp38 = ::hx::IsNotNull( msg->from );
+HXDLIN( 214)		if (_hx_tmp39) {
+HXLINE( 214)			_hx_tmp38 = ::hx::IsNotNull( msg->from );
             		}
             		else {
-HXLINE( 213)			_hx_tmp38 = false;
+HXLINE( 214)			_hx_tmp38 = false;
             		}
-HXDLIN( 213)		if (_hx_tmp38) {
-HXLINE( 213)			_hx_tmp37 = msg->from->isBare();
+HXDLIN( 214)		if (_hx_tmp38) {
+HXLINE( 214)			_hx_tmp37 = msg->from->isBare();
             		}
             		else {
-HXLINE( 213)			_hx_tmp37 = false;
+HXLINE( 214)			_hx_tmp37 = false;
             		}
-HXDLIN( 213)		if (_hx_tmp37) {
-HXLINE( 213)			::String _hx_tmp41 = msg->from->asString();
-HXDLIN( 213)			_hx_tmp36 = (_hx_tmp41 == msg->chatId());
+HXDLIN( 214)		if (_hx_tmp37) {
+HXLINE( 214)			::String _hx_tmp41 = msg->from->asString();
+HXDLIN( 214)			_hx_tmp36 = (_hx_tmp41 == msg->chatId());
             		}
             		else {
-HXLINE( 213)			_hx_tmp36 = false;
+HXLINE( 214)			_hx_tmp36 = false;
             		}
-HXDLIN( 213)		if (_hx_tmp36) {
-HXLINE( 214)			::String reason;
-HXDLIN( 214)			::String tmp10;
-HXDLIN( 214)			if (::hx::IsNotNull( retract )) {
-HXLINE( 214)				tmp10 = retract->getChildText(HX_("reason",c4,0f,9d,fc),null());
+HXDLIN( 214)		if (_hx_tmp36) {
+HXLINE( 215)			::String reason;
+HXDLIN( 215)			::String tmp10;
+HXDLIN( 215)			if (::hx::IsNotNull( retract )) {
+HXLINE( 215)				tmp10 = retract->getChildText(HX_("reason",c4,0f,9d,fc),null());
             			}
             			else {
-HXLINE( 214)				tmp10 = null();
+HXLINE( 215)				tmp10 = null();
             			}
-HXDLIN( 214)			if (::hx::IsNotNull( tmp10 )) {
-HXLINE( 214)				reason = tmp10;
+HXDLIN( 215)			if (::hx::IsNotNull( tmp10 )) {
+HXLINE( 215)				reason = tmp10;
             			}
             			else {
-HXLINE( 214)				if (::hx::IsNotNull( moderated )) {
-HXLINE( 214)					reason = moderated->getChildText(HX_("reason",c4,0f,9d,fc),null());
+HXLINE( 215)				if (::hx::IsNotNull( moderated )) {
+HXLINE( 215)					reason = moderated->getChildText(HX_("reason",c4,0f,9d,fc),null());
             				}
             				else {
-HXLINE( 214)					reason = null();
+HXLINE( 215)					reason = null();
             				}
             			}
-HXLINE( 215)			::String by = ( (::String)(::Reflect_obj::field(moderated->attr,HX_("by",d7,55,00,00))) );
-HXLINE( 218)			::String _hx_tmp42 = msg->chatId();
-HXLINE( 219)			::String _hx_tmp43 = msg->get_senderId();
-HXLINE( 220)			::String msg4 = msg->threadId;
-HXLINE( 217)			return  ::snikket::Message_obj::__alloc( HX_CTX ,_hx_tmp42,_hx_tmp43,msg4,::snikket::MessageStanza_obj::ModerateMessageStanza( ::snikket::ModerationAction_obj::__alloc( HX_CTX ,msg->chatId(),moderateServerId,timestamp,by,reason)));
+HXLINE( 216)			::String by = ( (::String)(::Reflect_obj::field(moderated->attr,HX_("by",d7,55,00,00))) );
+HXLINE( 219)			::String _hx_tmp42 = msg->chatId();
+HXLINE( 220)			::String _hx_tmp43 = msg->get_senderId();
+HXLINE( 221)			::String msg4 = msg->threadId;
+HXLINE( 218)			return  ::snikket::Message_obj::__alloc( HX_CTX ,_hx_tmp42,_hx_tmp43,msg4,::snikket::MessageStanza_obj::ModerateMessageStanza( ::snikket::ModerationAction_obj::__alloc( HX_CTX ,msg->chatId(),moderateServerId,timestamp,by,reason)));
             		}
-HXLINE( 225)		 ::snikket::Stanza replace = stanza->getChild(HX_("replace",34,48,28,ab),HX_("urn:xmpp:message-correct:0",be,10,1b,b0));
-HXLINE( 226)		 ::Dynamic tmp11;
-HXDLIN( 226)		if (::hx::IsNotNull( replace )) {
-HXLINE( 226)			tmp11 = replace->attr;
+HXLINE( 226)		 ::snikket::Stanza replace = stanza->getChild(HX_("replace",34,48,28,ab),HX_("urn:xmpp:message-correct:0",be,10,1b,b0));
+HXLINE( 227)		 ::Dynamic tmp11;
+HXDLIN( 227)		if (::hx::IsNotNull( replace )) {
+HXLINE( 227)			tmp11 = replace->attr;
             		}
             		else {
-HXLINE( 226)			tmp11 = null();
+HXLINE( 227)			tmp11 = null();
             		}
-HXDLIN( 226)		::String replaceId;
-HXDLIN( 226)		if (::hx::IsNotNull( tmp11 )) {
-HXLINE( 226)			replaceId = ( (::String)(::Reflect_obj::field(tmp11,HX_("id",db,5b,00,00))) );
+HXDLIN( 227)		::String replaceId;
+HXDLIN( 227)		if (::hx::IsNotNull( tmp11 )) {
+HXLINE( 227)			replaceId = ( (::String)(::Reflect_obj::field(tmp11,HX_("id",db,5b,00,00))) );
             		}
             		else {
-HXLINE( 226)			replaceId = null();
+HXLINE( 227)			replaceId = null();
             		}
-HXLINE( 228)		bool _hx_tmp44;
-HXDLIN( 228)		bool _hx_tmp45;
-HXDLIN( 228)		if (::hx::IsNull( msg->text )) {
-HXLINE( 228)			_hx_tmp45 = (msg->attachments->length < 1);
+HXLINE( 229)		bool _hx_tmp44;
+HXDLIN( 229)		bool _hx_tmp45;
+HXDLIN( 229)		if (::hx::IsNull( msg->text )) {
+HXLINE( 229)			_hx_tmp45 = (msg->attachments->length < 1);
             		}
             		else {
-HXLINE( 228)			_hx_tmp45 = false;
+HXLINE( 229)			_hx_tmp45 = false;
             		}
-HXDLIN( 228)		if (_hx_tmp45) {
-HXLINE( 228)			_hx_tmp44 = ::hx::IsNull( replaceId );
+HXDLIN( 229)		if (_hx_tmp45) {
+HXLINE( 229)			_hx_tmp44 = ::hx::IsNull( replaceId );
             		}
             		else {
-HXLINE( 228)			_hx_tmp44 = false;
-            		}
-HXDLIN( 228)		if (_hx_tmp44) {
-HXLINE( 228)			::String _hx_tmp46 = msg->chatId();
-HXDLIN( 228)			::String _hx_tmp47 = msg->get_senderId();
-HXDLIN( 228)			return  ::snikket::Message_obj::__alloc( HX_CTX ,_hx_tmp46,_hx_tmp47,msg->threadId,::snikket::MessageStanza_obj::UnknownMessageStanza(stanza));
-            		}
-HXLINE( 230)		{
-HXLINE( 230)			int _g14 = 0;
-HXDLIN( 230)			::Array< ::Dynamic> _g15 = stanza->allTags(HX_("fallback",22,f0,9d,2a),HX_("urn:xmpp:fallback:0",74,aa,56,9b));
-HXDLIN( 230)			while((_g14 < _g15->length)){
-HXLINE( 230)				 ::snikket::Stanza fallback = _g15->__get(_g14).StaticCast<  ::snikket::Stanza >();
-HXDLIN( 230)				_g14 = (_g14 + 1);
-HXLINE( 231)				msg->payloads->push(fallback);
+HXLINE( 229)			_hx_tmp44 = false;
+            		}
+HXDLIN( 229)		if (_hx_tmp44) {
+HXLINE( 229)			::String _hx_tmp46 = msg->chatId();
+HXDLIN( 229)			::String _hx_tmp47 = msg->get_senderId();
+HXDLIN( 229)			return  ::snikket::Message_obj::__alloc( HX_CTX ,_hx_tmp46,_hx_tmp47,msg->threadId,::snikket::MessageStanza_obj::UnknownMessageStanza(stanza));
+            		}
+HXLINE( 231)		{
+HXLINE( 231)			int _g15 = 0;
+HXDLIN( 231)			::Array< ::Dynamic> _g16 = stanza->allTags(HX_("fallback",22,f0,9d,2a),HX_("urn:xmpp:fallback:0",74,aa,56,9b));
+HXDLIN( 231)			while((_g15 < _g16->length)){
+HXLINE( 231)				 ::snikket::Stanza fallback = _g16->__get(_g15).StaticCast<  ::snikket::Stanza >();
+HXDLIN( 231)				_g15 = (_g15 + 1);
+HXLINE( 232)				msg->payloads->push(fallback);
             			}
             		}
-HXLINE( 234)		 ::snikket::Stanza unstyled = stanza->getChild(HX_("unstyled",2c,15,1a,18),HX_("urn:xmpp:styling:0",48,d3,aa,fb));
-HXLINE( 235)		if (::hx::IsNotNull( unstyled )) {
-HXLINE( 236)			msg->payloads->push(unstyled);
-            		}
-HXLINE( 239)		 ::snikket::Stanza html = stanza->getChild(HX_("html",6b,95,16,45),HX_("http://jabber.org/protocol/xhtml-im",c2,5d,b2,ce));
-HXLINE( 240)		if (::hx::IsNotNull( html )) {
-HXLINE( 241)			msg->payloads->push(html);
-            		}
-HXLINE( 244)		 ::snikket::Stanza reply = stanza->getChild(HX_("reply",2a,09,c6,e6),HX_("urn:xmpp:reply:0",c4,d5,6f,90));
-HXLINE( 245)		if (::hx::IsNotNull( reply )) {
-HXLINE( 246)			::String replyToJid = ( (::String)(::Reflect_obj::field(reply->attr,HX_("to",7b,65,00,00))) );
-HXLINE( 247)			::String replyToID = ( (::String)(::Reflect_obj::field(reply->attr,HX_("id",db,5b,00,00))) );
-HXLINE( 249)			::String text1 = msg->text;
-HXLINE( 250)			bool _hx_tmp48;
-HXDLIN( 250)			if (::hx::IsNotNull( text1 )) {
-HXLINE( 250)				_hx_tmp48 = ::snikket::EmojiUtil_obj::isOnlyEmoji(::StringTools_obj::trim(text1));
+HXLINE( 235)		 ::snikket::Stanza unstyled = stanza->getChild(HX_("unstyled",2c,15,1a,18),HX_("urn:xmpp:styling:0",48,d3,aa,fb));
+HXLINE( 236)		if (::hx::IsNotNull( unstyled )) {
+HXLINE( 237)			msg->payloads->push(unstyled);
+            		}
+HXLINE( 240)		 ::snikket::Stanza html = stanza->getChild(HX_("html",6b,95,16,45),HX_("http://jabber.org/protocol/xhtml-im",c2,5d,b2,ce));
+HXLINE( 241)		if (::hx::IsNotNull( html )) {
+HXLINE( 242)			msg->payloads->push(html);
+            		}
+HXLINE( 245)		 ::snikket::Stanza reply = stanza->getChild(HX_("reply",2a,09,c6,e6),HX_("urn:xmpp:reply:0",c4,d5,6f,90));
+HXLINE( 246)		if (::hx::IsNotNull( reply )) {
+HXLINE( 247)			::String replyToJid = ( (::String)(::Reflect_obj::field(reply->attr,HX_("to",7b,65,00,00))) );
+HXLINE( 248)			::String replyToID = ( (::String)(::Reflect_obj::field(reply->attr,HX_("id",db,5b,00,00))) );
+HXLINE( 250)			::String text1 = msg->text;
+HXLINE( 251)			bool _hx_tmp48;
+HXDLIN( 251)			if (::hx::IsNotNull( text1 )) {
+HXLINE( 251)				_hx_tmp48 = ::snikket::EmojiUtil_obj::isOnlyEmoji(::StringTools_obj::trim(text1));
             			}
             			else {
-HXLINE( 250)				_hx_tmp48 = false;
+HXLINE( 251)				_hx_tmp48 = false;
             			}
-HXDLIN( 250)			if (_hx_tmp48) {
-HXLINE( 251)				::String _hx_tmp49 = msg->chatId();
-HXDLIN( 251)				::String _hx_tmp50 = msg->get_senderId();
-HXDLIN( 251)				::String msg5 = msg->threadId;
-HXLINE( 252)				::String _hx_tmp51;
-HXDLIN( 252)				::String tmp12 = ( (::String)(::Reflect_obj::field(stanza->attr,HX_("id",db,5b,00,00))) );
-HXDLIN( 252)				if (::hx::IsNotNull( tmp12 )) {
-HXLINE( 252)					_hx_tmp51 = tmp12;
+HXDLIN( 251)			if (_hx_tmp48) {
+HXLINE( 252)				::String _hx_tmp49 = msg->chatId();
+HXDLIN( 252)				::String _hx_tmp50 = msg->get_senderId();
+HXDLIN( 252)				::String msg5 = msg->threadId;
+HXLINE( 253)				::String _hx_tmp51;
+HXDLIN( 253)				::String tmp12 = ( (::String)(::Reflect_obj::field(stanza->attr,HX_("id",db,5b,00,00))) );
+HXDLIN( 253)				if (::hx::IsNotNull( tmp12 )) {
+HXLINE( 253)					_hx_tmp51 = tmp12;
             				}
             				else {
-HXLINE( 252)					_hx_tmp51 = ::snikket::ID_obj::_hx_long();
+HXLINE( 253)					_hx_tmp51 = ::snikket::ID_obj::_hx_long();
             				}
-HXLINE( 253)				::String _hx_tmp52;
-HXDLIN( 253)				if (isGroupchat) {
-HXLINE( 253)					_hx_tmp52 = replyToID;
+HXLINE( 254)				::String _hx_tmp52;
+HXDLIN( 254)				if (isGroupchat) {
+HXLINE( 254)					_hx_tmp52 = replyToID;
             				}
             				else {
-HXLINE( 253)					_hx_tmp52 = null();
+HXLINE( 254)					_hx_tmp52 = null();
             				}
-HXLINE( 254)				::String _hx_tmp53;
-HXDLIN( 254)				if (isGroupchat) {
-HXLINE( 254)					_hx_tmp53 = msg->chatId();
+HXLINE( 255)				::String _hx_tmp53;
+HXDLIN( 255)				if (isGroupchat) {
+HXLINE( 255)					_hx_tmp53 = msg->chatId();
             				}
             				else {
-HXLINE( 254)					_hx_tmp53 = null();
+HXLINE( 255)					_hx_tmp53 = null();
             				}
-HXLINE( 255)				::String _hx_tmp54;
-HXDLIN( 255)				if (isGroupchat) {
-HXLINE( 255)					_hx_tmp54 = null();
+HXLINE( 256)				::String _hx_tmp54;
+HXDLIN( 256)				if (isGroupchat) {
+HXLINE( 256)					_hx_tmp54 = null();
             				}
             				else {
-HXLINE( 255)					_hx_tmp54 = replyToID;
+HXLINE( 256)					_hx_tmp54 = replyToID;
             				}
-HXLINE( 256)				::String _hx_tmp55 = msg->chatId();
-HXLINE( 257)				::String _hx_tmp56 = msg->get_senderId();
-HXLINE( 259)				::String _hx_tmp57 = msg->get_senderId();
-HXDLIN( 259)				::String _hx_tmp58 = ::StringTools_obj::trim(text1);
-HXLINE( 251)				return  ::snikket::Message_obj::__alloc( HX_CTX ,_hx_tmp49,_hx_tmp50,msg5,::snikket::MessageStanza_obj::ReactionUpdateStanza( ::snikket::ReactionUpdate_obj::__alloc( HX_CTX ,_hx_tmp51,_hx_tmp52,_hx_tmp53,_hx_tmp54,_hx_tmp55,_hx_tmp56,timestamp,::Array_obj< ::Dynamic>::__new(1)->init(0, ::snikket::Reaction_obj::__alloc( HX_CTX ,_hx_tmp57,timestamp,_hx_tmp58,msg->localId,null())),1)));
+HXLINE( 257)				::String _hx_tmp55 = msg->chatId();
+HXLINE( 258)				::String _hx_tmp56 = msg->get_senderId();
+HXLINE( 260)				::String _hx_tmp57 = msg->get_senderId();
+HXDLIN( 260)				::String _hx_tmp58 = ::StringTools_obj::trim(text1);
+HXLINE( 252)				return  ::snikket::Message_obj::__alloc( HX_CTX ,_hx_tmp49,_hx_tmp50,msg5,::snikket::MessageStanza_obj::ReactionUpdateStanza( ::snikket::ReactionUpdate_obj::__alloc( HX_CTX ,_hx_tmp51,_hx_tmp52,_hx_tmp53,_hx_tmp54,_hx_tmp55,_hx_tmp56,timestamp,::Array_obj< ::Dynamic>::__new(1)->init(0, ::snikket::Reaction_obj::__alloc( HX_CTX ,_hx_tmp57,timestamp,_hx_tmp58,msg->localId,null())),1)));
             			}
-HXLINE( 264)			if (::hx::IsNotNull( html )) {
-HXLINE( 265)				 ::snikket::Stanza body = html->getChild(HX_("body",a2,7a,1b,41),HX_("http://www.w3.org/1999/xhtml",90,6d,f8,c8));
-HXLINE( 266)				if (::hx::IsNotNull( body )) {
-HXLINE( 267)					::Array< ::Dynamic> els = body->allTags(null(),null());
-HXLINE( 268)					bool _hx_tmp59;
-HXDLIN( 268)					if ((els->length == 1)) {
-HXLINE( 268)						_hx_tmp59 = (els->__get(0).StaticCast<  ::snikket::Stanza >()->name == HX_("img",03,0c,50,00));
+HXLINE( 265)			if (::hx::IsNotNull( html )) {
+HXLINE( 266)				 ::snikket::Stanza body = html->getChild(HX_("body",a2,7a,1b,41),HX_("http://www.w3.org/1999/xhtml",90,6d,f8,c8));
+HXLINE( 267)				if (::hx::IsNotNull( body )) {
+HXLINE( 268)					::Array< ::Dynamic> els = body->allTags(null(),null());
+HXLINE( 269)					bool _hx_tmp59;
+HXDLIN( 269)					if ((els->length == 1)) {
+HXLINE( 269)						_hx_tmp59 = (els->__get(0).StaticCast<  ::snikket::Stanza >()->name == HX_("img",03,0c,50,00));
             					}
             					else {
-HXLINE( 268)						_hx_tmp59 = false;
+HXLINE( 269)						_hx_tmp59 = false;
             					}
-HXDLIN( 268)					if (_hx_tmp59) {
-HXLINE( 269)						::String tmp13 = ( (::String)(::Reflect_obj::field(els->__get(0).StaticCast<  ::snikket::Stanza >()->attr,HX_("src",e4,a6,57,00))) );
-HXDLIN( 269)						::String hash;
-HXDLIN( 269)						if (::hx::IsNotNull( tmp13 )) {
-HXLINE( 269)							hash = tmp13;
+HXDLIN( 269)					if (_hx_tmp59) {
+HXLINE( 270)						::String tmp13 = ( (::String)(::Reflect_obj::field(els->__get(0).StaticCast<  ::snikket::Stanza >()->attr,HX_("src",e4,a6,57,00))) );
+HXDLIN( 270)						::String hash;
+HXDLIN( 270)						if (::hx::IsNotNull( tmp13 )) {
+HXLINE( 270)							hash = tmp13;
             						}
             						else {
-HXLINE( 269)							hash = HX_("",00,00,00,00);
+HXLINE( 270)							hash = HX_("",00,00,00,00);
             						}
-HXDLIN( 269)						 ::snikket::Hash hash1 = ::snikket::Hash_obj::fromUri(hash);
-HXLINE( 270)						if (::hx::IsNotNull( hash1 )) {
-HXLINE( 271)							::String _hx_tmp60 = msg->chatId();
-HXDLIN( 271)							::String _hx_tmp61 = msg->get_senderId();
-HXDLIN( 271)							::String msg6 = msg->threadId;
-HXLINE( 272)							::String _hx_tmp62;
-HXDLIN( 272)							::String tmp14 = ( (::String)(::Reflect_obj::field(stanza->attr,HX_("id",db,5b,00,00))) );
-HXDLIN( 272)							if (::hx::IsNotNull( tmp14 )) {
-HXLINE( 272)								_hx_tmp62 = tmp14;
+HXDLIN( 270)						 ::snikket::Hash hash1 = ::snikket::Hash_obj::fromUri(hash);
+HXLINE( 271)						if (::hx::IsNotNull( hash1 )) {
+HXLINE( 272)							::String _hx_tmp60 = msg->chatId();
+HXDLIN( 272)							::String _hx_tmp61 = msg->get_senderId();
+HXDLIN( 272)							::String msg6 = msg->threadId;
+HXLINE( 273)							::String _hx_tmp62;
+HXDLIN( 273)							::String tmp14 = ( (::String)(::Reflect_obj::field(stanza->attr,HX_("id",db,5b,00,00))) );
+HXDLIN( 273)							if (::hx::IsNotNull( tmp14 )) {
+HXLINE( 273)								_hx_tmp62 = tmp14;
             							}
             							else {
-HXLINE( 272)								_hx_tmp62 = ::snikket::ID_obj::_hx_long();
+HXLINE( 273)								_hx_tmp62 = ::snikket::ID_obj::_hx_long();
             							}
-HXLINE( 273)							::String _hx_tmp63;
-HXDLIN( 273)							if (isGroupchat) {
-HXLINE( 273)								_hx_tmp63 = replyToID;
+HXLINE( 274)							::String _hx_tmp63;
+HXDLIN( 274)							if (isGroupchat) {
+HXLINE( 274)								_hx_tmp63 = replyToID;
             							}
             							else {
-HXLINE( 273)								_hx_tmp63 = null();
+HXLINE( 274)								_hx_tmp63 = null();
             							}
-HXLINE( 274)							::String _hx_tmp64;
-HXDLIN( 274)							if (isGroupchat) {
-HXLINE( 274)								_hx_tmp64 = msg->chatId();
+HXLINE( 275)							::String _hx_tmp64;
+HXDLIN( 275)							if (isGroupchat) {
+HXLINE( 275)								_hx_tmp64 = msg->chatId();
             							}
             							else {
-HXLINE( 274)								_hx_tmp64 = null();
+HXLINE( 275)								_hx_tmp64 = null();
             							}
-HXLINE( 275)							::String _hx_tmp65;
-HXDLIN( 275)							if (isGroupchat) {
-HXLINE( 275)								_hx_tmp65 = null();
+HXLINE( 276)							::String _hx_tmp65;
+HXDLIN( 276)							if (isGroupchat) {
+HXLINE( 276)								_hx_tmp65 = null();
             							}
             							else {
-HXLINE( 275)								_hx_tmp65 = replyToID;
+HXLINE( 276)								_hx_tmp65 = replyToID;
             							}
-HXLINE( 276)							::String _hx_tmp66 = msg->chatId();
-HXLINE( 277)							::String _hx_tmp67 = msg->get_senderId();
-HXLINE( 279)							::String _hx_tmp68 = msg->get_senderId();
-HXDLIN( 279)							::String _hx_tmp69;
-HXDLIN( 279)							::String tmp15 = ( (::String)(::Reflect_obj::field(els->__get(0).StaticCast<  ::snikket::Stanza >()->attr,HX_("alt",29,f9,49,00))) );
-HXDLIN( 279)							if (::hx::IsNotNull( tmp15 )) {
-HXLINE( 279)								_hx_tmp69 = tmp15;
+HXLINE( 277)							::String _hx_tmp66 = msg->chatId();
+HXLINE( 278)							::String _hx_tmp67 = msg->get_senderId();
+HXLINE( 280)							::String _hx_tmp68 = msg->get_senderId();
+HXDLIN( 280)							::String _hx_tmp69;
+HXDLIN( 280)							::String tmp15 = ( (::String)(::Reflect_obj::field(els->__get(0).StaticCast<  ::snikket::Stanza >()->attr,HX_("alt",29,f9,49,00))) );
+HXDLIN( 280)							if (::hx::IsNotNull( tmp15 )) {
+HXLINE( 280)								_hx_tmp69 = tmp15;
             							}
             							else {
-HXLINE( 279)								_hx_tmp69 = HX_("",00,00,00,00);
+HXLINE( 280)								_hx_tmp69 = HX_("",00,00,00,00);
             							}
-HXDLIN( 279)							::String _hx_tmp70 = hash1->serializeUri();
-HXLINE( 271)							return  ::snikket::Message_obj::__alloc( HX_CTX ,_hx_tmp60,_hx_tmp61,msg6,::snikket::MessageStanza_obj::ReactionUpdateStanza( ::snikket::ReactionUpdate_obj::__alloc( HX_CTX ,_hx_tmp62,_hx_tmp63,_hx_tmp64,_hx_tmp65,_hx_tmp66,_hx_tmp67,timestamp,::Array_obj< ::Dynamic>::__new(1)->init(0, ::snikket::CustomEmojiReaction_obj::__alloc( HX_CTX ,_hx_tmp68,timestamp,_hx_tmp69,_hx_tmp70,msg->localId)),1)));
+HXDLIN( 280)							::String _hx_tmp70 = hash1->serializeUri();
+HXLINE( 272)							return  ::snikket::Message_obj::__alloc( HX_CTX ,_hx_tmp60,_hx_tmp61,msg6,::snikket::MessageStanza_obj::ReactionUpdateStanza( ::snikket::ReactionUpdate_obj::__alloc( HX_CTX ,_hx_tmp62,_hx_tmp63,_hx_tmp64,_hx_tmp65,_hx_tmp66,_hx_tmp67,timestamp,::Array_obj< ::Dynamic>::__new(1)->init(0, ::snikket::CustomEmojiReaction_obj::__alloc( HX_CTX ,_hx_tmp68,timestamp,_hx_tmp69,_hx_tmp70,msg->localId)),1)));
             						}
             					}
             				}
             			}
-HXLINE( 287)			if (::hx::IsNotNull( replyToID )) {
-HXLINE( 289)				 ::snikket::ChatMessageBuilder replyToMessage =  ::snikket::ChatMessageBuilder_obj::__alloc( HX_CTX );
-HXLINE( 290)				 ::snikket::JID _hx_tmp71;
-HXDLIN( 290)				if ((replyToJid == msg->get_senderId())) {
-HXLINE( 290)					_hx_tmp71 = msg->to;
+HXLINE( 288)			if (::hx::IsNotNull( replyToID )) {
+HXLINE( 290)				 ::snikket::ChatMessageBuilder replyToMessage =  ::snikket::ChatMessageBuilder_obj::__alloc( HX_CTX );
+HXLINE( 291)				 ::snikket::JID _hx_tmp71;
+HXDLIN( 291)				if ((replyToJid == msg->get_senderId())) {
+HXLINE( 291)					_hx_tmp71 = msg->to;
             				}
             				else {
-HXLINE( 290)					_hx_tmp71 = msg->from;
+HXLINE( 291)					_hx_tmp71 = msg->from;
             				}
-HXDLIN( 290)				replyToMessage->to = _hx_tmp71;
-HXLINE( 291)				 ::snikket::JID _hx_tmp72;
-HXDLIN( 291)				if (::hx::IsNull( replyToJid )) {
-HXLINE( 291)					_hx_tmp72 = null();
+HXDLIN( 291)				replyToMessage->to = _hx_tmp71;
+HXLINE( 292)				 ::snikket::JID _hx_tmp72;
+HXDLIN( 292)				if (::hx::IsNull( replyToJid )) {
+HXLINE( 292)					_hx_tmp72 = null();
             				}
             				else {
-HXLINE( 291)					_hx_tmp72 = ::snikket::JID_obj::parse(replyToJid);
+HXLINE( 292)					_hx_tmp72 = ::snikket::JID_obj::parse(replyToJid);
             				}
-HXDLIN( 291)				replyToMessage->from = _hx_tmp72;
-HXLINE( 292)				::String _hx_tmp73;
-HXDLIN( 292)				if (isGroupchat) {
-HXLINE( 292)					 ::snikket::JID tmp16 = replyToMessage->from;
-HXDLIN( 292)					if (::hx::IsNotNull( tmp16 )) {
-HXLINE( 292)						_hx_tmp73 = tmp16->asString();
+HXDLIN( 292)				replyToMessage->from = _hx_tmp72;
+HXLINE( 293)				::String _hx_tmp73;
+HXDLIN( 293)				if (isGroupchat) {
+HXLINE( 293)					 ::snikket::JID tmp16 = replyToMessage->from;
+HXDLIN( 293)					if (::hx::IsNotNull( tmp16 )) {
+HXLINE( 293)						_hx_tmp73 = tmp16->asString();
             					}
             					else {
-HXLINE( 292)						_hx_tmp73 = null();
+HXLINE( 293)						_hx_tmp73 = null();
             					}
             				}
             				else {
-HXLINE( 292)					 ::snikket::JID tmp17 = replyToMessage->from;
-HXDLIN( 292)					 ::snikket::JID tmp18;
-HXDLIN( 292)					if (::hx::IsNotNull( tmp17 )) {
-HXLINE( 292)						tmp18 = tmp17->asBare();
+HXLINE( 293)					 ::snikket::JID tmp17 = replyToMessage->from;
+HXDLIN( 293)					 ::snikket::JID tmp18;
+HXDLIN( 293)					if (::hx::IsNotNull( tmp17 )) {
+HXLINE( 293)						tmp18 = tmp17->asBare();
             					}
             					else {
-HXLINE( 292)						tmp18 = null();
+HXLINE( 293)						tmp18 = null();
             					}
-HXDLIN( 292)					if (::hx::IsNotNull( tmp18 )) {
-HXLINE( 292)						_hx_tmp73 = tmp18->asString();
+HXDLIN( 293)					if (::hx::IsNotNull( tmp18 )) {
+HXLINE( 293)						_hx_tmp73 = tmp18->asString();
             					}
             					else {
-HXLINE( 292)						_hx_tmp73 = null();
+HXLINE( 293)						_hx_tmp73 = null();
             					}
             				}
-HXDLIN( 292)				replyToMessage->senderId = _hx_tmp73;
-HXLINE( 293)				replyToMessage->replyId = replyToID;
-HXLINE( 294)				bool _hx_tmp74;
-HXDLIN( 294)				if (::hx::IsNotNull( msg->serverIdBy )) {
-HXLINE( 294)					::String msg7 = msg->serverIdBy;
-HXDLIN( 294)					_hx_tmp74 = (msg7 != localJid->asBare()->asString());
+HXDLIN( 293)				replyToMessage->senderId = _hx_tmp73;
+HXLINE( 294)				replyToMessage->replyId = replyToID;
+HXLINE( 295)				bool _hx_tmp74;
+HXDLIN( 295)				if (::hx::IsNotNull( msg->serverIdBy )) {
+HXLINE( 295)					::String msg7 = msg->serverIdBy;
+HXDLIN( 295)					_hx_tmp74 = (msg7 != localJid->asBare()->asString());
             				}
             				else {
-HXLINE( 294)					_hx_tmp74 = false;
+HXLINE( 295)					_hx_tmp74 = false;
             				}
-HXDLIN( 294)				if (_hx_tmp74) {
-HXLINE( 295)					replyToMessage->serverId = replyToID;
+HXDLIN( 295)				if (_hx_tmp74) {
+HXLINE( 296)					replyToMessage->serverId = replyToID;
             				}
             				else {
-HXLINE( 297)					replyToMessage->localId = replyToID;
+HXLINE( 298)					replyToMessage->localId = replyToID;
             				}
-HXLINE( 299)				msg->replyToMessage = replyToMessage->build();
+HXLINE( 300)				msg->replyToMessage = replyToMessage->build();
             			}
             		}
-HXLINE( 303)		if (::hx::IsNotNull( replaceId )) {
-HXLINE( 304)			if ((msg->versions->length < 1)) {
-HXLINE( 304)				msg->versions = ::Array_obj< ::Dynamic>::__new(1)->init(0,msg->build());
+HXLINE( 304)		if (::hx::IsNotNull( replaceId )) {
+HXLINE( 305)			if ((msg->versions->length < 1)) {
+HXLINE( 305)				msg->versions = ::Array_obj< ::Dynamic>::__new(1)->init(0,msg->build());
             			}
-HXLINE( 305)			msg->localId = replaceId;
+HXLINE( 306)			msg->localId = replaceId;
             		}
-HXLINE( 308)		::String _hx_tmp75 = msg->chatId();
-HXDLIN( 308)		::String _hx_tmp76 = msg->get_senderId();
-HXDLIN( 308)		::String msg8 = msg->threadId;
-HXDLIN( 308)		return  ::snikket::Message_obj::__alloc( HX_CTX ,_hx_tmp75,_hx_tmp76,msg8,::snikket::MessageStanza_obj::ChatMessageStanza(msg->build()));
+HXLINE( 309)		::String _hx_tmp75 = msg->chatId();
+HXDLIN( 309)		::String _hx_tmp76 = msg->get_senderId();
+HXDLIN( 309)		::String msg8 = msg->threadId;
+HXDLIN( 309)		return  ::snikket::Message_obj::__alloc( HX_CTX ,_hx_tmp75,_hx_tmp76,msg8,::snikket::MessageStanza_obj::ChatMessageStanza(msg->build()));
             	}
 
 
diff --git a/Sources/c_snikket/src/snikket/Node.cpp b/Sources/c_snikket/src/snikket/Node.cpp
index f2dda9c..a67c057 100644
--- a/Sources/c_snikket/src/snikket/Node.cpp
+++ b/Sources/c_snikket/src/snikket/Node.cpp
@@ -7,15 +7,12 @@
 #ifndef INCLUDED_snikket_Stanza
 #include <snikket/Stanza.h>
 #endif
-#ifndef INCLUDED_snikket_TextNode
-#include <snikket/TextNode.h>
-#endif
 #ifndef INCLUDED_snikket__Stanza_NodeInterface
 #include <snikket/_Stanza/NodeInterface.h>
 #endif
 namespace snikket{
 
-::snikket::Node Node_obj::CData( ::snikket::TextNode textNode)
+::snikket::Node Node_obj::CData(::String textNode)
 {
 	return ::hx::CreateEnum< Node_obj >(HX_("CData",0d,60,15,c1),1,1)->_hx_init(0,textNode);
 }
diff --git a/Sources/c_snikket/src/snikket/Notification.cpp b/Sources/c_snikket/src/snikket/Notification.cpp
index 4b7c913..0aa7a21 100644
--- a/Sources/c_snikket/src/snikket/Notification.cpp
+++ b/Sources/c_snikket/src/snikket/Notification.cpp
@@ -23,11 +23,12 @@
 #include <snikket/_Stanza/NodeInterface.h>
 #endif
 
-HX_DEFINE_STACK_FRAME(_hx_pos_b0a79cae3ba17812_30_new,"snikket.Notification","new",0x26dbd48e,"snikket.Notification.new","snikket/Notification.hx",30,0x3ec09fc1)
+HX_DEFINE_STACK_FRAME(_hx_pos_b0a79cae3ba17812_31_new,"snikket.Notification","new",0x26dbd48e,"snikket.Notification.new","snikket/Notification.hx",31,0x3ec09fc1)
 HX_LOCAL_STACK_FRAME(_hx_pos_a71b5c2960d44fdc_355_title__fromC,"snikket.Notification","title__fromC",0x471ac3f3,"snikket.Notification.title__fromC","HaxeCBridge.hx",355,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_a71b5c2960d44fdc_355_body__fromC,"snikket.Notification","body__fromC",0x310d5045,"snikket.Notification.body__fromC","HaxeCBridge.hx",355,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_a71b5c2960d44fdc_355_accountId__fromC,"snikket.Notification","accountId__fromC",0x303bf2a3,"snikket.Notification.accountId__fromC","HaxeCBridge.hx",355,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_a71b5c2960d44fdc_355_chatId__fromC,"snikket.Notification","chatId__fromC",0xd6de45b4,"snikket.Notification.chatId__fromC","HaxeCBridge.hx",355,0xa18550d8)
+HX_LOCAL_STACK_FRAME(_hx_pos_a71b5c2960d44fdc_355_senderId__fromC,"snikket.Notification","senderId__fromC",0x285da0b7,"snikket.Notification.senderId__fromC","HaxeCBridge.hx",355,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_a71b5c2960d44fdc_355_messageId__fromC,"snikket.Notification","messageId__fromC",0x04e5c649,"snikket.Notification.messageId__fromC","HaxeCBridge.hx",355,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_a71b5c2960d44fdc_355_type__fromC,"snikket.Notification","type__fromC",0x2ef98b2d,"snikket.Notification.type__fromC","HaxeCBridge.hx",355,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_a71b5c2960d44fdc_355_callStatus__fromC,"snikket.Notification","callStatus__fromC",0x3a2418b7,"snikket.Notification.callStatus__fromC","HaxeCBridge.hx",355,0xa18550d8)
@@ -35,24 +36,25 @@ HX_LOCAL_STACK_FRAME(_hx_pos_a71b5c2960d44fdc_355_callSid__fromC,"snikket.Notifi
 HX_LOCAL_STACK_FRAME(_hx_pos_a71b5c2960d44fdc_355_imageUri__fromC,"snikket.Notification","imageUri__fromC",0xc4a25ef6,"snikket.Notification.imageUri__fromC","HaxeCBridge.hx",355,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_a71b5c2960d44fdc_355_lang__fromC,"snikket.Notification","lang__fromC",0xed8d0679,"snikket.Notification.lang__fromC","HaxeCBridge.hx",355,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_a71b5c2960d44fdc_355_timestamp__fromC,"snikket.Notification","timestamp__fromC",0xec75f975,"snikket.Notification.timestamp__fromC","HaxeCBridge.hx",355,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_b0a79cae3ba17812_45_fromChatMessage,"snikket.Notification","fromChatMessage",0xbfab11b3,"snikket.Notification.fromChatMessage","snikket/Notification.hx",45,0x3ec09fc1)
-HX_LOCAL_STACK_FRAME(_hx_pos_b0a79cae3ba17812_70_fromThinStanza,"snikket.Notification","fromThinStanza",0xff0721ca,"snikket.Notification.fromThinStanza","snikket/Notification.hx",70,0x3ec09fc1)
+HX_LOCAL_STACK_FRAME(_hx_pos_b0a79cae3ba17812_47_fromChatMessage,"snikket.Notification","fromChatMessage",0xbfab11b3,"snikket.Notification.fromChatMessage","snikket/Notification.hx",47,0x3ec09fc1)
+HX_LOCAL_STACK_FRAME(_hx_pos_b0a79cae3ba17812_73_fromThinStanza,"snikket.Notification","fromThinStanza",0xff0721ca,"snikket.Notification.fromThinStanza","snikket/Notification.hx",73,0x3ec09fc1)
 HX_LOCAL_STACK_FRAME(_hx_pos_b0a79cae3ba17812_16_boot,"snikket.Notification","boot",0xd1972844,"snikket.Notification.boot","snikket/Notification.hx",16,0x3ec09fc1)
 namespace snikket{
 
-void Notification_obj::__construct(::String title,::String body,::String accountId,::String chatId,::String messageId,int type,::String callStatus,::String callSid,::String imageUri,::String lang,::String timestamp){
-            	HX_STACKFRAME(&_hx_pos_b0a79cae3ba17812_30_new)
-HXLINE(  31)		this->title = title;
-HXLINE(  32)		this->body = body;
-HXLINE(  33)		this->accountId = accountId;
-HXLINE(  34)		this->chatId = chatId;
-HXLINE(  35)		this->messageId = messageId;
-HXLINE(  36)		this->type = type;
-HXLINE(  37)		this->callStatus = callStatus;
-HXLINE(  38)		this->callSid = callSid;
-HXLINE(  39)		this->imageUri = imageUri;
-HXLINE(  40)		this->lang = lang;
-HXLINE(  41)		this->timestamp = timestamp;
+void Notification_obj::__construct(::String title,::String body,::String accountId,::String chatId,::String senderId,::String messageId,int type,::String callStatus,::String callSid,::String imageUri,::String lang,::String timestamp){
+            	HX_STACKFRAME(&_hx_pos_b0a79cae3ba17812_31_new)
+HXLINE(  32)		this->title = title;
+HXLINE(  33)		this->body = body;
+HXLINE(  34)		this->accountId = accountId;
+HXLINE(  35)		this->chatId = chatId;
+HXLINE(  36)		this->senderId = senderId;
+HXLINE(  37)		this->messageId = messageId;
+HXLINE(  38)		this->type = type;
+HXLINE(  39)		this->callStatus = callStatus;
+HXLINE(  40)		this->callSid = callSid;
+HXLINE(  41)		this->imageUri = imageUri;
+HXLINE(  42)		this->lang = lang;
+HXLINE(  43)		this->timestamp = timestamp;
             	}
 
 Dynamic Notification_obj::__CreateEmpty() { return new Notification_obj; }
@@ -62,7 +64,7 @@ void *Notification_obj::_hx_vtable = 0;
 Dynamic Notification_obj::__Create(::hx::DynamicArray inArgs)
 {
 	::hx::ObjectPtr< Notification_obj > _hx_result = new Notification_obj();
-	_hx_result->__construct(inArgs[0],inArgs[1],inArgs[2],inArgs[3],inArgs[4],inArgs[5],inArgs[6],inArgs[7],inArgs[8],inArgs[9],inArgs[10]);
+	_hx_result->__construct(inArgs[0],inArgs[1],inArgs[2],inArgs[3],inArgs[4],inArgs[5],inArgs[6],inArgs[7],inArgs[8],inArgs[9],inArgs[10],inArgs[11]);
 	return _hx_result;
 }
 
@@ -102,6 +104,14 @@ HXDLIN( 355)		return this->chatId;
 
 HX_DEFINE_DYNAMIC_FUNC0(Notification_obj,chatId__fromC,return )
 
+::String Notification_obj::senderId__fromC(){
+            	HX_STACKFRAME(&_hx_pos_a71b5c2960d44fdc_355_senderId__fromC)
+HXDLIN( 355)		return this->senderId;
+            	}
+
+
+HX_DEFINE_DYNAMIC_FUNC0(Notification_obj,senderId__fromC,return )
+
 ::String Notification_obj::messageId__fromC(){
             	HX_STACKFRAME(&_hx_pos_a71b5c2960d44fdc_355_messageId__fromC)
 HXDLIN( 355)		return this->messageId;
@@ -159,37 +169,39 @@ HXDLIN( 355)		return this->timestamp;
 HX_DEFINE_DYNAMIC_FUNC0(Notification_obj,timestamp__fromC,return )
 
  ::snikket::Notification Notification_obj::fromChatMessage( ::snikket::ChatMessage m){
-            	HX_GC_STACKFRAME(&_hx_pos_b0a79cae3ba17812_45_fromChatMessage)
-HXLINE(  46)		::String imageUri = null();
-HXLINE(  47)		 ::snikket::ChatAttachment attachment = m->attachments->__get(0).StaticCast<  ::snikket::ChatAttachment >();
-HXLINE(  48)		if (::hx::IsNotNull( attachment )) {
-HXLINE(  49)			imageUri = attachment->uris->__get(0);
+            	HX_GC_STACKFRAME(&_hx_pos_b0a79cae3ba17812_47_fromChatMessage)
+HXLINE(  48)		::String imageUri = null();
+HXLINE(  49)		 ::snikket::ChatAttachment attachment = m->attachments->__get(0).StaticCast<  ::snikket::ChatAttachment >();
+HXLINE(  50)		if (::hx::IsNotNull( attachment )) {
+HXLINE(  51)			imageUri = attachment->uris->__get(0);
             		}
-HXLINE(  52)		::String _hx_tmp;
-HXDLIN(  52)		if ((m->type == 1)) {
-HXLINE(  52)			_hx_tmp = HX_("Incoming Call",18,e2,4d,47);
+HXLINE(  54)		::String _hx_tmp;
+HXDLIN(  54)		if ((m->type == 1)) {
+HXLINE(  54)			_hx_tmp = HX_("Incoming Call",18,e2,4d,47);
             		}
             		else {
-HXLINE(  52)			_hx_tmp = HX_("New Message",c7,69,0e,bd);
+HXLINE(  54)			_hx_tmp = HX_("New Message",c7,69,0e,bd);
             		}
-HXLINE(  53)		::String m1 = m->text;
-HXLINE(  54)		::String _hx_tmp1 = m->account();
-HXLINE(  55)		::String _hx_tmp2 = m->chatId();
-HXLINE(  56)		::String m2 = m->serverId;
-HXLINE(  57)		int m3 = m->type;
-HXLINE(  58)		::String _hx_tmp3 = m->callStatus();
-HXLINE(  59)		::String _hx_tmp4 = m->callSid();
-HXLINE(  51)		return  ::snikket::Notification_obj::__alloc( HX_CTX ,_hx_tmp,m1,_hx_tmp1,_hx_tmp2,m2,m3,_hx_tmp3,_hx_tmp4,imageUri,m->lang,m->timestamp);
+HXLINE(  55)		::String m1 = m->text;
+HXLINE(  56)		::String _hx_tmp1 = m->account();
+HXLINE(  57)		::String _hx_tmp2 = m->chatId();
+HXLINE(  58)		::String m2 = m->senderId;
+HXLINE(  59)		::String m3 = m->serverId;
+HXLINE(  60)		int m4 = m->type;
+HXLINE(  61)		::String _hx_tmp3 = m->callStatus();
+HXLINE(  62)		::String _hx_tmp4 = m->callSid();
+HXLINE(  53)		return  ::snikket::Notification_obj::__alloc( HX_CTX ,_hx_tmp,m1,_hx_tmp1,_hx_tmp2,m2,m3,m4,_hx_tmp3,_hx_tmp4,imageUri,m->lang,m->timestamp);
             	}
 
 
 STATIC_HX_DEFINE_DYNAMIC_FUNC1(Notification_obj,fromChatMessage,return )
 
  ::snikket::Notification Notification_obj::fromThinStanza( ::snikket::Stanza stanza){
-            	HX_GC_STACKFRAME(&_hx_pos_b0a79cae3ba17812_70_fromThinStanza)
-HXLINE(  73)		::String _hx_tmp = ::snikket::JID_obj::parse(( (::String)(::Reflect_obj::field(stanza->attr,HX_("to",7b,65,00,00))) ))->asBare()->asString();
-HXLINE(  74)		::String _hx_tmp1 = ::snikket::JID_obj::parse(( (::String)(::Reflect_obj::field(stanza->attr,HX_("from",6a,a5,c2,43))) ))->asBare()->asString();
-HXLINE(  70)		return  ::snikket::Notification_obj::__alloc( HX_CTX ,HX_("New Message",c7,69,0e,bd),HX_("",00,00,00,00),_hx_tmp,_hx_tmp1,stanza->getChildText(HX_("stanza-id",73,8a,54,e9),HX_("urn:xmpp:sid:0",a8,4b,37,54)),0,null(),null(),null(),null(),null());
+            	HX_GC_STACKFRAME(&_hx_pos_b0a79cae3ba17812_73_fromThinStanza)
+HXLINE(  76)		::String _hx_tmp = ::snikket::JID_obj::parse(( (::String)(::Reflect_obj::field(stanza->attr,HX_("to",7b,65,00,00))) ))->asBare()->asString();
+HXLINE(  77)		::String _hx_tmp1 = ::snikket::JID_obj::parse(( (::String)(::Reflect_obj::field(stanza->attr,HX_("from",6a,a5,c2,43))) ))->asBare()->asString();
+HXLINE(  78)		::String _hx_tmp2 = ::snikket::JID_obj::parse(( (::String)(::Reflect_obj::field(stanza->attr,HX_("from",6a,a5,c2,43))) ))->asString();
+HXLINE(  73)		return  ::snikket::Notification_obj::__alloc( HX_CTX ,HX_("New Message",c7,69,0e,bd),HX_("",00,00,00,00),_hx_tmp,_hx_tmp1,_hx_tmp2,stanza->getChildText(HX_("stanza-id",73,8a,54,e9),HX_("urn:xmpp:sid:0",a8,4b,37,54)),0,null(),null(),null(),null(),null());
             	}
 
 
@@ -207,6 +219,7 @@ void Notification_obj::__Mark(HX_MARK_PARAMS)
 	HX_MARK_MEMBER_NAME(body,"body");
 	HX_MARK_MEMBER_NAME(accountId,"accountId");
 	HX_MARK_MEMBER_NAME(chatId,"chatId");
+	HX_MARK_MEMBER_NAME(senderId,"senderId");
 	HX_MARK_MEMBER_NAME(messageId,"messageId");
 	HX_MARK_MEMBER_NAME(type,"type");
 	HX_MARK_MEMBER_NAME(callStatus,"callStatus");
@@ -223,6 +236,7 @@ void Notification_obj::__Visit(HX_VISIT_PARAMS)
 	HX_VISIT_MEMBER_NAME(body,"body");
 	HX_VISIT_MEMBER_NAME(accountId,"accountId");
 	HX_VISIT_MEMBER_NAME(chatId,"chatId");
+	HX_VISIT_MEMBER_NAME(senderId,"senderId");
 	HX_VISIT_MEMBER_NAME(messageId,"messageId");
 	HX_VISIT_MEMBER_NAME(type,"type");
 	HX_VISIT_MEMBER_NAME(callStatus,"callStatus");
@@ -250,6 +264,7 @@ void Notification_obj::__Visit(HX_VISIT_PARAMS)
 		if (HX_FIELD_EQ(inName,"callSid") ) { return ::hx::Val( callSid ); }
 		break;
 	case 8:
+		if (HX_FIELD_EQ(inName,"senderId") ) { return ::hx::Val( senderId ); }
 		if (HX_FIELD_EQ(inName,"imageUri") ) { return ::hx::Val( imageUri ); }
 		break;
 	case 9:
@@ -275,6 +290,7 @@ void Notification_obj::__Visit(HX_VISIT_PARAMS)
 		if (HX_FIELD_EQ(inName,"callSid__fromC") ) { return ::hx::Val( callSid__fromC_dyn() ); }
 		break;
 	case 15:
+		if (HX_FIELD_EQ(inName,"senderId__fromC") ) { return ::hx::Val( senderId__fromC_dyn() ); }
 		if (HX_FIELD_EQ(inName,"imageUri__fromC") ) { return ::hx::Val( imageUri__fromC_dyn() ); }
 		break;
 	case 16:
@@ -318,6 +334,7 @@ bool Notification_obj::__GetStatic(const ::String &inName, Dynamic &outValue, ::
 		if (HX_FIELD_EQ(inName,"callSid") ) { callSid=inValue.Cast< ::String >(); return inValue; }
 		break;
 	case 8:
+		if (HX_FIELD_EQ(inName,"senderId") ) { senderId=inValue.Cast< ::String >(); return inValue; }
 		if (HX_FIELD_EQ(inName,"imageUri") ) { imageUri=inValue.Cast< ::String >(); return inValue; }
 		break;
 	case 9:
@@ -337,6 +354,7 @@ void Notification_obj::__GetFields(Array< ::String> &outFields)
 	outFields->push(HX_("body",a2,7a,1b,41));
 	outFields->push(HX_("accountId",e8,81,54,29));
 	outFields->push(HX_("chatId",d3,04,77,b7));
+	outFields->push(HX_("senderId",f0,1e,0e,ec));
 	outFields->push(HX_("messageId",82,b5,1f,29));
 	outFields->push(HX_("type",ba,f2,08,4d));
 	outFields->push(HX_("callStatus",70,be,2b,31));
@@ -353,6 +371,7 @@ static ::hx::StorageInfo Notification_obj_sMemberStorageInfo[] = {
 	{::hx::fsString,(int)offsetof(Notification_obj,body),HX_("body",a2,7a,1b,41)},
 	{::hx::fsString,(int)offsetof(Notification_obj,accountId),HX_("accountId",e8,81,54,29)},
 	{::hx::fsString,(int)offsetof(Notification_obj,chatId),HX_("chatId",d3,04,77,b7)},
+	{::hx::fsString,(int)offsetof(Notification_obj,senderId),HX_("senderId",f0,1e,0e,ec)},
 	{::hx::fsString,(int)offsetof(Notification_obj,messageId),HX_("messageId",82,b5,1f,29)},
 	{::hx::fsInt,(int)offsetof(Notification_obj,type),HX_("type",ba,f2,08,4d)},
 	{::hx::fsString,(int)offsetof(Notification_obj,callStatus),HX_("callStatus",70,be,2b,31)},
@@ -374,6 +393,8 @@ static ::String Notification_obj_sMemberFields[] = {
 	HX_("accountId__fromC",91,7b,51,1b),
 	HX_("chatId",d3,04,77,b7),
 	HX_("chatId__fromC",06,fc,b1,94),
+	HX_("senderId",f0,1e,0e,ec),
+	HX_("senderId__fromC",89,0f,49,cb),
 	HX_("messageId",82,b5,1f,29),
 	HX_("messageId__fromC",37,4f,fb,ef),
 	HX_("type",ba,f2,08,4d),
@@ -426,7 +447,7 @@ void Notification_obj::__boot()
 {
             	HX_STACKFRAME(&_hx_pos_b0a79cae3ba17812_16_boot)
 HXDLIN(  16)		__mClass->__meta__ =  ::Dynamic(::hx::Anon_obj::Create(1)
-            			->setFixed(0,HX_("fields",79,8e,8e,80), ::Dynamic(::hx::Anon_obj::Create(11)
+            			->setFixed(0,HX_("fields",79,8e,8e,80), ::Dynamic(::hx::Anon_obj::Create(12)
             				->setFixed(0,HX_("type__fromC",ff,a8,6c,93), ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("HaxeCBridge.wrapper",8b,ea,27,d4),null())))
             				->setFixed(1,HX_("chatId__fromC",06,fc,b1,94), ::Dynamic(::hx::Anon_obj::Create(1)
@@ -435,19 +456,21 @@ HXDLIN(  16)		__mClass->__meta__ =  ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("HaxeCBridge.wrapper",8b,ea,27,d4),null())))
             				->setFixed(3,HX_("title__fromC",e1,bd,61,c7), ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("HaxeCBridge.wrapper",8b,ea,27,d4),null())))
-            				->setFixed(4,HX_("timestamp__fromC",63,82,8b,d7), ::Dynamic(::hx::Anon_obj::Create(1)
+            				->setFixed(4,HX_("senderId__fromC",89,0f,49,cb), ::Dynamic(::hx::Anon_obj::Create(1)
+            					->setFixed(0,HX_("HaxeCBridge.wrapper",8b,ea,27,d4),null())))
+            				->setFixed(5,HX_("timestamp__fromC",63,82,8b,d7), ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("HaxeCBridge.wrapper",8b,ea,27,d4),null())))
-            				->setFixed(5,HX_("messageId__fromC",37,4f,fb,ef), ::Dynamic(::hx::Anon_obj::Create(1)
+            				->setFixed(6,HX_("messageId__fromC",37,4f,fb,ef), ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("HaxeCBridge.wrapper",8b,ea,27,d4),null())))
-            				->setFixed(6,HX_("callStatus__fromC",09,60,e6,01), ::Dynamic(::hx::Anon_obj::Create(1)
+            				->setFixed(7,HX_("callStatus__fromC",09,60,e6,01), ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("HaxeCBridge.wrapper",8b,ea,27,d4),null())))
-            				->setFixed(7,HX_("accountId__fromC",91,7b,51,1b), ::Dynamic(::hx::Anon_obj::Create(1)
+            				->setFixed(8,HX_("accountId__fromC",91,7b,51,1b), ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("HaxeCBridge.wrapper",8b,ea,27,d4),null())))
-            				->setFixed(8,HX_("lang__fromC",4b,24,00,52), ::Dynamic(::hx::Anon_obj::Create(1)
+            				->setFixed(9,HX_("lang__fromC",4b,24,00,52), ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("HaxeCBridge.wrapper",8b,ea,27,d4),null())))
-            				->setFixed(9,HX_("imageUri__fromC",c8,cd,8d,67), ::Dynamic(::hx::Anon_obj::Create(1)
+            				->setFixed(10,HX_("imageUri__fromC",c8,cd,8d,67), ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("HaxeCBridge.wrapper",8b,ea,27,d4),null())))
-            				->setFixed(10,HX_("callSid__fromC",69,3d,58,77), ::Dynamic(::hx::Anon_obj::Create(1)
+            				->setFixed(11,HX_("callSid__fromC",69,3d,58,77), ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("HaxeCBridge.wrapper",8b,ea,27,d4),null()))))));
             	}
 }
diff --git a/Sources/c_snikket/src/snikket/Push.cpp b/Sources/c_snikket/src/snikket/Push.cpp
index 75538c8..c11dcb6 100644
--- a/Sources/c_snikket/src/snikket/Push.cpp
+++ b/Sources/c_snikket/src/snikket/Push.cpp
@@ -30,6 +30,7 @@
 #endif
 
 HX_LOCAL_STACK_FRAME(_hx_pos_f43ad8fb7d9b8ef0_21_receive,"snikket.Push","receive",0x2faa9e00,"snikket.Push.receive","snikket/Push.hx",21,0xbce40632)
+HX_LOCAL_STACK_FRAME(_hx_pos_f43ad8fb7d9b8ef0_34_receive,"snikket.Push","receive",0x2faa9e00,"snikket.Push.receive","snikket/Push.hx",34,0xbce40632)
 namespace snikket{
 
 void Push_obj::__construct() { }
@@ -80,10 +81,17 @@ HXLINE(  30)			return null();
             		}
 HXLINE(  32)		 ::snikket::ChatMessage message = ::snikket::ChatMessage_obj::fromStanza(stanza,::snikket::JID_obj::parse(( (::String)(::Reflect_obj::field(stanza->attr,HX_("to",7b,65,00,00))) ))->asBare(),null());
 HXLINE(  33)		if (::hx::IsNotNull( message )) {
-HXLINE(  34)			return ::snikket::Notification_obj::fromChatMessage(message);
+            			HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_0) HXARGC(1)
+            			void _hx_run(::Array< ::Dynamic> _){
+            				HX_STACKFRAME(&_hx_pos_f43ad8fb7d9b8ef0_34_receive)
+            			}
+            			HX_END_LOCAL_FUNC1((void))
+
+HXLINE(  34)			::snikket::Persistence_obj::storeMessages(persistence,message->account(),::Array_obj< ::Dynamic>::__new(1)->init(0,message), ::Dynamic(new _hx_Closure_0()));
+HXLINE(  35)			return ::snikket::Notification_obj::fromChatMessage(message);
             		}
             		else {
-HXLINE(  36)			return ::snikket::Notification_obj::fromThinStanza(stanza);
+HXLINE(  37)			return ::snikket::Notification_obj::fromThinStanza(stanza);
             		}
 HXLINE(  33)		return null();
             	}
diff --git a/Sources/c_snikket/src/snikket/SerializedChat.cpp b/Sources/c_snikket/src/snikket/SerializedChat.cpp
index 1f215f8..d67760f 100644
--- a/Sources/c_snikket/src/snikket/SerializedChat.cpp
+++ b/Sources/c_snikket/src/snikket/SerializedChat.cpp
@@ -1,9 +1,6 @@
 // Generated by Haxe 4.3.3
 #include <hxcpp.h>
 
-#ifndef INCLUDED_Xml
-#include <Xml.h>
-#endif
 #ifndef INCLUDED_haxe_IMap
 #include <haxe/IMap.h>
 #endif
@@ -50,54 +47,54 @@
 #include <snikket/_Stanza/NodeInterface.h>
 #endif
 
-HX_DEFINE_STACK_FRAME(_hx_pos_59459d97d9a61381_1570_new,"snikket.SerializedChat","new",0xcbfecbdf,"snikket.SerializedChat.new","snikket/Chat.hx",1570,0x18616bf4)
-HX_LOCAL_STACK_FRAME(_hx_pos_59459d97d9a61381_1588_toChat,"snikket.SerializedChat","toChat",0x0e8ec7d4,"snikket.SerializedChat.toChat","snikket/Chat.hx",1588,0x18616bf4)
+HX_DEFINE_STACK_FRAME(_hx_pos_59459d97d9a61381_1579_new,"snikket.SerializedChat","new",0xcbfecbdf,"snikket.SerializedChat.new","snikket/Chat.hx",1579,0x18616bf4)
+HX_LOCAL_STACK_FRAME(_hx_pos_59459d97d9a61381_1597_toChat,"snikket.SerializedChat","toChat",0x0e8ec7d4,"snikket.SerializedChat.toChat","snikket/Chat.hx",1597,0x18616bf4)
 static const ::String _hx_array_data_8cddf06d_3[] = {
 	HX_("http://jabber.org/protocol/muc",07,b2,7f,c6),
 };
 namespace snikket{
 
 void SerializedChat_obj::__construct(::String chatId,bool trusted,::Array< unsigned char > avatarSha1, ::haxe::ds::StringMap presence,::String displayName, ::Dynamic uiState, ::Dynamic isBlocked,::String extensions,::String readUpToId,::String readUpToBy, ::Dynamic notificationsFiltered,bool notifyMention,bool notifyReply, ::snikket::Caps disco,::String klass){
-            	HX_STACKFRAME(&_hx_pos_59459d97d9a61381_1570_new)
-HXLINE(1571)		this->chatId = chatId;
-HXLINE(1572)		this->trusted = trusted;
-HXLINE(1573)		this->avatarSha1 = avatarSha1;
-HXLINE(1574)		this->presence = presence;
-HXLINE(1575)		this->displayName = displayName;
-HXLINE(1576)		 ::Dynamic tmp = uiState;
-HXDLIN(1576)		int _hx_tmp;
-HXDLIN(1576)		if (::hx::IsNotNull( tmp )) {
-HXLINE(1576)			_hx_tmp = ( (int)(tmp) );
+            	HX_STACKFRAME(&_hx_pos_59459d97d9a61381_1579_new)
+HXLINE(1580)		this->chatId = chatId;
+HXLINE(1581)		this->trusted = trusted;
+HXLINE(1582)		this->avatarSha1 = avatarSha1;
+HXLINE(1583)		this->presence = presence;
+HXLINE(1584)		this->displayName = displayName;
+HXLINE(1585)		 ::Dynamic tmp = uiState;
+HXDLIN(1585)		int _hx_tmp;
+HXDLIN(1585)		if (::hx::IsNotNull( tmp )) {
+HXLINE(1585)			_hx_tmp = ( (int)(tmp) );
             		}
             		else {
-HXLINE(1576)			_hx_tmp = 1;
+HXLINE(1585)			_hx_tmp = 1;
             		}
-HXDLIN(1576)		this->uiState = _hx_tmp;
-HXLINE(1577)		 ::Dynamic tmp1 = isBlocked;
-HXDLIN(1577)		bool _hx_tmp1;
-HXDLIN(1577)		if (::hx::IsNotNull( tmp1 )) {
-HXLINE(1577)			_hx_tmp1 = ( (bool)(tmp1) );
+HXDLIN(1585)		this->uiState = _hx_tmp;
+HXLINE(1586)		 ::Dynamic tmp1 = isBlocked;
+HXDLIN(1586)		bool _hx_tmp1;
+HXDLIN(1586)		if (::hx::IsNotNull( tmp1 )) {
+HXLINE(1586)			_hx_tmp1 = ( (bool)(tmp1) );
             		}
             		else {
-HXLINE(1577)			_hx_tmp1 = false;
+HXLINE(1586)			_hx_tmp1 = false;
             		}
-HXDLIN(1577)		this->isBlocked = _hx_tmp1;
-HXLINE(1578)		::String tmp2 = extensions;
-HXDLIN(1578)		::String _hx_tmp2;
-HXDLIN(1578)		if (::hx::IsNotNull( tmp2 )) {
-HXLINE(1578)			_hx_tmp2 = tmp2;
+HXDLIN(1586)		this->isBlocked = _hx_tmp1;
+HXLINE(1587)		::String tmp2 = extensions;
+HXDLIN(1587)		::String _hx_tmp2;
+HXDLIN(1587)		if (::hx::IsNotNull( tmp2 )) {
+HXLINE(1587)			_hx_tmp2 = tmp2;
             		}
             		else {
-HXLINE(1578)			_hx_tmp2 = HX_("<extensions xmlns='urn:app:bookmarks:1' />",84,43,42,a9);
+HXLINE(1587)			_hx_tmp2 = HX_("<extensions xmlns='urn:app:bookmarks:1' />",84,43,42,a9);
             		}
-HXDLIN(1578)		this->extensions = _hx_tmp2;
-HXLINE(1579)		this->readUpToId = readUpToId;
-HXLINE(1580)		this->readUpToBy = readUpToBy;
-HXLINE(1581)		this->notificationsFiltered = notificationsFiltered;
-HXLINE(1582)		this->notifyMention = notifyMention;
-HXLINE(1583)		this->notifyReply = notifyReply;
-HXLINE(1584)		this->disco = disco;
-HXLINE(1585)		this->klass = klass;
+HXDLIN(1587)		this->extensions = _hx_tmp2;
+HXLINE(1588)		this->readUpToId = readUpToId;
+HXLINE(1589)		this->readUpToBy = readUpToBy;
+HXLINE(1590)		this->notificationsFiltered = notificationsFiltered;
+HXLINE(1591)		this->notifyMention = notifyMention;
+HXLINE(1592)		this->notifyReply = notifyReply;
+HXLINE(1593)		this->disco = disco;
+HXLINE(1594)		this->klass = klass;
             	}
 
 Dynamic SerializedChat_obj::__CreateEmpty() { return new SerializedChat_obj; }
@@ -116,72 +113,72 @@ bool SerializedChat_obj::_hx_isInstanceOf(int inClassId) {
 }
 
  ::snikket::Chat SerializedChat_obj::toChat( ::snikket::Client client, ::snikket::GenericStream stream,::Dynamic persistence){
-            	HX_GC_STACKFRAME(&_hx_pos_59459d97d9a61381_1588_toChat)
-HXLINE(1589)		 ::snikket::Stanza extensionsStanza = ::snikket::Stanza_obj::fromXml(::Xml_obj::parse(this->extensions));
-HXLINE(1590)		bool filterN;
-HXDLIN(1590)		 ::Dynamic tmp = this->notificationsFiltered;
-HXDLIN(1590)		if (::hx::IsNotNull( tmp )) {
-HXLINE(1590)			filterN = ( (bool)(tmp) );
+            	HX_GC_STACKFRAME(&_hx_pos_59459d97d9a61381_1597_toChat)
+HXLINE(1598)		 ::snikket::Stanza extensionsStanza = ::snikket::Stanza_obj::parse(this->extensions);
+HXLINE(1599)		bool filterN;
+HXDLIN(1599)		 ::Dynamic tmp = this->notificationsFiltered;
+HXDLIN(1599)		if (::hx::IsNotNull( tmp )) {
+HXLINE(1599)			filterN = ( (bool)(tmp) );
             		}
             		else {
-HXLINE(1590)			filterN = false;
+HXLINE(1599)			filterN = false;
             		}
-HXLINE(1591)		bool mention = this->notifyMention;
-HXLINE(1593)		 ::snikket::Chat chat;
-HXDLIN(1593)		if ((this->klass == HX_("DirectChat",c1,22,a3,05))) {
-HXLINE(1593)			chat =  ::snikket::DirectChat_obj::__alloc( HX_CTX ,client,stream,persistence,this->chatId,this->uiState,this->isBlocked,extensionsStanza,this->readUpToId,this->readUpToBy);
+HXLINE(1600)		bool mention = this->notifyMention;
+HXLINE(1602)		 ::snikket::Chat chat;
+HXDLIN(1602)		if ((this->klass == HX_("DirectChat",c1,22,a3,05))) {
+HXLINE(1602)			chat =  ::snikket::DirectChat_obj::__alloc( HX_CTX ,client,stream,persistence,this->chatId,this->uiState,this->isBlocked,extensionsStanza,this->readUpToId,this->readUpToBy);
             		}
             		else {
-HXLINE(1595)			if ((this->klass == HX_("Channel",a3,28,23,9a))) {
-HXLINE(1596)				 ::snikket::Channel channel =  ::snikket::Channel_obj::__alloc( HX_CTX ,client,stream,persistence,this->chatId,this->uiState,this->isBlocked,extensionsStanza,this->readUpToId,this->readUpToBy,null());
-HXLINE(1597)				 ::snikket::Caps tmp1 = this->disco;
-HXDLIN(1597)				 ::snikket::Caps chat1;
-HXDLIN(1597)				if (::hx::IsNotNull( tmp1 )) {
-HXLINE(1597)					chat1 = tmp1;
+HXLINE(1604)			if ((this->klass == HX_("Channel",a3,28,23,9a))) {
+HXLINE(1605)				 ::snikket::Channel channel =  ::snikket::Channel_obj::__alloc( HX_CTX ,client,stream,persistence,this->chatId,this->uiState,this->isBlocked,extensionsStanza,this->readUpToId,this->readUpToBy,null());
+HXLINE(1606)				 ::snikket::Caps tmp1 = this->disco;
+HXDLIN(1606)				 ::snikket::Caps chat1;
+HXDLIN(1606)				if (::hx::IsNotNull( tmp1 )) {
+HXLINE(1606)					chat1 = tmp1;
             				}
             				else {
-HXLINE(1597)					chat1 =  ::snikket::Caps_obj::__alloc( HX_CTX ,HX_("",00,00,00,00),::Array_obj< ::Dynamic>::__new(0),::Array_obj< ::String >::fromData( _hx_array_data_8cddf06d_3,1));
+HXLINE(1606)					chat1 =  ::snikket::Caps_obj::__alloc( HX_CTX ,HX_("",00,00,00,00),::Array_obj< ::Dynamic>::__new(0),::Array_obj< ::String >::fromData( _hx_array_data_8cddf06d_3,1),null());
             				}
-HXDLIN(1597)				channel->disco = chat1;
-HXLINE(1598)				bool chat2;
-HXDLIN(1598)				if (::hx::IsNull( this->notificationsFiltered )) {
-HXLINE(1598)					chat2 = !(channel->isPrivate());
+HXDLIN(1606)				channel->disco = chat1;
+HXLINE(1607)				bool chat2;
+HXDLIN(1607)				if (::hx::IsNull( this->notificationsFiltered )) {
+HXLINE(1607)					chat2 = !(channel->isPrivate());
             				}
             				else {
-HXLINE(1598)					chat2 = false;
+HXLINE(1607)					chat2 = false;
             				}
-HXDLIN(1598)				if (chat2) {
-HXLINE(1599)					filterN = true;
-HXDLIN(1599)					mention = filterN;
+HXDLIN(1607)				if (chat2) {
+HXLINE(1608)					filterN = true;
+HXDLIN(1608)					mention = filterN;
             				}
-HXLINE(1593)				chat = channel;
+HXLINE(1602)				chat = channel;
             			}
             			else {
-HXLINE(1603)				HX_STACK_DO_THROW((((HX_("Unknown class of ",0b,cb,7f,f2) + this->chatId) + HX_(": ",a6,32,00,00)) + this->klass));
+HXLINE(1612)				HX_STACK_DO_THROW((((HX_("Unknown class of ",0b,cb,7f,f2) + this->chatId) + HX_(": ",a6,32,00,00)) + this->klass));
             			}
             		}
-HXLINE(1605)		chat->setNotifications(filterN,mention,this->notifyReply);
-HXLINE(1606)		if (::hx::IsNotNull( this->displayName )) {
-HXLINE(1606)			chat->displayName = this->displayName;
+HXLINE(1614)		chat->setNotificationsInternal(filterN,mention,this->notifyReply);
+HXLINE(1615)		if (::hx::IsNotNull( this->displayName )) {
+HXLINE(1615)			chat->displayName = this->displayName;
             		}
-HXLINE(1607)		if (::hx::IsNotNull( this->avatarSha1 )) {
-HXLINE(1607)			chat->setAvatarSha1(this->avatarSha1);
+HXLINE(1616)		if (::hx::IsNotNull( this->avatarSha1 )) {
+HXLINE(1616)			chat->setAvatarSha1(this->avatarSha1);
             		}
-HXLINE(1608)		chat->setTrusted(this->trusted);
-HXLINE(1609)		{
-HXLINE(1609)			::Dynamic map = this->presence;
-HXDLIN(1609)			::Dynamic _g_map = map;
-HXDLIN(1609)			 ::Dynamic _g_keys = ::haxe::IMap_obj::keys(map);
-HXDLIN(1609)			while(( (bool)(_g_keys->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE(1609)				::String key = ( (::String)(_g_keys->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
-HXDLIN(1609)				 ::snikket::Presence _g_value = ( ( ::snikket::Presence)(::haxe::IMap_obj::get(_g_map,key)) );
-HXDLIN(1609)				::String _g_key = key;
-HXDLIN(1609)				::String resource = _g_key;
-HXDLIN(1609)				 ::snikket::Presence p = _g_value;
-HXLINE(1610)				chat->setPresence(resource,p);
+HXLINE(1617)		chat->setTrusted(this->trusted);
+HXLINE(1618)		{
+HXLINE(1618)			::Dynamic map = this->presence;
+HXDLIN(1618)			::Dynamic _g_map = map;
+HXDLIN(1618)			 ::Dynamic _g_keys = ::haxe::IMap_obj::keys(map);
+HXDLIN(1618)			while(( (bool)(_g_keys->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE(1618)				::String key = ( (::String)(_g_keys->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
+HXDLIN(1618)				 ::snikket::Presence _g_value = ( ( ::snikket::Presence)(::haxe::IMap_obj::get(_g_map,key)) );
+HXDLIN(1618)				::String _g_key = key;
+HXDLIN(1618)				::String resource = _g_key;
+HXDLIN(1618)				 ::snikket::Presence p = _g_value;
+HXLINE(1619)				chat->setPresence(resource,p);
             			}
             		}
-HXLINE(1612)		return chat;
+HXLINE(1621)		return chat;
             	}
 
 
diff --git a/Sources/c_snikket/src/snikket/Stanza.cpp b/Sources/c_snikket/src/snikket/Stanza.cpp
index 91f44cd..f021451 100644
--- a/Sources/c_snikket/src/snikket/Stanza.cpp
+++ b/Sources/c_snikket/src/snikket/Stanza.cpp
@@ -7,6 +7,12 @@
 #ifndef INCLUDED_Reflect
 #include <Reflect.h>
 #endif
+#ifndef INCLUDED_Std
+#include <Std.h>
+#endif
+#ifndef INCLUDED_StringBuf
+#include <StringBuf.h>
+#endif
 #ifndef INCLUDED_Xml
 #include <Xml.h>
 #endif
@@ -19,6 +25,12 @@
 #ifndef INCLUDED_haxe_xml_Printer
 #include <haxe/xml/Printer.h>
 #endif
+#ifndef INCLUDED_snikket_EventEmitter
+#include <snikket/EventEmitter.h>
+#endif
+#ifndef INCLUDED_snikket_GenericStream
+#include <snikket/GenericStream.h>
+#endif
 #ifndef INCLUDED_snikket_Node
 #include <snikket/Node.h>
 #endif
@@ -28,55 +40,70 @@
 #ifndef INCLUDED_snikket_StanzaError
 #include <snikket/StanzaError.h>
 #endif
-#ifndef INCLUDED_snikket_TextNode
-#include <snikket/TextNode.h>
+#ifndef INCLUDED_snikket_TextNodeClass
+#include <snikket/TextNodeClass.h>
 #endif
 #ifndef INCLUDED_snikket__Stanza_NodeInterface
 #include <snikket/_Stanza/NodeInterface.h>
 #endif
+#ifndef INCLUDED_snikket__Util_Util_Fields_
+#include <snikket/_Util/Util_Fields_.h>
+#endif
+#ifndef INCLUDED_snikket_streams_XmppStropheStream
+#include <snikket/streams/XmppStropheStream.h>
+#endif
 
-HX_DEFINE_STACK_FRAME(_hx_pos_77777da2cc20dfea_54_new,"snikket.Stanza","new",0x8db01dd8,"snikket.Stanza.new","snikket/Stanza.hx",54,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_69_serialize,"snikket.Stanza","serialize",0x62161558,"snikket.Stanza.serialize","snikket/Stanza.hx",69,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_91_toString,"snikket.Stanza","toString",0x332eb034,"snikket.Stanza.toString","snikket/Stanza.hx",91,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_122_tag,"snikket.Stanza","tag",0x8db4a7d2,"snikket.Stanza.tag","snikket/Stanza.hx",122,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_130_text,"snikket.Stanza","text",0x70614835,"snikket.Stanza.text","snikket/Stanza.hx",130,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_135_textTag,"snikket.Stanza","textTag",0xfce41925,"snikket.Stanza.textTag","snikket/Stanza.hx",135,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_140_up,"snikket.Stanza","up",0x792c6fe3,"snikket.Stanza.up","snikket/Stanza.hx",140,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_147_reset,"snikket.Stanza","reset",0xbdece547,"snikket.Stanza.reset","snikket/Stanza.hx",147,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_153_addChildren,"snikket.Stanza","addChildren",0x68e0d5f8,"snikket.Stanza.addChildren","snikket/Stanza.hx",153,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_161_addChildNodes,"snikket.Stanza","addChildNodes",0x4f6445ee,"snikket.Stanza.addChildNodes","snikket/Stanza.hx",161,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_168_addChild,"snikket.Stanza","addChild",0xb9d6af43,"snikket.Stanza.addChild","snikket/Stanza.hx",168,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_173_addDirectChild,"snikket.Stanza","addDirectChild",0xf89df69a,"snikket.Stanza.addDirectChild","snikket/Stanza.hx",173,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_178_clone,"snikket.Stanza","clone",0x1f87aed5,"snikket.Stanza.clone","snikket/Stanza.hx",178,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_189_allTags,"snikket.Stanza","allTags",0xb55fe812,"snikket.Stanza.allTags","snikket/Stanza.hx",189,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_211_allText,"snikket.Stanza","allText",0xb562ffe6,"snikket.Stanza.allText","snikket/Stanza.hx",211,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_222_getFirstChild,"snikket.Stanza","getFirstChild",0x86eb22fa,"snikket.Stanza.getFirstChild","snikket/Stanza.hx",222,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_225_getChildren,"snikket.Stanza","getChildren",0x5d78616d,"snikket.Stanza.getChildren","snikket/Stanza.hx",225,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_232_getChild,"snikket.Stanza","getChild",0xa05098ae,"snikket.Stanza.getChild","snikket/Stanza.hx",232,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_249_getChildText,"snikket.Stanza","getChildText",0x5808807b,"snikket.Stanza.getChildText","snikket/Stanza.hx",249,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_258_getText,"snikket.Stanza","getText",0x7d98e5db,"snikket.Stanza.getText","snikket/Stanza.hx",258,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_261_find,"snikket.Stanza","find",0x67234bc1,"snikket.Stanza.find","snikket/Stanza.hx",261,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_299_findChild,"snikket.Stanza","findChild",0xa1d4921b,"snikket.Stanza.findChild","snikket/Stanza.hx",299,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_310_findText,"snikket.Stanza","findText",0x9a4db90e,"snikket.Stanza.findText","snikket/Stanza.hx",310,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_321_traverse,"snikket.Stanza","traverse",0x672a5d3a,"snikket.Stanza.traverse","snikket/Stanza.hx",321,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_330_getError,"snikket.Stanza","getError",0xcdc0bada,"snikket.Stanza.getError","snikket/Stanza.hx",330,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_342_removeChildren,"snikket.Stanza","removeChildren",0x98988b2b,"snikket.Stanza.removeChildren","snikket/Stanza.hx",342,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_95_parse,"snikket.Stanza","parse",0x947a2bab,"snikket.Stanza.parse","snikket/Stanza.hx",95,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_100_fromXml,"snikket.Stanza","fromXml",0xb622a805,"snikket.Stanza.fromXml","snikket/Stanza.hx",100,0x3976dc77)
-HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_355_parseXmlBool,"snikket.Stanza","parseXmlBool",0x3825ed36,"snikket.Stanza.parseXmlBool","snikket/Stanza.hx",355,0x3976dc77)
+HX_DEFINE_STACK_FRAME(_hx_pos_77777da2cc20dfea_83_new,"snikket.Stanza","new",0x8db01dd8,"snikket.Stanza.new","snikket/Stanza.hx",83,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_98_serialize,"snikket.Stanza","serialize",0x62161558,"snikket.Stanza.serialize","snikket/Stanza.hx",98,0x3976dc77)
+static const ::String _hx_array_data_77ae91e6_4[] = {
+	HX_(">",3e,00,00,00),
+};
+static const ::String _hx_array_data_77ae91e6_5[] = {
+	HX_("</",73,34,00,00),
+};
+static const ::String _hx_array_data_77ae91e6_6[] = {
+	HX_(">",3e,00,00,00),
+};
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_124_toString,"snikket.Stanza","toString",0x332eb034,"snikket.Stanza.toString","snikket/Stanza.hx",124,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_159_tag,"snikket.Stanza","tag",0x8db4a7d2,"snikket.Stanza.tag","snikket/Stanza.hx",159,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_167_text,"snikket.Stanza","text",0x70614835,"snikket.Stanza.text","snikket/Stanza.hx",167,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_172_textTag,"snikket.Stanza","textTag",0xfce41925,"snikket.Stanza.textTag","snikket/Stanza.hx",172,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_177_up,"snikket.Stanza","up",0x792c6fe3,"snikket.Stanza.up","snikket/Stanza.hx",177,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_184_reset,"snikket.Stanza","reset",0xbdece547,"snikket.Stanza.reset","snikket/Stanza.hx",184,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_190_addChildren,"snikket.Stanza","addChildren",0x68e0d5f8,"snikket.Stanza.addChildren","snikket/Stanza.hx",190,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_198_addChildNodes,"snikket.Stanza","addChildNodes",0x4f6445ee,"snikket.Stanza.addChildNodes","snikket/Stanza.hx",198,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_205_addChild,"snikket.Stanza","addChild",0xb9d6af43,"snikket.Stanza.addChild","snikket/Stanza.hx",205,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_210_addDirectChild,"snikket.Stanza","addDirectChild",0xf89df69a,"snikket.Stanza.addDirectChild","snikket/Stanza.hx",210,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_215_clone,"snikket.Stanza","clone",0x1f87aed5,"snikket.Stanza.clone","snikket/Stanza.hx",215,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_226_allTags,"snikket.Stanza","allTags",0xb55fe812,"snikket.Stanza.allTags","snikket/Stanza.hx",226,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_248_allText,"snikket.Stanza","allText",0xb562ffe6,"snikket.Stanza.allText","snikket/Stanza.hx",248,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_259_getFirstChild,"snikket.Stanza","getFirstChild",0x86eb22fa,"snikket.Stanza.getFirstChild","snikket/Stanza.hx",259,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_262_getChildren,"snikket.Stanza","getChildren",0x5d78616d,"snikket.Stanza.getChildren","snikket/Stanza.hx",262,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_269_getChild,"snikket.Stanza","getChild",0xa05098ae,"snikket.Stanza.getChild","snikket/Stanza.hx",269,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_286_getChildText,"snikket.Stanza","getChildText",0x5808807b,"snikket.Stanza.getChildText","snikket/Stanza.hx",286,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_295_getText,"snikket.Stanza","getText",0x7d98e5db,"snikket.Stanza.getText","snikket/Stanza.hx",295,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_298_find,"snikket.Stanza","find",0x67234bc1,"snikket.Stanza.find","snikket/Stanza.hx",298,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_336_findChild,"snikket.Stanza","findChild",0xa1d4921b,"snikket.Stanza.findChild","snikket/Stanza.hx",336,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_347_findText,"snikket.Stanza","findText",0x9a4db90e,"snikket.Stanza.findText","snikket/Stanza.hx",347,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_358_traverse,"snikket.Stanza","traverse",0x672a5d3a,"snikket.Stanza.traverse","snikket/Stanza.hx",358,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_367_getError,"snikket.Stanza","getError",0xcdc0bada,"snikket.Stanza.getError","snikket/Stanza.hx",367,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_379_removeChildren,"snikket.Stanza","removeChildren",0x98988b2b,"snikket.Stanza.removeChildren","snikket/Stanza.hx",379,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_129_parse,"snikket.Stanza","parse",0x947a2bab,"snikket.Stanza.parse","snikket/Stanza.hx",129,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_137_fromXml,"snikket.Stanza","fromXml",0xb622a805,"snikket.Stanza.fromXml","snikket/Stanza.hx",137,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_77777da2cc20dfea_392_parseXmlBool,"snikket.Stanza","parseXmlBool",0x3825ed36,"snikket.Stanza.parseXmlBool","snikket/Stanza.hx",392,0x3976dc77)
 namespace snikket{
 
 void Stanza_obj::__construct(::String name, ::Dynamic attr){
-            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_54_new)
-HXLINE(  59)		this->last_added_stack = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE(  57)		this->children = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE(  56)		this->attr =  ::Dynamic(::hx::Anon_obj::Create(0));
-HXLINE(  55)		this->name = null();
-HXLINE(  62)		this->name = name;
-HXLINE(  63)		if (::hx::IsNotNull( attr )) {
-HXLINE(  64)			this->attr = attr;
+            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_83_new)
+HXLINE(  88)		this->last_added_stack = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE(  86)		this->children = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE(  85)		this->attr =  ::Dynamic(::hx::Anon_obj::Create(0));
+HXLINE(  84)		this->name = null();
+HXLINE(  91)		this->name = name;
+HXLINE(  92)		if (::hx::IsNotNull( attr )) {
+HXLINE(  93)			this->attr = attr;
             		}
-HXLINE(  66)		this->last_added = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE(  95)		this->last_added = ::hx::ObjectPtr<OBJ_>(this);
             	}
 
 Dynamic Stanza_obj::__CreateEmpty() { return new Stanza_obj; }
@@ -114,718 +141,786 @@ void *Stanza_obj::_hx_getInterface(int inHash) {
 }
 
 ::String Stanza_obj::serialize(){
-            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_69_serialize)
-HXLINE(  70)		 ::Xml el = ::Xml_obj::createElement(this->name);
-HXLINE(  71)		{
-HXLINE(  71)			int _g = 0;
-HXDLIN(  71)			::Array< ::String > _g1 = ::Reflect_obj::fields(this->attr);
-HXDLIN(  71)			while((_g < _g1->length)){
-HXLINE(  71)				::String attr_k = _g1->__get(_g);
-HXDLIN(  71)				_g = (_g + 1);
-HXLINE(  72)				el->set(attr_k,( (::String)(::Reflect_obj::field(this->attr,attr_k)) ));
+            	HX_GC_STACKFRAME(&_hx_pos_77777da2cc20dfea_98_serialize)
+HXLINE(  99)		 ::Xml el = ::Xml_obj::createElement(this->name);
+HXLINE( 100)		{
+HXLINE( 100)			int _g = 0;
+HXDLIN( 100)			::Array< ::String > _g1 = ::Reflect_obj::fields(this->attr);
+HXDLIN( 100)			while((_g < _g1->length)){
+HXLINE( 100)				::String attr_k = _g1->__get(_g);
+HXDLIN( 100)				_g = (_g + 1);
+HXLINE( 101)				el->set(attr_k,( (::String)(::Reflect_obj::field(this->attr,attr_k)) ));
             			}
             		}
-HXLINE(  75)		if ((this->children->length == 0)) {
-HXLINE(  76)			return ::haxe::xml::Printer_obj::print(el,null());
+HXLINE( 104)		if ((this->children->length == 0)) {
+HXLINE( 105)			return ::haxe::xml::Printer_obj::print(el,null());
             		}
-HXLINE(  78)		::String serialized = ::haxe::xml::Printer_obj::print(el,null());
-HXLINE(  79)		::Array< ::String > buffer = ::Array_obj< ::String >::__new(1)->init(0,(serialized.substring(0,(serialized.length - 2)) + HX_(">",3e,00,00,00)));
-HXLINE(  80)		{
-HXLINE(  80)			int _g2 = 0;
-HXDLIN(  80)			::Array< ::Dynamic> _g3 = this->children;
-HXDLIN(  80)			while((_g2 < _g3->length)){
-HXLINE(  80)				 ::snikket::Node child = _g3->__get(_g2).StaticCast<  ::snikket::Node >();
-HXDLIN(  80)				_g2 = (_g2 + 1);
-HXLINE(  81)				::String _hx_tmp;
-HXDLIN(  81)				switch((int)(child->_hx_getIndex())){
-            					case (int)0: {
-HXLINE(  82)						 ::snikket::Stanza c = child->_hx_getObject(0).StaticCast<  ::snikket::Stanza >();
-HXLINE(  81)						_hx_tmp = c->serialize();
+HXLINE( 107)		::String serialized = ::haxe::xml::Printer_obj::print(el,null());
+HXLINE( 108)		 ::StringBuf buffer =  ::StringBuf_obj::__alloc( HX_CTX );
+HXLINE( 109)		{
+HXLINE( 109)			 ::Dynamic len = (serialized.length - 2);
+HXDLIN( 109)			if (::hx::IsNotNull( buffer->charBuf )) {
+HXLINE( 109)				buffer->flush();
+            			}
+HXDLIN( 109)			if (::hx::IsNull( buffer->b )) {
+HXLINE( 109)				buffer->b = ::Array_obj< ::String >::__new(1)->init(0,serialized.substr(0,len));
+            			}
+            			else {
+HXLINE( 109)				::Array< ::String > buffer1 = buffer->b;
+HXDLIN( 109)				buffer1->push(serialized.substr(0,len));
+            			}
+            		}
+HXLINE( 110)		{
+HXLINE( 110)			if (::hx::IsNotNull( buffer->charBuf )) {
+HXLINE( 110)				buffer->flush();
+            			}
+HXDLIN( 110)			if (::hx::IsNull( buffer->b )) {
+HXLINE( 110)				buffer->b = ::Array_obj< ::String >::fromData( _hx_array_data_77ae91e6_4,1);
+            			}
+            			else {
+HXLINE( 110)				buffer->b->push(HX_(">",3e,00,00,00));
+            			}
+            		}
+HXLINE( 111)		{
+HXLINE( 111)			int _g2 = 0;
+HXDLIN( 111)			::Array< ::Dynamic> _g3 = this->children;
+HXDLIN( 111)			while((_g2 < _g3->length)){
+HXLINE( 111)				 ::snikket::Node child = _g3->__get(_g2).StaticCast<  ::snikket::Node >();
+HXDLIN( 111)				_g2 = (_g2 + 1);
+HXLINE( 112)				{
+HXLINE( 112)					::String x;
+HXDLIN( 112)					switch((int)(child->_hx_getIndex())){
+            						case (int)0: {
+HXLINE( 113)							 ::snikket::Stanza c = child->_hx_getObject(0).StaticCast<  ::snikket::Stanza >();
+HXLINE( 112)							x = c->serialize();
+            						}
+            						break;
+            						case (int)1: {
+HXLINE( 114)							::String c1 = child->_hx_getString(0);
+HXLINE( 112)							x = ::snikket::_Util::Util_Fields__obj::xmlEscape(c1);
+            						}
+            						break;
             					}
-            					break;
-            					case (int)1: {
-HXLINE(  83)						 ::snikket::TextNode c1 = child->_hx_getObject(0).StaticCast<  ::snikket::TextNode >();
-HXLINE(  81)						_hx_tmp = c1->serialize();
+HXDLIN( 112)					if (::hx::IsNotNull( buffer->charBuf )) {
+HXLINE( 112)						buffer->flush();
+            					}
+HXDLIN( 112)					if (::hx::IsNull( buffer->b )) {
+HXLINE( 112)						buffer->b = ::Array_obj< ::String >::__new(1)->init(0,::Std_obj::string(x));
+            					}
+            					else {
+HXLINE( 112)						::Array< ::String > buffer2 = buffer->b;
+HXDLIN( 112)						buffer2->push(::Std_obj::string(x));
             					}
-            					break;
             				}
-HXDLIN(  81)				buffer->push(_hx_tmp);
             			}
             		}
-HXLINE(  86)		buffer->push(((HX_("</",73,34,00,00) + this->name) + HX_(">",3e,00,00,00)));
-HXLINE(  87)		return buffer->join(HX_("",00,00,00,00));
+HXLINE( 117)		{
+HXLINE( 117)			if (::hx::IsNotNull( buffer->charBuf )) {
+HXLINE( 117)				buffer->flush();
+            			}
+HXDLIN( 117)			if (::hx::IsNull( buffer->b )) {
+HXLINE( 117)				buffer->b = ::Array_obj< ::String >::fromData( _hx_array_data_77ae91e6_5,1);
+            			}
+            			else {
+HXLINE( 117)				buffer->b->push(HX_("</",73,34,00,00));
+            			}
+            		}
+HXLINE( 118)		{
+HXLINE( 118)			::String x1 = this->name;
+HXDLIN( 118)			if (::hx::IsNotNull( buffer->charBuf )) {
+HXLINE( 118)				buffer->flush();
+            			}
+HXDLIN( 118)			if (::hx::IsNull( buffer->b )) {
+HXLINE( 118)				buffer->b = ::Array_obj< ::String >::__new(1)->init(0,::Std_obj::string(x1));
+            			}
+            			else {
+HXLINE( 118)				::Array< ::String > buffer3 = buffer->b;
+HXDLIN( 118)				buffer3->push(::Std_obj::string(x1));
+            			}
+            		}
+HXLINE( 119)		{
+HXLINE( 119)			if (::hx::IsNotNull( buffer->charBuf )) {
+HXLINE( 119)				buffer->flush();
+            			}
+HXDLIN( 119)			if (::hx::IsNull( buffer->b )) {
+HXLINE( 119)				buffer->b = ::Array_obj< ::String >::fromData( _hx_array_data_77ae91e6_6,1);
+            			}
+            			else {
+HXLINE( 119)				buffer->b->push(HX_(">",3e,00,00,00));
+            			}
+            		}
+HXLINE( 120)		return buffer->toString();
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Stanza_obj,serialize,return )
 
 ::String Stanza_obj::toString(){
-            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_91_toString)
-HXDLIN(  91)		return this->serialize();
+            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_124_toString)
+HXDLIN( 124)		return this->serialize();
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Stanza_obj,toString,return )
 
  ::snikket::Stanza Stanza_obj::tag(::String name, ::Dynamic attr){
-            	HX_GC_STACKFRAME(&_hx_pos_77777da2cc20dfea_122_tag)
-HXLINE( 123)		 ::snikket::Stanza child =  ::snikket::Stanza_obj::__alloc( HX_CTX ,name,attr);
-HXLINE( 124)		this->last_added->addDirectChild(::snikket::Node_obj::Element(child));
-HXLINE( 125)		this->last_added_stack->push(this->last_added);
-HXLINE( 126)		this->last_added = child;
-HXLINE( 127)		return ::hx::ObjectPtr<OBJ_>(this);
+            	HX_GC_STACKFRAME(&_hx_pos_77777da2cc20dfea_159_tag)
+HXLINE( 160)		 ::snikket::Stanza child =  ::snikket::Stanza_obj::__alloc( HX_CTX ,name,attr);
+HXLINE( 161)		this->last_added->addDirectChild(::snikket::Node_obj::Element(child));
+HXLINE( 162)		this->last_added_stack->push(this->last_added);
+HXLINE( 163)		this->last_added = child;
+HXLINE( 164)		return ::hx::ObjectPtr<OBJ_>(this);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC2(Stanza_obj,tag,return )
 
  ::snikket::Stanza Stanza_obj::text(::String content){
-            	HX_GC_STACKFRAME(&_hx_pos_77777da2cc20dfea_130_text)
-HXLINE( 131)		 ::snikket::Stanza _hx_tmp = this->last_added;
-HXDLIN( 131)		_hx_tmp->addDirectChild(::snikket::Node_obj::CData( ::snikket::TextNode_obj::__alloc( HX_CTX ,content)));
-HXLINE( 132)		return ::hx::ObjectPtr<OBJ_>(this);
+            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_167_text)
+HXLINE( 168)		this->last_added->addDirectChild(::snikket::Node_obj::CData(content));
+HXLINE( 169)		return ::hx::ObjectPtr<OBJ_>(this);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Stanza_obj,text,return )
 
  ::snikket::Stanza Stanza_obj::textTag(::String tagName,::String textContent, ::Dynamic attr){
-            	HX_GC_STACKFRAME(&_hx_pos_77777da2cc20dfea_135_textTag)
-HXLINE( 136)		 ::snikket::Stanza _hx_tmp = this->last_added;
-HXDLIN( 136)		 ::Dynamic tmp = attr;
-HXDLIN( 136)		 ::Dynamic _hx_tmp1;
-HXDLIN( 136)		if (::hx::IsNotNull( tmp )) {
-HXLINE( 136)			_hx_tmp1 = tmp;
+            	HX_GC_STACKFRAME(&_hx_pos_77777da2cc20dfea_172_textTag)
+HXLINE( 173)		 ::snikket::Stanza _hx_tmp = this->last_added;
+HXDLIN( 173)		 ::Dynamic tmp = attr;
+HXDLIN( 173)		 ::Dynamic _hx_tmp1;
+HXDLIN( 173)		if (::hx::IsNotNull( tmp )) {
+HXLINE( 173)			_hx_tmp1 = tmp;
             		}
             		else {
-HXLINE( 136)			_hx_tmp1 =  ::Dynamic(::hx::Anon_obj::Create(0));
+HXLINE( 173)			_hx_tmp1 =  ::Dynamic(::hx::Anon_obj::Create(0));
             		}
-HXDLIN( 136)		_hx_tmp->addDirectChild(::snikket::Node_obj::Element( ::snikket::Stanza_obj::__alloc( HX_CTX ,tagName,_hx_tmp1)->text(textContent)));
-HXLINE( 137)		return ::hx::ObjectPtr<OBJ_>(this);
+HXDLIN( 173)		_hx_tmp->addDirectChild(::snikket::Node_obj::Element( ::snikket::Stanza_obj::__alloc( HX_CTX ,tagName,_hx_tmp1)->text(textContent)));
+HXLINE( 174)		return ::hx::ObjectPtr<OBJ_>(this);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC3(Stanza_obj,textTag,return )
 
  ::snikket::Stanza Stanza_obj::up(){
-            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_140_up)
-HXLINE( 141)		if (::hx::IsInstanceNotEq( this->last_added,::hx::ObjectPtr<OBJ_>(this) )) {
-HXLINE( 142)			this->last_added = this->last_added_stack->pop().StaticCast<  ::snikket::Stanza >();
+            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_177_up)
+HXLINE( 178)		if (::hx::IsInstanceNotEq( this->last_added,::hx::ObjectPtr<OBJ_>(this) )) {
+HXLINE( 179)			this->last_added = this->last_added_stack->pop().StaticCast<  ::snikket::Stanza >();
             		}
-HXLINE( 144)		return ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 181)		return ::hx::ObjectPtr<OBJ_>(this);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Stanza_obj,up,return )
 
  ::snikket::Stanza Stanza_obj::reset(){
-            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_147_reset)
-HXLINE( 148)		this->last_added = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 149)		return ::hx::ObjectPtr<OBJ_>(this);
+            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_184_reset)
+HXLINE( 185)		this->last_added = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 186)		return ::hx::ObjectPtr<OBJ_>(this);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Stanza_obj,reset,return )
 
  ::snikket::Stanza Stanza_obj::addChildren( ::Dynamic children){
-            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_153_addChildren)
-HXLINE( 154)		{
-HXLINE( 154)			 ::Dynamic child = children->__Field(HX_("iterator",ee,49,9a,93),::hx::paccDynamic)();
-HXDLIN( 154)			while(( (bool)(child->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE( 154)				 ::snikket::Stanza child1 = ( ( ::snikket::Stanza)(child->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
-HXLINE( 155)				this->addChild(child1);
+            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_190_addChildren)
+HXLINE( 191)		{
+HXLINE( 191)			 ::Dynamic child = children->__Field(HX_("iterator",ee,49,9a,93),::hx::paccDynamic)();
+HXDLIN( 191)			while(( (bool)(child->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE( 191)				 ::snikket::Stanza child1 = ( ( ::snikket::Stanza)(child->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
+HXLINE( 192)				this->addChild(child1);
             			}
             		}
-HXLINE( 157)		return ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 194)		return ::hx::ObjectPtr<OBJ_>(this);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Stanza_obj,addChildren,return )
 
  ::snikket::Stanza Stanza_obj::addChildNodes( ::Dynamic children){
-            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_161_addChildNodes)
-HXLINE( 162)		{
-HXLINE( 162)			 ::Dynamic child = children->__Field(HX_("iterator",ee,49,9a,93),::hx::paccDynamic)();
-HXDLIN( 162)			while(( (bool)(child->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE( 162)				 ::snikket::Node child1 = child->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
-HXLINE( 163)				this->addDirectChild(child1);
+            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_198_addChildNodes)
+HXLINE( 199)		{
+HXLINE( 199)			 ::Dynamic child = children->__Field(HX_("iterator",ee,49,9a,93),::hx::paccDynamic)();
+HXDLIN( 199)			while(( (bool)(child->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE( 199)				 ::snikket::Node child1 = child->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
+HXLINE( 200)				this->addDirectChild(child1);
             			}
             		}
-HXLINE( 165)		return ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 202)		return ::hx::ObjectPtr<OBJ_>(this);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Stanza_obj,addChildNodes,return )
 
  ::snikket::Stanza Stanza_obj::addChild( ::snikket::Stanza stanza){
-            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_168_addChild)
-HXLINE( 169)		this->last_added->children->push(::snikket::Node_obj::Element(stanza));
-HXLINE( 170)		return ::hx::ObjectPtr<OBJ_>(this);
+            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_205_addChild)
+HXLINE( 206)		this->last_added->children->push(::snikket::Node_obj::Element(stanza));
+HXLINE( 207)		return ::hx::ObjectPtr<OBJ_>(this);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Stanza_obj,addChild,return )
 
  ::snikket::Stanza Stanza_obj::addDirectChild( ::snikket::Node child){
-            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_173_addDirectChild)
-HXLINE( 174)		this->children->push(child);
-HXLINE( 175)		return ::hx::ObjectPtr<OBJ_>(this);
+            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_210_addDirectChild)
+HXLINE( 211)		this->children->push(child);
+HXLINE( 212)		return ::hx::ObjectPtr<OBJ_>(this);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Stanza_obj,addDirectChild,return )
 
  ::snikket::Stanza Stanza_obj::clone(){
-            	HX_GC_STACKFRAME(&_hx_pos_77777da2cc20dfea_178_clone)
-HXLINE( 179)		 ::snikket::Stanza clone =  ::snikket::Stanza_obj::__alloc( HX_CTX ,this->name,this->attr);
-HXLINE( 180)		{
-HXLINE( 180)			int _g = 0;
-HXDLIN( 180)			::Array< ::Dynamic> _g1 = this->children;
-HXDLIN( 180)			while((_g < _g1->length)){
-HXLINE( 180)				 ::snikket::Node child = _g1->__get(_g).StaticCast<  ::snikket::Node >();
-HXDLIN( 180)				_g = (_g + 1);
-HXLINE( 181)				 ::snikket::Node _hx_tmp;
-HXDLIN( 181)				switch((int)(child->_hx_getIndex())){
+            	HX_GC_STACKFRAME(&_hx_pos_77777da2cc20dfea_215_clone)
+HXLINE( 216)		 ::snikket::Stanza clone =  ::snikket::Stanza_obj::__alloc( HX_CTX ,this->name,this->attr);
+HXLINE( 217)		{
+HXLINE( 217)			int _g = 0;
+HXDLIN( 217)			::Array< ::Dynamic> _g1 = this->children;
+HXDLIN( 217)			while((_g < _g1->length)){
+HXLINE( 217)				 ::snikket::Node child = _g1->__get(_g).StaticCast<  ::snikket::Node >();
+HXDLIN( 217)				_g = (_g + 1);
+HXLINE( 218)				 ::snikket::Node _hx_tmp;
+HXDLIN( 218)				switch((int)(child->_hx_getIndex())){
             					case (int)0: {
-HXLINE( 182)						 ::snikket::Stanza c = child->_hx_getObject(0).StaticCast<  ::snikket::Stanza >();
-HXLINE( 181)						_hx_tmp = ::snikket::Node_obj::Element(c->clone());
+HXLINE( 219)						 ::snikket::Stanza c = child->_hx_getObject(0).StaticCast<  ::snikket::Stanza >();
+HXLINE( 218)						_hx_tmp = ::snikket::Node_obj::Element(c->clone());
             					}
             					break;
             					case (int)1: {
-HXLINE( 183)						 ::snikket::TextNode c1 = child->_hx_getObject(0).StaticCast<  ::snikket::TextNode >();
-HXLINE( 181)						_hx_tmp = ::snikket::Node_obj::CData(c1->clone());
+HXLINE( 220)						::String c1 = child->_hx_getString(0);
+HXLINE( 218)						_hx_tmp = ::snikket::Node_obj::CData(c1);
             					}
             					break;
             				}
-HXDLIN( 181)				clone->addDirectChild(_hx_tmp);
+HXDLIN( 218)				clone->addDirectChild(_hx_tmp);
             			}
             		}
-HXLINE( 186)		return clone;
+HXLINE( 223)		return clone;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Stanza_obj,clone,return )
 
 ::Array< ::Dynamic> Stanza_obj::allTags(::String name,::String xmlns){
-            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_189_allTags)
-HXLINE( 190)		::Array< ::Dynamic> _g = ::Array_obj< ::Dynamic>::__new(0);
-HXDLIN( 190)		{
-HXLINE( 190)			int _g1 = 0;
-HXDLIN( 190)			::Array< ::Dynamic> _g2 = this->children;
-HXDLIN( 190)			while((_g1 < _g2->length)){
-HXLINE( 190)				 ::snikket::Node v = _g2->__get(_g1).StaticCast<  ::snikket::Node >();
-HXDLIN( 190)				_g1 = (_g1 + 1);
-HXLINE( 191)				bool _hx_tmp;
-HXDLIN( 191)				if ((v->_hx_getIndex() == 0)) {
-HXLINE( 191)					 ::snikket::Stanza _g3 = v->_hx_getObject(0).StaticCast<  ::snikket::Stanza >();
-HXDLIN( 191)					_hx_tmp = true;
+            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_226_allTags)
+HXLINE( 227)		::Array< ::Dynamic> _g = ::Array_obj< ::Dynamic>::__new(0);
+HXDLIN( 227)		{
+HXLINE( 227)			int _g1 = 0;
+HXDLIN( 227)			::Array< ::Dynamic> _g2 = this->children;
+HXDLIN( 227)			while((_g1 < _g2->length)){
+HXLINE( 227)				 ::snikket::Node v = _g2->__get(_g1).StaticCast<  ::snikket::Node >();
+HXDLIN( 227)				_g1 = (_g1 + 1);
+HXLINE( 228)				bool _hx_tmp;
+HXDLIN( 228)				if ((v->_hx_getIndex() == 0)) {
+HXLINE( 228)					 ::snikket::Stanza _g3 = v->_hx_getObject(0).StaticCast<  ::snikket::Stanza >();
+HXDLIN( 228)					_hx_tmp = true;
             				}
             				else {
-HXLINE( 191)					_hx_tmp = false;
+HXLINE( 228)					_hx_tmp = false;
             				}
-HXLINE( 190)				if (_hx_tmp) {
-HXLINE( 190)					_g->push(v);
+HXLINE( 227)				if (_hx_tmp) {
+HXLINE( 227)					_g->push(v);
             				}
             			}
             		}
-HXDLIN( 190)		::Array< ::Dynamic> _this = _g;
-HXDLIN( 190)		::Array< ::Dynamic> result = ::Array_obj< ::Dynamic>::__new(_this->length);
-HXDLIN( 190)		{
-HXLINE( 190)			int _g4 = 0;
-HXDLIN( 190)			int _g5 = _this->length;
-HXDLIN( 190)			while((_g4 < _g5)){
-HXLINE( 190)				_g4 = (_g4 + 1);
-HXDLIN( 190)				int i = (_g4 - 1);
-HXDLIN( 190)				{
-HXLINE( 193)					 ::snikket::Node child = _hx_array_unsafe_get(_this,i);
-HXLINE( 190)					 ::snikket::Stanza inValue;
-HXLINE( 193)					if ((child->_hx_getIndex() == 0)) {
-HXLINE( 194)						 ::snikket::Stanza c = child->_hx_getObject(0).StaticCast<  ::snikket::Stanza >();
-HXLINE( 190)						inValue = c;
+HXDLIN( 227)		::Array< ::Dynamic> _this = _g;
+HXDLIN( 227)		::Array< ::Dynamic> result = ::Array_obj< ::Dynamic>::__new(_this->length);
+HXDLIN( 227)		{
+HXLINE( 227)			int _g4 = 0;
+HXDLIN( 227)			int _g5 = _this->length;
+HXDLIN( 227)			while((_g4 < _g5)){
+HXLINE( 227)				_g4 = (_g4 + 1);
+HXDLIN( 227)				int i = (_g4 - 1);
+HXDLIN( 227)				{
+HXLINE( 230)					 ::snikket::Node child = _hx_array_unsafe_get(_this,i);
+HXLINE( 227)					 ::snikket::Stanza inValue;
+HXLINE( 230)					if ((child->_hx_getIndex() == 0)) {
+HXLINE( 231)						 ::snikket::Stanza c = child->_hx_getObject(0).StaticCast<  ::snikket::Stanza >();
+HXLINE( 227)						inValue = c;
             					}
             					else {
-HXLINE( 190)						inValue = null();
+HXLINE( 227)						inValue = null();
             					}
-HXDLIN( 190)					result->__unsafe_set(i,inValue);
+HXDLIN( 227)					result->__unsafe_set(i,inValue);
             				}
             			}
             		}
-HXDLIN( 190)		::Array< ::Dynamic> tags = result;
-HXLINE( 198)		bool _hx_tmp1;
-HXDLIN( 198)		if (::hx::IsNull( name )) {
-HXLINE( 198)			_hx_tmp1 = ::hx::IsNotNull( xmlns );
+HXDLIN( 227)		::Array< ::Dynamic> tags = result;
+HXLINE( 235)		bool _hx_tmp1;
+HXDLIN( 235)		if (::hx::IsNull( name )) {
+HXLINE( 235)			_hx_tmp1 = ::hx::IsNotNull( xmlns );
             		}
             		else {
-HXLINE( 198)			_hx_tmp1 = true;
+HXLINE( 235)			_hx_tmp1 = true;
             		}
-HXDLIN( 198)		if (_hx_tmp1) {
-HXLINE( 199)			::String ourXmlns = ( (::String)(::Reflect_obj::field(this->attr,HX_("xmlns",dc,31,74,60))) );
-HXLINE( 200)			::Array< ::Dynamic> _g6 = ::Array_obj< ::Dynamic>::__new(0);
-HXDLIN( 200)			{
-HXLINE( 200)				int _g7 = 0;
-HXDLIN( 200)				::Array< ::Dynamic> _g8 = tags;
-HXDLIN( 200)				while((_g7 < _g8->length)){
-HXLINE( 200)					 ::snikket::Stanza v1 = _g8->__get(_g7).StaticCast<  ::snikket::Stanza >();
-HXDLIN( 200)					_g7 = (_g7 + 1);
-HXLINE( 201)					::String childXmlns = ( (::String)(::Reflect_obj::field(v1->attr,HX_("xmlns",dc,31,74,60))) );
-HXLINE( 200)					bool tags1;
-HXLINE( 202)					bool tags2;
-HXDLIN( 202)					if (::hx::IsNotNull( name )) {
-HXLINE( 202)						tags2 = (v1->name == name);
+HXDLIN( 235)		if (_hx_tmp1) {
+HXLINE( 236)			::String ourXmlns = ( (::String)(::Reflect_obj::field(this->attr,HX_("xmlns",dc,31,74,60))) );
+HXLINE( 237)			::Array< ::Dynamic> _g6 = ::Array_obj< ::Dynamic>::__new(0);
+HXDLIN( 237)			{
+HXLINE( 237)				int _g7 = 0;
+HXDLIN( 237)				::Array< ::Dynamic> _g8 = tags;
+HXDLIN( 237)				while((_g7 < _g8->length)){
+HXLINE( 237)					 ::snikket::Stanza v1 = _g8->__get(_g7).StaticCast<  ::snikket::Stanza >();
+HXDLIN( 237)					_g7 = (_g7 + 1);
+HXLINE( 238)					::String childXmlns = ( (::String)(::Reflect_obj::field(v1->attr,HX_("xmlns",dc,31,74,60))) );
+HXLINE( 237)					bool tags1;
+HXLINE( 239)					bool tags2;
+HXDLIN( 239)					if (::hx::IsNotNull( name )) {
+HXLINE( 239)						tags2 = (v1->name == name);
             					}
             					else {
-HXLINE( 202)						tags2 = true;
+HXLINE( 239)						tags2 = true;
             					}
-HXDLIN( 202)					if (tags2) {
-HXLINE( 203)						bool tags3;
-HXDLIN( 203)						if (::hx::IsNull( xmlns )) {
-HXLINE( 203)							if ((ourXmlns != childXmlns)) {
-HXLINE( 203)								tags3 = ::hx::IsNull( childXmlns );
+HXDLIN( 239)					if (tags2) {
+HXLINE( 240)						bool tags3;
+HXDLIN( 240)						if (::hx::IsNull( xmlns )) {
+HXLINE( 240)							if ((ourXmlns != childXmlns)) {
+HXLINE( 240)								tags3 = ::hx::IsNull( childXmlns );
             							}
             							else {
-HXLINE( 203)								tags3 = true;
+HXLINE( 240)								tags3 = true;
             							}
             						}
             						else {
-HXLINE( 203)							tags3 = false;
+HXLINE( 240)							tags3 = false;
             						}
-HXDLIN( 203)						if (!(tags3)) {
-HXLINE( 200)							tags1 = (childXmlns == xmlns);
+HXDLIN( 240)						if (!(tags3)) {
+HXLINE( 237)							tags1 = (childXmlns == xmlns);
             						}
             						else {
-HXLINE( 200)							tags1 = true;
+HXLINE( 237)							tags1 = true;
             						}
             					}
             					else {
-HXLINE( 200)						tags1 = false;
+HXLINE( 237)						tags1 = false;
             					}
-HXDLIN( 200)					if (tags1) {
-HXLINE( 200)						_g6->push(v1);
+HXDLIN( 237)					if (tags1) {
+HXLINE( 237)						_g6->push(v1);
             					}
             				}
             			}
-HXDLIN( 200)			tags = _g6;
+HXDLIN( 237)			tags = _g6;
             		}
-HXLINE( 207)		return tags;
+HXLINE( 244)		return tags;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC2(Stanza_obj,allTags,return )
 
 ::Array< ::String > Stanza_obj::allText(){
-            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_211_allText)
-HXDLIN( 211)		::Array< ::Dynamic> _g = ::Array_obj< ::Dynamic>::__new(0);
-HXDLIN( 211)		{
-HXDLIN( 211)			int _g1 = 0;
-HXDLIN( 211)			::Array< ::Dynamic> _g2 = this->children;
-HXDLIN( 211)			while((_g1 < _g2->length)){
-HXDLIN( 211)				 ::snikket::Node v = _g2->__get(_g1).StaticCast<  ::snikket::Node >();
-HXDLIN( 211)				_g1 = (_g1 + 1);
-HXLINE( 212)				bool _hx_tmp;
-HXDLIN( 212)				if ((v->_hx_getIndex() == 1)) {
-HXLINE( 212)					 ::snikket::TextNode _g3 = v->_hx_getObject(0).StaticCast<  ::snikket::TextNode >();
-HXDLIN( 212)					_hx_tmp = true;
+            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_248_allText)
+HXDLIN( 248)		::Array< ::Dynamic> _g = ::Array_obj< ::Dynamic>::__new(0);
+HXDLIN( 248)		{
+HXDLIN( 248)			int _g1 = 0;
+HXDLIN( 248)			::Array< ::Dynamic> _g2 = this->children;
+HXDLIN( 248)			while((_g1 < _g2->length)){
+HXDLIN( 248)				 ::snikket::Node v = _g2->__get(_g1).StaticCast<  ::snikket::Node >();
+HXDLIN( 248)				_g1 = (_g1 + 1);
+HXLINE( 249)				bool _hx_tmp;
+HXDLIN( 249)				if ((v->_hx_getIndex() == 1)) {
+HXLINE( 249)					::String _g3 = v->_hx_getString(0);
+HXDLIN( 249)					_hx_tmp = true;
             				}
             				else {
-HXLINE( 212)					_hx_tmp = false;
+HXLINE( 249)					_hx_tmp = false;
             				}
-HXLINE( 211)				if (_hx_tmp) {
-HXDLIN( 211)					_g->push(v);
+HXLINE( 248)				if (_hx_tmp) {
+HXDLIN( 248)					_g->push(v);
             				}
             			}
             		}
-HXDLIN( 211)		::Array< ::Dynamic> _this = _g;
-HXDLIN( 211)		::Array< ::String > result = ::Array_obj< ::String >::__new(_this->length);
-HXDLIN( 211)		{
-HXDLIN( 211)			int _g4 = 0;
-HXDLIN( 211)			int _g5 = _this->length;
-HXDLIN( 211)			while((_g4 < _g5)){
-HXDLIN( 211)				_g4 = (_g4 + 1);
-HXDLIN( 211)				int i = (_g4 - 1);
-HXDLIN( 211)				{
-HXLINE( 214)					 ::snikket::Node child = _hx_array_unsafe_get(_this,i);
-HXLINE( 211)					::String inValue;
-HXLINE( 214)					if ((child->_hx_getIndex() == 1)) {
-HXLINE( 215)						 ::snikket::TextNode c = child->_hx_getObject(0).StaticCast<  ::snikket::TextNode >();
-HXLINE( 211)						inValue = c->content;
+HXDLIN( 248)		::Array< ::Dynamic> _this = _g;
+HXDLIN( 248)		::Array< ::String > result = ::Array_obj< ::String >::__new(_this->length);
+HXDLIN( 248)		{
+HXDLIN( 248)			int _g4 = 0;
+HXDLIN( 248)			int _g5 = _this->length;
+HXDLIN( 248)			while((_g4 < _g5)){
+HXDLIN( 248)				_g4 = (_g4 + 1);
+HXDLIN( 248)				int i = (_g4 - 1);
+HXDLIN( 248)				{
+HXLINE( 251)					 ::snikket::Node child = _hx_array_unsafe_get(_this,i);
+HXLINE( 248)					::String inValue;
+HXLINE( 251)					if ((child->_hx_getIndex() == 1)) {
+HXLINE( 252)						::String c = child->_hx_getString(0);
+HXLINE( 248)						inValue = c;
             					}
             					else {
-HXDLIN( 211)						inValue = null();
+HXDLIN( 248)						inValue = null();
             					}
-HXDLIN( 211)					result->__unsafe_set(i,inValue);
+HXDLIN( 248)					result->__unsafe_set(i,inValue);
             				}
             			}
             		}
-HXDLIN( 211)		return result;
+HXDLIN( 248)		return result;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Stanza_obj,allText,return )
 
  ::snikket::Stanza Stanza_obj::getFirstChild(){
-            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_222_getFirstChild)
-HXDLIN( 222)		return this->allTags(null(),null())->__get(0).StaticCast<  ::snikket::Stanza >();
+            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_259_getFirstChild)
+HXDLIN( 259)		return this->allTags(null(),null())->__get(0).StaticCast<  ::snikket::Stanza >();
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Stanza_obj,getFirstChild,return )
 
 ::Array< ::Dynamic> Stanza_obj::getChildren(){
-            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_225_getChildren)
-HXDLIN( 225)		 ::snikket::Stanza _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 226)		::Array< ::Dynamic> _this = this->children;
-HXDLIN( 226)		::Array< ::Dynamic> result = ::Array_obj< ::Dynamic>::__new(_this->length);
-HXDLIN( 226)		{
-HXLINE( 226)			int _g = 0;
-HXDLIN( 226)			int _g1 = _this->length;
-HXDLIN( 226)			while((_g < _g1)){
-HXLINE( 226)				_g = (_g + 1);
-HXDLIN( 226)				int i = (_g - 1);
-HXDLIN( 226)				{
-HXLINE( 226)					 ::snikket::Node child = _hx_array_unsafe_get(_this,i);
-HXDLIN( 226)					::Dynamic inValue;
-HXDLIN( 226)					switch((int)(child->_hx_getIndex())){
+            	HX_GC_STACKFRAME(&_hx_pos_77777da2cc20dfea_262_getChildren)
+HXDLIN( 262)		 ::snikket::Stanza _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 263)		::Array< ::Dynamic> _this = this->children;
+HXDLIN( 263)		::Array< ::Dynamic> result = ::Array_obj< ::Dynamic>::__new(_this->length);
+HXDLIN( 263)		{
+HXLINE( 263)			int _g = 0;
+HXDLIN( 263)			int _g1 = _this->length;
+HXDLIN( 263)			while((_g < _g1)){
+HXLINE( 263)				_g = (_g + 1);
+HXDLIN( 263)				int i = (_g - 1);
+HXDLIN( 263)				{
+HXLINE( 263)					 ::snikket::Node child = _hx_array_unsafe_get(_this,i);
+HXDLIN( 263)					::Dynamic inValue;
+HXDLIN( 263)					switch((int)(child->_hx_getIndex())){
             						case (int)0: {
-HXLINE( 227)							 ::snikket::Stanza el = child->_hx_getObject(0).StaticCast<  ::snikket::Stanza >();
-HXLINE( 226)							inValue = el;
+HXLINE( 264)							 ::snikket::Stanza el = child->_hx_getObject(0).StaticCast<  ::snikket::Stanza >();
+HXLINE( 263)							inValue = el;
             						}
             						break;
             						case (int)1: {
-HXLINE( 228)							 ::snikket::TextNode text = child->_hx_getObject(0).StaticCast<  ::snikket::TextNode >();
-HXLINE( 226)							inValue = text;
+HXLINE( 265)							::String text = child->_hx_getString(0);
+HXLINE( 263)							inValue =  ::snikket::TextNodeClass_obj::__alloc( HX_CTX ,text);
             						}
             						break;
             					}
-HXDLIN( 226)					result->__unsafe_set(i,inValue);
+HXDLIN( 263)					result->__unsafe_set(i,inValue);
             				}
             			}
             		}
-HXDLIN( 226)		return result;
+HXDLIN( 263)		return result;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Stanza_obj,getChildren,return )
 
  ::snikket::Stanza Stanza_obj::getChild(::String name,::String xmlns){
-            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_232_getChild)
-HXLINE( 233)		::String ourXmlns = ( (::String)(::Reflect_obj::field(this->attr,HX_("xmlns",dc,31,74,60))) );
-HXLINE( 242)		::Array< ::Dynamic> tags = this->allTags(name,xmlns);
-HXLINE( 243)		if ((tags->length == 0)) {
-HXLINE( 244)			return null();
+            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_269_getChild)
+HXLINE( 270)		::String ourXmlns = ( (::String)(::Reflect_obj::field(this->attr,HX_("xmlns",dc,31,74,60))) );
+HXLINE( 279)		::Array< ::Dynamic> tags = this->allTags(name,xmlns);
+HXLINE( 280)		if ((tags->length == 0)) {
+HXLINE( 281)			return null();
             		}
-HXLINE( 246)		return tags->__get(0).StaticCast<  ::snikket::Stanza >();
+HXLINE( 283)		return tags->__get(0).StaticCast<  ::snikket::Stanza >();
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC2(Stanza_obj,getChild,return )
 
 ::String Stanza_obj::getChildText(::String name,::String xmlns){
-            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_249_getChildText)
-HXLINE( 250)		 ::snikket::Stanza child = this->getChild(name,xmlns);
-HXLINE( 251)		if (::hx::IsNull( child )) {
-HXLINE( 252)			return null();
+            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_286_getChildText)
+HXLINE( 287)		 ::snikket::Stanza child = this->getChild(name,xmlns);
+HXLINE( 288)		if (::hx::IsNull( child )) {
+HXLINE( 289)			return null();
             		}
-HXLINE( 254)		return child->getText();
+HXLINE( 291)		return child->getText();
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC2(Stanza_obj,getChildText,return )
 
 ::String Stanza_obj::getText(){
-            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_258_getText)
-HXDLIN( 258)		return this->allText()->join(HX_("",00,00,00,00));
+            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_295_getText)
+HXDLIN( 295)		return this->allText()->join(HX_("",00,00,00,00));
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Stanza_obj,getText,return )
 
  ::snikket::Node Stanza_obj::find(::String path){
-            	HX_GC_STACKFRAME(&_hx_pos_77777da2cc20dfea_261_find)
-HXLINE( 262)		int pos = 0;
-HXLINE( 263)		int len = path.length;
-HXLINE( 264)		 ::snikket::Stanza cursor = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 266)		do {
-HXLINE( 267)			::String xmlns = null();
-HXDLIN( 267)			 ::Dynamic name = null();
-HXDLIN( 267)			 ::Dynamic text = null();
-HXLINE( 268)			::String _hx_char = path.charAt(pos);
-HXLINE( 269)			if ((_hx_char == HX_("@",40,00,00,00))) {
-HXLINE( 270)				 ::Dynamic this1 = cursor->attr;
-HXDLIN( 270)				return ::snikket::Node_obj::CData( ::snikket::TextNode_obj::__alloc( HX_CTX ,( (::String)(::Reflect_obj::field(this1,path.substr((pos + 1),null()))) )));
+            	HX_GC_STACKFRAME(&_hx_pos_77777da2cc20dfea_298_find)
+HXLINE( 299)		int pos = 0;
+HXLINE( 300)		int len = path.length;
+HXLINE( 301)		 ::snikket::Stanza cursor = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 303)		do {
+HXLINE( 304)			::String xmlns = null();
+HXDLIN( 304)			 ::Dynamic name = null();
+HXDLIN( 304)			 ::Dynamic text = null();
+HXLINE( 305)			::String _hx_char = path.charAt(pos);
+HXLINE( 306)			if ((_hx_char == HX_("@",40,00,00,00))) {
+HXLINE( 307)				 ::Dynamic this1 = cursor->attr;
+HXDLIN( 307)				return ::snikket::Node_obj::CData(( (::String)(::Reflect_obj::field(this1,path.substr((pos + 1),null()))) ));
             			}
             			else {
-HXLINE( 271)				if ((_hx_char == HX_("{",7b,00,00,00))) {
-HXLINE( 272)					xmlns = path.substring((pos + 1),path.indexOf(HX_("}",7d,00,00,00),(pos + 1)));
-HXLINE( 273)					pos = (pos + (xmlns.length + 2));
+HXLINE( 308)				if ((_hx_char == HX_("{",7b,00,00,00))) {
+HXLINE( 309)					xmlns = path.substring((pos + 1),path.indexOf(HX_("}",7d,00,00,00),(pos + 1)));
+HXLINE( 310)					pos = (pos + (xmlns.length + 2));
             				}
             			}
-HXLINE( 275)			 ::EReg reName =  ::EReg_obj::__alloc( HX_CTX ,HX_("([^@/#]*)([/#]?)",cd,f2,19,5a),HX_("",00,00,00,00));
-HXLINE( 276)			if (!(reName->matchSub(path,pos,null()))) {
-HXLINE( 277)				HX_STACK_DO_THROW( ::haxe::Exception_obj::__alloc( HX_CTX ,(HX_("Invalid path to Stanza.find(): ",c6,3a,06,10) + path),null(),null()));
+HXLINE( 312)			 ::EReg reName =  ::EReg_obj::__alloc( HX_CTX ,HX_("([^@/#]*)([/#]?)",cd,f2,19,5a),HX_("",00,00,00,00));
+HXLINE( 313)			if (!(reName->matchSub(path,pos,null()))) {
+HXLINE( 314)				HX_STACK_DO_THROW( ::haxe::Exception_obj::__alloc( HX_CTX ,(HX_("Invalid path to Stanza.find(): ",c6,3a,06,10) + path),null(),null()));
             			}
-HXLINE( 279)			::String name1 = reName->matched(1);
-HXDLIN( 279)			::String text1 = reName->matched(2);
-HXLINE( 280)			int pos1 = ( (int)(reName->matchedPos()->__Field(HX_("pos",94,5d,55,00),::hx::paccDynamic)) );
-HXDLIN( 280)			pos = ( (int)((pos1 + reName->matchedPos()->__Field(HX_("len",d5,4b,52,00),::hx::paccDynamic))) );
-HXLINE( 281)			if ((name1 == HX_("",00,00,00,00))) {
-HXLINE( 282)				name1 = null();
+HXLINE( 316)			::String name1 = reName->matched(1);
+HXDLIN( 316)			::String text1 = reName->matched(2);
+HXLINE( 317)			int pos1 = ( (int)(reName->matchedPos()->__Field(HX_("pos",94,5d,55,00),::hx::paccDynamic)) );
+HXDLIN( 317)			pos = ( (int)((pos1 + reName->matchedPos()->__Field(HX_("len",d5,4b,52,00),::hx::paccDynamic))) );
+HXLINE( 318)			if ((name1 == HX_("",00,00,00,00))) {
+HXLINE( 319)				name1 = null();
             			}
-HXLINE( 284)			if ((pos == len)) {
-HXLINE( 285)				if ((text1 == HX_("#",23,00,00,00))) {
-HXLINE( 286)					::String text2 = cursor->getChildText(name1,xmlns);
-HXLINE( 287)					if (::hx::IsNull( text2 )) {
-HXLINE( 288)						return null();
+HXLINE( 321)			if ((pos == len)) {
+HXLINE( 322)				if ((text1 == HX_("#",23,00,00,00))) {
+HXLINE( 323)					::String text2 = cursor->getChildText(name1,xmlns);
+HXLINE( 324)					if (::hx::IsNull( text2 )) {
+HXLINE( 325)						return null();
             					}
-HXLINE( 290)					return ::snikket::Node_obj::CData( ::snikket::TextNode_obj::__alloc( HX_CTX ,text2));
+HXLINE( 327)					return ::snikket::Node_obj::CData(text2);
             				}
-HXLINE( 292)				return ::snikket::Node_obj::Element(cursor->getChild(name1,xmlns));
+HXLINE( 329)				return ::snikket::Node_obj::Element(cursor->getChild(name1,xmlns));
             			}
-HXLINE( 294)			cursor = cursor->getChild(name1,xmlns);
+HXLINE( 331)			cursor = cursor->getChild(name1,xmlns);
             		} while(::hx::IsNotNull( cursor ));
 ;
-HXLINE( 296)		return null();
+HXLINE( 333)		return null();
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Stanza_obj,find,return )
 
  ::snikket::Stanza Stanza_obj::findChild(::String path){
-            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_299_findChild)
-HXLINE( 300)		 ::snikket::Node result = this->find(path);
-HXLINE( 301)		if (::hx::IsNull( result )) {
-HXLINE( 302)			return null();
+            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_336_findChild)
+HXLINE( 337)		 ::snikket::Node result = this->find(path);
+HXLINE( 338)		if (::hx::IsNull( result )) {
+HXLINE( 339)			return null();
             		}
-HXLINE( 304)		if (::hx::IsNull( result )) {
-HXLINE( 306)			return null();
+HXLINE( 341)		if (::hx::IsNull( result )) {
+HXLINE( 343)			return null();
             		}
             		else {
-HXLINE( 304)			if ((result->_hx_getIndex() == 0)) {
-HXLINE( 305)				 ::snikket::Stanza stanza = result->_hx_getObject(0).StaticCast<  ::snikket::Stanza >();
-HXDLIN( 305)				return stanza;
+HXLINE( 341)			if ((result->_hx_getIndex() == 0)) {
+HXLINE( 342)				 ::snikket::Stanza stanza = result->_hx_getObject(0).StaticCast<  ::snikket::Stanza >();
+HXDLIN( 342)				return stanza;
             			}
             			else {
-HXLINE( 306)				return null();
+HXLINE( 343)				return null();
             			}
             		}
-HXLINE( 304)		return null();
+HXLINE( 341)		return null();
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Stanza_obj,findChild,return )
 
 ::String Stanza_obj::findText(::String path){
-            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_310_findText)
-HXLINE( 311)		 ::snikket::Node result = this->find(path);
-HXLINE( 312)		if (::hx::IsNull( result )) {
-HXLINE( 313)			return null();
+            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_347_findText)
+HXLINE( 348)		 ::snikket::Node result = this->find(path);
+HXLINE( 349)		if (::hx::IsNull( result )) {
+HXLINE( 350)			return null();
             		}
-HXLINE( 315)		if (::hx::IsNull( result )) {
-HXLINE( 317)			return null();
+HXLINE( 352)		if (::hx::IsNull( result )) {
+HXLINE( 354)			return null();
             		}
             		else {
-HXLINE( 315)			if ((result->_hx_getIndex() == 1)) {
-HXLINE( 316)				 ::snikket::TextNode textNode = result->_hx_getObject(0).StaticCast<  ::snikket::TextNode >();
-HXDLIN( 316)				return textNode->content;
+HXLINE( 352)			if ((result->_hx_getIndex() == 1)) {
+HXLINE( 353)				::String textNode = result->_hx_getString(0);
+HXDLIN( 353)				return textNode;
             			}
             			else {
-HXLINE( 317)				return null();
+HXLINE( 354)				return null();
             			}
             		}
-HXLINE( 315)		return null();
+HXLINE( 352)		return null();
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Stanza_obj,findText,return )
 
  ::snikket::Stanza Stanza_obj::traverse( ::Dynamic f){
-            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_321_traverse)
-HXLINE( 322)		if (!(( (bool)(f(::hx::ObjectPtr<OBJ_>(this))) ))) {
-HXLINE( 323)			int _g = 0;
-HXDLIN( 323)			::Array< ::Dynamic> _g1 = this->allTags(null(),null());
-HXDLIN( 323)			while((_g < _g1->length)){
-HXLINE( 323)				 ::snikket::Stanza child = _g1->__get(_g).StaticCast<  ::snikket::Stanza >();
-HXDLIN( 323)				_g = (_g + 1);
-HXLINE( 324)				child->traverse(f);
+            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_358_traverse)
+HXLINE( 359)		if (!(( (bool)(f(::hx::ObjectPtr<OBJ_>(this))) ))) {
+HXLINE( 360)			int _g = 0;
+HXDLIN( 360)			::Array< ::Dynamic> _g1 = this->allTags(null(),null());
+HXDLIN( 360)			while((_g < _g1->length)){
+HXLINE( 360)				 ::snikket::Stanza child = _g1->__get(_g).StaticCast<  ::snikket::Stanza >();
+HXDLIN( 360)				_g = (_g + 1);
+HXLINE( 361)				child->traverse(f);
             			}
             		}
-HXLINE( 327)		return ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 364)		return ::hx::ObjectPtr<OBJ_>(this);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Stanza_obj,traverse,return )
 
  ::snikket::StanzaError Stanza_obj::getError(){
-            	HX_GC_STACKFRAME(&_hx_pos_77777da2cc20dfea_330_getError)
-HXLINE( 331)		 ::snikket::Stanza errorTag = this->getChild(HX_("error",c8,cb,29,73),null());
-HXLINE( 332)		if (::hx::IsNull( errorTag )) {
-HXLINE( 333)			return null();
+            	HX_GC_STACKFRAME(&_hx_pos_77777da2cc20dfea_367_getError)
+HXLINE( 368)		 ::snikket::Stanza errorTag = this->getChild(HX_("error",c8,cb,29,73),null());
+HXLINE( 369)		if (::hx::IsNull( errorTag )) {
+HXLINE( 370)			return null();
             		}
-HXLINE( 336)		::String _hx_tmp = ( (::String)(::Reflect_obj::field(errorTag->attr,HX_("type",ba,f2,08,4d))) );
-HXLINE( 337)		 ::snikket::Stanza tmp = errorTag->getChild(null(),HX_("urn:ietf:params:xml:ns:xmpp-stanzas",27,f2,3d,30));
-HXDLIN( 337)		::String _hx_tmp1;
-HXDLIN( 337)		if (::hx::IsNotNull( tmp )) {
-HXLINE( 337)			_hx_tmp1 = tmp->name;
+HXLINE( 373)		::String _hx_tmp = ( (::String)(::Reflect_obj::field(errorTag->attr,HX_("type",ba,f2,08,4d))) );
+HXLINE( 374)		 ::snikket::Stanza tmp = errorTag->getChild(null(),HX_("urn:ietf:params:xml:ns:xmpp-stanzas",27,f2,3d,30));
+HXDLIN( 374)		::String _hx_tmp1;
+HXDLIN( 374)		if (::hx::IsNotNull( tmp )) {
+HXLINE( 374)			_hx_tmp1 = tmp->name;
             		}
             		else {
-HXLINE( 337)			_hx_tmp1 = null();
+HXLINE( 374)			_hx_tmp1 = null();
             		}
-HXLINE( 335)		return  ::snikket::StanzaError_obj::__alloc( HX_CTX ,_hx_tmp,_hx_tmp1,errorTag->getChildText(HX_("text",ad,cc,f9,4c),HX_("urn:ietf:params:xml:ns:xmpp-stanzas",27,f2,3d,30)));
+HXLINE( 372)		return  ::snikket::StanzaError_obj::__alloc( HX_CTX ,_hx_tmp,_hx_tmp1,errorTag->getChildText(HX_("text",ad,cc,f9,4c),HX_("urn:ietf:params:xml:ns:xmpp-stanzas",27,f2,3d,30)));
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(Stanza_obj,getError,return )
 
 void Stanza_obj::removeChildren(::String name,::String xmlns_){
-            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_342_removeChildren)
-HXLINE( 343)		::String xmlns;
-HXDLIN( 343)		::String tmp = xmlns_;
-HXDLIN( 343)		if (::hx::IsNotNull( tmp )) {
-HXLINE( 343)			xmlns = tmp;
+            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_379_removeChildren)
+HXLINE( 380)		::String xmlns;
+HXDLIN( 380)		::String tmp = xmlns_;
+HXDLIN( 380)		if (::hx::IsNotNull( tmp )) {
+HXLINE( 380)			xmlns = tmp;
             		}
             		else {
-HXLINE( 343)			xmlns = ( (::String)(::Reflect_obj::field(this->attr,HX_("xmlns",dc,31,74,60))) );
+HXLINE( 380)			xmlns = ( (::String)(::Reflect_obj::field(this->attr,HX_("xmlns",dc,31,74,60))) );
             		}
-HXLINE( 344)		::Array< ::Dynamic> _g = ::Array_obj< ::Dynamic>::__new(0);
-HXDLIN( 344)		{
-HXLINE( 344)			int _g1 = 0;
-HXDLIN( 344)			::Array< ::Dynamic> _g2 = this->children;
-HXDLIN( 344)			while((_g1 < _g2->length)){
-HXLINE( 344)				 ::snikket::Node v = _g2->__get(_g1).StaticCast<  ::snikket::Node >();
-HXDLIN( 344)				_g1 = (_g1 + 1);
-HXLINE( 345)				bool _hx_tmp;
-HXDLIN( 345)				if ((v->_hx_getIndex() == 0)) {
-HXLINE( 346)					 ::snikket::Stanza c = v->_hx_getObject(0).StaticCast<  ::snikket::Stanza >();
-HXLINE( 347)					bool _hx_tmp1;
-HXDLIN( 347)					bool _hx_tmp2;
-HXDLIN( 347)					if (::hx::IsNotNull( name )) {
-HXLINE( 347)						_hx_tmp2 = (c->name == name);
+HXLINE( 381)		::Array< ::Dynamic> _g = ::Array_obj< ::Dynamic>::__new(0);
+HXDLIN( 381)		{
+HXLINE( 381)			int _g1 = 0;
+HXDLIN( 381)			::Array< ::Dynamic> _g2 = this->children;
+HXDLIN( 381)			while((_g1 < _g2->length)){
+HXLINE( 381)				 ::snikket::Node v = _g2->__get(_g1).StaticCast<  ::snikket::Node >();
+HXDLIN( 381)				_g1 = (_g1 + 1);
+HXLINE( 382)				bool _hx_tmp;
+HXDLIN( 382)				if ((v->_hx_getIndex() == 0)) {
+HXLINE( 383)					 ::snikket::Stanza c = v->_hx_getObject(0).StaticCast<  ::snikket::Stanza >();
+HXLINE( 384)					bool _hx_tmp1;
+HXDLIN( 384)					bool _hx_tmp2;
+HXDLIN( 384)					if (::hx::IsNotNull( name )) {
+HXLINE( 384)						_hx_tmp2 = (c->name == name);
             					}
             					else {
-HXLINE( 347)						_hx_tmp2 = true;
+HXLINE( 384)						_hx_tmp2 = true;
             					}
-HXDLIN( 347)					if (_hx_tmp2) {
-HXLINE( 347)						::String tmp1 = ( (::String)(::Reflect_obj::field(c->attr,HX_("xmlns",dc,31,74,60))) );
-HXDLIN( 347)						::String _hx_tmp3;
-HXDLIN( 347)						if (::hx::IsNotNull( tmp1 )) {
-HXLINE( 347)							_hx_tmp3 = tmp1;
+HXDLIN( 384)					if (_hx_tmp2) {
+HXLINE( 384)						::String tmp1 = ( (::String)(::Reflect_obj::field(c->attr,HX_("xmlns",dc,31,74,60))) );
+HXDLIN( 384)						::String _hx_tmp3;
+HXDLIN( 384)						if (::hx::IsNotNull( tmp1 )) {
+HXLINE( 384)							_hx_tmp3 = tmp1;
             						}
             						else {
-HXLINE( 347)							_hx_tmp3 = xmlns;
+HXLINE( 384)							_hx_tmp3 = xmlns;
             						}
-HXDLIN( 347)						_hx_tmp1 = (_hx_tmp3 == xmlns);
+HXDLIN( 384)						_hx_tmp1 = (_hx_tmp3 == xmlns);
             					}
             					else {
-HXLINE( 347)						_hx_tmp1 = false;
+HXLINE( 384)						_hx_tmp1 = false;
             					}
-HXLINE( 345)					_hx_tmp = !(_hx_tmp1);
+HXLINE( 382)					_hx_tmp = !(_hx_tmp1);
             				}
             				else {
-HXLINE( 345)					_hx_tmp = true;
+HXLINE( 382)					_hx_tmp = true;
             				}
-HXLINE( 344)				if (_hx_tmp) {
-HXLINE( 344)					_g->push(v);
+HXLINE( 381)				if (_hx_tmp) {
+HXLINE( 381)					_g->push(v);
             				}
             			}
             		}
-HXDLIN( 344)		this->children = _g;
+HXDLIN( 381)		this->children = _g;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC2(Stanza_obj,removeChildren,(void))
 
  ::snikket::Stanza Stanza_obj::parse(::String s){
-            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_95_parse)
-HXDLIN(  95)		return ::snikket::Stanza_obj::fromXml(::Xml_obj::parse(s));
+            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_129_parse)
+HXDLIN( 129)		return ::snikket::streams::XmppStropheStream_obj::parseStanza(s);
             	}
 
 
 STATIC_HX_DEFINE_DYNAMIC_FUNC1(Stanza_obj,parse,return )
 
  ::snikket::Stanza Stanza_obj::fromXml( ::Xml el){
-            	HX_GC_STACKFRAME(&_hx_pos_77777da2cc20dfea_100_fromXml)
-HXLINE( 101)		if ((el->nodeType == 6)) {
-HXLINE( 102)			return ::snikket::Stanza_obj::fromXml(el->firstElement());
+            	HX_GC_STACKFRAME(&_hx_pos_77777da2cc20dfea_137_fromXml)
+HXLINE( 138)		if ((el->nodeType == 6)) {
+HXLINE( 139)			return ::snikket::Stanza_obj::fromXml(el->firstElement());
             		}
-HXLINE( 105)		 ::Dynamic attrs =  ::Dynamic(::hx::Anon_obj::Create(0));
-HXLINE( 106)		{
-HXLINE( 106)			 ::Dynamic a = el->attributes();
-HXDLIN( 106)			while(( (bool)(a->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE( 106)				::String a1 = ( (::String)(a->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
-HXLINE( 107)				{
-HXLINE( 107)					::String value = el->get(a1);
-HXDLIN( 107)					::Reflect_obj::setField(attrs,a1,value);
+HXLINE( 142)		 ::Dynamic attrs =  ::Dynamic(::hx::Anon_obj::Create(0));
+HXLINE( 143)		{
+HXLINE( 143)			 ::Dynamic a = el->attributes();
+HXDLIN( 143)			while(( (bool)(a->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE( 143)				::String a1 = ( (::String)(a->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
+HXLINE( 144)				{
+HXLINE( 144)					::String value = el->get(a1);
+HXDLIN( 144)					::Reflect_obj::setField(attrs,a1,value);
             				}
             			}
             		}
-HXLINE( 109)		if ((el->nodeType != ::Xml_obj::Element)) {
-HXLINE( 109)			HX_STACK_DO_THROW((HX_("Bad node type, expected Element but found ",d8,90,8b,bb) + ::_Xml::XmlType_Impl__obj::toString(el->nodeType)));
+HXLINE( 146)		if ((el->nodeType != ::Xml_obj::Element)) {
+HXLINE( 146)			HX_STACK_DO_THROW((HX_("Bad node type, expected Element but found ",d8,90,8b,bb) + ::_Xml::XmlType_Impl__obj::toString(el->nodeType)));
             		}
-HXDLIN( 109)		 ::snikket::Stanza stanza =  ::snikket::Stanza_obj::__alloc( HX_CTX ,el->nodeName,attrs);
-HXLINE( 110)		{
-HXLINE( 110)			bool _hx_tmp;
-HXDLIN( 110)			if ((el->nodeType != ::Xml_obj::Document)) {
-HXLINE( 110)				_hx_tmp = (el->nodeType != ::Xml_obj::Element);
+HXDLIN( 146)		 ::snikket::Stanza stanza =  ::snikket::Stanza_obj::__alloc( HX_CTX ,el->nodeName,attrs);
+HXLINE( 147)		{
+HXLINE( 147)			bool _hx_tmp;
+HXDLIN( 147)			if ((el->nodeType != ::Xml_obj::Document)) {
+HXLINE( 147)				_hx_tmp = (el->nodeType != ::Xml_obj::Element);
             			}
             			else {
-HXLINE( 110)				_hx_tmp = false;
+HXLINE( 147)				_hx_tmp = false;
             			}
-HXDLIN( 110)			if (_hx_tmp) {
-HXLINE( 110)				HX_STACK_DO_THROW((HX_("Bad node type, expected Element or Document but found ",a0,d6,ba,79) + ::_Xml::XmlType_Impl__obj::toString(el->nodeType)));
+HXDLIN( 147)			if (_hx_tmp) {
+HXLINE( 147)				HX_STACK_DO_THROW((HX_("Bad node type, expected Element or Document but found ",a0,d6,ba,79) + ::_Xml::XmlType_Impl__obj::toString(el->nodeType)));
             			}
-HXDLIN( 110)			int _g_current = 0;
-HXDLIN( 110)			::Array< ::Dynamic> _g_array = el->children;
-HXDLIN( 110)			while((_g_current < _g_array->length)){
-HXLINE( 110)				_g_current = (_g_current + 1);
-HXDLIN( 110)				 ::Xml child = _g_array->__get((_g_current - 1)).StaticCast<  ::Xml >();
-HXLINE( 111)				if ((child->nodeType == 0)) {
-HXLINE( 112)					stanza->addChild(::snikket::Stanza_obj::fromXml(child));
+HXDLIN( 147)			int _g_current = 0;
+HXDLIN( 147)			::Array< ::Dynamic> _g_array = el->children;
+HXDLIN( 147)			while((_g_current < _g_array->length)){
+HXLINE( 147)				_g_current = (_g_current + 1);
+HXDLIN( 147)				 ::Xml child = _g_array->__get((_g_current - 1)).StaticCast<  ::Xml >();
+HXLINE( 148)				if ((child->nodeType == 0)) {
+HXLINE( 149)					stanza->addChild(::snikket::Stanza_obj::fromXml(child));
             				}
             				else {
-HXLINE( 113)					bool _hx_tmp1;
-HXDLIN( 113)					bool _hx_tmp2;
-HXDLIN( 113)					if ((child->nodeType != 5)) {
-HXLINE( 113)						_hx_tmp2 = (child->nodeType == 4);
+HXLINE( 150)					bool _hx_tmp1;
+HXDLIN( 150)					bool _hx_tmp2;
+HXDLIN( 150)					if ((child->nodeType != 5)) {
+HXLINE( 150)						_hx_tmp2 = (child->nodeType == 4);
             					}
             					else {
-HXLINE( 113)						_hx_tmp2 = true;
+HXLINE( 150)						_hx_tmp2 = true;
             					}
-HXDLIN( 113)					if (!(_hx_tmp2)) {
-HXLINE( 113)						_hx_tmp1 = (child->nodeType == 3);
+HXDLIN( 150)					if (!(_hx_tmp2)) {
+HXLINE( 150)						_hx_tmp1 = (child->nodeType == 3);
             					}
             					else {
-HXLINE( 113)						_hx_tmp1 = true;
+HXLINE( 150)						_hx_tmp1 = true;
             					}
-HXDLIN( 113)					if (!(_hx_tmp1)) {
-HXLINE( 116)						bool _hx_tmp3;
-HXDLIN( 116)						if ((child->nodeType != ::Xml_obj::Document)) {
-HXLINE( 116)							_hx_tmp3 = (child->nodeType == ::Xml_obj::Element);
+HXDLIN( 150)					if (!(_hx_tmp1)) {
+HXLINE( 153)						bool _hx_tmp3;
+HXDLIN( 153)						if ((child->nodeType != ::Xml_obj::Document)) {
+HXLINE( 153)							_hx_tmp3 = (child->nodeType == ::Xml_obj::Element);
             						}
             						else {
-HXLINE( 116)							_hx_tmp3 = true;
+HXLINE( 153)							_hx_tmp3 = true;
             						}
-HXDLIN( 116)						if (_hx_tmp3) {
-HXLINE( 116)							HX_STACK_DO_THROW((HX_("Bad node type, unexpected ",be,79,d5,11) + ::_Xml::XmlType_Impl__obj::toString(child->nodeType)));
+HXDLIN( 153)						if (_hx_tmp3) {
+HXLINE( 153)							HX_STACK_DO_THROW((HX_("Bad node type, unexpected ",be,79,d5,11) + ::_Xml::XmlType_Impl__obj::toString(child->nodeType)));
             						}
-HXDLIN( 116)						stanza->text(child->nodeValue);
+HXDLIN( 153)						stanza->text(child->nodeValue);
             					}
             				}
             			}
             		}
-HXLINE( 119)		return stanza;
+HXLINE( 156)		return stanza;
             	}
 
 
 STATIC_HX_DEFINE_DYNAMIC_FUNC1(Stanza_obj,fromXml,return )
 
 bool Stanza_obj::parseXmlBool(::String x){
-            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_355_parseXmlBool)
-HXDLIN( 355)		if ((x != HX_("true",4e,a7,03,4d))) {
-HXDLIN( 355)			return (x == HX_("1",31,00,00,00));
+            	HX_STACKFRAME(&_hx_pos_77777da2cc20dfea_392_parseXmlBool)
+HXDLIN( 392)		if ((x != HX_("true",4e,a7,03,4d))) {
+HXDLIN( 392)			return (x == HX_("1",31,00,00,00));
             		}
             		else {
-HXDLIN( 355)			return true;
+HXDLIN( 392)			return true;
             		}
-HXDLIN( 355)		return false;
+HXDLIN( 392)		return false;
             	}
 
 
diff --git a/Sources/c_snikket/src/snikket/StanzaError.cpp b/Sources/c_snikket/src/snikket/StanzaError.cpp
index a2e5d71..7ed7581 100644
--- a/Sources/c_snikket/src/snikket/StanzaError.cpp
+++ b/Sources/c_snikket/src/snikket/StanzaError.cpp
@@ -5,14 +5,14 @@
 #include <snikket/StanzaError.h>
 #endif
 
-HX_DEFINE_STACK_FRAME(_hx_pos_ba7467be1e1fd22b_46_new,"snikket.StanzaError","new",0x0f7cd1f4,"snikket.StanzaError.new","snikket/Stanza.hx",46,0x3976dc77)
+HX_DEFINE_STACK_FRAME(_hx_pos_ba7467be1e1fd22b_75_new,"snikket.StanzaError","new",0x0f7cd1f4,"snikket.StanzaError.new","snikket/Stanza.hx",75,0x3976dc77)
 namespace snikket{
 
 void StanzaError_obj::__construct(::String type_,::String condition_,::String text_){
-            	HX_STACKFRAME(&_hx_pos_ba7467be1e1fd22b_46_new)
-HXLINE(  47)		this->type = type_;
-HXLINE(  48)		this->condition = condition_;
-HXLINE(  49)		this->text = text_;
+            	HX_STACKFRAME(&_hx_pos_ba7467be1e1fd22b_75_new)
+HXLINE(  76)		this->type = type_;
+HXLINE(  77)		this->condition = condition_;
+HXLINE(  78)		this->text = text_;
             	}
 
 Dynamic StanzaError_obj::__CreateEmpty() { return new StanzaError_obj; }
diff --git a/Sources/c_snikket/src/snikket/TextNodeClass.cpp b/Sources/c_snikket/src/snikket/TextNodeClass.cpp
new file mode 100644
index 0000000..9304ec1
--- /dev/null
+++ b/Sources/c_snikket/src/snikket/TextNodeClass.cpp
@@ -0,0 +1,176 @@
+// Generated by Haxe 4.3.3
+#include <hxcpp.h>
+
+#ifndef INCLUDED_snikket_Stanza
+#include <snikket/Stanza.h>
+#endif
+#ifndef INCLUDED_snikket_TextNodeClass
+#include <snikket/TextNodeClass.h>
+#endif
+#ifndef INCLUDED_snikket__Stanza_NodeInterface
+#include <snikket/_Stanza/NodeInterface.h>
+#endif
+#ifndef INCLUDED_snikket__Util_Util_Fields_
+#include <snikket/_Util/Util_Fields_.h>
+#endif
+
+HX_DEFINE_STACK_FRAME(_hx_pos_c2e7318811985613_26_new,"snikket.TextNodeClass","new",0xec8b558a,"snikket.TextNodeClass.new","snikket/Stanza.hx",26,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_c2e7318811985613_34_serialize,"snikket.TextNodeClass","serialize",0xdda11e8a,"snikket.TextNodeClass.serialize","snikket/Stanza.hx",34,0x3976dc77)
+HX_LOCAL_STACK_FRAME(_hx_pos_c2e7318811985613_42_traverse,"snikket.TextNodeClass","traverse",0x1ace0048,"snikket.TextNodeClass.traverse","snikket/Stanza.hx",42,0x3976dc77)
+namespace snikket{
+
+void TextNodeClass_obj::__construct(::String node){
+            	HX_STACKFRAME(&_hx_pos_c2e7318811985613_26_new)
+HXDLIN(  26)		this->node = node;
+            	}
+
+Dynamic TextNodeClass_obj::__CreateEmpty() { return new TextNodeClass_obj; }
+
+void *TextNodeClass_obj::_hx_vtable = 0;
+
+Dynamic TextNodeClass_obj::__Create(::hx::DynamicArray inArgs)
+{
+	::hx::ObjectPtr< TextNodeClass_obj > _hx_result = new TextNodeClass_obj();
+	_hx_result->__construct(inArgs[0]);
+	return _hx_result;
+}
+
+bool TextNodeClass_obj::_hx_isInstanceOf(int inClassId) {
+	return inClassId==(int)0x00000001 || inClassId==(int)0x1ed164d0;
+}
+
+static ::snikket::_Stanza::NodeInterface_obj _hx_snikket_TextNodeClass__hx_snikket__Stanza_NodeInterface= {
+	( ::String (::hx::Object::*)())&::snikket::TextNodeClass_obj::serialize,
+	( ::Dynamic (::hx::Object::*)( ::Dynamic))&::snikket::TextNodeClass_obj::traverse_881a854a,
+};
+
+::Dynamic TextNodeClass_obj::traverse_881a854a( ::Dynamic f) {
+			return traverse(f);
+}
+void *TextNodeClass_obj::_hx_getInterface(int inHash) {
+	switch(inHash) {
+		case (int)0xc837e580: return &_hx_snikket_TextNodeClass__hx_snikket__Stanza_NodeInterface;
+	}
+	#ifdef HXCPP_SCRIPTABLE
+	return super::_hx_getInterface(inHash);
+	#else
+	return 0;
+	#endif
+}
+
+::String TextNodeClass_obj::serialize(){
+            	HX_STACKFRAME(&_hx_pos_c2e7318811985613_34_serialize)
+HXDLIN(  34)		return ::snikket::_Util::Util_Fields__obj::xmlEscape(this->node);
+            	}
+
+
+HX_DEFINE_DYNAMIC_FUNC0(TextNodeClass_obj,serialize,return )
+
+ ::snikket::TextNodeClass TextNodeClass_obj::traverse( ::Dynamic f){
+            	HX_STACKFRAME(&_hx_pos_c2e7318811985613_42_traverse)
+HXDLIN(  42)		return ::hx::ObjectPtr<OBJ_>(this);
+            	}
+
+
+HX_DEFINE_DYNAMIC_FUNC1(TextNodeClass_obj,traverse,return )
+
+
+::hx::ObjectPtr< TextNodeClass_obj > TextNodeClass_obj::__new(::String node) {
+	::hx::ObjectPtr< TextNodeClass_obj > __this = new TextNodeClass_obj();
+	__this->__construct(node);
+	return __this;
+}
+
+::hx::ObjectPtr< TextNodeClass_obj > TextNodeClass_obj::__alloc(::hx::Ctx *_hx_ctx,::String node) {
+	TextNodeClass_obj *__this = (TextNodeClass_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(TextNodeClass_obj), true, "snikket.TextNodeClass"));
+	*(void **)__this = TextNodeClass_obj::_hx_vtable;
+	__this->__construct(node);
+	return __this;
+}
+
+TextNodeClass_obj::TextNodeClass_obj()
+{
+}
+
+void TextNodeClass_obj::__Mark(HX_MARK_PARAMS)
+{
+	HX_MARK_BEGIN_CLASS(TextNodeClass);
+	HX_MARK_MEMBER_NAME(node,"node");
+	HX_MARK_END_CLASS();
+}
+
+void TextNodeClass_obj::__Visit(HX_VISIT_PARAMS)
+{
+	HX_VISIT_MEMBER_NAME(node,"node");
+}
+
+::hx::Val TextNodeClass_obj::__Field(const ::String &inName,::hx::PropertyAccess inCallProp)
+{
+	switch(inName.length) {
+	case 4:
+		if (HX_FIELD_EQ(inName,"node") ) { return ::hx::Val( node ); }
+		break;
+	case 8:
+		if (HX_FIELD_EQ(inName,"traverse") ) { return ::hx::Val( traverse_dyn() ); }
+		break;
+	case 9:
+		if (HX_FIELD_EQ(inName,"serialize") ) { return ::hx::Val( serialize_dyn() ); }
+	}
+	return super::__Field(inName,inCallProp);
+}
+
+::hx::Val TextNodeClass_obj::__SetField(const ::String &inName,const ::hx::Val &inValue,::hx::PropertyAccess inCallProp)
+{
+	switch(inName.length) {
+	case 4:
+		if (HX_FIELD_EQ(inName,"node") ) { node=inValue.Cast< ::String >(); return inValue; }
+	}
+	return super::__SetField(inName,inValue,inCallProp);
+}
+
+void TextNodeClass_obj::__GetFields(Array< ::String> &outFields)
+{
+	outFields->push(HX_("node",02,0a,0a,49));
+	super::__GetFields(outFields);
+};
+
+#ifdef HXCPP_SCRIPTABLE
+static ::hx::StorageInfo TextNodeClass_obj_sMemberStorageInfo[] = {
+	{::hx::fsString,(int)offsetof(TextNodeClass_obj,node),HX_("node",02,0a,0a,49)},
+	{ ::hx::fsUnknown, 0, null()}
+};
+static ::hx::StaticInfo *TextNodeClass_obj_sStaticStorageInfo = 0;
+#endif
+
+static ::String TextNodeClass_obj_sMemberFields[] = {
+	HX_("node",02,0a,0a,49),
+	HX_("serialize",e0,5d,f2,f4),
+	HX_("traverse",b2,7d,6a,6c),
+	::String(null()) };
+
+::hx::Class TextNodeClass_obj::__mClass;
+
+void TextNodeClass_obj::__register()
+{
+	TextNodeClass_obj _hx_dummy;
+	TextNodeClass_obj::_hx_vtable = *(void **)&_hx_dummy;
+	::hx::Static(__mClass) = new ::hx::Class_obj();
+	__mClass->mName = HX_("snikket.TextNodeClass",98,88,83,cc);
+	__mClass->mSuper = &super::__SGetClass();
+	__mClass->mConstructEmpty = &__CreateEmpty;
+	__mClass->mConstructArgs = &__Create;
+	__mClass->mGetStaticField = &::hx::Class_obj::GetNoStaticField;
+	__mClass->mSetStaticField = &::hx::Class_obj::SetNoStaticField;
+	__mClass->mStatics = ::hx::Class_obj::dupFunctions(0 /* sStaticFields */);
+	__mClass->mMembers = ::hx::Class_obj::dupFunctions(TextNodeClass_obj_sMemberFields);
+	__mClass->mCanCast = ::hx::TCanCast< TextNodeClass_obj >;
+#ifdef HXCPP_SCRIPTABLE
+	__mClass->mMemberStorageInfo = TextNodeClass_obj_sMemberStorageInfo;
+#endif
+#ifdef HXCPP_SCRIPTABLE
+	__mClass->mStaticStorageInfo = TextNodeClass_obj_sStaticStorageInfo;
+#endif
+	::hx::_hx_RegisterClass(__mClass->mName, __mClass);
+}
+
+} // end namespace snikket
diff --git a/Sources/c_snikket/src/snikket/XEP0393.cpp b/Sources/c_snikket/src/snikket/XEP0393.cpp
index 843f475..ba43ce9 100644
--- a/Sources/c_snikket/src/snikket/XEP0393.cpp
+++ b/Sources/c_snikket/src/snikket/XEP0393.cpp
@@ -28,9 +28,6 @@
 #ifndef INCLUDED_snikket_Stanza
 #include <snikket/Stanza.h>
 #endif
-#ifndef INCLUDED_snikket_TextNode
-#include <snikket/TextNode.h>
-#endif
 #ifndef INCLUDED_snikket_XEP0393
 #include <snikket/XEP0393.h>
 #endif
@@ -75,10 +72,10 @@ static const ::String _hx_array_data_533559ef_14[] = {
 };
 HX_LOCAL_STACK_FRAME(_hx_pos_100c160c0c16a433_84_renderNode,"snikket.XEP0393","renderNode",0x3bc9e897,"snikket.XEP0393.renderNode","snikket/XEP0393.hx",84,0xcee3f370)
 HX_LOCAL_STACK_FRAME(_hx_pos_100c160c0c16a433_90_parseSpans,"snikket.XEP0393","parseSpans",0x00fdc155,"snikket.XEP0393.parseSpans","snikket/XEP0393.hx",90,0xcee3f370)
-HX_LOCAL_STACK_FRAME(_hx_pos_100c160c0c16a433_136_parseSpan,"snikket.XEP0393","parseSpan",0x4bc5715e,"snikket.XEP0393.parseSpan","snikket/XEP0393.hx",136,0xcee3f370)
-HX_LOCAL_STACK_FRAME(_hx_pos_100c160c0c16a433_156_parseBlock,"snikket.XEP0393","parseBlock",0x3493a039,"snikket.XEP0393.parseBlock","snikket/XEP0393.hx",156,0xcee3f370)
-HX_LOCAL_STACK_FRAME(_hx_pos_100c160c0c16a433_168_parseQuote,"snikket.XEP0393","parseQuote",0xdd894e28,"snikket.XEP0393.parseQuote","snikket/XEP0393.hx",168,0xcee3f370)
-HX_LOCAL_STACK_FRAME(_hx_pos_100c160c0c16a433_195_parsePreformatted,"snikket.XEP0393","parsePreformatted",0xd018390d,"snikket.XEP0393.parsePreformatted","snikket/XEP0393.hx",195,0xcee3f370)
+HX_LOCAL_STACK_FRAME(_hx_pos_100c160c0c16a433_138_parseSpan,"snikket.XEP0393","parseSpan",0x4bc5715e,"snikket.XEP0393.parseSpan","snikket/XEP0393.hx",138,0xcee3f370)
+HX_LOCAL_STACK_FRAME(_hx_pos_100c160c0c16a433_158_parseBlock,"snikket.XEP0393","parseBlock",0x3493a039,"snikket.XEP0393.parseBlock","snikket/XEP0393.hx",158,0xcee3f370)
+HX_LOCAL_STACK_FRAME(_hx_pos_100c160c0c16a433_171_parseQuote,"snikket.XEP0393","parseQuote",0xdd894e28,"snikket.XEP0393.parseQuote","snikket/XEP0393.hx",171,0xcee3f370)
+HX_LOCAL_STACK_FRAME(_hx_pos_100c160c0c16a433_198_parsePreformatted,"snikket.XEP0393","parsePreformatted",0xd018390d,"snikket.XEP0393.parsePreformatted","snikket/XEP0393.hx",198,0xcee3f370)
 namespace snikket{
 
 void XEP0393_obj::__construct() { }
@@ -351,8 +348,8 @@ HXDLIN(  85)				return ::snikket::XEP0393_obj::render(c);
             			}
             			break;
             			case (int)1: {
-HXLINE(  86)				 ::snikket::TextNode c1 = xhtml->_hx_getObject(0).StaticCast<  ::snikket::TextNode >();
-HXDLIN(  86)				return c1->content;
+HXLINE(  86)				::String c1 = xhtml->_hx_getString(0);
+HXDLIN(  86)				return c1;
             			}
             			break;
             		}
@@ -363,83 +360,85 @@ HXLINE(  84)		return null();
 STATIC_HX_DEFINE_DYNAMIC_FUNC1(XEP0393_obj,renderNode,return )
 
  ::Dynamic XEP0393_obj::parseSpans(::String styled){
-            	HX_GC_STACKFRAME(&_hx_pos_100c160c0c16a433_90_parseSpans)
+            	HX_STACKFRAME(&_hx_pos_100c160c0c16a433_90_parseSpans)
 HXLINE(  91)		::Array< ::Dynamic> spans = ::Array_obj< ::Dynamic>::__new(0);
 HXLINE(  92)		int start = 0;
 HXLINE(  93)		 ::Dynamic nextLink = null();
-HXLINE(  94)		while((start < ::_UnicodeString::UnicodeString_Impl__obj::get_length(styled))){
-HXLINE(  95)			if (::StringTools_obj::isSpace(styled,(start + 1))) {
-HXLINE(  97)				spans->push(::snikket::Node_obj::CData( ::snikket::TextNode_obj::__alloc( HX_CTX ,::_UnicodeString::UnicodeString_Impl__obj::substr(styled,start,2))));
-HXLINE(  98)				start = (start + 2);
+HXLINE(  94)		int styledLength = ::_UnicodeString::UnicodeString_Impl__obj::get_length(styled);
+HXLINE(  95)		while((start < styledLength)){
+HXLINE(  96)			::String _hx_char = ::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,start);
+HXLINE(  97)			if (::StringTools_obj::isSpace(styled,(start + 1))) {
+HXLINE(  99)				spans->push(::snikket::Node_obj::CData(::_UnicodeString::UnicodeString_Impl__obj::substr(styled,start,2)));
+HXLINE( 100)				start = (start + 2);
             			}
             			else {
-HXLINE(  99)				bool _hx_tmp;
-HXDLIN(  99)				if ((start != 0)) {
-HXLINE(  99)					_hx_tmp = !(::StringTools_obj::isSpace(styled,(start - 1)));
+HXLINE( 101)				bool _hx_tmp;
+HXDLIN( 101)				if ((start != 0)) {
+HXLINE( 101)					_hx_tmp = !(::StringTools_obj::isSpace(styled,(start - 1)));
             				}
             				else {
-HXLINE(  99)					_hx_tmp = false;
+HXLINE( 101)					_hx_tmp = false;
             				}
-HXDLIN(  99)				if (_hx_tmp) {
-HXLINE( 101)					spans->push(::snikket::Node_obj::CData( ::snikket::TextNode_obj::__alloc( HX_CTX ,::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,start))));
-HXLINE( 102)					start = (start + 1);
+HXDLIN( 101)				if (_hx_tmp) {
+HXLINE( 103)					spans->push(::snikket::Node_obj::CData(_hx_char));
+HXLINE( 104)					start = (start + 1);
             				}
             				else {
-HXLINE( 103)					if ((::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,start) == HX_("*",2a,00,00,00))) {
-HXLINE( 104)						 ::Dynamic parsed = ::snikket::XEP0393_obj::parseSpan(HX_("strong",57,b6,34,11),HX_("*",2a,00,00,00),styled,start);
-HXLINE( 105)						spans->push( ::Dynamic(parsed->__Field(HX_("span",ca,da,58,4c),::hx::paccDynamic)));
-HXLINE( 106)						start = ( (int)(parsed->__Field(HX_("end",db,03,4d,00),::hx::paccDynamic)) );
+HXLINE( 105)					if ((_hx_char == HX_("*",2a,00,00,00))) {
+HXLINE( 106)						 ::Dynamic parsed = ::snikket::XEP0393_obj::parseSpan(HX_("strong",57,b6,34,11),HX_("*",2a,00,00,00),styled,start);
+HXLINE( 107)						spans->push( ::Dynamic(parsed->__Field(HX_("span",ca,da,58,4c),::hx::paccDynamic)));
+HXLINE( 108)						start = ( (int)(parsed->__Field(HX_("end",db,03,4d,00),::hx::paccDynamic)) );
             					}
             					else {
-HXLINE( 107)						if ((::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,start) == HX_("_",5f,00,00,00))) {
-HXLINE( 108)							 ::Dynamic parsed1 = ::snikket::XEP0393_obj::parseSpan(HX_("em",68,58,00,00),HX_("_",5f,00,00,00),styled,start);
-HXLINE( 109)							spans->push( ::Dynamic(parsed1->__Field(HX_("span",ca,da,58,4c),::hx::paccDynamic)));
-HXLINE( 110)							start = ( (int)(parsed1->__Field(HX_("end",db,03,4d,00),::hx::paccDynamic)) );
+HXLINE( 109)						if ((_hx_char == HX_("_",5f,00,00,00))) {
+HXLINE( 110)							 ::Dynamic parsed1 = ::snikket::XEP0393_obj::parseSpan(HX_("em",68,58,00,00),HX_("_",5f,00,00,00),styled,start);
+HXLINE( 111)							spans->push( ::Dynamic(parsed1->__Field(HX_("span",ca,da,58,4c),::hx::paccDynamic)));
+HXLINE( 112)							start = ( (int)(parsed1->__Field(HX_("end",db,03,4d,00),::hx::paccDynamic)) );
             						}
             						else {
-HXLINE( 111)							if ((::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,start) == HX_("~",7e,00,00,00))) {
-HXLINE( 112)								 ::Dynamic parsed2 = ::snikket::XEP0393_obj::parseSpan(HX_("s",73,00,00,00),HX_("~",7e,00,00,00),styled,start);
-HXLINE( 113)								spans->push( ::Dynamic(parsed2->__Field(HX_("span",ca,da,58,4c),::hx::paccDynamic)));
-HXLINE( 114)								start = ( (int)(parsed2->__Field(HX_("end",db,03,4d,00),::hx::paccDynamic)) );
+HXLINE( 113)							if ((_hx_char == HX_("~",7e,00,00,00))) {
+HXLINE( 114)								 ::Dynamic parsed2 = ::snikket::XEP0393_obj::parseSpan(HX_("s",73,00,00,00),HX_("~",7e,00,00,00),styled,start);
+HXLINE( 115)								spans->push( ::Dynamic(parsed2->__Field(HX_("span",ca,da,58,4c),::hx::paccDynamic)));
+HXLINE( 116)								start = ( (int)(parsed2->__Field(HX_("end",db,03,4d,00),::hx::paccDynamic)) );
             							}
             							else {
-HXLINE( 115)								if ((::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,start) == HX_("`",60,00,00,00))) {
-HXLINE( 117)									 ::Dynamic parsed3 = ::snikket::XEP0393_obj::parseSpan(HX_("tt",80,65,00,00),HX_("`",60,00,00,00),styled,start);
-HXLINE( 118)									spans->push( ::Dynamic(parsed3->__Field(HX_("span",ca,da,58,4c),::hx::paccDynamic)));
-HXLINE( 119)									start = ( (int)(parsed3->__Field(HX_("end",db,03,4d,00),::hx::paccDynamic)) );
+HXLINE( 117)								if ((_hx_char == HX_("`",60,00,00,00))) {
+HXLINE( 119)									 ::Dynamic parsed3 = ::snikket::XEP0393_obj::parseSpan(HX_("tt",80,65,00,00),HX_("`",60,00,00,00),styled,start);
+HXLINE( 120)									spans->push( ::Dynamic(parsed3->__Field(HX_("span",ca,da,58,4c),::hx::paccDynamic)));
+HXLINE( 121)									start = ( (int)(parsed3->__Field(HX_("end",db,03,4d,00),::hx::paccDynamic)) );
             								}
             								else {
-HXLINE( 121)									bool _hx_tmp1;
-HXDLIN( 121)									if (::hx::IsNotNull( nextLink )) {
-HXLINE( 121)										_hx_tmp1 = ::hx::IsGreater( start,nextLink->__Field(HX_("start",62,74,0b,84),::hx::paccDynamic) );
+HXLINE( 123)									bool _hx_tmp1;
+HXDLIN( 123)									if (::hx::IsNotNull( nextLink )) {
+HXLINE( 123)										_hx_tmp1 = ::hx::IsGreater( start,nextLink->__Field(HX_("start",62,74,0b,84),::hx::paccDynamic) );
             									}
             									else {
-HXLINE( 121)										_hx_tmp1 = true;
+HXLINE( 123)										_hx_tmp1 = true;
             									}
-HXDLIN( 121)									if (_hx_tmp1) {
-HXLINE( 122)										nextLink = ::snikket::Autolink_obj::one(styled,start);
+HXDLIN( 123)									if (_hx_tmp1) {
+HXLINE( 124)										nextLink = ::snikket::Autolink_obj::one(styled,start);
             									}
-HXLINE( 124)									bool _hx_tmp2;
-HXDLIN( 124)									bool _hx_tmp3;
-HXDLIN( 124)									if (::hx::IsNotNull( nextLink )) {
-HXLINE( 124)										_hx_tmp3 = ::hx::IsEq( nextLink->__Field(HX_("start",62,74,0b,84),::hx::paccDynamic),start );
+HXLINE( 126)									bool _hx_tmp2;
+HXDLIN( 126)									bool _hx_tmp3;
+HXDLIN( 126)									if (::hx::IsNotNull( nextLink )) {
+HXLINE( 126)										_hx_tmp3 = ::hx::IsEq( nextLink->__Field(HX_("start",62,74,0b,84),::hx::paccDynamic),start );
             									}
             									else {
-HXLINE( 124)										_hx_tmp3 = false;
+HXLINE( 126)										_hx_tmp3 = false;
             									}
-HXDLIN( 124)									if (_hx_tmp3) {
-HXLINE( 124)										_hx_tmp2 = ::hx::IsNotNull( nextLink->__Field(HX_("span",ca,da,58,4c),::hx::paccDynamic) );
+HXDLIN( 126)									if (_hx_tmp3) {
+HXLINE( 126)										_hx_tmp2 = ::hx::IsNotNull( nextLink->__Field(HX_("span",ca,da,58,4c),::hx::paccDynamic) );
             									}
             									else {
-HXLINE( 124)										_hx_tmp2 = false;
+HXLINE( 126)										_hx_tmp2 = false;
             									}
-HXDLIN( 124)									if (_hx_tmp2) {
-HXLINE( 125)										spans->push( ::Dynamic(nextLink->__Field(HX_("span",ca,da,58,4c),::hx::paccDynamic)));
-HXLINE( 126)										start = ( (int)(nextLink->__Field(HX_("end",db,03,4d,00),::hx::paccDynamic)) );
+HXDLIN( 126)									if (_hx_tmp2) {
+HXLINE( 127)										spans->push( ::Dynamic(nextLink->__Field(HX_("span",ca,da,58,4c),::hx::paccDynamic)));
+HXLINE( 128)										start = ( (int)(nextLink->__Field(HX_("end",db,03,4d,00),::hx::paccDynamic)) );
             									}
             									else {
-HXLINE( 128)										spans->push(::snikket::Node_obj::CData( ::snikket::TextNode_obj::__alloc( HX_CTX ,::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,start))));
-HXLINE( 129)										start = (start + 1);
+HXLINE( 130)										spans->push(::snikket::Node_obj::CData(_hx_char));
+HXLINE( 131)										start = (start + 1);
             									}
             								}
             							}
@@ -448,167 +447,168 @@ HXLINE( 129)										start = (start + 1);
             				}
             			}
             		}
-HXLINE( 133)		return spans;
+HXLINE( 135)		return spans;
             	}
 
 
 STATIC_HX_DEFINE_DYNAMIC_FUNC1(XEP0393_obj,parseSpans,return )
 
  ::Dynamic XEP0393_obj::parseSpan(::String tagName,::String marker,::String styled,int start){
-            	HX_GC_STACKFRAME(&_hx_pos_100c160c0c16a433_136_parseSpan)
-HXLINE( 137)		int end = (start + 1);
-HXLINE( 138)		while(true){
-HXLINE( 138)			bool _hx_tmp;
-HXDLIN( 138)			if ((end < styled.length)) {
-HXLINE( 138)				_hx_tmp = (styled.charAt(end) != marker);
+            	HX_GC_STACKFRAME(&_hx_pos_100c160c0c16a433_138_parseSpan)
+HXLINE( 139)		int end = (start + 1);
+HXLINE( 140)		while(true){
+HXLINE( 140)			bool _hx_tmp;
+HXDLIN( 140)			if ((end < styled.length)) {
+HXLINE( 140)				_hx_tmp = (styled.charAt(end) != marker);
             			}
             			else {
-HXLINE( 138)				_hx_tmp = false;
+HXLINE( 140)				_hx_tmp = false;
             			}
-HXDLIN( 138)			if (!(_hx_tmp)) {
-HXLINE( 138)				goto _hx_goto_18;
+HXDLIN( 140)			if (!(_hx_tmp)) {
+HXLINE( 140)				goto _hx_goto_18;
             			}
-HXLINE( 139)			if (::StringTools_obj::isSpace(styled,end)) {
-HXLINE( 139)				end = (end + 1);
+HXLINE( 141)			if (::StringTools_obj::isSpace(styled,end)) {
+HXLINE( 141)				end = (end + 1);
             			}
-HXLINE( 140)			end = (end + 1);
+HXLINE( 142)			end = (end + 1);
             		}
             		_hx_goto_18:;
-HXLINE( 142)		if ((end == (start + 1))) {
-HXLINE( 144)			return  ::Dynamic(::hx::Anon_obj::Create(2)
+HXLINE( 144)		if ((end == (start + 1))) {
+HXLINE( 146)			return  ::Dynamic(::hx::Anon_obj::Create(2)
             				->setFixed(0,HX_("end",db,03,4d,00),(end + 1))
-            				->setFixed(1,HX_("span",ca,da,58,4c),::snikket::Node_obj::CData( ::snikket::TextNode_obj::__alloc( HX_CTX ,styled.substr(start,2)))));
+            				->setFixed(1,HX_("span",ca,da,58,4c),::snikket::Node_obj::CData(styled.substr(start,2))));
             		}
             		else {
-HXLINE( 145)			if ((styled.charAt(end) != marker)) {
-HXLINE( 147)				return  ::Dynamic(::hx::Anon_obj::Create(2)
+HXLINE( 147)			if ((styled.charAt(end) != marker)) {
+HXLINE( 149)				return  ::Dynamic(::hx::Anon_obj::Create(2)
             					->setFixed(0,HX_("end",db,03,4d,00),end)
-            					->setFixed(1,HX_("span",ca,da,58,4c),::snikket::Node_obj::CData( ::snikket::TextNode_obj::__alloc( HX_CTX ,styled.substr(start,(end - start))))));
+            					->setFixed(1,HX_("span",ca,da,58,4c),::snikket::Node_obj::CData(styled.substr(start,(end - start)))));
             			}
             			else {
-HXLINE( 148)				if ((marker == HX_("`",60,00,00,00))) {
-HXLINE( 149)					 ::snikket::Stanza _hx_tmp1 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,tagName,null());
-HXDLIN( 149)					return  ::Dynamic(::hx::Anon_obj::Create(2)
+HXLINE( 150)				if ((marker == HX_("`",60,00,00,00))) {
+HXLINE( 151)					 ::snikket::Stanza _hx_tmp1 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,tagName,null());
+HXDLIN( 151)					return  ::Dynamic(::hx::Anon_obj::Create(2)
             						->setFixed(0,HX_("end",db,03,4d,00),(end + 1))
             						->setFixed(1,HX_("span",ca,da,58,4c),::snikket::Node_obj::Element(_hx_tmp1->text(styled.substr((start + 1),((end - start) - 1))))));
             				}
             				else {
-HXLINE( 151)					 ::snikket::Stanza _hx_tmp2 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,tagName,null());
-HXDLIN( 151)					return  ::Dynamic(::hx::Anon_obj::Create(2)
+HXLINE( 153)					 ::snikket::Stanza _hx_tmp2 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,tagName,null());
+HXDLIN( 153)					return  ::Dynamic(::hx::Anon_obj::Create(2)
             						->setFixed(0,HX_("end",db,03,4d,00),(end + 1))
             						->setFixed(1,HX_("span",ca,da,58,4c),::snikket::Node_obj::Element(_hx_tmp2->addChildNodes(::snikket::XEP0393_obj::parseSpans(styled.substr((start + 1),((end - start) - 1)))))));
             				}
             			}
             		}
-HXLINE( 142)		return null();
+HXLINE( 144)		return null();
             	}
 
 
 STATIC_HX_DEFINE_DYNAMIC_FUNC4(XEP0393_obj,parseSpan,return )
 
  ::Dynamic XEP0393_obj::parseBlock(::String styled){
-            	HX_GC_STACKFRAME(&_hx_pos_100c160c0c16a433_156_parseBlock)
-HXDLIN( 156)		if ((::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,0) == HX_(">",3e,00,00,00))) {
-HXLINE( 157)			return ::snikket::XEP0393_obj::parseQuote(styled);
+            	HX_GC_STACKFRAME(&_hx_pos_100c160c0c16a433_158_parseBlock)
+HXDLIN( 158)		if ((::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,0) == HX_(">",3e,00,00,00))) {
+HXLINE( 159)			return ::snikket::XEP0393_obj::parseQuote(styled);
             		}
             		else {
-HXLINE( 158)			if ((::_UnicodeString::UnicodeString_Impl__obj::substr(styled,0,3) == HX_("```",60,2c,49,00))) {
-HXLINE( 159)				return ::snikket::XEP0393_obj::parsePreformatted(styled);
+HXLINE( 160)			if ((::_UnicodeString::UnicodeString_Impl__obj::substr(styled,0,3) == HX_("```",60,2c,49,00))) {
+HXLINE( 161)				return ::snikket::XEP0393_obj::parsePreformatted(styled);
             			}
             			else {
-HXLINE( 161)				int end = 0;
-HXLINE( 162)				while(true){
-HXLINE( 162)					bool _hx_tmp;
-HXDLIN( 162)					if ((end < ::_UnicodeString::UnicodeString_Impl__obj::get_length(styled))) {
-HXLINE( 162)						_hx_tmp = (::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,end) != HX_("\n",0a,00,00,00));
+HXLINE( 163)				int end = 0;
+HXLINE( 164)				int styledLength = ::_UnicodeString::UnicodeString_Impl__obj::get_length(styled);
+HXLINE( 165)				while(true){
+HXLINE( 165)					bool _hx_tmp;
+HXDLIN( 165)					if ((end < styledLength)) {
+HXLINE( 165)						_hx_tmp = (::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,end) != HX_("\n",0a,00,00,00));
             					}
             					else {
-HXLINE( 162)						_hx_tmp = false;
+HXLINE( 165)						_hx_tmp = false;
             					}
-HXDLIN( 162)					if (!(_hx_tmp)) {
-HXLINE( 162)						goto _hx_goto_20;
+HXDLIN( 165)					if (!(_hx_tmp)) {
+HXLINE( 165)						goto _hx_goto_20;
             					}
-HXDLIN( 162)					end = (end + 1);
+HXDLIN( 165)					end = (end + 1);
             				}
             				_hx_goto_20:;
-HXLINE( 163)				bool _hx_tmp1;
-HXDLIN( 163)				if ((end < ::_UnicodeString::UnicodeString_Impl__obj::get_length(styled))) {
-HXLINE( 163)					_hx_tmp1 = (::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,end) == HX_("\n",0a,00,00,00));
+HXLINE( 166)				bool _hx_tmp1;
+HXDLIN( 166)				if ((end < styledLength)) {
+HXLINE( 166)					_hx_tmp1 = (::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,end) == HX_("\n",0a,00,00,00));
             				}
             				else {
-HXLINE( 163)					_hx_tmp1 = false;
+HXLINE( 166)					_hx_tmp1 = false;
             				}
-HXDLIN( 163)				if (_hx_tmp1) {
-HXLINE( 163)					end = (end + 1);
+HXDLIN( 166)				if (_hx_tmp1) {
+HXLINE( 166)					end = (end + 1);
             				}
-HXLINE( 164)				 ::snikket::Stanza _hx_tmp2 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("div",51,3d,4c,00),null());
-HXDLIN( 164)				 ::snikket::Stanza _hx_tmp3 = _hx_tmp2->addChildNodes(::snikket::XEP0393_obj::parseSpans(::_UnicodeString::UnicodeString_Impl__obj::substr(styled,0,end)));
-HXDLIN( 164)				return  ::Dynamic(::hx::Anon_obj::Create(2)
+HXLINE( 167)				 ::snikket::Stanza _hx_tmp2 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("div",51,3d,4c,00),null());
+HXDLIN( 167)				 ::snikket::Stanza _hx_tmp3 = _hx_tmp2->addChildNodes(::snikket::XEP0393_obj::parseSpans(::_UnicodeString::UnicodeString_Impl__obj::substr(styled,0,end)));
+HXDLIN( 167)				return  ::Dynamic(::hx::Anon_obj::Create(2)
             					->setFixed(0,HX_("block",4d,75,fc,b4),_hx_tmp3)
             					->setFixed(1,HX_("rest",14,5b,a7,4b),::_UnicodeString::UnicodeString_Impl__obj::substr(styled,end,null())));
             			}
             		}
-HXLINE( 156)		return null();
+HXLINE( 158)		return null();
             	}
 
 
 STATIC_HX_DEFINE_DYNAMIC_FUNC1(XEP0393_obj,parseBlock,return )
 
  ::Dynamic XEP0393_obj::parseQuote(::String styled){
-            	HX_GC_STACKFRAME(&_hx_pos_100c160c0c16a433_168_parseQuote)
-HXLINE( 169)		::Array< ::String > lines = ::Array_obj< ::String >::__new(0);
-HXLINE( 170)		::String line = HX_("",00,00,00,00);
-HXLINE( 171)		int end = 1;
-HXLINE( 172)		int spaceAfter = 0;
-HXLINE( 173)		while((end < ::_UnicodeString::UnicodeString_Impl__obj::get_length(styled))){
-HXLINE( 174)			bool _hx_tmp;
-HXDLIN( 174)			if ((::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,end) != HX_("\n",0a,00,00,00))) {
-HXLINE( 174)				_hx_tmp = ::StringTools_obj::isSpace(styled,end);
+            	HX_GC_STACKFRAME(&_hx_pos_100c160c0c16a433_171_parseQuote)
+HXLINE( 172)		::Array< ::String > lines = ::Array_obj< ::String >::__new(0);
+HXLINE( 173)		::String line = HX_("",00,00,00,00);
+HXLINE( 174)		int end = 1;
+HXLINE( 175)		int spaceAfter = 0;
+HXLINE( 176)		while((end < ::_UnicodeString::UnicodeString_Impl__obj::get_length(styled))){
+HXLINE( 177)			bool _hx_tmp;
+HXDLIN( 177)			if ((::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,end) != HX_("\n",0a,00,00,00))) {
+HXLINE( 177)				_hx_tmp = ::StringTools_obj::isSpace(styled,end);
             			}
             			else {
-HXLINE( 174)				_hx_tmp = false;
+HXLINE( 177)				_hx_tmp = false;
             			}
-HXDLIN( 174)			if (_hx_tmp) {
-HXLINE( 174)				end = (end + 1);
+HXDLIN( 177)			if (_hx_tmp) {
+HXLINE( 177)				end = (end + 1);
             			}
-HXLINE( 175)			while(true){
-HXLINE( 175)				bool _hx_tmp1;
-HXDLIN( 175)				if ((end < ::_UnicodeString::UnicodeString_Impl__obj::get_length(styled))) {
-HXLINE( 175)					_hx_tmp1 = (::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,end) != HX_("\n",0a,00,00,00));
+HXLINE( 178)			while(true){
+HXLINE( 178)				bool _hx_tmp1;
+HXDLIN( 178)				if ((end < ::_UnicodeString::UnicodeString_Impl__obj::get_length(styled))) {
+HXLINE( 178)					_hx_tmp1 = (::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,end) != HX_("\n",0a,00,00,00));
             				}
             				else {
-HXLINE( 175)					_hx_tmp1 = false;
+HXLINE( 178)					_hx_tmp1 = false;
             				}
-HXDLIN( 175)				if (!(_hx_tmp1)) {
-HXLINE( 175)					goto _hx_goto_23;
+HXDLIN( 178)				if (!(_hx_tmp1)) {
+HXLINE( 178)					goto _hx_goto_23;
             				}
-HXLINE( 176)				line = (line + ::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,end));
-HXLINE( 177)				end = (end + 1);
+HXLINE( 179)				line = (line + ::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,end));
+HXLINE( 180)				end = (end + 1);
             			}
             			_hx_goto_23:;
-HXLINE( 179)			bool _hx_tmp2;
-HXDLIN( 179)			if ((end < ::_UnicodeString::UnicodeString_Impl__obj::get_length(styled))) {
-HXLINE( 179)				_hx_tmp2 = (::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,end) == HX_("\n",0a,00,00,00));
+HXLINE( 182)			bool _hx_tmp2;
+HXDLIN( 182)			if ((end < ::_UnicodeString::UnicodeString_Impl__obj::get_length(styled))) {
+HXLINE( 182)				_hx_tmp2 = (::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,end) == HX_("\n",0a,00,00,00));
             			}
             			else {
-HXLINE( 179)				_hx_tmp2 = false;
+HXLINE( 182)				_hx_tmp2 = false;
             			}
-HXDLIN( 179)			if (_hx_tmp2) {
-HXLINE( 180)				end = (end + 1);
+HXDLIN( 182)			if (_hx_tmp2) {
+HXLINE( 183)				end = (end + 1);
             			}
-HXLINE( 182)			lines->push((line + HX_("\n",0a,00,00,00)));
-HXLINE( 183)			line = HX_("",00,00,00,00);
-HXLINE( 184)			if ((::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,end) == HX_(">",3e,00,00,00))) {
-HXLINE( 185)				end = (end + 1);
+HXLINE( 185)			lines->push((line + HX_("\n",0a,00,00,00)));
+HXLINE( 186)			line = HX_("",00,00,00,00);
+HXLINE( 187)			if ((::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,end) == HX_(">",3e,00,00,00))) {
+HXLINE( 188)				end = (end + 1);
             			}
             			else {
-HXLINE( 187)				goto _hx_goto_22;
+HXLINE( 190)				goto _hx_goto_22;
             			}
             		}
             		_hx_goto_22:;
-HXLINE( 191)		 ::snikket::Stanza _hx_tmp3 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("blockquote",cf,56,28,a2),null());
-HXDLIN( 191)		 ::snikket::Stanza _hx_tmp4 = _hx_tmp3->addChildren(::snikket::XEP0393_obj::parse(lines->join(HX_("",00,00,00,00))));
-HXDLIN( 191)		return  ::Dynamic(::hx::Anon_obj::Create(2)
+HXLINE( 194)		 ::snikket::Stanza _hx_tmp3 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("blockquote",cf,56,28,a2),null());
+HXDLIN( 194)		 ::snikket::Stanza _hx_tmp4 = _hx_tmp3->addChildren(::snikket::XEP0393_obj::parse(lines->join(HX_("",00,00,00,00))));
+HXDLIN( 194)		return  ::Dynamic(::hx::Anon_obj::Create(2)
             			->setFixed(0,HX_("block",4d,75,fc,b4),_hx_tmp4)
             			->setFixed(1,HX_("rest",14,5b,a7,4b),::_UnicodeString::UnicodeString_Impl__obj::substr(styled,end,null())));
             	}
@@ -617,58 +617,59 @@ HXDLIN( 191)		return  ::Dynamic(::hx::Anon_obj::Create(2)
 STATIC_HX_DEFINE_DYNAMIC_FUNC1(XEP0393_obj,parseQuote,return )
 
  ::Dynamic XEP0393_obj::parsePreformatted(::String styled){
-            	HX_GC_STACKFRAME(&_hx_pos_100c160c0c16a433_195_parsePreformatted)
-HXLINE( 196)		::Array< ::String > lines = ::Array_obj< ::String >::__new(0);
-HXLINE( 197)		::String line = null();
-HXLINE( 198)		int end = 0;
-HXLINE( 199)		while((end < ::_UnicodeString::UnicodeString_Impl__obj::get_length(styled))){
-HXLINE( 200)			while(true){
-HXLINE( 200)				bool _hx_tmp;
-HXDLIN( 200)				if ((end < ::_UnicodeString::UnicodeString_Impl__obj::get_length(styled))) {
-HXLINE( 200)					_hx_tmp = (::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,end) != HX_("\n",0a,00,00,00));
+            	HX_GC_STACKFRAME(&_hx_pos_100c160c0c16a433_198_parsePreformatted)
+HXLINE( 199)		::Array< ::String > lines = ::Array_obj< ::String >::__new(0);
+HXLINE( 200)		::String line = null();
+HXLINE( 201)		int end = 0;
+HXLINE( 202)		int styledLength = ::_UnicodeString::UnicodeString_Impl__obj::get_length(styled);
+HXLINE( 203)		while((end < styledLength)){
+HXLINE( 204)			while(true){
+HXLINE( 204)				bool _hx_tmp;
+HXDLIN( 204)				if ((end < styledLength)) {
+HXLINE( 204)					_hx_tmp = (::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,end) != HX_("\n",0a,00,00,00));
             				}
             				else {
-HXLINE( 200)					_hx_tmp = false;
+HXLINE( 204)					_hx_tmp = false;
             				}
-HXDLIN( 200)				if (!(_hx_tmp)) {
-HXLINE( 200)					goto _hx_goto_26;
+HXDLIN( 204)				if (!(_hx_tmp)) {
+HXLINE( 204)					goto _hx_goto_26;
             				}
-HXLINE( 201)				if (::hx::IsNotNull( line )) {
-HXLINE( 201)					line = (line + ::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,end));
+HXLINE( 205)				if (::hx::IsNotNull( line )) {
+HXLINE( 205)					line = (line + ::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,end));
             				}
-HXLINE( 202)				end = (end + 1);
+HXLINE( 206)				end = (end + 1);
             			}
             			_hx_goto_26:;
-HXLINE( 204)			bool _hx_tmp1;
-HXDLIN( 204)			if ((end < ::_UnicodeString::UnicodeString_Impl__obj::get_length(styled))) {
-HXLINE( 204)				_hx_tmp1 = (::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,end) == HX_("\n",0a,00,00,00));
+HXLINE( 208)			bool _hx_tmp1;
+HXDLIN( 208)			if ((end < styledLength)) {
+HXLINE( 208)				_hx_tmp1 = (::_UnicodeString::UnicodeString_Impl__obj::charAt(styled,end) == HX_("\n",0a,00,00,00));
             			}
             			else {
-HXLINE( 204)				_hx_tmp1 = false;
+HXLINE( 208)				_hx_tmp1 = false;
             			}
-HXDLIN( 204)			if (_hx_tmp1) {
-HXLINE( 205)				end = (end + 1);
+HXDLIN( 208)			if (_hx_tmp1) {
+HXLINE( 209)				end = (end + 1);
             			}
-HXLINE( 207)			if (::hx::IsNotNull( line )) {
-HXLINE( 207)				lines->push((line + HX_("\n",0a,00,00,00)));
+HXLINE( 211)			if (::hx::IsNotNull( line )) {
+HXLINE( 211)				lines->push((line + HX_("\n",0a,00,00,00)));
             			}
-HXLINE( 208)			line = HX_("",00,00,00,00);
-HXLINE( 209)			bool _hx_tmp2;
-HXDLIN( 209)			if ((::_UnicodeString::UnicodeString_Impl__obj::substr(styled,end,4) != HX_("```\n",aa,a7,bd,3f))) {
-HXLINE( 209)				_hx_tmp2 = (::_UnicodeString::UnicodeString_Impl__obj::substr(styled,end,null()) == HX_("```",60,2c,49,00));
+HXLINE( 212)			line = HX_("",00,00,00,00);
+HXLINE( 213)			bool _hx_tmp2;
+HXDLIN( 213)			if ((::_UnicodeString::UnicodeString_Impl__obj::substr(styled,end,4) != HX_("```\n",aa,a7,bd,3f))) {
+HXLINE( 213)				_hx_tmp2 = (::_UnicodeString::UnicodeString_Impl__obj::substr(styled,end,null()) == HX_("```",60,2c,49,00));
             			}
             			else {
-HXLINE( 209)				_hx_tmp2 = true;
+HXLINE( 213)				_hx_tmp2 = true;
             			}
-HXDLIN( 209)			if (_hx_tmp2) {
-HXLINE( 210)				end = (end + 4);
-HXLINE( 211)				goto _hx_goto_25;
+HXDLIN( 213)			if (_hx_tmp2) {
+HXLINE( 214)				end = (end + 4);
+HXLINE( 215)				goto _hx_goto_25;
             			}
             		}
             		_hx_goto_25:;
-HXLINE( 215)		 ::snikket::Stanza _hx_tmp3 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("pre",23,60,55,00),null());
-HXDLIN( 215)		 ::snikket::Stanza _hx_tmp4 = _hx_tmp3->text(lines->join(HX_("",00,00,00,00)));
-HXDLIN( 215)		return  ::Dynamic(::hx::Anon_obj::Create(2)
+HXLINE( 219)		 ::snikket::Stanza _hx_tmp3 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("pre",23,60,55,00),null());
+HXDLIN( 219)		 ::snikket::Stanza _hx_tmp4 = _hx_tmp3->text(lines->join(HX_("",00,00,00,00)));
+HXDLIN( 219)		return  ::Dynamic(::hx::Anon_obj::Create(2)
             			->setFixed(0,HX_("block",4d,75,fc,b4),_hx_tmp4)
             			->setFixed(1,HX_("rest",14,5b,a7,4b),::_UnicodeString::UnicodeString_Impl__obj::substr(styled,end,null())));
             	}
diff --git a/Sources/c_snikket/src/snikket/_Util/Util_Fields_.cpp b/Sources/c_snikket/src/snikket/_Util/Util_Fields_.cpp
index 8c09c1d..92c10af 100644
--- a/Sources/c_snikket/src/snikket/_Util/Util_Fields_.cpp
+++ b/Sources/c_snikket/src/snikket/_Util/Util_Fields_.cpp
@@ -12,8 +12,8 @@
 #endif
 
 HX_LOCAL_STACK_FRAME(_hx_pos_9fb9d2715b360f7b_3_setupTrace,"snikket._Util.Util_Fields_","setupTrace",0xaf383aaf,"snikket._Util.Util_Fields_.setupTrace","snikket/Util.hx",3,0x6717090a)
-HX_LOCAL_STACK_FRAME(_hx_pos_9fb9d2715b360f7b_21_downcast,"snikket._Util.Util_Fields_","downcast",0x1252e848,"snikket._Util.Util_Fields_.downcast","snikket/Util.hx",21,0x6717090a)
-HX_LOCAL_STACK_FRAME(_hx_pos_9fb9d2715b360f7b_26_xmlEscape,"snikket._Util.Util_Fields_","xmlEscape",0x084fcab1,"snikket._Util.Util_Fields_.xmlEscape","snikket/Util.hx",26,0x6717090a)
+HX_LOCAL_STACK_FRAME(_hx_pos_9fb9d2715b360f7b_45_downcast,"snikket._Util.Util_Fields_","downcast",0x1252e848,"snikket._Util.Util_Fields_.downcast","snikket/Util.hx",45,0x6717090a)
+HX_LOCAL_STACK_FRAME(_hx_pos_9fb9d2715b360f7b_50_xmlEscape,"snikket._Util.Util_Fields_","xmlEscape",0x084fcab1,"snikket._Util.Util_Fields_.xmlEscape","snikket/Util.hx",50,0x6717090a)
 namespace snikket{
 namespace _Util{
 
@@ -42,16 +42,16 @@ void Util_Fields__obj::setupTrace(){
 STATIC_HX_DEFINE_DYNAMIC_FUNC0(Util_Fields__obj,setupTrace,(void))
 
  ::Dynamic Util_Fields__obj::downcast( ::Dynamic value,::hx::Class c){
-            	HX_STACKFRAME(&_hx_pos_9fb9d2715b360f7b_21_downcast)
-HXDLIN(  21)		return ::Std_obj::downcast(value,c);
+            	HX_STACKFRAME(&_hx_pos_9fb9d2715b360f7b_45_downcast)
+HXDLIN(  45)		return ::Std_obj::downcast(value,c);
             	}
 
 
 STATIC_HX_DEFINE_DYNAMIC_FUNC2(Util_Fields__obj,downcast,return )
 
 ::String Util_Fields__obj::xmlEscape(::String s){
-            	HX_STACKFRAME(&_hx_pos_9fb9d2715b360f7b_26_xmlEscape)
-HXDLIN(  26)		return ::StringTools_obj::replace(::StringTools_obj::replace(::StringTools_obj::replace(s,HX_("&",26,00,00,00),HX_("&amp;",dd,d4,aa,21)),HX_("<",3c,00,00,00),HX_("&lt;",4d,74,70,19)),HX_(">",3e,00,00,00),HX_("&gt;",08,a9,6c,19));
+            	HX_STACKFRAME(&_hx_pos_9fb9d2715b360f7b_50_xmlEscape)
+HXDLIN(  50)		return ::StringTools_obj::replace(::StringTools_obj::replace(::StringTools_obj::replace(s,HX_("&",26,00,00,00),HX_("&amp;",dd,d4,aa,21)),HX_("<",3c,00,00,00),HX_("&lt;",4d,74,70,19)),HX_(">",3e,00,00,00),HX_("&gt;",08,a9,6c,19));
             	}
 
 
diff --git a/Sources/c_snikket/src/snikket/jingle/IncomingProposedSession.cpp b/Sources/c_snikket/src/snikket/jingle/IncomingProposedSession.cpp
index 77588b5..dd8e202 100644
--- a/Sources/c_snikket/src/snikket/jingle/IncomingProposedSession.cpp
+++ b/Sources/c_snikket/src/snikket/jingle/IncomingProposedSession.cpp
@@ -65,33 +65,34 @@
 #include <thenshim/_Promise/Promise_Impl_.h>
 #endif
 
-HX_DEFINE_STACK_FRAME(_hx_pos_070c1caeb07d54b9_60_new,"snikket.jingle.IncomingProposedSession","new",0x8d7afc70,"snikket.jingle.IncomingProposedSession.new","snikket/jingle/Session.hx",60,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_79_ring,"snikket.jingle.IncomingProposedSession","ring",0x40c9c1a0,"snikket.jingle.IncomingProposedSession.ring","snikket/jingle/Session.hx",79,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_73_ring,"snikket.jingle.IncomingProposedSession","ring",0x40c9c1a0,"snikket.jingle.IncomingProposedSession.ring","snikket/jingle/Session.hx",73,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_91_hangup,"snikket.jingle.IncomingProposedSession","hangup",0xbd2f903d,"snikket.jingle.IncomingProposedSession.hangup","snikket/jingle/Session.hx",91,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_84_hangup,"snikket.jingle.IncomingProposedSession","hangup",0xbd2f903d,"snikket.jingle.IncomingProposedSession.hangup","snikket/jingle/Session.hx",84,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_98_retract,"snikket.jingle.IncomingProposedSession","retract",0x81505611,"snikket.jingle.IncomingProposedSession.retract","snikket/jingle/Session.hx",98,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_102_terminate,"snikket.jingle.IncomingProposedSession","terminate",0xabf9ca71,"snikket.jingle.IncomingProposedSession.terminate","snikket/jingle/Session.hx",102,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_106_contentAdd,"snikket.jingle.IncomingProposedSession","contentAdd",0xf85adc58,"snikket.jingle.IncomingProposedSession.contentAdd","snikket/jingle/Session.hx",106,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_110_contentAccept,"snikket.jingle.IncomingProposedSession","contentAccept",0x4d3ea531,"snikket.jingle.IncomingProposedSession.contentAccept","snikket/jingle/Session.hx",110,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_113_transportInfo,"snikket.jingle.IncomingProposedSession","transportInfo",0x230c1cc7,"snikket.jingle.IncomingProposedSession.transportInfo","snikket/jingle/Session.hx",113,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_124_accept,"snikket.jingle.IncomingProposedSession","accept",0x103650f8,"snikket.jingle.IncomingProposedSession.accept","snikket/jingle/Session.hx",124,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_118_accept,"snikket.jingle.IncomingProposedSession","accept",0x103650f8,"snikket.jingle.IncomingProposedSession.accept","snikket/jingle/Session.hx",118,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_134_initiate,"snikket.jingle.IncomingProposedSession","initiate",0xde9e8449,"snikket.jingle.IncomingProposedSession.initiate","snikket/jingle/Session.hx",134,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_144_addMedia,"snikket.jingle.IncomingProposedSession","addMedia",0xfe2844f3,"snikket.jingle.IncomingProposedSession.addMedia","snikket/jingle/Session.hx",144,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_148_callStatus,"snikket.jingle.IncomingProposedSession","callStatus",0xe5a93460,"snikket.jingle.IncomingProposedSession.callStatus","snikket/jingle/Session.hx",148,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_152_videoTracks,"snikket.jingle.IncomingProposedSession","videoTracks",0xf76e7e73,"snikket.jingle.IncomingProposedSession.videoTracks","snikket/jingle/Session.hx",152,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_156_dtmf,"snikket.jingle.IncomingProposedSession","dtmf",0x37911cd9,"snikket.jingle.IncomingProposedSession.dtmf","snikket/jingle/Session.hx",156,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_160_get_sid,"snikket.jingle.IncomingProposedSession","get_sid",0xab62dbb5,"snikket.jingle.IncomingProposedSession.get_sid","snikket/jingle/Session.hx",160,0x6db2dd54)
+HX_DEFINE_STACK_FRAME(_hx_pos_070c1caeb07d54b9_61_new,"snikket.jingle.IncomingProposedSession","new",0x8d7afc70,"snikket.jingle.IncomingProposedSession.new","snikket/jingle/Session.hx",61,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_81_ring,"snikket.jingle.IncomingProposedSession","ring",0x40c9c1a0,"snikket.jingle.IncomingProposedSession.ring","snikket/jingle/Session.hx",81,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_75_ring,"snikket.jingle.IncomingProposedSession","ring",0x40c9c1a0,"snikket.jingle.IncomingProposedSession.ring","snikket/jingle/Session.hx",75,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_93_hangup,"snikket.jingle.IncomingProposedSession","hangup",0xbd2f903d,"snikket.jingle.IncomingProposedSession.hangup","snikket/jingle/Session.hx",93,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_86_hangup,"snikket.jingle.IncomingProposedSession","hangup",0xbd2f903d,"snikket.jingle.IncomingProposedSession.hangup","snikket/jingle/Session.hx",86,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_100_retract,"snikket.jingle.IncomingProposedSession","retract",0x81505611,"snikket.jingle.IncomingProposedSession.retract","snikket/jingle/Session.hx",100,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_104_terminate,"snikket.jingle.IncomingProposedSession","terminate",0xabf9ca71,"snikket.jingle.IncomingProposedSession.terminate","snikket/jingle/Session.hx",104,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_108_contentAdd,"snikket.jingle.IncomingProposedSession","contentAdd",0xf85adc58,"snikket.jingle.IncomingProposedSession.contentAdd","snikket/jingle/Session.hx",108,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_112_contentAccept,"snikket.jingle.IncomingProposedSession","contentAccept",0x4d3ea531,"snikket.jingle.IncomingProposedSession.contentAccept","snikket/jingle/Session.hx",112,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_115_transportInfo,"snikket.jingle.IncomingProposedSession","transportInfo",0x230c1cc7,"snikket.jingle.IncomingProposedSession.transportInfo","snikket/jingle/Session.hx",115,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_126_accept,"snikket.jingle.IncomingProposedSession","accept",0x103650f8,"snikket.jingle.IncomingProposedSession.accept","snikket/jingle/Session.hx",126,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_120_accept,"snikket.jingle.IncomingProposedSession","accept",0x103650f8,"snikket.jingle.IncomingProposedSession.accept","snikket/jingle/Session.hx",120,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_136_initiate,"snikket.jingle.IncomingProposedSession","initiate",0xde9e8449,"snikket.jingle.IncomingProposedSession.initiate","snikket/jingle/Session.hx",136,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_146_addMedia,"snikket.jingle.IncomingProposedSession","addMedia",0xfe2844f3,"snikket.jingle.IncomingProposedSession.addMedia","snikket/jingle/Session.hx",146,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_150_callStatus,"snikket.jingle.IncomingProposedSession","callStatus",0xe5a93460,"snikket.jingle.IncomingProposedSession.callStatus","snikket/jingle/Session.hx",150,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_154_videoTracks,"snikket.jingle.IncomingProposedSession","videoTracks",0xf76e7e73,"snikket.jingle.IncomingProposedSession.videoTracks","snikket/jingle/Session.hx",154,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_158_dtmf,"snikket.jingle.IncomingProposedSession","dtmf",0x37911cd9,"snikket.jingle.IncomingProposedSession.dtmf","snikket/jingle/Session.hx",158,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_162_get_sid,"snikket.jingle.IncomingProposedSession","get_sid",0xab62dbb5,"snikket.jingle.IncomingProposedSession.get_sid","snikket/jingle/Session.hx",162,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_070c1caeb07d54b9_166_get_chatId,"snikket.jingle.IncomingProposedSession","get_chatId",0x5c7bea8c,"snikket.jingle.IncomingProposedSession.get_chatId","snikket/jingle/Session.hx",166,0x6db2dd54)
 namespace snikket{
 namespace jingle{
 
 void IncomingProposedSession_obj::__construct( ::snikket::Client client, ::snikket::JID from,::String sid){
-            	HX_STACKFRAME(&_hx_pos_070c1caeb07d54b9_60_new)
-HXLINE(  65)		this->accepted = false;
-HXLINE(  68)		this->client = client;
-HXLINE(  69)		this->from = from;
-HXLINE(  70)		this->_sid = sid;
+            	HX_STACKFRAME(&_hx_pos_070c1caeb07d54b9_61_new)
+HXLINE(  67)		this->accepted = false;
+HXLINE(  70)		this->client = client;
+HXLINE(  71)		this->from = from;
+HXLINE(  72)		this->_sid = sid;
             	}
 
 Dynamic IncomingProposedSession_obj::__CreateEmpty() { return new IncomingProposedSession_obj; }
@@ -111,6 +112,7 @@ bool IncomingProposedSession_obj::_hx_isInstanceOf(int inClassId) {
 
 static ::snikket::jingle::Session_obj _hx_snikket_jingle_IncomingProposedSession__hx_snikket_jingle_Session= {
 	( ::String (::hx::Object::*)())&::snikket::jingle::IncomingProposedSession_obj::get_sid,
+	( ::String (::hx::Object::*)())&::snikket::jingle::IncomingProposedSession_obj::get_chatId,
 	(  ::snikket::jingle::InitiatedSession (::hx::Object::*)( ::snikket::Stanza))&::snikket::jingle::IncomingProposedSession_obj::initiate,
 	( void (::hx::Object::*)())&::snikket::jingle::IncomingProposedSession_obj::accept,
 	( void (::hx::Object::*)())&::snikket::jingle::IncomingProposedSession_obj::hangup,
@@ -139,22 +141,20 @@ void *IncomingProposedSession_obj::_hx_getInterface(int inHash) {
 void IncomingProposedSession_obj::ring(){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::jingle::IncomingProposedSession,_gthis) HXARGC(1)
             		void _hx_run(::Array< ::Dynamic> stored){
-            			HX_GC_STACKFRAME(&_hx_pos_070c1caeb07d54b9_79_ring)
-HXLINE(  79)			_gthis->client->notifyMessageHandlers(stored->__get(0).StaticCast<  ::snikket::ChatMessage >(),1);
+            			HX_GC_STACKFRAME(&_hx_pos_070c1caeb07d54b9_81_ring)
+HXLINE(  81)			_gthis->client->notifyMessageHandlers(stored->__get(0).StaticCast<  ::snikket::ChatMessage >(),1);
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_GC_STACKFRAME(&_hx_pos_070c1caeb07d54b9_73_ring)
-HXDLIN(  73)		 ::snikket::jingle::IncomingProposedSession _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE(  76)		 ::snikket::Stanza event =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("ringing",32,9b,80,1a), ::Dynamic(::hx::Anon_obj::Create(2)
+            	HX_GC_STACKFRAME(&_hx_pos_070c1caeb07d54b9_75_ring)
+HXDLIN(  75)		 ::snikket::jingle::IncomingProposedSession _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE(  78)		 ::snikket::Stanza event =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("ringing",32,9b,80,1a), ::Dynamic(::hx::Anon_obj::Create(2)
             			->setFixed(0,HX_("id",db,5b,00,00),this->get_sid())
             			->setFixed(1,HX_("xmlns",dc,31,74,60),HX_("urn:xmpp:jingle-message:0",fd,20,a5,07))));
-HXLINE(  77)		 ::snikket::ChatMessage msg = ::snikket::jingle::_Session::Session_Fields__obj::mkCallMessage(this->from,this->client->jid,event);
-HXLINE(  78)		this->client->storeMessages(::Array_obj< ::Dynamic>::__new(1)->init(0,msg), ::Dynamic(new _hx_Closure_0(_gthis)));
-HXLINE(  81)		 ::snikket::Client _hx_tmp = this->client;
-HXDLIN(  81)		_hx_tmp->trigger(HX_("call/ring",01,8e,91,54), ::Dynamic(::hx::Anon_obj::Create(2)
-            			->setFixed(0,HX_("session",56,17,98,93),::hx::ObjectPtr<OBJ_>(this))
-            			->setFixed(1,HX_("chatId",d3,04,77,b7),this->from->asBare()->asString())));
+HXLINE(  79)		 ::snikket::ChatMessage msg = ::snikket::jingle::_Session::Session_Fields__obj::mkCallMessage(this->from,this->client->jid,event);
+HXLINE(  80)		this->client->storeMessages(::Array_obj< ::Dynamic>::__new(1)->init(0,msg), ::Dynamic(new _hx_Closure_0(_gthis)));
+HXLINE(  83)		this->client->trigger(HX_("call/ring",01,8e,91,54), ::Dynamic(::hx::Anon_obj::Create(1)
+            			->setFixed(0,HX_("session",56,17,98,93),::hx::ObjectPtr<OBJ_>(this))));
             	}
 
 
@@ -163,22 +163,22 @@ HX_DEFINE_DYNAMIC_FUNC0(IncomingProposedSession_obj,ring,(void))
 void IncomingProposedSession_obj::hangup(){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::jingle::IncomingProposedSession,_gthis) HXARGC(1)
             		void _hx_run(::Array< ::Dynamic> stored){
-            			HX_GC_STACKFRAME(&_hx_pos_070c1caeb07d54b9_91_hangup)
-HXLINE(  91)			_gthis->client->notifyMessageHandlers(stored->__get(0).StaticCast<  ::snikket::ChatMessage >(),1);
+            			HX_GC_STACKFRAME(&_hx_pos_070c1caeb07d54b9_93_hangup)
+HXLINE(  93)			_gthis->client->notifyMessageHandlers(stored->__get(0).StaticCast<  ::snikket::ChatMessage >(),1);
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_GC_STACKFRAME(&_hx_pos_070c1caeb07d54b9_84_hangup)
-HXDLIN(  84)		 ::snikket::jingle::IncomingProposedSession _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE(  88)		 ::snikket::Stanza event =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("reject",5f,51,85,02), ::Dynamic(::hx::Anon_obj::Create(2)
+            	HX_GC_STACKFRAME(&_hx_pos_070c1caeb07d54b9_86_hangup)
+HXDLIN(  86)		 ::snikket::jingle::IncomingProposedSession _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE(  90)		 ::snikket::Stanza event =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("reject",5f,51,85,02), ::Dynamic(::hx::Anon_obj::Create(2)
             			->setFixed(0,HX_("id",db,5b,00,00),this->get_sid())
             			->setFixed(1,HX_("xmlns",dc,31,74,60),HX_("urn:xmpp:jingle-message:0",fd,20,a5,07))));
-HXLINE(  89)		 ::snikket::ChatMessage msg = ::snikket::jingle::_Session::Session_Fields__obj::mkCallMessage(this->from,this->client->jid,event);
-HXLINE(  90)		this->client->storeMessages(::Array_obj< ::Dynamic>::__new(1)->init(0,msg), ::Dynamic(new _hx_Closure_0(_gthis)));
-HXLINE(  93)		{
-HXLINE(  93)			 ::snikket::Client this1 = this->client;
-HXDLIN(  93)			::Dynamic this2 = this1->getDirectChat(this->from->asBare()->asString(),false)->jingleSessions;
-HXDLIN(  93)			( ( ::haxe::ds::StringMap)(this2) )->remove(this->get_sid());
+HXLINE(  91)		 ::snikket::ChatMessage msg = ::snikket::jingle::_Session::Session_Fields__obj::mkCallMessage(this->from,this->client->jid,event);
+HXLINE(  92)		this->client->storeMessages(::Array_obj< ::Dynamic>::__new(1)->init(0,msg), ::Dynamic(new _hx_Closure_0(_gthis)));
+HXLINE(  95)		{
+HXLINE(  95)			 ::snikket::Client this1 = this->client;
+HXDLIN(  95)			::Dynamic this2 = this1->getDirectChat(this->from->asBare()->asString(),false)->jingleSessions;
+HXDLIN(  95)			( ( ::haxe::ds::StringMap)(this2) )->remove(this->get_sid());
             		}
             	}
 
@@ -186,71 +186,73 @@ HXDLIN(  93)			( ( ::haxe::ds::StringMap)(this2) )->remove(this->get_sid());
 HX_DEFINE_DYNAMIC_FUNC0(IncomingProposedSession_obj,hangup,(void))
 
 void IncomingProposedSession_obj::retract(){
-            	HX_STACKFRAME(&_hx_pos_070c1caeb07d54b9_98_retract)
-HXDLIN(  98)		 ::snikket::Client _hx_tmp = this->client;
-HXDLIN(  98)		_hx_tmp->trigger(HX_("call/retract",50,bc,8d,db), ::Dynamic(::hx::Anon_obj::Create(1)
-            			->setFixed(0,HX_("chatId",d3,04,77,b7),this->from->asBare()->asString())));
+            	HX_STACKFRAME(&_hx_pos_070c1caeb07d54b9_100_retract)
+HXDLIN( 100)		 ::snikket::Client _hx_tmp = this->client;
+HXDLIN( 100)		::String _hx_tmp1 = this->get_chatId();
+HXDLIN( 100)		_hx_tmp->trigger(HX_("call/retract",50,bc,8d,db), ::Dynamic(::hx::Anon_obj::Create(2)
+            			->setFixed(0,HX_("chatId",d3,04,77,b7),_hx_tmp1)
+            			->setFixed(1,HX_("sid",0e,9f,57,00),this->get_sid())));
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(IncomingProposedSession_obj,retract,(void))
 
 void IncomingProposedSession_obj::terminate(){
-            	HX_STACKFRAME(&_hx_pos_070c1caeb07d54b9_102_terminate)
-HXDLIN( 102)		 ::Dynamic _hx_tmp = ::haxe::Log_obj::trace;
-HXDLIN( 102)		::String _hx_tmp1 = (HX_("Tried to terminate before session-initiate: ",a9,d4,f3,a4) + this->get_sid());
-HXDLIN( 102)		_hx_tmp(_hx_tmp1, ::Dynamic(::hx::Anon_obj::Create(5)
+            	HX_STACKFRAME(&_hx_pos_070c1caeb07d54b9_104_terminate)
+HXDLIN( 104)		 ::Dynamic _hx_tmp = ::haxe::Log_obj::trace;
+HXDLIN( 104)		::String _hx_tmp1 = (HX_("Tried to terminate before session-initiate: ",a9,d4,f3,a4) + this->get_sid());
+HXDLIN( 104)		_hx_tmp(_hx_tmp1, ::Dynamic(::hx::Anon_obj::Create(5)
             			->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.jingle.IncomingProposedSession",7e,44,d0,fa))
             			->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(1)->init(0,::hx::ObjectPtr<OBJ_>(this)))
             			->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("terminate",61,32,d2,fd))
             			->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/jingle/Session.hx",54,dd,b2,6d))
-            			->setFixed(4,HX_("lineNumber",dd,81,22,76),102)));
+            			->setFixed(4,HX_("lineNumber",dd,81,22,76),104)));
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(IncomingProposedSession_obj,terminate,(void))
 
 void IncomingProposedSession_obj::contentAdd( ::snikket::Stanza _){
-            	HX_STACKFRAME(&_hx_pos_070c1caeb07d54b9_106_contentAdd)
-HXDLIN( 106)		 ::Dynamic _hx_tmp = ::haxe::Log_obj::trace;
-HXDLIN( 106)		::String _hx_tmp1 = (HX_("Got content-add before session-initiate: ",10,d3,fa,8a) + this->get_sid());
-HXDLIN( 106)		_hx_tmp(_hx_tmp1, ::Dynamic(::hx::Anon_obj::Create(5)
+            	HX_STACKFRAME(&_hx_pos_070c1caeb07d54b9_108_contentAdd)
+HXDLIN( 108)		 ::Dynamic _hx_tmp = ::haxe::Log_obj::trace;
+HXDLIN( 108)		::String _hx_tmp1 = (HX_("Got content-add before session-initiate: ",10,d3,fa,8a) + this->get_sid());
+HXDLIN( 108)		_hx_tmp(_hx_tmp1, ::Dynamic(::hx::Anon_obj::Create(5)
             			->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.jingle.IncomingProposedSession",7e,44,d0,fa))
             			->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(1)->init(0,::hx::ObjectPtr<OBJ_>(this)))
             			->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("contentAdd",68,66,dd,43))
             			->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/jingle/Session.hx",54,dd,b2,6d))
-            			->setFixed(4,HX_("lineNumber",dd,81,22,76),106)));
+            			->setFixed(4,HX_("lineNumber",dd,81,22,76),108)));
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(IncomingProposedSession_obj,contentAdd,(void))
 
 void IncomingProposedSession_obj::contentAccept( ::snikket::Stanza _){
-            	HX_STACKFRAME(&_hx_pos_070c1caeb07d54b9_110_contentAccept)
-HXDLIN( 110)		 ::Dynamic _hx_tmp = ::haxe::Log_obj::trace;
-HXDLIN( 110)		::String _hx_tmp1 = (HX_("Got content-accept before session-initiate: ",47,72,87,71) + this->get_sid());
-HXDLIN( 110)		_hx_tmp(_hx_tmp1, ::Dynamic(::hx::Anon_obj::Create(5)
+            	HX_STACKFRAME(&_hx_pos_070c1caeb07d54b9_112_contentAccept)
+HXDLIN( 112)		 ::Dynamic _hx_tmp = ::haxe::Log_obj::trace;
+HXDLIN( 112)		::String _hx_tmp1 = (HX_("Got content-accept before session-initiate: ",47,72,87,71) + this->get_sid());
+HXDLIN( 112)		_hx_tmp(_hx_tmp1, ::Dynamic(::hx::Anon_obj::Create(5)
             			->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.jingle.IncomingProposedSession",7e,44,d0,fa))
             			->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(1)->init(0,::hx::ObjectPtr<OBJ_>(this)))
             			->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("contentAccept",21,c5,01,e1))
             			->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/jingle/Session.hx",54,dd,b2,6d))
-            			->setFixed(4,HX_("lineNumber",dd,81,22,76),110)));
+            			->setFixed(4,HX_("lineNumber",dd,81,22,76),112)));
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(IncomingProposedSession_obj,contentAccept,(void))
 
 ::Dynamic IncomingProposedSession_obj::transportInfo( ::snikket::Stanza _){
-            	HX_STACKFRAME(&_hx_pos_070c1caeb07d54b9_113_transportInfo)
-HXLINE( 114)		 ::Dynamic _hx_tmp = ::haxe::Log_obj::trace;
-HXDLIN( 114)		::String _hx_tmp1 = (HX_("Got transport-info before session-initiate: ",bd,bd,9d,08) + this->get_sid());
-HXDLIN( 114)		_hx_tmp(_hx_tmp1, ::Dynamic(::hx::Anon_obj::Create(5)
+            	HX_STACKFRAME(&_hx_pos_070c1caeb07d54b9_115_transportInfo)
+HXLINE( 116)		 ::Dynamic _hx_tmp = ::haxe::Log_obj::trace;
+HXDLIN( 116)		::String _hx_tmp1 = (HX_("Got transport-info before session-initiate: ",bd,bd,9d,08) + this->get_sid());
+HXDLIN( 116)		_hx_tmp(_hx_tmp1, ::Dynamic(::hx::Anon_obj::Create(5)
             			->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.jingle.IncomingProposedSession",7e,44,d0,fa))
             			->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(1)->init(0,::hx::ObjectPtr<OBJ_>(this)))
             			->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("transportInfo",b7,3c,cf,b6))
             			->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/jingle/Session.hx",54,dd,b2,6d))
-            			->setFixed(4,HX_("lineNumber",dd,81,22,76),114)));
-HXLINE( 115)		return ::thenshim::_Promise::Promise_Impl__obj::resolve(null());
+            			->setFixed(4,HX_("lineNumber",dd,81,22,76),116)));
+HXLINE( 117)		return ::thenshim::_Promise::Promise_Impl__obj::resolve(null());
             	}
 
 
@@ -259,11 +261,11 @@ HX_DEFINE_DYNAMIC_FUNC1(IncomingProposedSession_obj,transportInfo,return )
 void IncomingProposedSession_obj::accept(){
             		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_0, ::snikket::jingle::IncomingProposedSession,_gthis, ::snikket::Stanza,event, ::snikket::ChatMessage,msg) HXARGC(1)
             		void _hx_run(::Array< ::Dynamic> stored){
-            			HX_GC_STACKFRAME(&_hx_pos_070c1caeb07d54b9_124_accept)
-HXLINE( 125)			_gthis->client->notifyMessageHandlers(stored->__get(0).StaticCast<  ::snikket::ChatMessage >(),1);
-HXLINE( 126)			 ::snikket::Client _gthis1 = _gthis->client;
-HXLINE( 127)			::String _hx_tmp = _gthis->from->asString();
-HXLINE( 126)			_gthis1->sendStanza( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("message",c7,35,11,9a), ::Dynamic(::hx::Anon_obj::Create(3)
+            			HX_GC_STACKFRAME(&_hx_pos_070c1caeb07d54b9_126_accept)
+HXLINE( 127)			_gthis->client->notifyMessageHandlers(stored->__get(0).StaticCast<  ::snikket::ChatMessage >(),1);
+HXLINE( 128)			 ::snikket::Client _gthis1 = _gthis->client;
+HXLINE( 129)			::String _hx_tmp = _gthis->from->asString();
+HXLINE( 128)			_gthis1->sendStanza( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("message",c7,35,11,9a), ::Dynamic(::hx::Anon_obj::Create(3)
             				->setFixed(0,HX_("id",db,5b,00,00),msg->versions->__get(0).StaticCast<  ::snikket::ChatMessage >()->localId)
             				->setFixed(1,HX_("to",7b,65,00,00),_hx_tmp)
             				->setFixed(2,HX_("type",ba,f2,08,4d),HX_("chat",d8,5e,bf,41))))->addChild(event)->tag(HX_("store",e1,13,16,84), ::Dynamic(::hx::Anon_obj::Create(1)
@@ -271,81 +273,89 @@ HXLINE( 126)			_gthis1->sendStanza( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_(
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_GC_STACKFRAME(&_hx_pos_070c1caeb07d54b9_118_accept)
-HXDLIN( 118)		 ::snikket::jingle::IncomingProposedSession _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 119)		if (this->accepted) {
-HXLINE( 119)			return;
+            	HX_GC_STACKFRAME(&_hx_pos_070c1caeb07d54b9_120_accept)
+HXDLIN( 120)		 ::snikket::jingle::IncomingProposedSession _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 121)		if (this->accepted) {
+HXLINE( 121)			return;
             		}
-HXLINE( 120)		this->accepted = true;
-HXLINE( 121)		 ::snikket::Client _hx_tmp = this->client;
-HXDLIN( 121)		_hx_tmp->sendPresence(this->from->asString(),null());
-HXLINE( 122)		 ::snikket::Stanza event =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("proceed",2e,96,4a,f1), ::Dynamic(::hx::Anon_obj::Create(2)
+HXLINE( 122)		this->accepted = true;
+HXLINE( 123)		 ::snikket::Client _hx_tmp = this->client;
+HXDLIN( 123)		_hx_tmp->sendPresence(this->from->asString(),null());
+HXLINE( 124)		 ::snikket::Stanza event =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("proceed",2e,96,4a,f1), ::Dynamic(::hx::Anon_obj::Create(2)
             			->setFixed(0,HX_("id",db,5b,00,00),this->get_sid())
             			->setFixed(1,HX_("xmlns",dc,31,74,60),HX_("urn:xmpp:jingle-message:0",fd,20,a5,07))));
-HXLINE( 123)		 ::snikket::ChatMessage msg = ::snikket::jingle::_Session::Session_Fields__obj::mkCallMessage(this->from,this->client->jid,event);
-HXLINE( 124)		this->client->storeMessages(::Array_obj< ::Dynamic>::__new(1)->init(0,msg), ::Dynamic(new _hx_Closure_0(_gthis,event,msg)));
+HXLINE( 125)		 ::snikket::ChatMessage msg = ::snikket::jingle::_Session::Session_Fields__obj::mkCallMessage(this->from,this->client->jid,event);
+HXLINE( 126)		this->client->storeMessages(::Array_obj< ::Dynamic>::__new(1)->init(0,msg), ::Dynamic(new _hx_Closure_0(_gthis,event,msg)));
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(IncomingProposedSession_obj,accept,(void))
 
  ::snikket::jingle::InitiatedSession IncomingProposedSession_obj::initiate( ::snikket::Stanza stanza){
-            	HX_STACKFRAME(&_hx_pos_070c1caeb07d54b9_134_initiate)
-HXLINE( 136)		 ::snikket::jingle::InitiatedSession session = ::snikket::jingle::InitiatedSession_obj::fromSessionInitiate(this->client,stanza);
-HXLINE( 137)		::String _hx_tmp = session->get_sid();
-HXDLIN( 137)		if ((_hx_tmp != this->get_sid())) {
-HXLINE( 137)			HX_STACK_DO_THROW(HX_("id mismatch",33,05,74,bd));
+            	HX_STACKFRAME(&_hx_pos_070c1caeb07d54b9_136_initiate)
+HXLINE( 138)		 ::snikket::jingle::InitiatedSession session = ::snikket::jingle::InitiatedSession_obj::fromSessionInitiate(this->client,stanza);
+HXLINE( 139)		::String _hx_tmp = session->get_sid();
+HXDLIN( 139)		if ((_hx_tmp != this->get_sid())) {
+HXLINE( 139)			HX_STACK_DO_THROW(HX_("id mismatch",33,05,74,bd));
             		}
-HXLINE( 138)		if (!(this->accepted)) {
-HXLINE( 138)			HX_STACK_DO_THROW(HX_("trying to initiate unaccepted session",b1,34,34,a4));
+HXLINE( 140)		if (!(this->accepted)) {
+HXLINE( 140)			HX_STACK_DO_THROW(HX_("trying to initiate unaccepted session",b1,34,34,a4));
             		}
-HXLINE( 139)		session->accept();
-HXLINE( 140)		return session;
+HXLINE( 141)		session->accept();
+HXLINE( 142)		return session;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(IncomingProposedSession_obj,initiate,return )
 
 void IncomingProposedSession_obj::addMedia(::Array< ::Dynamic> _){
-            	HX_STACKFRAME(&_hx_pos_070c1caeb07d54b9_144_addMedia)
-HXDLIN( 144)		HX_STACK_DO_THROW(HX_("Cannot add media before call starts",aa,0a,79,d5));
+            	HX_STACKFRAME(&_hx_pos_070c1caeb07d54b9_146_addMedia)
+HXDLIN( 146)		HX_STACK_DO_THROW(HX_("Cannot add media before call starts",aa,0a,79,d5));
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(IncomingProposedSession_obj,addMedia,(void))
 
 ::String IncomingProposedSession_obj::callStatus(){
-            	HX_STACKFRAME(&_hx_pos_070c1caeb07d54b9_148_callStatus)
-HXDLIN( 148)		return HX_("incoming",e6,40,15,1b);
+            	HX_STACKFRAME(&_hx_pos_070c1caeb07d54b9_150_callStatus)
+HXDLIN( 150)		return HX_("incoming",e6,40,15,1b);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(IncomingProposedSession_obj,callStatus,return )
 
 ::Array< ::Dynamic> IncomingProposedSession_obj::videoTracks(){
-            	HX_STACKFRAME(&_hx_pos_070c1caeb07d54b9_152_videoTracks)
-HXDLIN( 152)		return ::Array_obj< ::Dynamic>::__new(0);
+            	HX_STACKFRAME(&_hx_pos_070c1caeb07d54b9_154_videoTracks)
+HXDLIN( 154)		return ::Array_obj< ::Dynamic>::__new(0);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(IncomingProposedSession_obj,videoTracks,return )
 
  ::snikket::jingle::DTMFSender IncomingProposedSession_obj::dtmf(){
-            	HX_STACKFRAME(&_hx_pos_070c1caeb07d54b9_156_dtmf)
-HXDLIN( 156)		return null();
+            	HX_STACKFRAME(&_hx_pos_070c1caeb07d54b9_158_dtmf)
+HXDLIN( 158)		return null();
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(IncomingProposedSession_obj,dtmf,return )
 
 ::String IncomingProposedSession_obj::get_sid(){
-            	HX_STACKFRAME(&_hx_pos_070c1caeb07d54b9_160_get_sid)
-HXDLIN( 160)		return this->_sid;
+            	HX_STACKFRAME(&_hx_pos_070c1caeb07d54b9_162_get_sid)
+HXDLIN( 162)		return this->_sid;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(IncomingProposedSession_obj,get_sid,return )
 
+::String IncomingProposedSession_obj::get_chatId(){
+            	HX_STACKFRAME(&_hx_pos_070c1caeb07d54b9_166_get_chatId)
+HXDLIN( 166)		return this->from->asBare()->asString();
+            	}
+
+
+HX_DEFINE_DYNAMIC_FUNC0(IncomingProposedSession_obj,get_chatId,return )
+
 
 ::hx::ObjectPtr< IncomingProposedSession_obj > IncomingProposedSession_obj::__new( ::snikket::Client client, ::snikket::JID from,::String sid) {
 	::hx::ObjectPtr< IncomingProposedSession_obj > __this = new IncomingProposedSession_obj();
@@ -368,6 +378,7 @@ void IncomingProposedSession_obj::__Mark(HX_MARK_PARAMS)
 {
 	HX_MARK_BEGIN_CLASS(IncomingProposedSession);
 	HX_MARK_MEMBER_NAME(sid,"sid");
+	HX_MARK_MEMBER_NAME(chatId,"chatId");
 	HX_MARK_MEMBER_NAME(client,"client");
 	HX_MARK_MEMBER_NAME(from,"from");
 	HX_MARK_MEMBER_NAME(_sid,"_sid");
@@ -378,6 +389,7 @@ void IncomingProposedSession_obj::__Mark(HX_MARK_PARAMS)
 void IncomingProposedSession_obj::__Visit(HX_VISIT_PARAMS)
 {
 	HX_VISIT_MEMBER_NAME(sid,"sid");
+	HX_VISIT_MEMBER_NAME(chatId,"chatId");
 	HX_VISIT_MEMBER_NAME(client,"client");
 	HX_VISIT_MEMBER_NAME(from,"from");
 	HX_VISIT_MEMBER_NAME(_sid,"_sid");
@@ -397,6 +409,7 @@ void IncomingProposedSession_obj::__Visit(HX_VISIT_PARAMS)
 		if (HX_FIELD_EQ(inName,"dtmf") ) { return ::hx::Val( dtmf_dyn() ); }
 		break;
 	case 6:
+		if (HX_FIELD_EQ(inName,"chatId") ) { return ::hx::Val( inCallProp == ::hx::paccAlways ? get_chatId() : chatId ); }
 		if (HX_FIELD_EQ(inName,"client") ) { return ::hx::Val( client ); }
 		if (HX_FIELD_EQ(inName,"hangup") ) { return ::hx::Val( hangup_dyn() ); }
 		if (HX_FIELD_EQ(inName,"accept") ) { return ::hx::Val( accept_dyn() ); }
@@ -416,6 +429,7 @@ void IncomingProposedSession_obj::__Visit(HX_VISIT_PARAMS)
 	case 10:
 		if (HX_FIELD_EQ(inName,"contentAdd") ) { return ::hx::Val( contentAdd_dyn() ); }
 		if (HX_FIELD_EQ(inName,"callStatus") ) { return ::hx::Val( callStatus_dyn() ); }
+		if (HX_FIELD_EQ(inName,"get_chatId") ) { return ::hx::Val( get_chatId_dyn() ); }
 		break;
 	case 11:
 		if (HX_FIELD_EQ(inName,"videoTracks") ) { return ::hx::Val( videoTracks_dyn() ); }
@@ -438,6 +452,7 @@ void IncomingProposedSession_obj::__Visit(HX_VISIT_PARAMS)
 		if (HX_FIELD_EQ(inName,"_sid") ) { _sid=inValue.Cast< ::String >(); return inValue; }
 		break;
 	case 6:
+		if (HX_FIELD_EQ(inName,"chatId") ) { chatId=inValue.Cast< ::String >(); return inValue; }
 		if (HX_FIELD_EQ(inName,"client") ) { client=inValue.Cast<  ::snikket::Client >(); return inValue; }
 		break;
 	case 8:
@@ -449,6 +464,7 @@ void IncomingProposedSession_obj::__Visit(HX_VISIT_PARAMS)
 void IncomingProposedSession_obj::__GetFields(Array< ::String> &outFields)
 {
 	outFields->push(HX_("sid",0e,9f,57,00));
+	outFields->push(HX_("chatId",d3,04,77,b7));
 	outFields->push(HX_("client",4b,ca,4f,0a));
 	outFields->push(HX_("from",6a,a5,c2,43));
 	outFields->push(HX_("_sid",0f,e4,22,3f));
@@ -459,6 +475,7 @@ void IncomingProposedSession_obj::__GetFields(Array< ::String> &outFields)
 #ifdef HXCPP_SCRIPTABLE
 static ::hx::StorageInfo IncomingProposedSession_obj_sMemberStorageInfo[] = {
 	{::hx::fsString,(int)offsetof(IncomingProposedSession_obj,sid),HX_("sid",0e,9f,57,00)},
+	{::hx::fsString,(int)offsetof(IncomingProposedSession_obj,chatId),HX_("chatId",d3,04,77,b7)},
 	{::hx::fsObject /*  ::snikket::Client */ ,(int)offsetof(IncomingProposedSession_obj,client),HX_("client",4b,ca,4f,0a)},
 	{::hx::fsObject /*  ::snikket::JID */ ,(int)offsetof(IncomingProposedSession_obj,from),HX_("from",6a,a5,c2,43)},
 	{::hx::fsString,(int)offsetof(IncomingProposedSession_obj,_sid),HX_("_sid",0f,e4,22,3f)},
@@ -470,6 +487,7 @@ static ::hx::StaticInfo *IncomingProposedSession_obj_sStaticStorageInfo = 0;
 
 static ::String IncomingProposedSession_obj_sMemberFields[] = {
 	HX_("sid",0e,9f,57,00),
+	HX_("chatId",d3,04,77,b7),
 	HX_("client",4b,ca,4f,0a),
 	HX_("from",6a,a5,c2,43),
 	HX_("_sid",0f,e4,22,3f),
@@ -488,6 +506,7 @@ static ::String IncomingProposedSession_obj_sMemberFields[] = {
 	HX_("videoTracks",63,c2,24,be),
 	HX_("dtmf",e9,ba,71,42),
 	HX_("get_sid",a5,67,cc,26),
+	HX_("get_chatId",9c,74,fe,a7),
 	::String(null()) };
 
 ::hx::Class IncomingProposedSession_obj::__mClass;
diff --git a/Sources/c_snikket/src/snikket/jingle/InitiatedSession.cpp b/Sources/c_snikket/src/snikket/jingle/InitiatedSession.cpp
index 8440f99..323ac94 100644
--- a/Sources/c_snikket/src/snikket/jingle/InitiatedSession.cpp
+++ b/Sources/c_snikket/src/snikket/jingle/InitiatedSession.cpp
@@ -107,86 +107,88 @@
 #include <thenshim/_Promise/Promise_Impl_.h>
 #endif
 
-HX_DEFINE_STACK_FRAME(_hx_pos_de51993dbb06b02d_278_new,"snikket.jingle.InitiatedSession","new",0x32cfb629,"snikket.jingle.InitiatedSession.new","snikket/jingle/Session.hx",278,0x6db2dd54)
+HX_DEFINE_STACK_FRAME(_hx_pos_de51993dbb06b02d_289_new,"snikket.jingle.InitiatedSession","new",0x32cfb629,"snikket.jingle.InitiatedSession.new","snikket/jingle/Session.hx",289,0x6db2dd54)
 HX_LOCAL_STACK_FRAME(_hx_pos_042a82ddefcd0233_308_sid__fromC,"snikket.jingle.InitiatedSession","sid__fromC",0x9aaf4482,"snikket.jingle.InitiatedSession.sid__fromC","HaxeCBridge.hx",308,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_317_get_sid,"snikket.jingle.InitiatedSession","get_sid",0x312965ee,"snikket.jingle.InitiatedSession.get_sid","snikket/jingle/Session.hx",317,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_322_ring,"snikket.jingle.InitiatedSession","ring",0x459789c7,"snikket.jingle.InitiatedSession.ring","snikket/jingle/Session.hx",322,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_327_retract,"snikket.jingle.InitiatedSession","retract",0x0716e04a,"snikket.jingle.InitiatedSession.retract","snikket/jingle/Session.hx",327,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_333_accept,"snikket.jingle.InitiatedSession","accept",0x3a23b0df,"snikket.jingle.InitiatedSession.accept","snikket/jingle/Session.hx",333,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_334_accept,"snikket.jingle.InitiatedSession","accept",0x3a23b0df,"snikket.jingle.InitiatedSession.accept","snikket/jingle/Session.hx",334,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_330_accept,"snikket.jingle.InitiatedSession","accept",0x3a23b0df,"snikket.jingle.InitiatedSession.accept","snikket/jingle/Session.hx",330,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_338_hangup,"snikket.jingle.InitiatedSession","hangup",0xe71cf024,"snikket.jingle.InitiatedSession.hangup","snikket/jingle/Session.hx",338,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_349_initiate,"snikket.jingle.InitiatedSession","initiate",0x6690ebf0,"snikket.jingle.InitiatedSession.initiate","snikket/jingle/Session.hx",349,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_368_terminate,"snikket.jingle.InitiatedSession","terminate",0x182214ea,"snikket.jingle.InitiatedSession.terminate","snikket/jingle/Session.hx",368,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_355_terminate,"snikket.jingle.InitiatedSession","terminate",0x182214ea,"snikket.jingle.InitiatedSession.terminate","snikket/jingle/Session.hx",355,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_402_contentAdd,"snikket.jingle.InitiatedSession","contentAdd",0x2f73bbbf,"snikket.jingle.InitiatedSession.contentAdd","snikket/jingle/Session.hx",402,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_401_contentAdd,"snikket.jingle.InitiatedSession","contentAdd",0x2f73bbbf,"snikket.jingle.InitiatedSession.contentAdd","snikket/jingle/Session.hx",401,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_042a82ddefcd0233_308_chatId__fromC,"snikket.jingle.InitiatedSession","chatId__fromC",0xf380570f,"snikket.jingle.InitiatedSession.chatId__fromC","HaxeCBridge.hx",308,0xa18550d8)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_329_get_sid,"snikket.jingle.InitiatedSession","get_sid",0x312965ee,"snikket.jingle.InitiatedSession.get_sid","snikket/jingle/Session.hx",329,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_333_get_chatId,"snikket.jingle.InitiatedSession","get_chatId",0x9394c9f3,"snikket.jingle.InitiatedSession.get_chatId","snikket/jingle/Session.hx",333,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_338_ring,"snikket.jingle.InitiatedSession","ring",0x459789c7,"snikket.jingle.InitiatedSession.ring","snikket/jingle/Session.hx",338,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_343_retract,"snikket.jingle.InitiatedSession","retract",0x0716e04a,"snikket.jingle.InitiatedSession.retract","snikket/jingle/Session.hx",343,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_349_accept,"snikket.jingle.InitiatedSession","accept",0x3a23b0df,"snikket.jingle.InitiatedSession.accept","snikket/jingle/Session.hx",349,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_350_accept,"snikket.jingle.InitiatedSession","accept",0x3a23b0df,"snikket.jingle.InitiatedSession.accept","snikket/jingle/Session.hx",350,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_346_accept,"snikket.jingle.InitiatedSession","accept",0x3a23b0df,"snikket.jingle.InitiatedSession.accept","snikket/jingle/Session.hx",346,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_354_hangup,"snikket.jingle.InitiatedSession","hangup",0xe71cf024,"snikket.jingle.InitiatedSession.hangup","snikket/jingle/Session.hx",354,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_365_initiate,"snikket.jingle.InitiatedSession","initiate",0x6690ebf0,"snikket.jingle.InitiatedSession.initiate","snikket/jingle/Session.hx",365,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_384_terminate,"snikket.jingle.InitiatedSession","terminate",0x182214ea,"snikket.jingle.InitiatedSession.terminate","snikket/jingle/Session.hx",384,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_371_terminate,"snikket.jingle.InitiatedSession","terminate",0x182214ea,"snikket.jingle.InitiatedSession.terminate","snikket/jingle/Session.hx",371,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_418_contentAdd,"snikket.jingle.InitiatedSession","contentAdd",0x2f73bbbf,"snikket.jingle.InitiatedSession.contentAdd","snikket/jingle/Session.hx",418,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_417_contentAdd,"snikket.jingle.InitiatedSession","contentAdd",0x2f73bbbf,"snikket.jingle.InitiatedSession.contentAdd","snikket/jingle/Session.hx",417,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_411_contentAdd,"snikket.jingle.InitiatedSession","contentAdd",0x2f73bbbf,"snikket.jingle.InitiatedSession.contentAdd","snikket/jingle/Session.hx",411,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_410_contentAdd,"snikket.jingle.InitiatedSession","contentAdd",0x2f73bbbf,"snikket.jingle.InitiatedSession.contentAdd","snikket/jingle/Session.hx",410,0x6db2dd54)
 HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_395_contentAdd,"snikket.jingle.InitiatedSession","contentAdd",0x2f73bbbf,"snikket.jingle.InitiatedSession.contentAdd","snikket/jingle/Session.hx",395,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_394_contentAdd,"snikket.jingle.InitiatedSession","contentAdd",0x2f73bbbf,"snikket.jingle.InitiatedSession.contentAdd","snikket/jingle/Session.hx",394,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_379_contentAdd,"snikket.jingle.InitiatedSession","contentAdd",0x2f73bbbf,"snikket.jingle.InitiatedSession.contentAdd","snikket/jingle/Session.hx",379,0x6db2dd54)
-static const bool _hx_array_data_22056db7_21[] = {
+static const bool _hx_array_data_22056db7_23[] = {
 	0,
 };
-static const bool _hx_array_data_22056db7_22[] = {
+static const bool _hx_array_data_22056db7_24[] = {
 	0,
 };
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_386_contentAdd,"snikket.jingle.InitiatedSession","contentAdd",0x2f73bbbf,"snikket.jingle.InitiatedSession.contentAdd","snikket/jingle/Session.hx",386,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_418_contentAccept,"snikket.jingle.InitiatedSession","contentAccept",0x3fd0202a,"snikket.jingle.InitiatedSession.contentAccept","snikket/jingle/Session.hx",418,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_445_transportInfo,"snikket.jingle.InitiatedSession","transportInfo",0x159d97c0,"snikket.jingle.InitiatedSession.transportInfo","snikket/jingle/Session.hx",445,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_431_transportInfo,"snikket.jingle.InitiatedSession","transportInfo",0x159d97c0,"snikket.jingle.InitiatedSession.transportInfo","snikket/jingle/Session.hx",431,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_448_addMedia,"snikket.jingle.InitiatedSession","addMedia",0x861aac9a,"snikket.jingle.InitiatedSession.addMedia","snikket/jingle/Session.hx",448,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_402_contentAdd,"snikket.jingle.InitiatedSession","contentAdd",0x2f73bbbf,"snikket.jingle.InitiatedSession.contentAdd","snikket/jingle/Session.hx",402,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_434_contentAccept,"snikket.jingle.InitiatedSession","contentAccept",0x3fd0202a,"snikket.jingle.InitiatedSession.contentAccept","snikket/jingle/Session.hx",434,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_461_transportInfo,"snikket.jingle.InitiatedSession","transportInfo",0x159d97c0,"snikket.jingle.InitiatedSession.transportInfo","snikket/jingle/Session.hx",461,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_447_transportInfo,"snikket.jingle.InitiatedSession","transportInfo",0x159d97c0,"snikket.jingle.InitiatedSession.transportInfo","snikket/jingle/Session.hx",447,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_464_addMedia,"snikket.jingle.InitiatedSession","addMedia",0x861aac9a,"snikket.jingle.InitiatedSession.addMedia","snikket/jingle/Session.hx",464,0x6db2dd54)
 HX_LOCAL_STACK_FRAME(_hx_pos_042a82ddefcd0233_252_addMedia__fromC,"snikket.jingle.InitiatedSession","addMedia__fromC",0x8f17eb1f,"snikket.jingle.InitiatedSession.addMedia__fromC","HaxeCBridge.hx",252,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_462_callStatus,"snikket.jingle.InitiatedSession","callStatus",0x1cc213c7,"snikket.jingle.InitiatedSession.callStatus","snikket/jingle/Session.hx",462,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_465_videoTracks,"snikket.jingle.InitiatedSession","videoTracks",0xf619192c,"snikket.jingle.InitiatedSession.videoTracks","snikket/jingle/Session.hx",465,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_478_callStatus,"snikket.jingle.InitiatedSession","callStatus",0x1cc213c7,"snikket.jingle.InitiatedSession.callStatus","snikket/jingle/Session.hx",478,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_481_videoTracks,"snikket.jingle.InitiatedSession","videoTracks",0xf619192c,"snikket.jingle.InitiatedSession.videoTracks","snikket/jingle/Session.hx",481,0x6db2dd54)
 HX_LOCAL_STACK_FRAME(_hx_pos_042a82ddefcd0233_250_videoTracks__fromC,"snikket.jingle.InitiatedSession","videoTracks__fromC",0x21c414cd,"snikket.jingle.InitiatedSession.videoTracks__fromC","HaxeCBridge.hx",250,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_474_dtmf,"snikket.jingle.InitiatedSession","dtmf",0x3c5ee500,"snikket.jingle.InitiatedSession.dtmf","snikket/jingle/Session.hx",474,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_472_dtmf,"snikket.jingle.InitiatedSession","dtmf",0x3c5ee500,"snikket.jingle.InitiatedSession.dtmf","snikket/jingle/Session.hx",472,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_489_sendIceCandidate,"snikket.jingle.InitiatedSession","sendIceCandidate",0x8f88e577,"snikket.jingle.InitiatedSession.sendIceCandidate","snikket/jingle/Session.hx",489,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_501_sendIceCandidate,"snikket.jingle.InitiatedSession","sendIceCandidate",0x8f88e577,"snikket.jingle.InitiatedSession.sendIceCandidate","snikket/jingle/Session.hx",501,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_479_sendIceCandidate,"snikket.jingle.InitiatedSession","sendIceCandidate",0x8f88e577,"snikket.jingle.InitiatedSession.sendIceCandidate","snikket/jingle/Session.hx",479,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_502_sendIceCandidate,"snikket.jingle.InitiatedSession","sendIceCandidate",0x8f88e577,"snikket.jingle.InitiatedSession.sendIceCandidate","snikket/jingle/Session.hx",502,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_514_supplyMedia,"snikket.jingle.InitiatedSession","supplyMedia",0xd2bd62fe,"snikket.jingle.InitiatedSession.supplyMedia","snikket/jingle/Session.hx",514,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_522_supplyMedia,"snikket.jingle.InitiatedSession","supplyMedia",0xd2bd62fe,"snikket.jingle.InitiatedSession.supplyMedia","snikket/jingle/Session.hx",522,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_513_supplyMedia,"snikket.jingle.InitiatedSession","supplyMedia",0xd2bd62fe,"snikket.jingle.InitiatedSession.supplyMedia","snikket/jingle/Session.hx",513,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_490_dtmf,"snikket.jingle.InitiatedSession","dtmf",0x3c5ee500,"snikket.jingle.InitiatedSession.dtmf","snikket/jingle/Session.hx",490,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_488_dtmf,"snikket.jingle.InitiatedSession","dtmf",0x3c5ee500,"snikket.jingle.InitiatedSession.dtmf","snikket/jingle/Session.hx",488,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_505_sendIceCandidate,"snikket.jingle.InitiatedSession","sendIceCandidate",0x8f88e577,"snikket.jingle.InitiatedSession.sendIceCandidate","snikket/jingle/Session.hx",505,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_517_sendIceCandidate,"snikket.jingle.InitiatedSession","sendIceCandidate",0x8f88e577,"snikket.jingle.InitiatedSession.sendIceCandidate","snikket/jingle/Session.hx",517,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_495_sendIceCandidate,"snikket.jingle.InitiatedSession","sendIceCandidate",0x8f88e577,"snikket.jingle.InitiatedSession.sendIceCandidate","snikket/jingle/Session.hx",495,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_518_sendIceCandidate,"snikket.jingle.InitiatedSession","sendIceCandidate",0x8f88e577,"snikket.jingle.InitiatedSession.sendIceCandidate","snikket/jingle/Session.hx",518,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_530_supplyMedia,"snikket.jingle.InitiatedSession","supplyMedia",0xd2bd62fe,"snikket.jingle.InitiatedSession.supplyMedia","snikket/jingle/Session.hx",530,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_538_supplyMedia,"snikket.jingle.InitiatedSession","supplyMedia",0xd2bd62fe,"snikket.jingle.InitiatedSession.supplyMedia","snikket/jingle/Session.hx",538,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_529_supplyMedia,"snikket.jingle.InitiatedSession","supplyMedia",0xd2bd62fe,"snikket.jingle.InitiatedSession.supplyMedia","snikket/jingle/Session.hx",529,0x6db2dd54)
 HX_LOCAL_STACK_FRAME(_hx_pos_042a82ddefcd0233_252_supplyMedia__fromC,"snikket.jingle.InitiatedSession","supplyMedia__fromC",0x2f8c893b,"snikket.jingle.InitiatedSession.supplyMedia__fromC","HaxeCBridge.hx",252,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_540_setupPeerConnection,"snikket.jingle.InitiatedSession","setupPeerConnection",0xb3182f86,"snikket.jingle.InitiatedSession.setupPeerConnection","snikket/jingle/Session.hx",540,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_542_setupPeerConnection,"snikket.jingle.InitiatedSession","setupPeerConnection",0xb3182f86,"snikket.jingle.InitiatedSession.setupPeerConnection","snikket/jingle/Session.hx",542,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_544_setupPeerConnection,"snikket.jingle.InitiatedSession","setupPeerConnection",0xb3182f86,"snikket.jingle.InitiatedSession.setupPeerConnection","snikket/jingle/Session.hx",544,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_547_setupPeerConnection,"snikket.jingle.InitiatedSession","setupPeerConnection",0xb3182f86,"snikket.jingle.InitiatedSession.setupPeerConnection","snikket/jingle/Session.hx",547,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_537_setupPeerConnection,"snikket.jingle.InitiatedSession","setupPeerConnection",0xb3182f86,"snikket.jingle.InitiatedSession.setupPeerConnection","snikket/jingle/Session.hx",537,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_532_setupPeerConnection,"snikket.jingle.InitiatedSession","setupPeerConnection",0xb3182f86,"snikket.jingle.InitiatedSession.setupPeerConnection","snikket/jingle/Session.hx",532,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_556_setupLocalDescription,"snikket.jingle.InitiatedSession","setupLocalDescription",0x3c0669f7,"snikket.jingle.InitiatedSession.setupLocalDescription","snikket/jingle/Session.hx",556,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_561_setupLocalDescription,"snikket.jingle.InitiatedSession","setupLocalDescription",0x3c0669f7,"snikket.jingle.InitiatedSession.setupLocalDescription","snikket/jingle/Session.hx",561,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_560_setupLocalDescription,"snikket.jingle.InitiatedSession","setupLocalDescription",0x3c0669f7,"snikket.jingle.InitiatedSession.setupLocalDescription","snikket/jingle/Session.hx",560,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_564_setupLocalDescription,"snikket.jingle.InitiatedSession","setupLocalDescription",0x3c0669f7,"snikket.jingle.InitiatedSession.setupLocalDescription","snikket/jingle/Session.hx",564,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_559_setupLocalDescription,"snikket.jingle.InitiatedSession","setupLocalDescription",0x3c0669f7,"snikket.jingle.InitiatedSession.setupLocalDescription","snikket/jingle/Session.hx",559,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_572_setupLocalDescription,"snikket.jingle.InitiatedSession","setupLocalDescription",0x3c0669f7,"snikket.jingle.InitiatedSession.setupLocalDescription","snikket/jingle/Session.hx",572,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_555_setupLocalDescription,"snikket.jingle.InitiatedSession","setupLocalDescription",0x3c0669f7,"snikket.jingle.InitiatedSession.setupLocalDescription","snikket/jingle/Session.hx",555,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_600_onPeerConnection,"snikket.jingle.InitiatedSession","onPeerConnection",0x7ec12276,"snikket.jingle.InitiatedSession.onPeerConnection","snikket/jingle/Session.hx",600,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_606_onPeerConnection,"snikket.jingle.InitiatedSession","onPeerConnection",0x7ec12276,"snikket.jingle.InitiatedSession.onPeerConnection","snikket/jingle/Session.hx",606,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_607_onPeerConnection,"snikket.jingle.InitiatedSession","onPeerConnection",0x7ec12276,"snikket.jingle.InitiatedSession.onPeerConnection","snikket/jingle/Session.hx",607,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_598_onPeerConnection,"snikket.jingle.InitiatedSession","onPeerConnection",0x7ec12276,"snikket.jingle.InitiatedSession.onPeerConnection","snikket/jingle/Session.hx",598,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_304_fromSessionInitiate,"snikket.jingle.InitiatedSession","fromSessionInitiate",0xe2a3554e,"snikket.jingle.InitiatedSession.fromSessionInitiate","snikket/jingle/Session.hx",304,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_278_boot,"snikket.jingle.InitiatedSession","boot",0x3b08ae49,"snikket.jingle.InitiatedSession.boot","snikket/jingle/Session.hx",278,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_556_setupPeerConnection,"snikket.jingle.InitiatedSession","setupPeerConnection",0xb3182f86,"snikket.jingle.InitiatedSession.setupPeerConnection","snikket/jingle/Session.hx",556,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_558_setupPeerConnection,"snikket.jingle.InitiatedSession","setupPeerConnection",0xb3182f86,"snikket.jingle.InitiatedSession.setupPeerConnection","snikket/jingle/Session.hx",558,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_560_setupPeerConnection,"snikket.jingle.InitiatedSession","setupPeerConnection",0xb3182f86,"snikket.jingle.InitiatedSession.setupPeerConnection","snikket/jingle/Session.hx",560,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_563_setupPeerConnection,"snikket.jingle.InitiatedSession","setupPeerConnection",0xb3182f86,"snikket.jingle.InitiatedSession.setupPeerConnection","snikket/jingle/Session.hx",563,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_553_setupPeerConnection,"snikket.jingle.InitiatedSession","setupPeerConnection",0xb3182f86,"snikket.jingle.InitiatedSession.setupPeerConnection","snikket/jingle/Session.hx",553,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_548_setupPeerConnection,"snikket.jingle.InitiatedSession","setupPeerConnection",0xb3182f86,"snikket.jingle.InitiatedSession.setupPeerConnection","snikket/jingle/Session.hx",548,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_578_setupLocalDescription,"snikket.jingle.InitiatedSession","setupLocalDescription",0x3c0669f7,"snikket.jingle.InitiatedSession.setupLocalDescription","snikket/jingle/Session.hx",578,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_583_setupLocalDescription,"snikket.jingle.InitiatedSession","setupLocalDescription",0x3c0669f7,"snikket.jingle.InitiatedSession.setupLocalDescription","snikket/jingle/Session.hx",583,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_582_setupLocalDescription,"snikket.jingle.InitiatedSession","setupLocalDescription",0x3c0669f7,"snikket.jingle.InitiatedSession.setupLocalDescription","snikket/jingle/Session.hx",582,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_586_setupLocalDescription,"snikket.jingle.InitiatedSession","setupLocalDescription",0x3c0669f7,"snikket.jingle.InitiatedSession.setupLocalDescription","snikket/jingle/Session.hx",586,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_581_setupLocalDescription,"snikket.jingle.InitiatedSession","setupLocalDescription",0x3c0669f7,"snikket.jingle.InitiatedSession.setupLocalDescription","snikket/jingle/Session.hx",581,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_594_setupLocalDescription,"snikket.jingle.InitiatedSession","setupLocalDescription",0x3c0669f7,"snikket.jingle.InitiatedSession.setupLocalDescription","snikket/jingle/Session.hx",594,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_577_setupLocalDescription,"snikket.jingle.InitiatedSession","setupLocalDescription",0x3c0669f7,"snikket.jingle.InitiatedSession.setupLocalDescription","snikket/jingle/Session.hx",577,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_622_onPeerConnection,"snikket.jingle.InitiatedSession","onPeerConnection",0x7ec12276,"snikket.jingle.InitiatedSession.onPeerConnection","snikket/jingle/Session.hx",622,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_628_onPeerConnection,"snikket.jingle.InitiatedSession","onPeerConnection",0x7ec12276,"snikket.jingle.InitiatedSession.onPeerConnection","snikket/jingle/Session.hx",628,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_629_onPeerConnection,"snikket.jingle.InitiatedSession","onPeerConnection",0x7ec12276,"snikket.jingle.InitiatedSession.onPeerConnection","snikket/jingle/Session.hx",629,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_620_onPeerConnection,"snikket.jingle.InitiatedSession","onPeerConnection",0x7ec12276,"snikket.jingle.InitiatedSession.onPeerConnection","snikket/jingle/Session.hx",620,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_316_fromSessionInitiate,"snikket.jingle.InitiatedSession","fromSessionInitiate",0xe2a3554e,"snikket.jingle.InitiatedSession.fromSessionInitiate","snikket/jingle/Session.hx",316,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_de51993dbb06b02d_289_boot,"snikket.jingle.InitiatedSession","boot",0x3b08ae49,"snikket.jingle.InitiatedSession.boot","snikket/jingle/Session.hx",289,0x6db2dd54)
 namespace snikket{
 namespace jingle{
 
 void InitiatedSession_obj::__construct( ::snikket::Client client, ::snikket::JID counterpart,::String sid, ::snikket::jingle::SessionDescription remoteDescription){
-            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_278_new)
-HXLINE( 292)		this->candidatesDone = null();
-HXLINE( 290)		this->afterMedia = null();
-HXLINE( 289)		this->accepted = false;
-HXLINE( 288)		this->queuedOutboundCandidate = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE( 287)		this->queuedInboundTransportInfo = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE( 286)		this->peerDtlsSetup = HX_("actpass",23,e7,c3,6b);
-HXLINE( 285)		this->pc = null();
-HXLINE( 284)		this->localDescription = null();
-HXLINE( 283)		this->remoteDescription = null();
-HXLINE( 296)		this->client = client;
-HXLINE( 297)		this->counterpart = counterpart;
-HXLINE( 298)		this->_sid = sid;
-HXLINE( 299)		this->remoteDescription = remoteDescription;
-HXLINE( 300)		this->initiator = ::hx::IsNull( remoteDescription );
+            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_289_new)
+HXLINE( 304)		this->candidatesDone = null();
+HXLINE( 302)		this->afterMedia = null();
+HXLINE( 301)		this->accepted = false;
+HXLINE( 300)		this->queuedOutboundCandidate = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE( 299)		this->queuedInboundTransportInfo = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE( 298)		this->peerDtlsSetup = HX_("actpass",23,e7,c3,6b);
+HXLINE( 297)		this->pc = null();
+HXLINE( 296)		this->localDescription = null();
+HXLINE( 295)		this->remoteDescription = null();
+HXLINE( 308)		this->client = client;
+HXLINE( 309)		this->counterpart = counterpart;
+HXLINE( 310)		this->_sid = sid;
+HXLINE( 311)		this->remoteDescription = remoteDescription;
+HXLINE( 312)		this->initiator = ::hx::IsNull( remoteDescription );
             	}
 
 Dynamic InitiatedSession_obj::__CreateEmpty() { return new InitiatedSession_obj; }
@@ -206,6 +208,7 @@ bool InitiatedSession_obj::_hx_isInstanceOf(int inClassId) {
 
 static ::snikket::jingle::Session_obj _hx_snikket_jingle_InitiatedSession__hx_snikket_jingle_Session= {
 	( ::String (::hx::Object::*)())&::snikket::jingle::InitiatedSession_obj::get_sid,
+	( ::String (::hx::Object::*)())&::snikket::jingle::InitiatedSession_obj::get_chatId,
 	(  ::snikket::jingle::InitiatedSession (::hx::Object::*)( ::snikket::Stanza))&::snikket::jingle::InitiatedSession_obj::initiate_ef691953,
 	( void (::hx::Object::*)())&::snikket::jingle::InitiatedSession_obj::accept,
 	( void (::hx::Object::*)())&::snikket::jingle::InitiatedSession_obj::hangup,
@@ -242,35 +245,49 @@ HXDLIN( 308)		return this->get_sid();
 
 HX_DEFINE_DYNAMIC_FUNC0(InitiatedSession_obj,sid__fromC,return )
 
+::String InitiatedSession_obj::chatId__fromC(){
+            	HX_STACKFRAME(&_hx_pos_042a82ddefcd0233_308_chatId__fromC)
+HXDLIN( 308)		return this->get_chatId();
+            	}
+
+
+HX_DEFINE_DYNAMIC_FUNC0(InitiatedSession_obj,chatId__fromC,return )
+
 ::String InitiatedSession_obj::get_sid(){
-            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_317_get_sid)
-HXDLIN( 317)		return this->_sid;
+            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_329_get_sid)
+HXDLIN( 329)		return this->_sid;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(InitiatedSession_obj,get_sid,return )
 
+::String InitiatedSession_obj::get_chatId(){
+            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_333_get_chatId)
+HXDLIN( 333)		return this->counterpart->asBare()->asString();
+            	}
+
+
+HX_DEFINE_DYNAMIC_FUNC0(InitiatedSession_obj,get_chatId,return )
+
 void InitiatedSession_obj::ring(){
-            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_322_ring)
-HXDLIN( 322)		 ::snikket::Client _hx_tmp = this->client;
-HXDLIN( 322)		_hx_tmp->trigger(HX_("call/ring",01,8e,91,54), ::Dynamic(::hx::Anon_obj::Create(2)
-            			->setFixed(0,HX_("session",56,17,98,93),::hx::ObjectPtr<OBJ_>(this))
-            			->setFixed(1,HX_("chatId",d3,04,77,b7),this->counterpart->asBare()->asString())));
+            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_338_ring)
+HXDLIN( 338)		this->client->trigger(HX_("call/ring",01,8e,91,54), ::Dynamic(::hx::Anon_obj::Create(1)
+            			->setFixed(0,HX_("session",56,17,98,93),::hx::ObjectPtr<OBJ_>(this))));
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(InitiatedSession_obj,ring,(void))
 
 void InitiatedSession_obj::retract(){
-            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_327_retract)
-HXDLIN( 327)		 ::Dynamic _hx_tmp = ::haxe::Log_obj::trace;
-HXDLIN( 327)		::String _hx_tmp1 = (HX_("Tried to retract session in wrong state: ",e1,1c,0c,db) + this->get_sid());
-HXDLIN( 327)		_hx_tmp(_hx_tmp1, ::Dynamic(::hx::Anon_obj::Create(5)
+            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_343_retract)
+HXDLIN( 343)		 ::Dynamic _hx_tmp = ::haxe::Log_obj::trace;
+HXDLIN( 343)		::String _hx_tmp1 = (HX_("Tried to retract session in wrong state: ",e1,1c,0c,db) + this->get_sid());
+HXDLIN( 343)		_hx_tmp(_hx_tmp1, ::Dynamic(::hx::Anon_obj::Create(5)
             			->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.jingle.InitiatedSession",b7,6d,05,22))
             			->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(1)->init(0,::hx::ObjectPtr<OBJ_>(this)))
             			->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("retract",01,e2,b9,fc))
             			->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/jingle/Session.hx",54,dd,b2,6d))
-            			->setFixed(4,HX_("lineNumber",dd,81,22,76),327)));
+            			->setFixed(4,HX_("lineNumber",dd,81,22,76),343)));
             	}
 
 
@@ -279,33 +296,33 @@ HX_DEFINE_DYNAMIC_FUNC0(InitiatedSession_obj,retract,(void))
 void InitiatedSession_obj::accept(){
             		HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_0) HXARGC(1)
             		bool _hx_run( ::snikket::jingle::Media m){
-            			HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_333_accept)
-HXLINE( 333)			return (m->media == HX_("audio",d6,78,80,27));
+            			HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_349_accept)
+HXLINE( 349)			return (m->media == HX_("audio",d6,78,80,27));
             		}
             		HX_END_LOCAL_FUNC1(return)
 
             		HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_1) HXARGC(1)
             		bool _hx_run( ::snikket::jingle::Media m){
-            			HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_334_accept)
-HXLINE( 334)			return (m->media == HX_("video",7b,14,fc,36));
+            			HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_350_accept)
+HXLINE( 350)			return (m->media == HX_("video",7b,14,fc,36));
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_330_accept)
-HXLINE( 331)		bool _hx_tmp;
-HXDLIN( 331)		if (!(this->accepted)) {
-HXLINE( 331)			_hx_tmp = ::hx::IsNull( this->remoteDescription );
+            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_346_accept)
+HXLINE( 347)		bool _hx_tmp;
+HXDLIN( 347)		if (!(this->accepted)) {
+HXLINE( 347)			_hx_tmp = ::hx::IsNull( this->remoteDescription );
             		}
             		else {
-HXLINE( 331)			_hx_tmp = true;
+HXLINE( 347)			_hx_tmp = true;
             		}
-HXDLIN( 331)		if (_hx_tmp) {
-HXLINE( 331)			return;
+HXDLIN( 347)		if (_hx_tmp) {
+HXLINE( 347)			return;
             		}
-HXLINE( 332)		this->accepted = true;
-HXLINE( 333)		bool audio = ::hx::IsNotNull( ::Lambda_obj::find(this->remoteDescription->media, ::Dynamic(new _hx_Closure_0())) );
-HXLINE( 334)		bool video = ::hx::IsNotNull( ::Lambda_obj::find(this->remoteDescription->media, ::Dynamic(new _hx_Closure_1())) );
-HXLINE( 335)		this->client->trigger(HX_("call/media",73,5d,1d,c7), ::Dynamic(::hx::Anon_obj::Create(3)
+HXLINE( 348)		this->accepted = true;
+HXLINE( 349)		bool audio = ::hx::IsNotNull( ::Lambda_obj::find(this->remoteDescription->media, ::Dynamic(new _hx_Closure_0())) );
+HXLINE( 350)		bool video = ::hx::IsNotNull( ::Lambda_obj::find(this->remoteDescription->media, ::Dynamic(new _hx_Closure_1())) );
+HXLINE( 351)		this->client->trigger(HX_("call/media",73,5d,1d,c7), ::Dynamic(::hx::Anon_obj::Create(3)
             			->setFixed(0,HX_("session",56,17,98,93),::hx::ObjectPtr<OBJ_>(this))
             			->setFixed(1,HX_("audio",d6,78,80,27),audio)
             			->setFixed(2,HX_("video",7b,14,fc,36),video)));
@@ -315,30 +332,30 @@ HXLINE( 335)		this->client->trigger(HX_("call/media",73,5d,1d,c7), ::Dynamic(::h
 HX_DEFINE_DYNAMIC_FUNC0(InitiatedSession_obj,accept,(void))
 
 void InitiatedSession_obj::hangup(){
-            	HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_338_hangup)
-HXLINE( 339)		 ::snikket::Client _hx_tmp = this->client;
-HXLINE( 340)		::String _hx_tmp1 = this->counterpart->asString();
-HXDLIN( 340)		 ::snikket::Stanza _hx_tmp2 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("iq",e8,5b,00,00), ::Dynamic(::hx::Anon_obj::Create(3)
+            	HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_354_hangup)
+HXLINE( 355)		 ::snikket::Client _hx_tmp = this->client;
+HXLINE( 356)		::String _hx_tmp1 = this->counterpart->asString();
+HXDLIN( 356)		 ::snikket::Stanza _hx_tmp2 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("iq",e8,5b,00,00), ::Dynamic(::hx::Anon_obj::Create(3)
             			->setFixed(0,HX_("id",db,5b,00,00),::snikket::ID_obj::medium())
             			->setFixed(1,HX_("to",7b,65,00,00),_hx_tmp1)
             			->setFixed(2,HX_("type",ba,f2,08,4d),HX_("set",a2,9b,57,00))));
-HXLINE( 339)		_hx_tmp->sendStanza(_hx_tmp2->tag(HX_("jingle",31,27,eb,1f), ::Dynamic(::hx::Anon_obj::Create(3)
+HXLINE( 355)		_hx_tmp->sendStanza(_hx_tmp2->tag(HX_("jingle",31,27,eb,1f), ::Dynamic(::hx::Anon_obj::Create(3)
             			->setFixed(0,HX_("sid",0e,9f,57,00),this->get_sid())
             			->setFixed(1,HX_("action",b6,3b,46,16),HX_("session-terminate",6a,23,dc,12))
             			->setFixed(2,HX_("xmlns",dc,31,74,60),HX_("urn:xmpp:jingle:1",44,c4,fe,f7))))->tag(HX_("reason",c4,0f,9d,fc),null())->tag(HX_("success",c3,25,4e,b8),null())->up()->up()->up());
-HXLINE( 345)		this->terminate();
+HXLINE( 361)		this->terminate();
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(InitiatedSession_obj,hangup,(void))
 
  ::snikket::jingle::OutgoingSession InitiatedSession_obj::initiate( ::snikket::Stanza stanza){
-            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_349_initiate)
-HXLINE( 350)		 ::Dynamic _hx_tmp = ::haxe::Log_obj::trace;
-HXDLIN( 350)		::String _hx_tmp1 = (HX_("Trying to initiate already initiated session: ",84,56,c8,79) + this->get_sid());
-HXDLIN( 350)		_hx_tmp(_hx_tmp1,::hx::SourceInfo(HX_("snikket/jingle/Session.hx",54,dd,b2,6d),350,HX_("snikket.jingle.InitiatedSession",b7,6d,05,22),HX_("initiate",59,6a,8f,5f)));
-HXLINE( 351)		HX_STACK_DO_THROW(HX_("already initiated",63,a5,36,1a));
-HXDLIN( 351)		return null();
+            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_365_initiate)
+HXLINE( 366)		 ::Dynamic _hx_tmp = ::haxe::Log_obj::trace;
+HXDLIN( 366)		::String _hx_tmp1 = (HX_("Trying to initiate already initiated session: ",84,56,c8,79) + this->get_sid());
+HXDLIN( 366)		_hx_tmp(_hx_tmp1,::hx::SourceInfo(HX_("snikket/jingle/Session.hx",54,dd,b2,6d),366,HX_("snikket.jingle.InitiatedSession",b7,6d,05,22),HX_("initiate",59,6a,8f,5f)));
+HXLINE( 367)		HX_STACK_DO_THROW(HX_("already initiated",63,a5,36,1a));
+HXDLIN( 367)		return null();
             	}
 
 
@@ -347,11 +364,11 @@ HX_DEFINE_DYNAMIC_FUNC1(InitiatedSession_obj,initiate,return )
 void InitiatedSession_obj::terminate(){
             		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_0, ::snikket::jingle::InitiatedSession,_gthis, ::snikket::Stanza,event, ::snikket::ChatMessage,msg) HXARGC(1)
             		void _hx_run(::Array< ::Dynamic> stored){
-            			HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_368_terminate)
-HXLINE( 369)			_gthis->client->notifyMessageHandlers(stored->__get(0).StaticCast<  ::snikket::ChatMessage >(),1);
-HXLINE( 370)			 ::snikket::Client _gthis1 = _gthis->client;
-HXLINE( 371)			::String _hx_tmp = _gthis->counterpart->asString();
-HXLINE( 370)			_gthis1->sendStanza( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("message",c7,35,11,9a), ::Dynamic(::hx::Anon_obj::Create(3)
+            			HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_384_terminate)
+HXLINE( 385)			_gthis->client->notifyMessageHandlers(stored->__get(0).StaticCast<  ::snikket::ChatMessage >(),1);
+HXLINE( 386)			 ::snikket::Client _gthis1 = _gthis->client;
+HXLINE( 387)			::String _hx_tmp = _gthis->counterpart->asString();
+HXLINE( 386)			_gthis1->sendStanza( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("message",c7,35,11,9a), ::Dynamic(::hx::Anon_obj::Create(3)
             				->setFixed(0,HX_("id",db,5b,00,00),msg->versions->__get(0).StaticCast<  ::snikket::ChatMessage >()->localId)
             				->setFixed(1,HX_("to",7b,65,00,00),_hx_tmp)
             				->setFixed(2,HX_("type",ba,f2,08,4d),HX_("chat",d8,5e,bf,41))))->addChild(event)->tag(HX_("store",e1,13,16,84), ::Dynamic(::hx::Anon_obj::Create(1)
@@ -359,39 +376,41 @@ HXLINE( 370)			_gthis1->sendStanza( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_(
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_355_terminate)
-HXDLIN( 355)		 ::snikket::jingle::InitiatedSession _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 356)		if (::hx::IsNull( this->pc )) {
-HXLINE( 356)			return;
+            	HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_371_terminate)
+HXDLIN( 371)		 ::snikket::jingle::InitiatedSession _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 372)		if (::hx::IsNull( this->pc )) {
+HXLINE( 372)			return;
             		}
-HXLINE( 357)		this->pc->close();
-HXLINE( 358)		{
-HXLINE( 358)			int _g = 0;
-HXDLIN( 358)			::Array< ::Dynamic> _g1 = this->pc->getTransceivers();
-HXDLIN( 358)			while((_g < _g1->length)){
-HXLINE( 358)				 ::Dynamic tranceiver = _g1->__get(_g);
-HXDLIN( 358)				_g = (_g + 1);
-HXLINE( 359)				bool _hx_tmp;
-HXDLIN( 359)				if (::hx::IsNotNull( tranceiver->__Field(HX_("sender",b5,c7,84,6b),::hx::paccDynamic) )) {
-HXLINE( 359)					_hx_tmp = ::hx::IsNotNull(  ::Dynamic(tranceiver->__Field(HX_("sender",b5,c7,84,6b),::hx::paccDynamic))->__Field(HX_("track",8b,8e,1f,16),::hx::paccDynamic) );
+HXLINE( 373)		this->pc->close();
+HXLINE( 374)		{
+HXLINE( 374)			int _g = 0;
+HXDLIN( 374)			::Array< ::Dynamic> _g1 = this->pc->getTransceivers();
+HXDLIN( 374)			while((_g < _g1->length)){
+HXLINE( 374)				 ::Dynamic tranceiver = _g1->__get(_g);
+HXDLIN( 374)				_g = (_g + 1);
+HXLINE( 375)				bool _hx_tmp;
+HXDLIN( 375)				if (::hx::IsNotNull( tranceiver->__Field(HX_("sender",b5,c7,84,6b),::hx::paccDynamic) )) {
+HXLINE( 375)					_hx_tmp = ::hx::IsNotNull(  ::Dynamic(tranceiver->__Field(HX_("sender",b5,c7,84,6b),::hx::paccDynamic))->__Field(HX_("track",8b,8e,1f,16),::hx::paccDynamic) );
             				}
             				else {
-HXLINE( 359)					_hx_tmp = false;
+HXLINE( 375)					_hx_tmp = false;
             				}
-HXDLIN( 359)				if (_hx_tmp) {
-HXLINE( 360)					( ( ::snikket::jingle::MediaStreamTrack)( ::Dynamic(tranceiver->__Field(HX_("sender",b5,c7,84,6b),::hx::paccDynamic))->__Field(HX_("track",8b,8e,1f,16),::hx::paccDynamic)) )->stop();
+HXDLIN( 375)				if (_hx_tmp) {
+HXLINE( 376)					( ( ::snikket::jingle::MediaStreamTrack)( ::Dynamic(tranceiver->__Field(HX_("sender",b5,c7,84,6b),::hx::paccDynamic))->__Field(HX_("track",8b,8e,1f,16),::hx::paccDynamic)) )->stop();
             				}
             			}
             		}
-HXLINE( 363)		this->pc = null();
-HXLINE( 364)		 ::snikket::Client _hx_tmp1 = this->client;
-HXDLIN( 364)		_hx_tmp1->trigger(HX_("call/retract",50,bc,8d,db), ::Dynamic(::hx::Anon_obj::Create(1)
-            			->setFixed(0,HX_("chatId",d3,04,77,b7),this->counterpart->asBare()->asString())));
-HXLINE( 366)		 ::snikket::Stanza event =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("finish",53,40,7f,86), ::Dynamic(::hx::Anon_obj::Create(2)
+HXLINE( 379)		this->pc = null();
+HXLINE( 380)		 ::snikket::Client _hx_tmp1 = this->client;
+HXDLIN( 380)		::String _hx_tmp2 = this->get_chatId();
+HXDLIN( 380)		_hx_tmp1->trigger(HX_("call/retract",50,bc,8d,db), ::Dynamic(::hx::Anon_obj::Create(2)
+            			->setFixed(0,HX_("chatId",d3,04,77,b7),_hx_tmp2)
+            			->setFixed(1,HX_("sid",0e,9f,57,00),this->get_sid())));
+HXLINE( 382)		 ::snikket::Stanza event =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("finish",53,40,7f,86), ::Dynamic(::hx::Anon_obj::Create(2)
             			->setFixed(0,HX_("id",db,5b,00,00),this->get_sid())
             			->setFixed(1,HX_("xmlns",dc,31,74,60),HX_("urn:xmpp:jingle-message:0",fd,20,a5,07))));
-HXLINE( 367)		 ::snikket::ChatMessage msg = ::snikket::jingle::_Session::Session_Fields__obj::mkCallMessage(this->counterpart,this->client->jid,event);
-HXLINE( 368)		this->client->storeMessages(::Array_obj< ::Dynamic>::__new(1)->init(0,msg), ::Dynamic(new _hx_Closure_0(_gthis,event,msg)));
+HXLINE( 383)		 ::snikket::ChatMessage msg = ::snikket::jingle::_Session::Session_Fields__obj::mkCallMessage(this->counterpart,this->client->jid,event);
+HXLINE( 384)		this->client->storeMessages(::Array_obj< ::Dynamic>::__new(1)->init(0,msg), ::Dynamic(new _hx_Closure_0(_gthis,event,msg)));
             	}
 
 
@@ -408,108 +427,108 @@ void InitiatedSession_obj::contentAdd( ::snikket::Stanza stanza){
             					bool _hx_run( ::snikket::jingle::Media m){
             						HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_1, ::snikket::jingle::Media,m) HXARGC(1)
             						bool _hx_run( ::snikket::jingle::Media addM){
-            							HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_402_contentAdd)
-HXLINE( 402)							return (addM->mid == m->mid);
+            							HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_418_contentAdd)
+HXLINE( 418)							return (addM->mid == m->mid);
             						}
             						HX_END_LOCAL_FUNC1(return)
 
-            						HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_402_contentAdd)
-HXLINE( 402)						::String _hx_tmp = ( (::String)(::Reflect_obj::field(m->contentElement(false)->attr,HX_("senders",1e,f7,a9,a8))) );
-HXDLIN( 402)						return (_hx_tmp != ( (::String)(::Reflect_obj::field(( ( ::snikket::jingle::Media)(::Lambda_obj::find(addThis->media, ::Dynamic(new _hx_Closure_1(m)))) )->contentElement(false)->attr,HX_("senders",1e,f7,a9,a8))) ));
+            						HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_418_contentAdd)
+HXLINE( 418)						::String _hx_tmp = ( (::String)(::Reflect_obj::field(m->contentElement(false)->attr,HX_("senders",1e,f7,a9,a8))) );
+HXDLIN( 418)						return (_hx_tmp != ( (::String)(::Reflect_obj::field(( ( ::snikket::jingle::Media)(::Lambda_obj::find(addThis->media, ::Dynamic(new _hx_Closure_1(m)))) )->contentElement(false)->attr,HX_("senders",1e,f7,a9,a8))) ));
             					}
             					HX_END_LOCAL_FUNC1(return)
 
-            					HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_401_contentAdd)
-HXLINE( 401)					if (::hx::IsNotNull( ::Lambda_obj::find(gonnaAccept->media, ::Dynamic(new _hx_Closure_2(addThis))) )) {
-HXLINE( 404)						::String modify = _gthis->get_sid();
-HXDLIN( 404)						 ::snikket::Stanza modify1 = gonnaAccept->toStanza(HX_("content-modify",4e,70,8f,a8),modify,_gthis->initiator);
-HXLINE( 405)						{
-HXLINE( 405)							 ::Dynamic this1 = modify1->attr;
-HXDLIN( 405)							::String value = _gthis->counterpart->asString();
-HXDLIN( 405)							::Reflect_obj::setField(this1,HX_("to",7b,65,00,00),value);
+            					HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_417_contentAdd)
+HXLINE( 417)					if (::hx::IsNotNull( ::Lambda_obj::find(gonnaAccept->media, ::Dynamic(new _hx_Closure_2(addThis))) )) {
+HXLINE( 420)						::String modify = _gthis->get_sid();
+HXDLIN( 420)						 ::snikket::Stanza modify1 = gonnaAccept->toStanza(HX_("content-modify",4e,70,8f,a8),modify,_gthis->initiator);
+HXLINE( 421)						{
+HXLINE( 421)							 ::Dynamic this1 = modify1->attr;
+HXDLIN( 421)							::String value = _gthis->counterpart->asString();
+HXDLIN( 421)							::Reflect_obj::setField(this1,HX_("to",7b,65,00,00),value);
             						}
-HXLINE( 406)						{
-HXLINE( 406)							 ::Dynamic this2 = modify1->attr;
-HXDLIN( 406)							::String value1 = ::snikket::ID_obj::medium();
-HXDLIN( 406)							::Reflect_obj::setField(this2,HX_("id",db,5b,00,00),value1);
+HXLINE( 422)						{
+HXLINE( 422)							 ::Dynamic this2 = modify1->attr;
+HXDLIN( 422)							::String value1 = ::snikket::ID_obj::medium();
+HXDLIN( 422)							::Reflect_obj::setField(this2,HX_("id",db,5b,00,00),value1);
             						}
-HXLINE( 407)						_gthis->client->sendStanza(modify1);
+HXLINE( 423)						_gthis->client->sendStanza(modify1);
             					}
             				}
             				HX_END_LOCAL_FUNC1((void))
 
-            				HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_395_contentAdd)
-HXLINE( 396)				 ::snikket::jingle::InitiatedSession _gthis1 = _gthis;
-HXLINE( 398)				::Array< ::Dynamic> _this = addThis->media;
-HXDLIN( 398)				::Array< ::String > result = ::Array_obj< ::String >::__new(_this->length);
-HXDLIN( 398)				{
-HXLINE( 398)					int _g = 0;
-HXDLIN( 398)					int _g1 = _this->length;
-HXDLIN( 398)					while((_g < _g1)){
-HXLINE( 398)						_g = (_g + 1);
-HXDLIN( 398)						int i = (_g - 1);
-HXDLIN( 398)						{
-HXLINE( 398)							::String inValue = ( ( ::snikket::jingle::Media)(_hx_array_unsafe_get(_this,i)) )->mid;
-HXDLIN( 398)							result->__unsafe_set(i,inValue);
+            				HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_411_contentAdd)
+HXLINE( 412)				 ::snikket::jingle::InitiatedSession _gthis1 = _gthis;
+HXLINE( 414)				::Array< ::Dynamic> _this = addThis->media;
+HXDLIN( 414)				::Array< ::String > result = ::Array_obj< ::String >::__new(_this->length);
+HXDLIN( 414)				{
+HXLINE( 414)					int _g = 0;
+HXDLIN( 414)					int _g1 = _this->length;
+HXDLIN( 414)					while((_g < _g1)){
+HXLINE( 414)						_g = (_g + 1);
+HXDLIN( 414)						int i = (_g - 1);
+HXDLIN( 414)						{
+HXLINE( 414)							::String inValue = ( ( ::snikket::jingle::Media)(_hx_array_unsafe_get(_this,i)) )->mid;
+HXDLIN( 414)							result->__unsafe_set(i,inValue);
             						}
             					}
             				}
-HXLINE( 396)				_gthis1->setupLocalDescription(HX_("content-accept",dc,ee,cb,f2),result,false, ::Dynamic(new _hx_Closure_3(_gthis,addThis)));
-HXLINE( 411)				_gthis->afterMedia = null();
+HXLINE( 412)				_gthis1->setupLocalDescription(HX_("content-accept",dc,ee,cb,f2),result,false, ::Dynamic(new _hx_Closure_3(_gthis,addThis)));
+HXLINE( 427)				_gthis->afterMedia = null();
             			}
             			HX_END_LOCAL_FUNC0((void))
 
-            			HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_394_contentAdd)
-HXLINE( 395)			_gthis->afterMedia =  ::Dynamic(new _hx_Closure_4(_gthis,addThis));
-HXLINE( 413)			return _gthis->client->trigger(HX_("call/media",73,5d,1d,c7), ::Dynamic(::hx::Anon_obj::Create(3)
+            			HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_410_contentAdd)
+HXLINE( 411)			_gthis->afterMedia =  ::Dynamic(new _hx_Closure_4(_gthis,addThis));
+HXLINE( 429)			return _gthis->client->trigger(HX_("call/media",73,5d,1d,c7), ::Dynamic(::hx::Anon_obj::Create(3)
             				->setFixed(0,HX_("session",56,17,98,93),_gthis)
             				->setFixed(1,HX_("audio",d6,78,80,27),audio->__get(0))
             				->setFixed(2,HX_("video",7b,14,fc,36),video->__get(0))));
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            	HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_379_contentAdd)
-HXDLIN( 379)		 ::snikket::jingle::InitiatedSession _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 380)		if (::hx::IsNull( this->remoteDescription )) {
-HXLINE( 380)			HX_STACK_DO_THROW(HX_("Got content-add before session-accept",59,44,5e,1c));
+            	HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_395_contentAdd)
+HXDLIN( 395)		 ::snikket::jingle::InitiatedSession _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 396)		if (::hx::IsNull( this->remoteDescription )) {
+HXLINE( 396)			HX_STACK_DO_THROW(HX_("Got content-add before session-accept",59,44,5e,1c));
             		}
-HXLINE( 382)		 ::snikket::jingle::SessionDescription addThis = ::snikket::jingle::SessionDescription_obj::fromStanza(stanza,this->initiator,this->remoteDescription);
-HXLINE( 383)		::Array< bool > video = ::Array_obj< bool >::fromData( _hx_array_data_22056db7_21,1);
-HXLINE( 384)		::Array< bool > audio = ::Array_obj< bool >::fromData( _hx_array_data_22056db7_22,1);
-HXLINE( 385)		{
-HXLINE( 385)			int _g = 0;
-HXDLIN( 385)			::Array< ::Dynamic> _g1 = addThis->media;
-HXDLIN( 385)			while((_g < _g1->length)){
+HXLINE( 398)		 ::snikket::jingle::SessionDescription addThis = ::snikket::jingle::SessionDescription_obj::fromStanza(stanza,this->initiator,this->remoteDescription);
+HXLINE( 399)		::Array< bool > video = ::Array_obj< bool >::fromData( _hx_array_data_22056db7_23,1);
+HXLINE( 400)		::Array< bool > audio = ::Array_obj< bool >::fromData( _hx_array_data_22056db7_24,1);
+HXLINE( 401)		{
+HXLINE( 401)			int _g = 0;
+HXDLIN( 401)			::Array< ::Dynamic> _g1 = addThis->media;
+HXDLIN( 401)			while((_g < _g1->length)){
             				HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_0) HXARGC(1)
             				bool _hx_run( ::snikket::jingle::Attribute attr){
-            					HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_386_contentAdd)
-HXLINE( 386)					if ((attr->key != HX_("sendrecv",6e,1e,9c,f4))) {
-HXLINE( 386)						return (attr->key == HX_("sendonly",b4,56,a7,f2));
+            					HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_402_contentAdd)
+HXLINE( 402)					if ((attr->key != HX_("sendrecv",6e,1e,9c,f4))) {
+HXLINE( 402)						return (attr->key == HX_("sendonly",b4,56,a7,f2));
             					}
             					else {
-HXLINE( 386)						return true;
+HXLINE( 402)						return true;
             					}
-HXDLIN( 386)					return false;
+HXDLIN( 402)					return false;
             				}
             				HX_END_LOCAL_FUNC1(return)
 
-HXLINE( 385)				 ::snikket::jingle::Media m = _g1->__get(_g).StaticCast<  ::snikket::jingle::Media >();
-HXDLIN( 385)				_g = (_g + 1);
-HXLINE( 386)				if (::Lambda_obj::exists(m->attributes, ::Dynamic(new _hx_Closure_0()))) {
-HXLINE( 387)					if ((m->media == HX_("video",7b,14,fc,36))) {
-HXLINE( 387)						video[0] = true;
+HXLINE( 401)				 ::snikket::jingle::Media m = _g1->__get(_g).StaticCast<  ::snikket::jingle::Media >();
+HXDLIN( 401)				_g = (_g + 1);
+HXLINE( 402)				if (::Lambda_obj::exists(m->attributes, ::Dynamic(new _hx_Closure_0()))) {
+HXLINE( 403)					if ((m->media == HX_("video",7b,14,fc,36))) {
+HXLINE( 403)						video[0] = true;
             					}
-HXLINE( 388)					if ((m->media == HX_("audio",d6,78,80,27))) {
-HXLINE( 388)						audio[0] = true;
+HXLINE( 404)					if ((m->media == HX_("audio",d6,78,80,27))) {
+HXLINE( 404)						audio[0] = true;
             					}
             				}
-HXLINE( 390)				::Array< ::Dynamic> m1 = m->attributes;
-HXDLIN( 390)				m1->push( ::snikket::jingle::Attribute_obj::__alloc( HX_CTX ,HX_("setup",7d,ae,2f,7a),this->peerDtlsSetup));
+HXLINE( 406)				::Array< ::Dynamic> m1 = m->attributes;
+HXDLIN( 406)				m1->push( ::snikket::jingle::Attribute_obj::__alloc( HX_CTX ,HX_("setup",7d,ae,2f,7a),this->peerDtlsSetup));
             			}
             		}
-HXLINE( 392)		this->remoteDescription = this->remoteDescription->addContent(addThis);
-HXLINE( 394)		 ::snikket::jingle::PeerConnection _hx_tmp = this->pc;
-HXDLIN( 394)		::thenshim::_Promise::Promise_Impl__obj::then(_hx_tmp->setRemoteDescription( ::Dynamic(::hx::Anon_obj::Create(2)
+HXLINE( 408)		this->remoteDescription = this->remoteDescription->addContent(addThis);
+HXLINE( 410)		 ::snikket::jingle::PeerConnection _hx_tmp = this->pc;
+HXDLIN( 410)		::thenshim::_Promise::Promise_Impl__obj::then(_hx_tmp->setRemoteDescription( ::Dynamic(::hx::Anon_obj::Create(2)
             			->setFixed(0,HX_("sdp",bf,9a,57,00),this->remoteDescription->toSdp())
             			->setFixed(1,HX_("type",ba,f2,08,4d),cpp::Struct(rtc::Description::Type::Offer)))), ::Dynamic(new _hx_Closure_5(video,_gthis,addThis,audio)),null());
             	}
@@ -518,24 +537,24 @@ HXDLIN( 394)		::thenshim::_Promise::Promise_Impl__obj::then(_hx_tmp->setRemoteDe
 HX_DEFINE_DYNAMIC_FUNC1(InitiatedSession_obj,contentAdd,(void))
 
 void InitiatedSession_obj::contentAccept( ::snikket::Stanza stanza){
-            	HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_418_contentAccept)
-HXLINE( 419)		if (::hx::IsNull( this->remoteDescription )) {
-HXLINE( 419)			HX_STACK_DO_THROW(HX_("Got content-accept before session-accept",10,3c,4f,73));
+            	HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_434_contentAccept)
+HXLINE( 435)		if (::hx::IsNull( this->remoteDescription )) {
+HXLINE( 435)			HX_STACK_DO_THROW(HX_("Got content-accept before session-accept",10,3c,4f,73));
             		}
-HXLINE( 422)		 ::snikket::jingle::SessionDescription addThis = ::snikket::jingle::SessionDescription_obj::fromStanza(stanza,!(this->initiator),this->remoteDescription);
-HXLINE( 423)		{
-HXLINE( 423)			int _g = 0;
-HXDLIN( 423)			::Array< ::Dynamic> _g1 = addThis->media;
-HXDLIN( 423)			while((_g < _g1->length)){
-HXLINE( 423)				 ::snikket::jingle::Media m = _g1->__get(_g).StaticCast<  ::snikket::jingle::Media >();
-HXDLIN( 423)				_g = (_g + 1);
-HXLINE( 424)				::Array< ::Dynamic> m1 = m->attributes;
-HXDLIN( 424)				m1->push( ::snikket::jingle::Attribute_obj::__alloc( HX_CTX ,HX_("setup",7d,ae,2f,7a),this->peerDtlsSetup));
+HXLINE( 438)		 ::snikket::jingle::SessionDescription addThis = ::snikket::jingle::SessionDescription_obj::fromStanza(stanza,!(this->initiator),this->remoteDescription);
+HXLINE( 439)		{
+HXLINE( 439)			int _g = 0;
+HXDLIN( 439)			::Array< ::Dynamic> _g1 = addThis->media;
+HXDLIN( 439)			while((_g < _g1->length)){
+HXLINE( 439)				 ::snikket::jingle::Media m = _g1->__get(_g).StaticCast<  ::snikket::jingle::Media >();
+HXDLIN( 439)				_g = (_g + 1);
+HXLINE( 440)				::Array< ::Dynamic> m1 = m->attributes;
+HXDLIN( 440)				m1->push( ::snikket::jingle::Attribute_obj::__alloc( HX_CTX ,HX_("setup",7d,ae,2f,7a),this->peerDtlsSetup));
             			}
             		}
-HXLINE( 426)		this->remoteDescription = this->remoteDescription->addContent(addThis);
-HXLINE( 427)		 ::snikket::jingle::PeerConnection _hx_tmp = this->pc;
-HXDLIN( 427)		_hx_tmp->setRemoteDescription( ::Dynamic(::hx::Anon_obj::Create(2)
+HXLINE( 442)		this->remoteDescription = this->remoteDescription->addContent(addThis);
+HXLINE( 443)		 ::snikket::jingle::PeerConnection _hx_tmp = this->pc;
+HXDLIN( 443)		_hx_tmp->setRemoteDescription( ::Dynamic(::hx::Anon_obj::Create(2)
             			->setFixed(0,HX_("sdp",bf,9a,57,00),this->remoteDescription->toSdp())
             			->setFixed(1,HX_("type",ba,f2,08,4d),cpp::Struct(rtc::Description::Type::Answer))));
             	}
@@ -546,96 +565,96 @@ HX_DEFINE_DYNAMIC_FUNC1(InitiatedSession_obj,contentAccept,(void))
 ::Dynamic InitiatedSession_obj::transportInfo( ::snikket::Stanza stanza){
             		HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_0) HXARGC(1)
             		void _hx_run(::cpp::VirtualArray _){
-            			HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_445_transportInfo)
-HXLINE( 445)			return;
+            			HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_461_transportInfo)
+HXLINE( 461)			return;
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_431_transportInfo)
-HXDLIN( 431)		 ::snikket::jingle::InitiatedSession _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 432)		bool _hx_tmp;
-HXDLIN( 432)		if (::hx::IsNotNull( this->pc )) {
-HXLINE( 432)			_hx_tmp = ::hx::IsNull( this->remoteDescription );
+            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_447_transportInfo)
+HXDLIN( 447)		 ::snikket::jingle::InitiatedSession _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 448)		bool _hx_tmp;
+HXDLIN( 448)		if (::hx::IsNotNull( this->pc )) {
+HXLINE( 448)			_hx_tmp = ::hx::IsNull( this->remoteDescription );
             		}
             		else {
-HXLINE( 432)			_hx_tmp = true;
+HXLINE( 448)			_hx_tmp = true;
             		}
-HXDLIN( 432)		if (_hx_tmp) {
-HXLINE( 433)			this->queuedInboundTransportInfo->push(stanza);
-HXLINE( 434)			return ::thenshim::_Promise::Promise_Impl__obj::resolve(null());
+HXDLIN( 448)		if (_hx_tmp) {
+HXLINE( 449)			this->queuedInboundTransportInfo->push(stanza);
+HXLINE( 450)			return ::thenshim::_Promise::Promise_Impl__obj::resolve(null());
             		}
-HXLINE( 437)		::Array< ::Dynamic> _this = ::snikket::jingle::IceCandidate_obj::fromStanza(stanza);
-HXDLIN( 437)		::Array< ::Dynamic> result = ::Array_obj< ::Dynamic>::__new(_this->length);
-HXDLIN( 437)		{
-HXLINE( 437)			int _g = 0;
-HXDLIN( 437)			int _g1 = _this->length;
-HXDLIN( 437)			while((_g < _g1)){
-HXLINE( 437)				_g = (_g + 1);
-HXDLIN( 437)				int i = (_g - 1);
-HXDLIN( 437)				{
-HXLINE( 437)					 ::snikket::jingle::IceCandidate candidate = ( ( ::snikket::jingle::IceCandidate)(_hx_array_unsafe_get(_this,i)) );
-HXLINE( 438)					int index = _gthis->remoteDescription->identificationTags->indexOf(candidate->sdpMid,null());
-HXLINE( 439)					 ::snikket::jingle::PeerConnection _gthis1 = _gthis->pc;
-HXLINE( 440)					::String inValue = candidate->toSdp();
-HXLINE( 442)					 ::Dynamic inValue1;
-HXDLIN( 442)					if ((index < 0)) {
-HXLINE( 442)						inValue1 = null();
+HXLINE( 453)		::Array< ::Dynamic> _this = ::snikket::jingle::IceCandidate_obj::fromStanza(stanza);
+HXDLIN( 453)		::Array< ::Dynamic> result = ::Array_obj< ::Dynamic>::__new(_this->length);
+HXDLIN( 453)		{
+HXLINE( 453)			int _g = 0;
+HXDLIN( 453)			int _g1 = _this->length;
+HXDLIN( 453)			while((_g < _g1)){
+HXLINE( 453)				_g = (_g + 1);
+HXDLIN( 453)				int i = (_g - 1);
+HXDLIN( 453)				{
+HXLINE( 453)					 ::snikket::jingle::IceCandidate candidate = ( ( ::snikket::jingle::IceCandidate)(_hx_array_unsafe_get(_this,i)) );
+HXLINE( 454)					int index = _gthis->remoteDescription->identificationTags->indexOf(candidate->sdpMid,null());
+HXLINE( 455)					 ::snikket::jingle::PeerConnection _gthis1 = _gthis->pc;
+HXLINE( 456)					::String inValue = candidate->toSdp();
+HXLINE( 458)					 ::Dynamic inValue1;
+HXDLIN( 458)					if ((index < 0)) {
+HXLINE( 458)						inValue1 = null();
             					}
             					else {
-HXLINE( 442)						inValue1 = index;
+HXLINE( 458)						inValue1 = index;
             					}
-HXLINE( 437)					::Dynamic inValue2 = _gthis1->addIceCandidate( ::Dynamic(::hx::Anon_obj::Create(4)
+HXLINE( 453)					::Dynamic inValue2 = _gthis1->addIceCandidate( ::Dynamic(::hx::Anon_obj::Create(4)
             						->setFixed(0,HX_("usernameFragment",06,a8,37,89),candidate->ufrag)
             						->setFixed(1,HX_("candidate",43,34,d8,d0),inValue)
             						->setFixed(2,HX_("sdpMid",09,30,5f,d9),candidate->sdpMid)
             						->setFixed(3,HX_("sdpMLineIndex",f0,ab,d6,e2),inValue1)));
-HXDLIN( 437)					result->__unsafe_set(i,inValue2);
+HXDLIN( 453)					result->__unsafe_set(i,inValue2);
             				}
             			}
             		}
-HXDLIN( 437)		return ::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::PromiseTools_obj::all(result), ::Dynamic(new _hx_Closure_0()),null());
+HXDLIN( 453)		return ::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::PromiseTools_obj::all(result), ::Dynamic(new _hx_Closure_0()),null());
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(InitiatedSession_obj,transportInfo,return )
 
 void InitiatedSession_obj::addMedia(::Array< ::Dynamic> streams){
-            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_448_addMedia)
-HXLINE( 449)		if (::hx::IsNull( this->pc )) {
-HXLINE( 449)			HX_STACK_DO_THROW(HX_("tried to add media before PeerConnection exists",25,49,19,b2));
+            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_464_addMedia)
+HXLINE( 465)		if (::hx::IsNull( this->pc )) {
+HXLINE( 465)			HX_STACK_DO_THROW(HX_("tried to add media before PeerConnection exists",25,49,19,b2));
             		}
-HXLINE( 451)		::Array< ::Dynamic> _this = this->localDescription->media;
-HXDLIN( 451)		::Array< ::String > result = ::Array_obj< ::String >::__new(_this->length);
-HXDLIN( 451)		{
-HXLINE( 451)			int _g = 0;
-HXDLIN( 451)			int _g1 = _this->length;
-HXDLIN( 451)			while((_g < _g1)){
-HXLINE( 451)				_g = (_g + 1);
-HXDLIN( 451)				int i = (_g - 1);
-HXDLIN( 451)				{
-HXLINE( 451)					::String inValue = ( ( ::snikket::jingle::Media)(_hx_array_unsafe_get(_this,i)) )->mid;
-HXDLIN( 451)					result->__unsafe_set(i,inValue);
+HXLINE( 467)		::Array< ::Dynamic> _this = this->localDescription->media;
+HXDLIN( 467)		::Array< ::String > result = ::Array_obj< ::String >::__new(_this->length);
+HXDLIN( 467)		{
+HXLINE( 467)			int _g = 0;
+HXDLIN( 467)			int _g1 = _this->length;
+HXDLIN( 467)			while((_g < _g1)){
+HXLINE( 467)				_g = (_g + 1);
+HXDLIN( 467)				int i = (_g - 1);
+HXDLIN( 467)				{
+HXLINE( 467)					::String inValue = ( ( ::snikket::jingle::Media)(_hx_array_unsafe_get(_this,i)) )->mid;
+HXDLIN( 467)					result->__unsafe_set(i,inValue);
             				}
             			}
             		}
-HXDLIN( 451)		::Array< ::String > oldMids = result;
-HXLINE( 452)		{
-HXLINE( 452)			int _g2 = 0;
-HXDLIN( 452)			while((_g2 < streams->length)){
-HXLINE( 452)				 ::snikket::jingle::MediaStream stream = streams->__get(_g2).StaticCast<  ::snikket::jingle::MediaStream >();
-HXDLIN( 452)				_g2 = (_g2 + 1);
-HXLINE( 453)				{
-HXLINE( 453)					int _g3 = 0;
-HXDLIN( 453)					::Array< ::Dynamic> _g4 = stream->getTracks();
-HXDLIN( 453)					while((_g3 < _g4->length)){
-HXLINE( 453)						 ::snikket::jingle::MediaStreamTrack track = _g4->__get(_g3).StaticCast<  ::snikket::jingle::MediaStreamTrack >();
-HXDLIN( 453)						_g3 = (_g3 + 1);
-HXLINE( 454)						this->pc->addTrack(track,stream);
+HXDLIN( 467)		::Array< ::String > oldMids = result;
+HXLINE( 468)		{
+HXLINE( 468)			int _g2 = 0;
+HXDLIN( 468)			while((_g2 < streams->length)){
+HXLINE( 468)				 ::snikket::jingle::MediaStream stream = streams->__get(_g2).StaticCast<  ::snikket::jingle::MediaStream >();
+HXDLIN( 468)				_g2 = (_g2 + 1);
+HXLINE( 469)				{
+HXLINE( 469)					int _g3 = 0;
+HXDLIN( 469)					::Array< ::Dynamic> _g4 = stream->getTracks();
+HXDLIN( 469)					while((_g3 < _g4->length)){
+HXLINE( 469)						 ::snikket::jingle::MediaStreamTrack track = _g4->__get(_g3).StaticCast<  ::snikket::jingle::MediaStreamTrack >();
+HXDLIN( 469)						_g3 = (_g3 + 1);
+HXLINE( 470)						this->pc->addTrack(track,stream);
             					}
             				}
             			}
             		}
-HXLINE( 458)		this->setupLocalDescription(HX_("content-add",cd,a9,a1,10),oldMids,true,null());
+HXLINE( 474)		this->setupLocalDescription(HX_("content-add",cd,a9,a1,10),oldMids,true,null());
             	}
 
 
@@ -661,66 +680,66 @@ HXLINE( 252)		this->addMedia(_hx_tmp);
 HX_DEFINE_DYNAMIC_FUNC2(InitiatedSession_obj,addMedia__fromC,(void))
 
 ::String InitiatedSession_obj::callStatus(){
-            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_462_callStatus)
-HXDLIN( 462)		return HX_("ongoing",3b,aa,04,9b);
+            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_478_callStatus)
+HXDLIN( 478)		return HX_("ongoing",3b,aa,04,9b);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(InitiatedSession_obj,callStatus,return )
 
 ::Array< ::Dynamic> InitiatedSession_obj::videoTracks(){
-            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_465_videoTracks)
-HXLINE( 466)		if (::hx::IsNull( this->pc )) {
-HXLINE( 466)			return ::Array_obj< ::Dynamic>::__new(0);
+            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_481_videoTracks)
+HXLINE( 482)		if (::hx::IsNull( this->pc )) {
+HXLINE( 482)			return ::Array_obj< ::Dynamic>::__new(0);
             		}
-HXLINE( 467)		::Array< ::Dynamic> _g = ::Array_obj< ::Dynamic>::__new(0);
-HXDLIN( 467)		{
-HXLINE( 467)			int _g1 = 0;
-HXDLIN( 467)			::Array< ::Dynamic> _g2 = this->pc->getTransceivers();
-HXDLIN( 467)			while((_g1 < _g2->length)){
-HXLINE( 467)				 ::Dynamic v = _g2->__get(_g1);
-HXDLIN( 467)				_g1 = (_g1 + 1);
-HXLINE( 468)				bool _hx_tmp;
-HXDLIN( 468)				bool _hx_tmp1;
-HXDLIN( 468)				bool _hx_tmp2;
-HXDLIN( 468)				if (::hx::IsNotNull( v->__Field(HX_("receiver",2f,45,fd,e2),::hx::paccDynamic) )) {
-HXLINE( 468)					_hx_tmp2 = ::hx::IsNotNull(  ::Dynamic(v->__Field(HX_("receiver",2f,45,fd,e2),::hx::paccDynamic))->__Field(HX_("track",8b,8e,1f,16),::hx::paccDynamic) );
+HXLINE( 483)		::Array< ::Dynamic> _g = ::Array_obj< ::Dynamic>::__new(0);
+HXDLIN( 483)		{
+HXLINE( 483)			int _g1 = 0;
+HXDLIN( 483)			::Array< ::Dynamic> _g2 = this->pc->getTransceivers();
+HXDLIN( 483)			while((_g1 < _g2->length)){
+HXLINE( 483)				 ::Dynamic v = _g2->__get(_g1);
+HXDLIN( 483)				_g1 = (_g1 + 1);
+HXLINE( 484)				bool _hx_tmp;
+HXDLIN( 484)				bool _hx_tmp1;
+HXDLIN( 484)				bool _hx_tmp2;
+HXDLIN( 484)				if (::hx::IsNotNull( v->__Field(HX_("receiver",2f,45,fd,e2),::hx::paccDynamic) )) {
+HXLINE( 484)					_hx_tmp2 = ::hx::IsNotNull(  ::Dynamic(v->__Field(HX_("receiver",2f,45,fd,e2),::hx::paccDynamic))->__Field(HX_("track",8b,8e,1f,16),::hx::paccDynamic) );
             				}
             				else {
-HXLINE( 468)					_hx_tmp2 = false;
+HXLINE( 484)					_hx_tmp2 = false;
             				}
-HXDLIN( 468)				if (_hx_tmp2) {
-HXLINE( 468)					_hx_tmp1 = (( ( ::snikket::jingle::MediaStreamTrack)( ::Dynamic(v->__Field(HX_("receiver",2f,45,fd,e2),::hx::paccDynamic))->__Field(HX_("track",8b,8e,1f,16),::hx::paccDynamic)) )->get_kind() == HX_("video",7b,14,fc,36));
+HXDLIN( 484)				if (_hx_tmp2) {
+HXLINE( 484)					_hx_tmp1 = (( ( ::snikket::jingle::MediaStreamTrack)( ::Dynamic(v->__Field(HX_("receiver",2f,45,fd,e2),::hx::paccDynamic))->__Field(HX_("track",8b,8e,1f,16),::hx::paccDynamic)) )->get_kind() == HX_("video",7b,14,fc,36));
             				}
             				else {
-HXLINE( 468)					_hx_tmp1 = false;
+HXLINE( 484)					_hx_tmp1 = false;
             				}
-HXDLIN( 468)				if (_hx_tmp1) {
-HXLINE( 468)					_hx_tmp = !(( ( ::snikket::jingle::MediaStreamTrack)( ::Dynamic(v->__Field(HX_("receiver",2f,45,fd,e2),::hx::paccDynamic))->__Field(HX_("track",8b,8e,1f,16),::hx::paccDynamic)) )->get_muted());
+HXDLIN( 484)				if (_hx_tmp1) {
+HXLINE( 484)					_hx_tmp = !(( ( ::snikket::jingle::MediaStreamTrack)( ::Dynamic(v->__Field(HX_("receiver",2f,45,fd,e2),::hx::paccDynamic))->__Field(HX_("track",8b,8e,1f,16),::hx::paccDynamic)) )->get_muted());
             				}
             				else {
-HXLINE( 468)					_hx_tmp = false;
+HXLINE( 484)					_hx_tmp = false;
             				}
-HXLINE( 467)				if (_hx_tmp) {
-HXLINE( 467)					_g->push(v);
+HXLINE( 483)				if (_hx_tmp) {
+HXLINE( 483)					_g->push(v);
             				}
             			}
             		}
-HXDLIN( 467)		::Array< ::Dynamic> _this = _g;
-HXDLIN( 467)		::Array< ::Dynamic> result = ::Array_obj< ::Dynamic>::__new(_this->length);
-HXDLIN( 467)		{
-HXLINE( 467)			int _g3 = 0;
-HXDLIN( 467)			int _g4 = _this->length;
-HXDLIN( 467)			while((_g3 < _g4)){
-HXLINE( 467)				_g3 = (_g3 + 1);
-HXDLIN( 467)				int i = (_g3 - 1);
-HXDLIN( 467)				{
-HXLINE( 467)					 ::snikket::jingle::MediaStreamTrack inValue = ( ( ::snikket::jingle::MediaStreamTrack)( ::Dynamic(_hx_array_unsafe_get(_this,i)->__Field(HX_("receiver",2f,45,fd,e2),::hx::paccDynamic))->__Field(HX_("track",8b,8e,1f,16),::hx::paccDynamic)) );
-HXDLIN( 467)					result->__unsafe_set(i,inValue);
+HXDLIN( 483)		::Array< ::Dynamic> _this = _g;
+HXDLIN( 483)		::Array< ::Dynamic> result = ::Array_obj< ::Dynamic>::__new(_this->length);
+HXDLIN( 483)		{
+HXLINE( 483)			int _g3 = 0;
+HXDLIN( 483)			int _g4 = _this->length;
+HXDLIN( 483)			while((_g3 < _g4)){
+HXLINE( 483)				_g3 = (_g3 + 1);
+HXDLIN( 483)				int i = (_g3 - 1);
+HXDLIN( 483)				{
+HXLINE( 483)					 ::snikket::jingle::MediaStreamTrack inValue = ( ( ::snikket::jingle::MediaStreamTrack)( ::Dynamic(_hx_array_unsafe_get(_this,i)->__Field(HX_("receiver",2f,45,fd,e2),::hx::paccDynamic))->__Field(HX_("track",8b,8e,1f,16),::hx::paccDynamic)) );
+HXDLIN( 483)					result->__unsafe_set(i,inValue);
             				}
             			}
             		}
-HXDLIN( 467)		return result;
+HXDLIN( 483)		return result;
             	}
 
 
@@ -776,40 +795,40 @@ HXDLIN( 250)		return ( (size_t)(out->length) );
  ::snikket::jingle::DTMFSender InitiatedSession_obj::dtmf(){
             		HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_0) HXARGC(1)
             		bool _hx_run( ::Dynamic t){
-            			HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_474_dtmf)
-HXLINE( 474)			bool transceiver;
-HXDLIN( 474)			bool transceiver1;
-HXDLIN( 474)			if (::hx::IsNotNull( t->__Field(HX_("sender",b5,c7,84,6b),::hx::paccDynamic) )) {
-HXLINE( 474)				transceiver1 = ::hx::IsNotNull(  ::Dynamic(t->__Field(HX_("sender",b5,c7,84,6b),::hx::paccDynamic))->__Field(HX_("track",8b,8e,1f,16),::hx::paccDynamic) );
+            			HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_490_dtmf)
+HXLINE( 490)			bool transceiver;
+HXDLIN( 490)			bool transceiver1;
+HXDLIN( 490)			if (::hx::IsNotNull( t->__Field(HX_("sender",b5,c7,84,6b),::hx::paccDynamic) )) {
+HXLINE( 490)				transceiver1 = ::hx::IsNotNull(  ::Dynamic(t->__Field(HX_("sender",b5,c7,84,6b),::hx::paccDynamic))->__Field(HX_("track",8b,8e,1f,16),::hx::paccDynamic) );
             			}
             			else {
-HXLINE( 474)				transceiver1 = false;
+HXLINE( 490)				transceiver1 = false;
             			}
-HXDLIN( 474)			if (transceiver1) {
-HXLINE( 474)				transceiver = (( ( ::snikket::jingle::MediaStreamTrack)( ::Dynamic(t->__Field(HX_("sender",b5,c7,84,6b),::hx::paccDynamic))->__Field(HX_("track",8b,8e,1f,16),::hx::paccDynamic)) )->get_kind() == HX_("audio",d6,78,80,27));
+HXDLIN( 490)			if (transceiver1) {
+HXLINE( 490)				transceiver = (( ( ::snikket::jingle::MediaStreamTrack)( ::Dynamic(t->__Field(HX_("sender",b5,c7,84,6b),::hx::paccDynamic))->__Field(HX_("track",8b,8e,1f,16),::hx::paccDynamic)) )->get_kind() == HX_("audio",d6,78,80,27));
             			}
             			else {
-HXLINE( 474)				transceiver = false;
+HXLINE( 490)				transceiver = false;
             			}
-HXDLIN( 474)			if (transceiver) {
-HXLINE( 474)				return !(( ( ::snikket::jingle::MediaStreamTrack)( ::Dynamic(t->__Field(HX_("sender",b5,c7,84,6b),::hx::paccDynamic))->__Field(HX_("track",8b,8e,1f,16),::hx::paccDynamic)) )->get_muted());
+HXDLIN( 490)			if (transceiver) {
+HXLINE( 490)				return !(( ( ::snikket::jingle::MediaStreamTrack)( ::Dynamic(t->__Field(HX_("sender",b5,c7,84,6b),::hx::paccDynamic))->__Field(HX_("track",8b,8e,1f,16),::hx::paccDynamic)) )->get_muted());
             			}
             			else {
-HXLINE( 474)				return false;
+HXLINE( 490)				return false;
             			}
-HXDLIN( 474)			return false;
+HXDLIN( 490)			return false;
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_472_dtmf)
-HXLINE( 473)		if (::hx::IsNull( this->pc )) {
-HXLINE( 473)			return null();
+            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_488_dtmf)
+HXLINE( 489)		if (::hx::IsNull( this->pc )) {
+HXLINE( 489)			return null();
             		}
-HXLINE( 474)		 ::Dynamic transceiver = ::Lambda_obj::find(this->pc->getTransceivers(), ::Dynamic(new _hx_Closure_0()));
-HXLINE( 475)		if (::hx::IsNull( transceiver )) {
-HXLINE( 475)			return null();
+HXLINE( 490)		 ::Dynamic transceiver = ::Lambda_obj::find(this->pc->getTransceivers(), ::Dynamic(new _hx_Closure_0()));
+HXLINE( 491)		if (::hx::IsNull( transceiver )) {
+HXLINE( 491)			return null();
             		}
-HXLINE( 476)		return ( ( ::snikket::jingle::DTMFSender)( ::Dynamic(transceiver->__Field(HX_("sender",b5,c7,84,6b),::hx::paccDynamic))->__Field(HX_("dtmf",e9,ba,71,42),::hx::paccDynamic)) );
+HXLINE( 492)		return ( ( ::snikket::jingle::DTMFSender)( ::Dynamic(transceiver->__Field(HX_("sender",b5,c7,84,6b),::hx::paccDynamic))->__Field(HX_("dtmf",e9,ba,71,42),::hx::paccDynamic)) );
             	}
 
 
@@ -818,79 +837,79 @@ HX_DEFINE_DYNAMIC_FUNC0(InitiatedSession_obj,dtmf,return )
 void InitiatedSession_obj::sendIceCandidate( ::Dynamic candidate){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::Dynamic,candidate) HXARGC(1)
             		bool _hx_run( ::snikket::jingle::Media media){
-            			HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_489_sendIceCandidate)
-HXLINE( 489)			return ::hx::IsEq( media->mid,candidate->__Field(HX_("sdpMid",09,30,5f,d9),::hx::paccDynamic) );
+            			HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_505_sendIceCandidate)
+HXLINE( 505)			return ::hx::IsEq( media->mid,candidate->__Field(HX_("sdpMid",09,30,5f,d9),::hx::paccDynamic) );
             		}
             		HX_END_LOCAL_FUNC1(return)
 
             		HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_1) HXARGC(1)
             		bool _hx_run( ::snikket::jingle::Attribute attr){
-            			HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_501_sendIceCandidate)
-HXLINE( 501)			return (attr->key == HX_("ice-pwd",3b,03,2f,e9));
+            			HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_517_sendIceCandidate)
+HXLINE( 517)			return (attr->key == HX_("ice-pwd",3b,03,2f,e9));
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            	HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_479_sendIceCandidate)
-HXLINE( 480)		bool _hx_tmp;
-HXDLIN( 480)		if (::hx::IsNotNull( candidate )) {
-HXLINE( 480)			_hx_tmp = ::hx::IsEq( candidate->__Field(HX_("candidate",43,34,d8,d0),::hx::paccDynamic),HX_("",00,00,00,00) );
+            	HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_495_sendIceCandidate)
+HXLINE( 496)		bool _hx_tmp;
+HXDLIN( 496)		if (::hx::IsNotNull( candidate )) {
+HXLINE( 496)			_hx_tmp = ::hx::IsEq( candidate->__Field(HX_("candidate",43,34,d8,d0),::hx::paccDynamic),HX_("",00,00,00,00) );
             		}
             		else {
-HXLINE( 480)			_hx_tmp = true;
+HXLINE( 496)			_hx_tmp = true;
             		}
-HXDLIN( 480)		if (_hx_tmp) {
-HXLINE( 481)			if (::hx::IsNotNull( this->candidatesDone )) {
-HXLINE( 481)				this->candidatesDone();
+HXDLIN( 496)		if (_hx_tmp) {
+HXLINE( 497)			if (::hx::IsNotNull( this->candidatesDone )) {
+HXLINE( 497)				this->candidatesDone();
             			}
-HXLINE( 482)			return;
+HXLINE( 498)			return;
             		}
-HXLINE( 484)		if (::hx::IsNotNull( this->candidatesDone )) {
-HXLINE( 484)			return;
+HXLINE( 500)		if (::hx::IsNotNull( this->candidatesDone )) {
+HXLINE( 500)			return;
             		}
-HXLINE( 485)		if (::hx::IsNull( this->localDescription )) {
-HXLINE( 486)			this->queuedOutboundCandidate->push(candidate);
-HXLINE( 487)			return;
+HXLINE( 501)		if (::hx::IsNull( this->localDescription )) {
+HXLINE( 502)			this->queuedOutboundCandidate->push(candidate);
+HXLINE( 503)			return;
             		}
-HXLINE( 489)		 ::snikket::jingle::Media media = ( ( ::snikket::jingle::Media)(::Lambda_obj::find(this->localDescription->media, ::Dynamic(new _hx_Closure_0(candidate)))) );
-HXLINE( 490)		if (::hx::IsNull( media )) {
-HXLINE( 490)			HX_STACK_DO_THROW( ::Dynamic((HX_("Unknown media: ",d4,41,45,83) + candidate->__Field(HX_("sdpMid",09,30,5f,d9),::hx::paccDynamic))));
+HXLINE( 505)		 ::snikket::jingle::Media media = ( ( ::snikket::jingle::Media)(::Lambda_obj::find(this->localDescription->media, ::Dynamic(new _hx_Closure_0(candidate)))) );
+HXLINE( 506)		if (::hx::IsNull( media )) {
+HXLINE( 506)			HX_STACK_DO_THROW( ::Dynamic((HX_("Unknown media: ",d4,41,45,83) + candidate->__Field(HX_("sdpMid",09,30,5f,d9),::hx::paccDynamic))));
             		}
-HXLINE( 493)		::String media1 = media->mid;
-HXLINE( 494)		::String media2 = media->media;
-HXLINE( 495)		::String media3 = media->connectionData;
-HXLINE( 496)		::String media4 = media->port;
-HXLINE( 497)		::String media5 = media->protocol;
-HXLINE( 499)		 ::snikket::jingle::Attribute transportInfo = ::snikket::jingle::Attribute_obj::parse(( (::String)(candidate->__Field(HX_("candidate",43,34,d8,d0),::hx::paccDynamic)) ));
-HXLINE( 500)		 ::snikket::jingle::Attribute transportInfo1 =  ::snikket::jingle::Attribute_obj::__alloc( HX_CTX ,HX_("ice-ufrag",65,c2,31,ab),( (::String)(candidate->__Field(HX_("usernameFragment",06,a8,37,89),::hx::paccDynamic)) ));
-HXLINE( 501)		 ::snikket::jingle::Attribute tmp = ( ( ::snikket::jingle::Attribute)(::Lambda_obj::find(media->attributes, ::Dynamic(new _hx_Closure_1()))) );
-HXDLIN( 501)		 ::snikket::jingle::Attribute transportInfo2;
-HXDLIN( 501)		if (::hx::IsNotNull( tmp )) {
-HXLINE( 501)			transportInfo2 = tmp;
+HXLINE( 509)		::String media1 = media->mid;
+HXLINE( 510)		::String media2 = media->media;
+HXLINE( 511)		::String media3 = media->connectionData;
+HXLINE( 512)		::String media4 = media->port;
+HXLINE( 513)		::String media5 = media->protocol;
+HXLINE( 515)		 ::snikket::jingle::Attribute transportInfo = ::snikket::jingle::Attribute_obj::parse(( (::String)(candidate->__Field(HX_("candidate",43,34,d8,d0),::hx::paccDynamic)) ));
+HXLINE( 516)		 ::snikket::jingle::Attribute transportInfo1 =  ::snikket::jingle::Attribute_obj::__alloc( HX_CTX ,HX_("ice-ufrag",65,c2,31,ab),( (::String)(candidate->__Field(HX_("usernameFragment",06,a8,37,89),::hx::paccDynamic)) ));
+HXLINE( 517)		 ::snikket::jingle::Attribute tmp = ( ( ::snikket::jingle::Attribute)(::Lambda_obj::find(media->attributes, ::Dynamic(new _hx_Closure_1()))) );
+HXDLIN( 517)		 ::snikket::jingle::Attribute transportInfo2;
+HXDLIN( 517)		if (::hx::IsNotNull( tmp )) {
+HXLINE( 517)			transportInfo2 = tmp;
             		}
             		else {
             			HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_2) HXARGC(1)
             			bool _hx_run( ::snikket::jingle::Attribute attr){
-            				HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_502_sendIceCandidate)
-HXLINE( 502)				return (attr->key == HX_("ice-pwd",3b,03,2f,e9));
+            				HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_518_sendIceCandidate)
+HXLINE( 518)				return (attr->key == HX_("ice-pwd",3b,03,2f,e9));
             			}
             			HX_END_LOCAL_FUNC1(return)
 
-HXLINE( 501)			transportInfo2 = ( ( ::snikket::jingle::Attribute)(::Lambda_obj::find(this->localDescription->attributes, ::Dynamic(new _hx_Closure_2()))) );
+HXLINE( 517)			transportInfo2 = ( ( ::snikket::jingle::Attribute)(::Lambda_obj::find(this->localDescription->attributes, ::Dynamic(new _hx_Closure_2()))) );
             		}
-HXLINE( 492)		 ::snikket::jingle::Media transportInfo3 =  ::snikket::jingle::Media_obj::__alloc( HX_CTX ,media1,media2,media3,media4,media5,::Array_obj< ::Dynamic>::__new(3)->init(0,transportInfo)->init(1,transportInfo1)->init(2,transportInfo2),media->formats);
-HXLINE( 506)		::String transportInfo4 = this->get_sid();
-HXLINE( 491)		 ::snikket::Stanza transportInfo5 =  ::snikket::jingle::TransportInfo_obj::__alloc( HX_CTX ,transportInfo3,transportInfo4)->toStanza(this->initiator);
-HXLINE( 508)		{
-HXLINE( 508)			 ::Dynamic this1 = transportInfo5->attr;
-HXDLIN( 508)			::String value = this->counterpart->asString();
-HXDLIN( 508)			::Reflect_obj::setField(this1,HX_("to",7b,65,00,00),value);
+HXLINE( 508)		 ::snikket::jingle::Media transportInfo3 =  ::snikket::jingle::Media_obj::__alloc( HX_CTX ,media1,media2,media3,media4,media5,::Array_obj< ::Dynamic>::__new(3)->init(0,transportInfo)->init(1,transportInfo1)->init(2,transportInfo2),media->formats);
+HXLINE( 522)		::String transportInfo4 = this->get_sid();
+HXLINE( 507)		 ::snikket::Stanza transportInfo5 =  ::snikket::jingle::TransportInfo_obj::__alloc( HX_CTX ,transportInfo3,transportInfo4)->toStanza(this->initiator);
+HXLINE( 524)		{
+HXLINE( 524)			 ::Dynamic this1 = transportInfo5->attr;
+HXDLIN( 524)			::String value = this->counterpart->asString();
+HXDLIN( 524)			::Reflect_obj::setField(this1,HX_("to",7b,65,00,00),value);
             		}
-HXLINE( 509)		{
-HXLINE( 509)			 ::Dynamic this2 = transportInfo5->attr;
-HXDLIN( 509)			::String value1 = ::snikket::ID_obj::medium();
-HXDLIN( 509)			::Reflect_obj::setField(this2,HX_("id",db,5b,00,00),value1);
+HXLINE( 525)		{
+HXLINE( 525)			 ::Dynamic this2 = transportInfo5->attr;
+HXDLIN( 525)			::String value1 = ::snikket::ID_obj::medium();
+HXDLIN( 525)			::Reflect_obj::setField(this2,HX_("id",db,5b,00,00),value1);
             		}
-HXLINE( 510)		this->client->sendStanza(transportInfo5);
+HXLINE( 526)		this->client->sendStanza(transportInfo5);
             	}
 
 
@@ -899,56 +918,56 @@ HX_DEFINE_DYNAMIC_FUNC1(InitiatedSession_obj,sendIceCandidate,(void))
 void InitiatedSession_obj::supplyMedia(::Array< ::Dynamic> streams){
             		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_1, ::snikket::jingle::InitiatedSession,_gthis,::Array< ::Dynamic>,streams) HXARGC(0)
             		void _hx_run(){
-            			HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_514_supplyMedia)
-HXLINE( 515)			{
-HXLINE( 515)				int _g = 0;
-HXDLIN( 515)				while((_g < streams->length)){
-HXLINE( 515)					 ::snikket::jingle::MediaStream stream = streams->__get(_g).StaticCast<  ::snikket::jingle::MediaStream >();
-HXDLIN( 515)					_g = (_g + 1);
-HXLINE( 516)					{
-HXLINE( 516)						int _g1 = 0;
-HXDLIN( 516)						::Array< ::Dynamic> _g2 = stream->getTracks();
-HXDLIN( 516)						while((_g1 < _g2->length)){
-HXLINE( 516)							 ::snikket::jingle::MediaStreamTrack track = _g2->__get(_g1).StaticCast<  ::snikket::jingle::MediaStreamTrack >();
-HXDLIN( 516)							_g1 = (_g1 + 1);
-HXLINE( 517)							_gthis->pc->addTrack(track,stream);
+            			HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_530_supplyMedia)
+HXLINE( 531)			{
+HXLINE( 531)				int _g = 0;
+HXDLIN( 531)				while((_g < streams->length)){
+HXLINE( 531)					 ::snikket::jingle::MediaStream stream = streams->__get(_g).StaticCast<  ::snikket::jingle::MediaStream >();
+HXDLIN( 531)					_g = (_g + 1);
+HXLINE( 532)					{
+HXLINE( 532)						int _g1 = 0;
+HXDLIN( 532)						::Array< ::Dynamic> _g2 = stream->getTracks();
+HXDLIN( 532)						while((_g1 < _g2->length)){
+HXLINE( 532)							 ::snikket::jingle::MediaStreamTrack track = _g2->__get(_g1).StaticCast<  ::snikket::jingle::MediaStreamTrack >();
+HXDLIN( 532)							_g1 = (_g1 + 1);
+HXLINE( 533)							_gthis->pc->addTrack(track,stream);
             						}
             					}
             				}
             			}
-HXLINE( 521)			if (::hx::IsNull( _gthis->afterMedia )) {
+HXLINE( 537)			if (::hx::IsNull( _gthis->afterMedia )) {
             				HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::jingle::InitiatedSession,_gthis) HXARGC(1)
             				void _hx_run( ::Dynamic e){
-            					HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_522_supplyMedia)
-HXLINE( 523)					 ::Dynamic _hx_tmp = ::haxe::Log_obj::trace;
-HXDLIN( 523)					::String _hx_tmp1;
-HXDLIN( 523)					if (::hx::IsNull( e )) {
-HXLINE( 523)						_hx_tmp1 = HX_("null",87,9e,0e,49);
+            					HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_538_supplyMedia)
+HXLINE( 539)					 ::Dynamic _hx_tmp = ::haxe::Log_obj::trace;
+HXDLIN( 539)					::String _hx_tmp1;
+HXDLIN( 539)					if (::hx::IsNull( e )) {
+HXLINE( 539)						_hx_tmp1 = HX_("null",87,9e,0e,49);
             					}
             					else {
-HXLINE( 523)						_hx_tmp1 = ::Std_obj::string(e);
+HXLINE( 539)						_hx_tmp1 = ::Std_obj::string(e);
             					}
-HXDLIN( 523)					_hx_tmp(HX_("supplyMedia error",9d,f9,a0,33), ::Dynamic(::hx::Anon_obj::Create(5)
+HXDLIN( 539)					_hx_tmp(HX_("supplyMedia error",9d,f9,a0,33), ::Dynamic(::hx::Anon_obj::Create(5)
             						->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.jingle.InitiatedSession",b7,6d,05,22))
             						->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(1)->init(0,_hx_tmp1))
             						->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("supplyMedia",35,0c,c9,9a))
             						->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/jingle/Session.hx",54,dd,b2,6d))
-            						->setFixed(4,HX_("lineNumber",dd,81,22,76),523)));
-HXLINE( 524)					_gthis->pc->close();
+            						->setFixed(4,HX_("lineNumber",dd,81,22,76),539)));
+HXLINE( 540)					_gthis->pc->close();
             				}
             				HX_END_LOCAL_FUNC1((void))
 
-HXLINE( 522)				::thenshim::PromiseTools_obj::catch_(_gthis->onPeerConnection(), ::Dynamic(new _hx_Closure_0(_gthis)));
+HXLINE( 538)				::thenshim::PromiseTools_obj::catch_(_gthis->onPeerConnection(), ::Dynamic(new _hx_Closure_0(_gthis)));
             			}
             			else {
-HXLINE( 527)				_gthis->afterMedia();
+HXLINE( 543)				_gthis->afterMedia();
             			}
             		}
             		HX_END_LOCAL_FUNC0((void))
 
-            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_513_supplyMedia)
-HXDLIN( 513)		 ::snikket::jingle::InitiatedSession _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 514)		this->setupPeerConnection( ::Dynamic(new _hx_Closure_1(_gthis,streams)));
+            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_529_supplyMedia)
+HXDLIN( 529)		 ::snikket::jingle::InitiatedSession _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 530)		this->setupPeerConnection( ::Dynamic(new _hx_Closure_1(_gthis,streams)));
             	}
 
 
@@ -978,10 +997,10 @@ void InitiatedSession_obj::setupPeerConnection( ::Dynamic callback){
             		void _hx_run(::Array< ::Dynamic> servers){
             			HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::jingle::InitiatedSession,_gthis) HXARGC(1)
             			void _hx_run( ::Dynamic event){
-            				HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_540_setupPeerConnection)
-HXLINE( 540)				 ::snikket::Client _gthis1 = _gthis->client;
-HXDLIN( 540)				::String _hx_tmp = _gthis->counterpart->asBare()->asString();
-HXDLIN( 540)				_gthis1->trigger(HX_("call/track",1a,e7,80,d7), ::Dynamic(::hx::Anon_obj::Create(3)
+            				HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_556_setupPeerConnection)
+HXLINE( 556)				 ::snikket::Client _gthis1 = _gthis->client;
+HXDLIN( 556)				::String _hx_tmp = _gthis->get_chatId();
+HXDLIN( 556)				_gthis1->trigger(HX_("call/track",1a,e7,80,d7), ::Dynamic(::hx::Anon_obj::Create(3)
             					->setFixed(0,HX_("chatId",d3,04,77,b7),_hx_tmp)
             					->setFixed(1,HX_("streams",f3,db,44,f6), ::Dynamic(event->__Field(HX_("streams",f3,db,44,f6),::hx::paccDynamic)))
             					->setFixed(2,HX_("track",8b,8e,1f,16), ::Dynamic(event->__Field(HX_("track",8b,8e,1f,16),::hx::paccDynamic)))));
@@ -990,62 +1009,72 @@ HXDLIN( 540)				_gthis1->trigger(HX_("call/track",1a,e7,80,d7), ::Dynamic(::hx::
 
             			HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_1) HXARGC(1)
             			void _hx_run( ::Dynamic event){
-            				HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_542_setupPeerConnection)
-HXLINE( 542)				::haxe::Log_obj::trace(HX_("renegotiate",2b,b9,fb,a1), ::Dynamic(::hx::Anon_obj::Create(5)
+            				HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_558_setupPeerConnection)
+HXLINE( 558)				::haxe::Log_obj::trace(HX_("renegotiate",2b,b9,fb,a1), ::Dynamic(::hx::Anon_obj::Create(5)
             					->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.jingle.InitiatedSession",b7,6d,05,22))
             					->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(1)->init(0,event))
             					->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("setupPeerConnection",bd,67,52,ae))
             					->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/jingle/Session.hx",54,dd,b2,6d))
-            					->setFixed(4,HX_("lineNumber",dd,81,22,76),542)));
+            					->setFixed(4,HX_("lineNumber",dd,81,22,76),558)));
             			}
             			HX_END_LOCAL_FUNC1((void))
 
             			HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_2, ::snikket::jingle::InitiatedSession,_gthis) HXARGC(1)
             			void _hx_run( ::Dynamic event){
-            				HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_544_setupPeerConnection)
-HXLINE( 544)				_gthis->sendIceCandidate(event->__Field(HX_("candidate",43,34,d8,d0),::hx::paccDynamic));
+            				HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_560_setupPeerConnection)
+HXLINE( 560)				_gthis->sendIceCandidate(event->__Field(HX_("candidate",43,34,d8,d0),::hx::paccDynamic));
             			}
             			HX_END_LOCAL_FUNC1((void))
 
             			HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_3, ::snikket::jingle::InitiatedSession,_gthis) HXARGC(1)
             			void _hx_run( ::Dynamic event){
-            				HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_547_setupPeerConnection)
-HXLINE( 547)				bool _hx_tmp;
-HXDLIN( 547)				if (::hx::IsNotNull( _gthis->pc )) {
-HXLINE( 547)					if ((_gthis->pc->get_connectionState() != HX_("closed",ac,a9,51,0e))) {
-HXLINE( 547)						_hx_tmp = (_gthis->pc->get_connectionState() == HX_("failed",bd,c5,fe,e7));
+            				HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_563_setupPeerConnection)
+HXLINE( 563)				bool _hx_tmp;
+HXDLIN( 563)				if (::hx::IsNotNull( _gthis->pc )) {
+HXLINE( 563)					if ((_gthis->pc->get_connectionState() != HX_("closed",ac,a9,51,0e))) {
+HXLINE( 563)						_hx_tmp = (_gthis->pc->get_connectionState() == HX_("failed",bd,c5,fe,e7));
             					}
             					else {
-HXLINE( 547)						_hx_tmp = true;
+HXLINE( 563)						_hx_tmp = true;
             					}
             				}
             				else {
-HXLINE( 547)					_hx_tmp = false;
+HXLINE( 563)					_hx_tmp = false;
             				}
-HXDLIN( 547)				if (_hx_tmp) {
-HXLINE( 548)					_gthis->terminate();
+HXDLIN( 563)				if (_hx_tmp) {
+HXLINE( 564)					 ::snikket::Client _gthis1 = _gthis->client;
+HXLINE( 565)					::String _hx_tmp1 = _gthis->counterpart->asString();
+HXDLIN( 565)					 ::snikket::Stanza _hx_tmp2 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("iq",e8,5b,00,00), ::Dynamic(::hx::Anon_obj::Create(3)
+            						->setFixed(0,HX_("id",db,5b,00,00),::snikket::ID_obj::medium())
+            						->setFixed(1,HX_("to",7b,65,00,00),_hx_tmp1)
+            						->setFixed(2,HX_("type",ba,f2,08,4d),HX_("set",a2,9b,57,00))));
+HXLINE( 564)					_gthis1->sendStanza(_hx_tmp2->tag(HX_("jingle",31,27,eb,1f), ::Dynamic(::hx::Anon_obj::Create(3)
+            						->setFixed(0,HX_("sid",0e,9f,57,00),_gthis->get_sid())
+            						->setFixed(1,HX_("action",b6,3b,46,16),HX_("session-terminate",6a,23,dc,12))
+            						->setFixed(2,HX_("xmlns",dc,31,74,60),HX_("urn:xmpp:jingle:1",44,c4,fe,f7))))->tag(HX_("reason",c4,0f,9d,fc),null())->tag(HX_("connectivity-error",f2,07,09,18),null())->up()->up()->up());
+HXLINE( 570)					_gthis->terminate();
             				}
             			}
             			HX_END_LOCAL_FUNC1((void))
 
-            			HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_537_setupPeerConnection)
-HXLINE( 538)			_gthis->pc =  ::snikket::jingle::PeerConnection_obj::__alloc( HX_CTX , ::Dynamic(::hx::Anon_obj::Create(1)
+            			HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_553_setupPeerConnection)
+HXLINE( 554)			_gthis->pc =  ::snikket::jingle::PeerConnection_obj::__alloc( HX_CTX , ::Dynamic(::hx::Anon_obj::Create(1)
             				->setFixed(0,HX_("iceServers",45,14,49,d2),servers)),null());
-HXLINE( 539)			_gthis->pc->addEventListener(HX_("track",8b,8e,1f,16), ::Dynamic(new _hx_Closure_0(_gthis)));
-HXLINE( 542)			_gthis->pc->addEventListener(HX_("negotiationneeded",d6,4d,d0,53), ::Dynamic(new _hx_Closure_1()));
-HXLINE( 543)			_gthis->pc->addEventListener(HX_("icecandidate",98,ef,c0,7b), ::Dynamic(new _hx_Closure_2(_gthis)));
-HXLINE( 546)			_gthis->pc->addEventListener(HX_("connectionstatechange",e3,a2,87,36), ::Dynamic(new _hx_Closure_3(_gthis)));
-HXLINE( 551)			callback();
+HXLINE( 555)			_gthis->pc->addEventListener(HX_("track",8b,8e,1f,16), ::Dynamic(new _hx_Closure_0(_gthis)));
+HXLINE( 558)			_gthis->pc->addEventListener(HX_("negotiationneeded",d6,4d,d0,53), ::Dynamic(new _hx_Closure_1()));
+HXLINE( 559)			_gthis->pc->addEventListener(HX_("icecandidate",98,ef,c0,7b), ::Dynamic(new _hx_Closure_2(_gthis)));
+HXLINE( 562)			_gthis->pc->addEventListener(HX_("connectionstatechange",e3,a2,87,36), ::Dynamic(new _hx_Closure_3(_gthis)));
+HXLINE( 573)			callback();
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_532_setupPeerConnection)
-HXDLIN( 532)		 ::snikket::jingle::InitiatedSession _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 533)		if (::hx::IsNotNull( this->pc )) {
-HXLINE( 534)			callback();
-HXLINE( 535)			return;
+            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_548_setupPeerConnection)
+HXDLIN( 548)		 ::snikket::jingle::InitiatedSession _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 549)		if (::hx::IsNotNull( this->pc )) {
+HXLINE( 550)			callback();
+HXLINE( 551)			return;
             		}
-HXLINE( 537)		this->client->getIceServers( ::Dynamic(new _hx_Closure_4(_gthis,callback)));
+HXLINE( 553)		this->client->getIceServers( ::Dynamic(new _hx_Closure_4(_gthis,callback)));
             	}
 
 
@@ -1054,118 +1083,118 @@ HX_DEFINE_DYNAMIC_FUNC1(InitiatedSession_obj,setupPeerConnection,(void))
 ::Dynamic InitiatedSession_obj::setupLocalDescription(::String type,::Array< ::String > filterMedia, ::Dynamic __o_filterOut, ::Dynamic beforeSend){
             		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_4, ::snikket::jingle::InitiatedSession,_gthis,::String,type) HXARGC(1)
             		::Dynamic _hx_run( ::Dynamic _){
-            			HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_556_setupLocalDescription)
-HXLINE( 557)			 ::snikket::Client _gthis1 = _gthis->client;
-HXDLIN( 557)			::String caps = _gthis->counterpart->asBare()->asString();
-HXDLIN( 557)			 ::snikket::Caps caps1 = _gthis1->getDirectChat(caps,null())->getResourceCaps(_gthis->counterpart->resource);
-HXLINE( 558)			bool _hx_tmp;
-HXDLIN( 558)			bool _hx_tmp1;
-HXDLIN( 558)			if ((type != HX_("session-initiate",70,2d,30,f7))) {
-HXLINE( 558)				_hx_tmp1 = (type == HX_("session-accept",5f,92,e7,a8));
+            			HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_578_setupLocalDescription)
+HXLINE( 579)			 ::snikket::Client _gthis1 = _gthis->client;
+HXDLIN( 579)			::String caps = _gthis->counterpart->asBare()->asString();
+HXDLIN( 579)			 ::snikket::Caps caps1 = _gthis1->getDirectChat(caps,null())->getResourceCaps(_gthis->counterpart->resource);
+HXLINE( 580)			bool _hx_tmp;
+HXDLIN( 580)			bool _hx_tmp1;
+HXDLIN( 580)			if ((type != HX_("session-initiate",70,2d,30,f7))) {
+HXLINE( 580)				_hx_tmp1 = (type == HX_("session-accept",5f,92,e7,a8));
             			}
             			else {
-HXLINE( 558)				_hx_tmp1 = true;
+HXLINE( 580)				_hx_tmp1 = true;
             			}
-HXDLIN( 558)			if (_hx_tmp1) {
-HXLINE( 558)				_hx_tmp = caps1->features->contains(HX_("urn:ietf:rfc:3264",2b,35,57,2c));
+HXDLIN( 580)			if (_hx_tmp1) {
+HXLINE( 580)				_hx_tmp = caps1->features->contains(HX_("urn:ietf:rfc:3264",2b,35,57,2c));
             			}
             			else {
-HXLINE( 558)				_hx_tmp = false;
+HXLINE( 580)				_hx_tmp = false;
             			}
-HXDLIN( 558)			if (_hx_tmp) {
+HXDLIN( 580)			if (_hx_tmp) {
             				HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_3, ::snikket::jingle::InitiatedSession,_gthis) HXARGC(2)
             				void _hx_run( ::Dynamic resolve, ::Dynamic reject){
             					HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_1, ::snikket::jingle::InitiatedSession,_gthis, ::Dynamic,resolve) HXARGC(0)
             					void _hx_run(){
             						HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_0) HXARGC(0)
             						void _hx_run(){
-            							HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_561_setupLocalDescription)
+            							HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_583_setupLocalDescription)
             						}
             						HX_END_LOCAL_FUNC0((void))
 
-            						HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_560_setupLocalDescription)
-HXLINE( 561)						_gthis->candidatesDone =  ::Dynamic(new _hx_Closure_0());
-HXLINE( 562)						resolve(false);
+            						HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_582_setupLocalDescription)
+HXLINE( 583)						_gthis->candidatesDone =  ::Dynamic(new _hx_Closure_0());
+HXLINE( 584)						resolve(false);
             					}
             					HX_END_LOCAL_FUNC0((void))
 
             					HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_2, ::Dynamic,resolve, ::haxe::Timer,timeout) HXARGC(0)
             					void _hx_run(){
-            						HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_564_setupLocalDescription)
-HXLINE( 565)						timeout->stop();
-HXLINE( 566)						resolve(true);
+            						HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_586_setupLocalDescription)
+HXLINE( 587)						timeout->stop();
+HXLINE( 588)						resolve(true);
             					}
             					HX_END_LOCAL_FUNC0((void))
 
-            					HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_559_setupLocalDescription)
-HXLINE( 560)					 ::haxe::Timer timeout = ::haxe::Timer_obj::delay( ::Dynamic(new _hx_Closure_1(_gthis,resolve)),3000);
-HXLINE( 564)					_gthis->candidatesDone =  ::Dynamic(new _hx_Closure_2(resolve,timeout));
+            					HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_581_setupLocalDescription)
+HXLINE( 582)					 ::haxe::Timer timeout = ::haxe::Timer_obj::delay( ::Dynamic(new _hx_Closure_1(_gthis,resolve)),3000);
+HXLINE( 586)					_gthis->candidatesDone =  ::Dynamic(new _hx_Closure_2(resolve,timeout));
             				}
             				HX_END_LOCAL_FUNC2((void))
 
-HXLINE( 559)				return ::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_3(_gthis)));
+HXLINE( 581)				return ::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_3(_gthis)));
             			}
             			else {
-HXLINE( 570)				return null();
+HXLINE( 592)				return null();
             			}
-HXLINE( 558)			return null();
+HXLINE( 580)			return null();
             		}
             		HX_END_LOCAL_FUNC1(return)
 
             		HX_BEGIN_LOCAL_FUNC_S5(::hx::LocalFunc,_hx_Closure_5, ::snikket::jingle::InitiatedSession,_gthis,::String,type, ::Dynamic,beforeSend, ::Dynamic,filterOut,::Array< ::String >,filterMedia) HXARGC(1)
             		void _hx_run(bool _){
-            			HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_572_setupLocalDescription)
-HXLINE( 573)			_gthis->localDescription = ::snikket::jingle::SessionDescription_obj::parse(( (::String)(_gthis->pc->get_localDescription()->__Field(HX_("sdp",bf,9a,57,00),::hx::paccDynamic)) ));
-HXLINE( 574)			 ::snikket::jingle::SessionDescription descriptionToSend = _gthis->localDescription;
-HXLINE( 575)			if (::hx::IsNotNull( filterMedia )) {
-HXLINE( 577)				int descriptionToSend1 = descriptionToSend->version;
-HXLINE( 578)				::String descriptionToSend2 = descriptionToSend->name;
-HXLINE( 579)				::Array< ::Dynamic> _g = ::Array_obj< ::Dynamic>::__new(0);
-HXDLIN( 579)				{
-HXLINE( 579)					int _g1 = 0;
-HXDLIN( 579)					::Array< ::Dynamic> _g2 = descriptionToSend->media;
-HXDLIN( 579)					while((_g1 < _g2->length)){
-HXLINE( 579)						 ::snikket::jingle::Media v = _g2->__get(_g1).StaticCast<  ::snikket::jingle::Media >();
-HXDLIN( 579)						_g1 = (_g1 + 1);
-HXDLIN( 579)						bool descriptionToSend3;
-HXDLIN( 579)						if (( (bool)(filterOut) )) {
-HXLINE( 579)							descriptionToSend3 = !(filterMedia->contains(v->mid));
+            			HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_594_setupLocalDescription)
+HXLINE( 595)			_gthis->localDescription = ::snikket::jingle::SessionDescription_obj::parse(( (::String)(_gthis->pc->get_localDescription()->__Field(HX_("sdp",bf,9a,57,00),::hx::paccDynamic)) ));
+HXLINE( 596)			 ::snikket::jingle::SessionDescription descriptionToSend = _gthis->localDescription;
+HXLINE( 597)			if (::hx::IsNotNull( filterMedia )) {
+HXLINE( 599)				int descriptionToSend1 = descriptionToSend->version;
+HXLINE( 600)				::String descriptionToSend2 = descriptionToSend->name;
+HXLINE( 601)				::Array< ::Dynamic> _g = ::Array_obj< ::Dynamic>::__new(0);
+HXDLIN( 601)				{
+HXLINE( 601)					int _g1 = 0;
+HXDLIN( 601)					::Array< ::Dynamic> _g2 = descriptionToSend->media;
+HXDLIN( 601)					while((_g1 < _g2->length)){
+HXLINE( 601)						 ::snikket::jingle::Media v = _g2->__get(_g1).StaticCast<  ::snikket::jingle::Media >();
+HXDLIN( 601)						_g1 = (_g1 + 1);
+HXDLIN( 601)						bool descriptionToSend3;
+HXDLIN( 601)						if (( (bool)(filterOut) )) {
+HXLINE( 601)							descriptionToSend3 = !(filterMedia->contains(v->mid));
             						}
             						else {
-HXLINE( 579)							descriptionToSend3 = filterMedia->contains(v->mid);
+HXLINE( 601)							descriptionToSend3 = filterMedia->contains(v->mid);
             						}
-HXDLIN( 579)						if (descriptionToSend3) {
-HXLINE( 579)							_g->push(v);
+HXDLIN( 601)						if (descriptionToSend3) {
+HXLINE( 601)							_g->push(v);
             						}
             					}
             				}
-HXLINE( 576)				descriptionToSend =  ::snikket::jingle::SessionDescription_obj::__alloc( HX_CTX ,descriptionToSend1,descriptionToSend2,_g,descriptionToSend->attributes,descriptionToSend->identificationTags);
+HXLINE( 598)				descriptionToSend =  ::snikket::jingle::SessionDescription_obj::__alloc( HX_CTX ,descriptionToSend1,descriptionToSend2,_g,descriptionToSend->attributes,descriptionToSend->identificationTags);
             			}
-HXLINE( 584)			if (::hx::IsNotNull( beforeSend )) {
-HXLINE( 584)				beforeSend(descriptionToSend);
+HXLINE( 606)			if (::hx::IsNotNull( beforeSend )) {
+HXLINE( 606)				beforeSend(descriptionToSend);
             			}
-HXLINE( 585)			::String type1 = type;
-HXDLIN( 585)			::String sessionAccept = _gthis->get_sid();
-HXDLIN( 585)			 ::snikket::Stanza sessionAccept1 = descriptionToSend->toStanza(type1,sessionAccept,_gthis->initiator);
-HXLINE( 586)			{
-HXLINE( 586)				 ::Dynamic this1 = sessionAccept1->attr;
-HXDLIN( 586)				::String value = _gthis->counterpart->asString();
-HXDLIN( 586)				::Reflect_obj::setField(this1,HX_("to",7b,65,00,00),value);
+HXLINE( 607)			::String type1 = type;
+HXDLIN( 607)			::String sessionAccept = _gthis->get_sid();
+HXDLIN( 607)			 ::snikket::Stanza sessionAccept1 = descriptionToSend->toStanza(type1,sessionAccept,_gthis->initiator);
+HXLINE( 608)			{
+HXLINE( 608)				 ::Dynamic this1 = sessionAccept1->attr;
+HXDLIN( 608)				::String value = _gthis->counterpart->asString();
+HXDLIN( 608)				::Reflect_obj::setField(this1,HX_("to",7b,65,00,00),value);
             			}
-HXLINE( 587)			{
-HXLINE( 587)				 ::Dynamic this2 = sessionAccept1->attr;
-HXDLIN( 587)				::String value1 = ::snikket::ID_obj::medium();
-HXDLIN( 587)				::Reflect_obj::setField(this2,HX_("id",db,5b,00,00),value1);
+HXLINE( 609)			{
+HXLINE( 609)				 ::Dynamic this2 = sessionAccept1->attr;
+HXDLIN( 609)				::String value1 = ::snikket::ID_obj::medium();
+HXDLIN( 609)				::Reflect_obj::setField(this2,HX_("id",db,5b,00,00),value1);
             			}
-HXLINE( 588)			_gthis->client->sendStanza(sessionAccept1);
-HXLINE( 590)			::Array< ::Dynamic> outboundCandidate = _gthis->queuedOutboundCandidate->copy();
-HXLINE( 591)			_gthis->queuedOutboundCandidate->resize(0);
-HXLINE( 592)			{
-HXLINE( 592)				int _g3 = 0;
-HXDLIN( 592)				while((_g3 < outboundCandidate->length)){
-HXLINE( 592)					 ::Dynamic candidate = outboundCandidate->__get(_g3);
-HXDLIN( 592)					_g3 = (_g3 + 1);
-HXLINE( 593)					_gthis->sendIceCandidate(candidate);
+HXLINE( 610)			_gthis->client->sendStanza(sessionAccept1);
+HXLINE( 612)			::Array< ::Dynamic> outboundCandidate = _gthis->queuedOutboundCandidate->copy();
+HXLINE( 613)			_gthis->queuedOutboundCandidate->resize(0);
+HXLINE( 614)			{
+HXLINE( 614)				int _g3 = 0;
+HXDLIN( 614)				while((_g3 < outboundCandidate->length)){
+HXLINE( 614)					 ::Dynamic candidate = outboundCandidate->__get(_g3);
+HXDLIN( 614)					_g3 = (_g3 + 1);
+HXLINE( 615)					_gthis->sendIceCandidate(candidate);
             				}
             			}
             		}
@@ -1173,9 +1202,9 @@ HXLINE( 593)					_gthis->sendIceCandidate(candidate);
 
             		 ::Dynamic filterOut = __o_filterOut;
             		if (::hx::IsNull(__o_filterOut)) filterOut = false;
-            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_555_setupLocalDescription)
-HXDLIN( 555)		 ::snikket::jingle::InitiatedSession _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 556)		return ::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(this->pc->setLocalDescription(null()), ::Dynamic(new _hx_Closure_4(_gthis,type)),null()), ::Dynamic(new _hx_Closure_5(_gthis,type,beforeSend,filterOut,filterMedia)),null());
+            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_577_setupLocalDescription)
+HXDLIN( 577)		 ::snikket::jingle::InitiatedSession _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 578)		return ::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(this->pc->setLocalDescription(null()), ::Dynamic(new _hx_Closure_4(_gthis,type)),null()), ::Dynamic(new _hx_Closure_5(_gthis,type,beforeSend,filterOut,filterMedia)),null());
             	}
 
 
@@ -1184,52 +1213,52 @@ HX_DEFINE_DYNAMIC_FUNC4(InitiatedSession_obj,setupLocalDescription,return )
 ::Dynamic InitiatedSession_obj::onPeerConnection(){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::jingle::InitiatedSession,_gthis) HXARGC(1)
             		::Array< ::Dynamic> _hx_run( ::Dynamic _){
-            			HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_600_onPeerConnection)
-HXLINE( 601)			::Array< ::Dynamic> inboundTransportInfo = _gthis->queuedInboundTransportInfo->copy();
-HXLINE( 602)			_gthis->queuedInboundTransportInfo->resize(0);
-HXLINE( 603)			 ::Dynamic f = _gthis->transportInfo_dyn();
-HXDLIN( 603)			::Array< ::Dynamic> result = ::Array_obj< ::Dynamic>::__new(inboundTransportInfo->length);
-HXDLIN( 603)			{
-HXLINE( 603)				int _g = 0;
-HXDLIN( 603)				int _g1 = inboundTransportInfo->length;
-HXDLIN( 603)				while((_g < _g1)){
-HXLINE( 603)					_g = (_g + 1);
-HXDLIN( 603)					int i = (_g - 1);
-HXDLIN( 603)					{
-HXLINE( 603)						::Dynamic inValue = f(_hx_array_unsafe_get(inboundTransportInfo,i));
-HXDLIN( 603)						result->__unsafe_set(i,inValue);
+            			HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_622_onPeerConnection)
+HXLINE( 623)			::Array< ::Dynamic> inboundTransportInfo = _gthis->queuedInboundTransportInfo->copy();
+HXLINE( 624)			_gthis->queuedInboundTransportInfo->resize(0);
+HXLINE( 625)			 ::Dynamic f = _gthis->transportInfo_dyn();
+HXDLIN( 625)			::Array< ::Dynamic> result = ::Array_obj< ::Dynamic>::__new(inboundTransportInfo->length);
+HXDLIN( 625)			{
+HXLINE( 625)				int _g = 0;
+HXDLIN( 625)				int _g1 = inboundTransportInfo->length;
+HXDLIN( 625)				while((_g < _g1)){
+HXLINE( 625)					_g = (_g + 1);
+HXDLIN( 625)					int i = (_g - 1);
+HXDLIN( 625)					{
+HXLINE( 625)						::Dynamic inValue = f(_hx_array_unsafe_get(inboundTransportInfo,i));
+HXDLIN( 625)						result->__unsafe_set(i,inValue);
             					}
             				}
             			}
-HXDLIN( 603)			return result;
+HXDLIN( 625)			return result;
             		}
             		HX_END_LOCAL_FUNC1(return)
 
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_1, ::snikket::jingle::InitiatedSession,_gthis) HXARGC(1)
             		::Dynamic _hx_run(::Array< ::Dynamic> _){
-            			HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_606_onPeerConnection)
-HXLINE( 606)			return _gthis->setupLocalDescription(HX_("session-accept",5f,92,e7,a8),null(),null(),null());
+            			HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_628_onPeerConnection)
+HXLINE( 628)			return _gthis->setupLocalDescription(HX_("session-accept",5f,92,e7,a8),null(),null(),null());
             		}
             		HX_END_LOCAL_FUNC1(return)
 
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_2, ::snikket::jingle::InitiatedSession,_gthis) HXARGC(1)
             		::String _hx_run( ::Dynamic _){
-            			HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_607_onPeerConnection)
-HXLINE( 608)			::String _hx_tmp;
-HXDLIN( 608)			if ((_gthis->localDescription->getDtlsSetup() == HX_("active",c6,41,46,16))) {
-HXLINE( 608)				_hx_tmp = HX_("passive",a7,47,6a,7d);
+            			HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_629_onPeerConnection)
+HXLINE( 630)			::String _hx_tmp;
+HXDLIN( 630)			if ((_gthis->localDescription->getDtlsSetup() == HX_("active",c6,41,46,16))) {
+HXLINE( 630)				_hx_tmp = HX_("passive",a7,47,6a,7d);
             			}
             			else {
-HXLINE( 608)				_hx_tmp = HX_("active",c6,41,46,16);
+HXLINE( 630)				_hx_tmp = HX_("active",c6,41,46,16);
             			}
-HXLINE( 607)			return (_gthis->peerDtlsSetup = _hx_tmp);
+HXLINE( 629)			return (_gthis->peerDtlsSetup = _hx_tmp);
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_598_onPeerConnection)
-HXDLIN( 598)		 ::snikket::jingle::InitiatedSession _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 599)		 ::snikket::jingle::PeerConnection _hx_tmp = this->pc;
-HXDLIN( 599)		return ::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(_hx_tmp->setRemoteDescription( ::Dynamic(::hx::Anon_obj::Create(2)
+            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_620_onPeerConnection)
+HXDLIN( 620)		 ::snikket::jingle::InitiatedSession _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 621)		 ::snikket::jingle::PeerConnection _hx_tmp = this->pc;
+HXDLIN( 621)		return ::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(_hx_tmp->setRemoteDescription( ::Dynamic(::hx::Anon_obj::Create(2)
             			->setFixed(0,HX_("sdp",bf,9a,57,00),this->remoteDescription->toSdp())
             			->setFixed(1,HX_("type",ba,f2,08,4d),cpp::Struct(rtc::Description::Type::Offer)))), ::Dynamic(new _hx_Closure_0(_gthis)),null()), ::Dynamic(new _hx_Closure_1(_gthis)),null()), ::Dynamic(new _hx_Closure_2(_gthis)),null());
             	}
@@ -1238,13 +1267,13 @@ HXDLIN( 599)		return ::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_
 HX_DEFINE_DYNAMIC_FUNC0(InitiatedSession_obj,onPeerConnection,return )
 
  ::snikket::jingle::InitiatedSession InitiatedSession_obj::fromSessionInitiate( ::snikket::Client client, ::snikket::Stanza stanza){
-            	HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_304_fromSessionInitiate)
-HXLINE( 305)		 ::snikket::Stanza jingle = stanza->getChild(HX_("jingle",31,27,eb,1f),HX_("urn:xmpp:jingle:1",44,c4,fe,f7));
-HXLINE( 308)		 ::snikket::JID session = ::snikket::JID_obj::parse(( (::String)(::Reflect_obj::field(stanza->attr,HX_("from",6a,a5,c2,43))) ));
-HXLINE( 309)		::String session1 = ( (::String)(::Reflect_obj::field(jingle->attr,HX_("sid",0e,9f,57,00))) );
-HXLINE( 306)		 ::snikket::jingle::InitiatedSession session2 =  ::snikket::jingle::InitiatedSession_obj::__alloc( HX_CTX ,client,session,session1,::snikket::jingle::SessionDescription_obj::fromStanza(stanza,false,null()));
-HXLINE( 312)		session2->transportInfo(stanza);
-HXLINE( 313)		return session2;
+            	HX_GC_STACKFRAME(&_hx_pos_de51993dbb06b02d_316_fromSessionInitiate)
+HXLINE( 317)		 ::snikket::Stanza jingle = stanza->getChild(HX_("jingle",31,27,eb,1f),HX_("urn:xmpp:jingle:1",44,c4,fe,f7));
+HXLINE( 320)		 ::snikket::JID session = ::snikket::JID_obj::parse(( (::String)(::Reflect_obj::field(stanza->attr,HX_("from",6a,a5,c2,43))) ));
+HXLINE( 321)		::String session1 = ( (::String)(::Reflect_obj::field(jingle->attr,HX_("sid",0e,9f,57,00))) );
+HXLINE( 318)		 ::snikket::jingle::InitiatedSession session2 =  ::snikket::jingle::InitiatedSession_obj::__alloc( HX_CTX ,client,session,session1,::snikket::jingle::SessionDescription_obj::fromStanza(stanza,false,null()));
+HXLINE( 324)		session2->transportInfo(stanza);
+HXLINE( 325)		return session2;
             	}
 
 
@@ -1272,6 +1301,7 @@ void InitiatedSession_obj::__Mark(HX_MARK_PARAMS)
 {
 	HX_MARK_BEGIN_CLASS(InitiatedSession);
 	HX_MARK_MEMBER_NAME(sid,"sid");
+	HX_MARK_MEMBER_NAME(chatId,"chatId");
 	HX_MARK_MEMBER_NAME(client,"client");
 	HX_MARK_MEMBER_NAME(counterpart,"counterpart");
 	HX_MARK_MEMBER_NAME(_sid,"_sid");
@@ -1291,6 +1321,7 @@ void InitiatedSession_obj::__Mark(HX_MARK_PARAMS)
 void InitiatedSession_obj::__Visit(HX_VISIT_PARAMS)
 {
 	HX_VISIT_MEMBER_NAME(sid,"sid");
+	HX_VISIT_MEMBER_NAME(chatId,"chatId");
 	HX_VISIT_MEMBER_NAME(client,"client");
 	HX_VISIT_MEMBER_NAME(counterpart,"counterpart");
 	HX_VISIT_MEMBER_NAME(_sid,"_sid");
@@ -1321,6 +1352,7 @@ void InitiatedSession_obj::__Visit(HX_VISIT_PARAMS)
 		if (HX_FIELD_EQ(inName,"dtmf") ) { return ::hx::Val( dtmf_dyn() ); }
 		break;
 	case 6:
+		if (HX_FIELD_EQ(inName,"chatId") ) { return ::hx::Val( inCallProp == ::hx::paccAlways ? get_chatId() : chatId ); }
 		if (HX_FIELD_EQ(inName,"client") ) { return ::hx::Val( client ); }
 		if (HX_FIELD_EQ(inName,"accept") ) { return ::hx::Val( accept_dyn() ); }
 		if (HX_FIELD_EQ(inName,"hangup") ) { return ::hx::Val( hangup_dyn() ); }
@@ -1341,6 +1373,7 @@ void InitiatedSession_obj::__Visit(HX_VISIT_PARAMS)
 	case 10:
 		if (HX_FIELD_EQ(inName,"sid__fromC") ) { return ::hx::Val( sid__fromC_dyn() ); }
 		if (HX_FIELD_EQ(inName,"afterMedia") ) { return ::hx::Val( afterMedia ); }
+		if (HX_FIELD_EQ(inName,"get_chatId") ) { return ::hx::Val( get_chatId_dyn() ); }
 		if (HX_FIELD_EQ(inName,"contentAdd") ) { return ::hx::Val( contentAdd_dyn() ); }
 		if (HX_FIELD_EQ(inName,"callStatus") ) { return ::hx::Val( callStatus_dyn() ); }
 		break;
@@ -1350,6 +1383,7 @@ void InitiatedSession_obj::__Visit(HX_VISIT_PARAMS)
 		if (HX_FIELD_EQ(inName,"supplyMedia") ) { return ::hx::Val( supplyMedia_dyn() ); }
 		break;
 	case 13:
+		if (HX_FIELD_EQ(inName,"chatId__fromC") ) { return ::hx::Val( chatId__fromC_dyn() ); }
 		if (HX_FIELD_EQ(inName,"peerDtlsSetup") ) { return ::hx::Val( peerDtlsSetup ); }
 		if (HX_FIELD_EQ(inName,"contentAccept") ) { return ::hx::Val( contentAccept_dyn() ); }
 		if (HX_FIELD_EQ(inName,"transportInfo") ) { return ::hx::Val( transportInfo_dyn() ); }
@@ -1408,6 +1442,7 @@ bool InitiatedSession_obj::__GetStatic(const ::String &inName, Dynamic &outValue
 		if (HX_FIELD_EQ(inName,"_sid") ) { _sid=inValue.Cast< ::String >(); return inValue; }
 		break;
 	case 6:
+		if (HX_FIELD_EQ(inName,"chatId") ) { chatId=inValue.Cast< ::String >(); return inValue; }
 		if (HX_FIELD_EQ(inName,"client") ) { client=inValue.Cast<  ::snikket::Client >(); return inValue; }
 		break;
 	case 8:
@@ -1446,6 +1481,7 @@ bool InitiatedSession_obj::__GetStatic(const ::String &inName, Dynamic &outValue
 void InitiatedSession_obj::__GetFields(Array< ::String> &outFields)
 {
 	outFields->push(HX_("sid",0e,9f,57,00));
+	outFields->push(HX_("chatId",d3,04,77,b7));
 	outFields->push(HX_("client",4b,ca,4f,0a));
 	outFields->push(HX_("counterpart",ef,c0,14,5a));
 	outFields->push(HX_("_sid",0f,e4,22,3f));
@@ -1463,6 +1499,7 @@ void InitiatedSession_obj::__GetFields(Array< ::String> &outFields)
 #ifdef HXCPP_SCRIPTABLE
 static ::hx::StorageInfo InitiatedSession_obj_sMemberStorageInfo[] = {
 	{::hx::fsString,(int)offsetof(InitiatedSession_obj,sid),HX_("sid",0e,9f,57,00)},
+	{::hx::fsString,(int)offsetof(InitiatedSession_obj,chatId),HX_("chatId",d3,04,77,b7)},
 	{::hx::fsObject /*  ::snikket::Client */ ,(int)offsetof(InitiatedSession_obj,client),HX_("client",4b,ca,4f,0a)},
 	{::hx::fsObject /*  ::snikket::JID */ ,(int)offsetof(InitiatedSession_obj,counterpart),HX_("counterpart",ef,c0,14,5a)},
 	{::hx::fsString,(int)offsetof(InitiatedSession_obj,_sid),HX_("_sid",0f,e4,22,3f)},
@@ -1484,6 +1521,8 @@ static ::hx::StaticInfo *InitiatedSession_obj_sStaticStorageInfo = 0;
 static ::String InitiatedSession_obj_sMemberFields[] = {
 	HX_("sid",0e,9f,57,00),
 	HX_("sid__fromC",2b,ef,18,af),
+	HX_("chatId",d3,04,77,b7),
+	HX_("chatId__fromC",06,fc,b1,94),
 	HX_("client",4b,ca,4f,0a),
 	HX_("counterpart",ef,c0,14,5a),
 	HX_("_sid",0f,e4,22,3f),
@@ -1498,6 +1537,7 @@ static ::String InitiatedSession_obj_sMemberFields[] = {
 	HX_("initiator",af,ac,ed,3d),
 	HX_("candidatesDone",72,4b,30,dd),
 	HX_("get_sid",a5,67,cc,26),
+	HX_("get_chatId",9c,74,fe,a7),
 	HX_("ring",b0,5f,aa,4b),
 	HX_("retract",01,e2,b9,fc),
 	HX_("accept",08,93,06,0b),
@@ -1553,22 +1593,24 @@ void InitiatedSession_obj::__register()
 void InitiatedSession_obj::__boot()
 {
 {
-            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_278_boot)
-HXDLIN( 278)		__mClass->__meta__ =  ::Dynamic(::hx::Anon_obj::Create(1)
-            			->setFixed(0,HX_("fields",79,8e,8e,80), ::Dynamic(::hx::Anon_obj::Create(7)
-            				->setFixed(0,HX_("supplyMedia",35,0c,c9,9a), ::Dynamic(::hx::Anon_obj::Create(1)
+            	HX_STACKFRAME(&_hx_pos_de51993dbb06b02d_289_boot)
+HXDLIN( 289)		__mClass->__meta__ =  ::Dynamic(::hx::Anon_obj::Create(1)
+            			->setFixed(0,HX_("fields",79,8e,8e,80), ::Dynamic(::hx::Anon_obj::Create(8)
+            				->setFixed(0,HX_("chatId__fromC",06,fc,b1,94), ::Dynamic(::hx::Anon_obj::Create(1)
+            					->setFixed(0,HX_("HaxeCBridge.wrapper",8b,ea,27,d4),null())))
+            				->setFixed(1,HX_("supplyMedia",35,0c,c9,9a), ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("HaxeCBridge.noemit",dc,2c,99,2f),::cpp::VirtualArray_obj::__new(1)->init(0,HX_("wrapped",45,d5,64,0d)))))
-            				->setFixed(1,HX_("sid__fromC",2b,ef,18,af), ::Dynamic(::hx::Anon_obj::Create(1)
+            				->setFixed(2,HX_("sid__fromC",2b,ef,18,af), ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("HaxeCBridge.wrapper",8b,ea,27,d4),null())))
-            				->setFixed(2,HX_("videoTracks",63,c2,24,be), ::Dynamic(::hx::Anon_obj::Create(1)
+            				->setFixed(3,HX_("videoTracks",63,c2,24,be), ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("HaxeCBridge.noemit",dc,2c,99,2f),::cpp::VirtualArray_obj::__new(1)->init(0,HX_("wrapped",45,d5,64,0d)))))
-            				->setFixed(3,HX_("videoTracks__fromC",76,10,46,d8), ::Dynamic(::hx::Anon_obj::Create(1)
+            				->setFixed(4,HX_("videoTracks__fromC",76,10,46,d8), ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("HaxeCBridge.wrapper",8b,ea,27,d4),null())))
-            				->setFixed(4,HX_("supplyMedia__fromC",e4,84,0e,e6), ::Dynamic(::hx::Anon_obj::Create(1)
+            				->setFixed(5,HX_("supplyMedia__fromC",e4,84,0e,e6), ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("HaxeCBridge.wrapper",8b,ea,27,d4),null())))
-            				->setFixed(5,HX_("addMedia__fromC",d6,fb,b5,1b), ::Dynamic(::hx::Anon_obj::Create(1)
+            				->setFixed(6,HX_("addMedia__fromC",d6,fb,b5,1b), ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("HaxeCBridge.wrapper",8b,ea,27,d4),null())))
-            				->setFixed(6,HX_("addMedia",03,2b,19,7f), ::Dynamic(::hx::Anon_obj::Create(1)
+            				->setFixed(7,HX_("addMedia",03,2b,19,7f), ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("HaxeCBridge.noemit",dc,2c,99,2f),::cpp::VirtualArray_obj::__new(1)->init(0,HX_("wrapped",45,d5,64,0d))))))));
             	}
 }
diff --git a/Sources/c_snikket/src/snikket/jingle/MediaStream.cpp b/Sources/c_snikket/src/snikket/jingle/MediaStream.cpp
index e76c48d..b66a660 100644
--- a/Sources/c_snikket/src/snikket/jingle/MediaStream.cpp
+++ b/Sources/c_snikket/src/snikket/jingle/MediaStream.cpp
@@ -28,18 +28,18 @@
 #include <snikket/jingle/MediaStreamTrack.h>
 #endif
 
-HX_DEFINE_STACK_FRAME(_hx_pos_73a4884454ac5ac3_633_new,"snikket.jingle.MediaStream","new",0xfb2579ea,"snikket.jingle.MediaStream.new","snikket/jingle/PeerConnection.cpp.hx",633,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_73a4884454ac5ac3_653_addTrack,"snikket.jingle.MediaStream","addTrack",0x3c4636e0,"snikket.jingle.MediaStream.addTrack","snikket/jingle/PeerConnection.cpp.hx",653,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_73a4884454ac5ac3_657_getTracks,"snikket.jingle.MediaStream","getTracks",0x455c21c8,"snikket.jingle.MediaStream.getTracks","snikket/jingle/PeerConnection.cpp.hx",657,0xf9fab71d)
+HX_DEFINE_STACK_FRAME(_hx_pos_73a4884454ac5ac3_642_new,"snikket.jingle.MediaStream","new",0xfb2579ea,"snikket.jingle.MediaStream.new","snikket/jingle/PeerConnection.cpp.hx",642,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_73a4884454ac5ac3_662_addTrack,"snikket.jingle.MediaStream","addTrack",0x3c4636e0,"snikket.jingle.MediaStream.addTrack","snikket/jingle/PeerConnection.cpp.hx",662,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_73a4884454ac5ac3_666_getTracks,"snikket.jingle.MediaStream","getTracks",0x455c21c8,"snikket.jingle.MediaStream.getTracks","snikket/jingle/PeerConnection.cpp.hx",666,0xf9fab71d)
 HX_LOCAL_STACK_FRAME(_hx_pos_fa9a1f555469415a_250_getTracks__fromC,"snikket.jingle.MediaStream","getTracks__fromC",0xff2f97b1,"snikket.jingle.MediaStream.getTracks__fromC","HaxeCBridge.hx",250,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_73a4884454ac5ac3_638_makeAudio,"snikket.jingle.MediaStream","makeAudio",0x7ea15d12,"snikket.jingle.MediaStream.makeAudio","snikket/jingle/PeerConnection.cpp.hx",638,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_73a4884454ac5ac3_632_boot,"snikket.jingle.MediaStream","boot",0xbdbe3368,"snikket.jingle.MediaStream.boot","snikket/jingle/PeerConnection.cpp.hx",632,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_73a4884454ac5ac3_647_makeAudio,"snikket.jingle.MediaStream","makeAudio",0x7ea15d12,"snikket.jingle.MediaStream.makeAudio","snikket/jingle/PeerConnection.cpp.hx",647,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_73a4884454ac5ac3_641_boot,"snikket.jingle.MediaStream","boot",0xbdbe3368,"snikket.jingle.MediaStream.boot","snikket/jingle/PeerConnection.cpp.hx",641,0xf9fab71d)
 namespace snikket{
 namespace jingle{
 
 void MediaStream_obj::__construct(){
-            	HX_STACKFRAME(&_hx_pos_73a4884454ac5ac3_633_new)
-HXDLIN( 633)		this->tracks = ::Array_obj< ::Dynamic>::__new(0);
+            	HX_STACKFRAME(&_hx_pos_73a4884454ac5ac3_642_new)
+HXDLIN( 642)		this->tracks = ::Array_obj< ::Dynamic>::__new(0);
             	}
 
 Dynamic MediaStream_obj::__CreateEmpty() { return new MediaStream_obj; }
@@ -58,16 +58,16 @@ bool MediaStream_obj::_hx_isInstanceOf(int inClassId) {
 }
 
 void MediaStream_obj::addTrack( ::snikket::jingle::MediaStreamTrack track){
-            	HX_STACKFRAME(&_hx_pos_73a4884454ac5ac3_653_addTrack)
-HXDLIN( 653)		this->tracks->push(track);
+            	HX_STACKFRAME(&_hx_pos_73a4884454ac5ac3_662_addTrack)
+HXDLIN( 662)		this->tracks->push(track);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(MediaStream_obj,addTrack,(void))
 
 ::Array< ::Dynamic> MediaStream_obj::getTracks(){
-            	HX_STACKFRAME(&_hx_pos_73a4884454ac5ac3_657_getTracks)
-HXDLIN( 657)		return this->tracks;
+            	HX_STACKFRAME(&_hx_pos_73a4884454ac5ac3_666_getTracks)
+HXDLIN( 666)		return this->tracks;
             	}
 
 
@@ -121,16 +121,16 @@ HXDLIN( 250)		return ( (size_t)(out->length) );
 
 
  ::snikket::jingle::MediaStream MediaStream_obj::makeAudio(){
-            	HX_GC_STACKFRAME(&_hx_pos_73a4884454ac5ac3_638_makeAudio)
-HXLINE( 639)		 rtc::Description::Audio audio =  rtc::Description::Audio(::hx::StdString(::snikket::ID_obj::tiny()),cpp::Struct(rtc::Description::Direction::SendRecv));
-HXLINE( 640)		audio.addOpusCodec(107);
-HXLINE( 641)		audio.addPCMUCodec(0);
-HXLINE( 642)		audio.addAudioCodec(101,::hx::StdString(HX_("telephone-event/8000",36,ae,10,93)));
-HXLINE( 643)		 ::snikket::jingle::MediaStreamTrack media =  ::snikket::jingle::MediaStreamTrack_obj::__alloc( HX_CTX );
-HXLINE( 644)		media->media =  std::optional<  rtc::Description::Media >(audio);
-HXLINE( 645)		 ::snikket::jingle::MediaStream stream =  ::snikket::jingle::MediaStream_obj::__alloc( HX_CTX );
-HXLINE( 646)		stream->addTrack(media);
-HXLINE( 647)		return stream;
+            	HX_GC_STACKFRAME(&_hx_pos_73a4884454ac5ac3_647_makeAudio)
+HXLINE( 648)		 rtc::Description::Audio audio =  rtc::Description::Audio(::hx::StdString(::snikket::ID_obj::tiny()),cpp::Struct(rtc::Description::Direction::SendRecv));
+HXLINE( 649)		audio.addOpusCodec(107);
+HXLINE( 650)		audio.addPCMUCodec(0);
+HXLINE( 651)		audio.addAudioCodec(101,::hx::StdString(HX_("telephone-event/8000",36,ae,10,93)));
+HXLINE( 652)		 ::snikket::jingle::MediaStreamTrack media =  ::snikket::jingle::MediaStreamTrack_obj::__alloc( HX_CTX );
+HXLINE( 653)		media->media =  std::optional<  rtc::Description::Media >(audio);
+HXLINE( 654)		 ::snikket::jingle::MediaStream stream =  ::snikket::jingle::MediaStream_obj::__alloc( HX_CTX );
+HXLINE( 655)		stream->addTrack(media);
+HXLINE( 656)		return stream;
             	}
 
 
@@ -252,8 +252,8 @@ void MediaStream_obj::__register()
 void MediaStream_obj::__boot()
 {
 {
-            	HX_STACKFRAME(&_hx_pos_73a4884454ac5ac3_632_boot)
-HXDLIN( 632)		__mClass->__meta__ =  ::Dynamic(::hx::Anon_obj::Create(1)
+            	HX_STACKFRAME(&_hx_pos_73a4884454ac5ac3_641_boot)
+HXDLIN( 641)		__mClass->__meta__ =  ::Dynamic(::hx::Anon_obj::Create(1)
             			->setFixed(0,HX_("fields",79,8e,8e,80), ::Dynamic(::hx::Anon_obj::Create(2)
             				->setFixed(0,HX_("getTracks",be,b4,d3,c1), ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("HaxeCBridge.noemit",dc,2c,99,2f),::cpp::VirtualArray_obj::__new(1)->init(0,HX_("wrapped",45,d5,64,0d)))))
diff --git a/Sources/c_snikket/src/snikket/jingle/MediaStreamTrack.cpp b/Sources/c_snikket/src/snikket/jingle/MediaStreamTrack.cpp
index b549f78..c71fd2d 100644
--- a/Sources/c_snikket/src/snikket/jingle/MediaStreamTrack.cpp
+++ b/Sources/c_snikket/src/snikket/jingle/MediaStreamTrack.cpp
@@ -82,19 +82,19 @@ HX_LOCAL_STACK_FRAME(_hx_pos_199cfc803453bfcf_467_addPCMListener,"snikket.jingle
 HX_LOCAL_STACK_FRAME(_hx_pos_6a2465e57550c9c8_221_addPCMListener__fromC,"snikket.jingle.MediaStreamTrack","addPCMListener__fromC",0x90d840d1,"snikket.jingle.MediaStreamTrack.addPCMListener__fromC","HaxeCBridge.hx",221,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_6a2465e57550c9c8_252_addPCMListener__fromC,"snikket.jingle.MediaStreamTrack","addPCMListener__fromC",0x90d840d1,"snikket.jingle.MediaStreamTrack.addPCMListener__fromC","HaxeCBridge.hx",252,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_199cfc803453bfcf_492_onFrame,"snikket.jingle.MediaStreamTrack","onFrame",0x55f2c193,"snikket.jingle.MediaStreamTrack.onFrame","snikket/jingle/PeerConnection.cpp.hx",492,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_199cfc803453bfcf_521_addReadyForPCMListener,"snikket.jingle.MediaStreamTrack","addReadyForPCMListener",0x339e25e2,"snikket.jingle.MediaStreamTrack.addReadyForPCMListener","snikket/jingle/PeerConnection.cpp.hx",521,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_199cfc803453bfcf_529_addReadyForPCMListener,"snikket.jingle.MediaStreamTrack","addReadyForPCMListener",0x339e25e2,"snikket.jingle.MediaStreamTrack.addReadyForPCMListener","snikket/jingle/PeerConnection.cpp.hx",529,0xf9fab71d)
 HX_LOCAL_STACK_FRAME(_hx_pos_6a2465e57550c9c8_221_addReadyForPCMListener__fromC,"snikket.jingle.MediaStreamTrack","addReadyForPCMListener__fromC",0xd615aad7,"snikket.jingle.MediaStreamTrack.addReadyForPCMListener__fromC","HaxeCBridge.hx",221,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_6a2465e57550c9c8_252_addReadyForPCMListener__fromC,"snikket.jingle.MediaStreamTrack","addReadyForPCMListener__fromC",0xd615aad7,"snikket.jingle.MediaStreamTrack.addReadyForPCMListener__fromC","HaxeCBridge.hx",252,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_199cfc803453bfcf_528_notifyReadyForData,"snikket.jingle.MediaStreamTrack","notifyReadyForData",0x61f3b534,"snikket.jingle.MediaStreamTrack.notifyReadyForData","snikket/jingle/PeerConnection.cpp.hx",528,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_199cfc803453bfcf_532_notifyReadyForData,"snikket.jingle.MediaStreamTrack","notifyReadyForData",0x61f3b534,"snikket.jingle.MediaStreamTrack.notifyReadyForData","snikket/jingle/PeerConnection.cpp.hx",532,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_199cfc803453bfcf_552_writePCM,"snikket.jingle.MediaStreamTrack","writePCM",0x763990d6,"snikket.jingle.MediaStreamTrack.writePCM","snikket/jingle/PeerConnection.cpp.hx",552,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_199cfc803453bfcf_554_writePCM,"snikket.jingle.MediaStreamTrack","writePCM",0x763990d6,"snikket.jingle.MediaStreamTrack.writePCM","snikket/jingle/PeerConnection.cpp.hx",554,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_199cfc803453bfcf_551_writePCM,"snikket.jingle.MediaStreamTrack","writePCM",0x763990d6,"snikket.jingle.MediaStreamTrack.writePCM","snikket/jingle/PeerConnection.cpp.hx",551,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_199cfc803453bfcf_536_notifyReadyForData,"snikket.jingle.MediaStreamTrack","notifyReadyForData",0x61f3b534,"snikket.jingle.MediaStreamTrack.notifyReadyForData","snikket/jingle/PeerConnection.cpp.hx",536,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_199cfc803453bfcf_540_notifyReadyForData,"snikket.jingle.MediaStreamTrack","notifyReadyForData",0x61f3b534,"snikket.jingle.MediaStreamTrack.notifyReadyForData","snikket/jingle/PeerConnection.cpp.hx",540,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_199cfc803453bfcf_562_writePCM,"snikket.jingle.MediaStreamTrack","writePCM",0x763990d6,"snikket.jingle.MediaStreamTrack.writePCM","snikket/jingle/PeerConnection.cpp.hx",562,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_199cfc803453bfcf_564_writePCM,"snikket.jingle.MediaStreamTrack","writePCM",0x763990d6,"snikket.jingle.MediaStreamTrack.writePCM","snikket/jingle/PeerConnection.cpp.hx",564,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_199cfc803453bfcf_561_writePCM,"snikket.jingle.MediaStreamTrack","writePCM",0x763990d6,"snikket.jingle.MediaStreamTrack.writePCM","snikket/jingle/PeerConnection.cpp.hx",561,0xf9fab71d)
 HX_LOCAL_STACK_FRAME(_hx_pos_6a2465e57550c9c8_252_writePCM__fromC,"snikket.jingle.MediaStreamTrack","writePCM__fromC",0x54304663,"snikket.jingle.MediaStreamTrack.writePCM__fromC","HaxeCBridge.hx",252,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_199cfc803453bfcf_598_onAudioLoop,"snikket.jingle.MediaStreamTrack","onAudioLoop",0x959462c0,"snikket.jingle.MediaStreamTrack.onAudioLoop","snikket/jingle/PeerConnection.cpp.hx",598,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_199cfc803453bfcf_602_write,"snikket.jingle.MediaStreamTrack","write",0xf83bdca4,"snikket.jingle.MediaStreamTrack.write","snikket/jingle/PeerConnection.cpp.hx",602,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_199cfc803453bfcf_614_advanceTimestamp,"snikket.jingle.MediaStreamTrack","advanceTimestamp",0xa8dad84f,"snikket.jingle.MediaStreamTrack.advanceTimestamp","snikket/jingle/PeerConnection.cpp.hx",614,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_199cfc803453bfcf_617_stop,"snikket.jingle.MediaStreamTrack","stop",0x4ffb5fdd,"snikket.jingle.MediaStreamTrack.stop","snikket/jingle/PeerConnection.cpp.hx",617,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_199cfc803453bfcf_607_onAudioLoop,"snikket.jingle.MediaStreamTrack","onAudioLoop",0x959462c0,"snikket.jingle.MediaStreamTrack.onAudioLoop","snikket/jingle/PeerConnection.cpp.hx",607,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_199cfc803453bfcf_611_write,"snikket.jingle.MediaStreamTrack","write",0xf83bdca4,"snikket.jingle.MediaStreamTrack.write","snikket/jingle/PeerConnection.cpp.hx",611,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_199cfc803453bfcf_623_advanceTimestamp,"snikket.jingle.MediaStreamTrack","advanceTimestamp",0xa8dad84f,"snikket.jingle.MediaStreamTrack.advanceTimestamp","snikket/jingle/PeerConnection.cpp.hx",623,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_199cfc803453bfcf_626_stop,"snikket.jingle.MediaStreamTrack","stop",0x4ffb5fdd,"snikket.jingle.MediaStreamTrack.stop","snikket/jingle/PeerConnection.cpp.hx",626,0xf9fab71d)
 HX_LOCAL_STACK_FRAME(_hx_pos_199cfc803453bfcf_362_fromTrack,"snikket.jingle.MediaStreamTrack","fromTrack",0x73deaf06,"snikket.jingle.MediaStreamTrack.fromTrack","snikket/jingle/PeerConnection.cpp.hx",362,0xf9fab71d)
 HX_LOCAL_STACK_FRAME(_hx_pos_199cfc803453bfcf_473_pcmToUlaw,"snikket.jingle.MediaStreamTrack","pcmToUlaw",0x7deff727,"snikket.jingle.MediaStreamTrack.pcmToUlaw","snikket/jingle/PeerConnection.cpp.hx",473,0xf9fab71d)
 HX_LOCAL_STACK_FRAME(_hx_pos_199cfc803453bfcf_337_boot,"snikket.jingle.MediaStreamTrack","boot",0x44baf40d,"snikket.jingle.MediaStreamTrack.boot","snikket/jingle/PeerConnection.cpp.hx",337,0xf9fab71d)
@@ -463,51 +463,55 @@ HXDLIN( 500)						s16->__unsafe_set(i,val);
             				}
             			}
 HXLINE( 502)			if (::hx::IsNotNull( this->pcmCallback )) {
-HXLINE( 502)				this->pcmCallback(s16,rtp.clockRate,channels);
+HXLINE( 503)				__hxcpp_enter_gc_free_zone();
+HXLINE( 504)				this->pcmCallback(s16,rtp.clockRate,channels);
+HXLINE( 505)				__hxcpp_exit_gc_free_zone();
             			}
             		}
             		else {
-HXLINE( 503)			if ((format == HX_("opus",bf,11,b4,49))) {
-HXLINE( 504)				::Array< short > s161 = ::Array_obj< short >::__new(5760);
-HXLINE( 505)				if (!opus) {
-HXLINE( 505)					::cpp::Pointer< int > tmp = null();
-HXDLIN( 505)					this->opus = opus_decoder_create(rtp.clockRate,( (int)(channels) ),tmp);
+HXLINE( 507)			if ((format == HX_("opus",bf,11,b4,49))) {
+HXLINE( 508)				::Array< short > s161 = ::Array_obj< short >::__new(5760);
+HXLINE( 509)				if (!opus) {
+HXLINE( 509)					::cpp::Pointer< int > tmp = null();
+HXDLIN( 509)					this->opus = opus_decoder_create(rtp.clockRate,( (int)(channels) ),tmp);
             				}
-HXLINE( 507)				::cpp::Pointer< unsigned char > tmp1 = ( (::cpp::Pointer< unsigned char >)(msg.data()) );
-HXDLIN( 507)				::cpp::Pointer< short > tmp2 = ( (::cpp::Pointer< short >)(::cpp::Pointer_obj::ofArray(s161)) );
-HXDLIN( 507)				cpp::Struct<  OpusDecoder* > decoded = this->opus;
-HXDLIN( 507)				size_t decoded1 = msg.size();
-HXDLIN( 507)				int decoded2 = opus_decode(decoded,tmp1,( (int)(decoded1) ),tmp2,::Std_obj::_hx_int((( (Float)(s161->length) ) / ( (Float)(channels) ))),false);
-HXLINE( 508)				s161->resize((decoded2 * ( (int)(channels) )));
-HXLINE( 509)				if (::hx::IsNotNull( this->pcmCallback )) {
-HXLINE( 509)					this->pcmCallback(s161,rtp.clockRate,channels);
+HXLINE( 511)				::cpp::Pointer< unsigned char > tmp1 = ( (::cpp::Pointer< unsigned char >)(msg.data()) );
+HXDLIN( 511)				::cpp::Pointer< short > tmp2 = ( (::cpp::Pointer< short >)(::cpp::Pointer_obj::ofArray(s161)) );
+HXDLIN( 511)				cpp::Struct<  OpusDecoder* > decoded = this->opus;
+HXDLIN( 511)				size_t decoded1 = msg.size();
+HXDLIN( 511)				int decoded2 = opus_decode(decoded,tmp1,( (int)(decoded1) ),tmp2,::Std_obj::_hx_int((( (Float)(s161->length) ) / ( (Float)(channels) ))),false);
+HXLINE( 512)				s161->resize((decoded2 * ( (int)(channels) )));
+HXLINE( 513)				if (::hx::IsNotNull( this->pcmCallback )) {
+HXLINE( 514)					__hxcpp_enter_gc_free_zone();
+HXLINE( 515)					this->pcmCallback(s161,rtp.clockRate,channels);
+HXLINE( 516)					__hxcpp_exit_gc_free_zone();
             				}
             			}
             			else {
-HXLINE( 511)				::haxe::Log_obj::trace(HX_("Ignoring audio frame with format",a3,bb,fe,5b), ::Dynamic(::hx::Anon_obj::Create(5)
+HXLINE( 519)				::haxe::Log_obj::trace(HX_("Ignoring audio frame with format",a3,bb,fe,5b), ::Dynamic(::hx::Anon_obj::Create(5)
             					->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.jingle.MediaStreamTrack",73,fe,80,a9))
             					->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(1)->init(0,format))
             					->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("onFrame",8e,16,c1,9c))
             					->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/jingle/PeerConnection.cpp.hx",1d,b7,fa,f9))
-            					->setFixed(4,HX_("lineNumber",dd,81,22,76),511)));
+            					->setFixed(4,HX_("lineNumber",dd,81,22,76),519)));
             			}
             		}
-HXLINE( 513)		hx::SetTopOfStack((int*)0, true);;
+HXLINE( 521)		hx::SetTopOfStack((int*)0, true);;
             	}
 
 
 void MediaStreamTrack_obj::addReadyForPCMListener( ::Dynamic callback){
-            	HX_STACKFRAME(&_hx_pos_199cfc803453bfcf_521_addReadyForPCMListener)
-HXLINE( 522)		this->readyForPCMCallback = callback;
-HXLINE( 523)		bool _hx_tmp;
-HXDLIN( 523)		if (track) {
-HXLINE( 523)			_hx_tmp = this->track->isOpen();
+            	HX_STACKFRAME(&_hx_pos_199cfc803453bfcf_529_addReadyForPCMListener)
+HXLINE( 530)		this->readyForPCMCallback = callback;
+HXLINE( 531)		bool _hx_tmp;
+HXDLIN( 531)		if (track) {
+HXLINE( 531)			_hx_tmp = this->track->isOpen();
             		}
             		else {
-HXLINE( 523)			_hx_tmp = false;
+HXLINE( 531)			_hx_tmp = false;
             		}
-HXDLIN( 523)		if (_hx_tmp) {
-HXLINE( 524)			this->notifyReadyForData(false);
+HXDLIN( 531)		if (_hx_tmp) {
+HXLINE( 532)			this->notifyReadyForData(false);
             		}
             	}
 
@@ -528,27 +532,29 @@ HXDLIN( 252)		this->addReadyForPCMListener( ::Dynamic(new _hx_Closure_0(callback
 
 
 void MediaStreamTrack_obj::notifyReadyForData(bool fromCPP){
-            	HX_STACKFRAME(&_hx_pos_199cfc803453bfcf_528_notifyReadyForData)
-HXDLIN( 528)		 ::snikket::jingle::MediaStreamTrack _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 529)		if (fromCPP) { int base = 0; hx::SetTopOfStack(&base, true); };
-HXLINE( 530)		if (::hx::IsNotNull( this->readyForPCMCallback )) {
+            	HX_STACKFRAME(&_hx_pos_199cfc803453bfcf_536_notifyReadyForData)
+HXDLIN( 536)		 ::snikket::jingle::MediaStreamTrack _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 537)		if (fromCPP) { int base = 0; hx::SetTopOfStack(&base, true); };
+HXLINE( 538)		if (::hx::IsNotNull( this->readyForPCMCallback )) {
             			HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::jingle::MediaStreamTrack,_gthis) HXARGC(0)
             			void _hx_run(){
-            				HX_STACKFRAME(&_hx_pos_199cfc803453bfcf_532_notifyReadyForData)
-HXLINE( 532)				if ((_gthis->audioQ->length > (50 + (( (Float)(50) ) * _gthis->bufferSizeInSeconds)))) {
-HXLINE( 533)					_gthis->mutex->acquire();
-HXLINE( 534)					_gthis->waitForQ = true;
-HXLINE( 535)					_gthis->mutex->release();
+            				HX_STACKFRAME(&_hx_pos_199cfc803453bfcf_540_notifyReadyForData)
+HXLINE( 540)				if ((_gthis->audioQ->length > (50 + (( (Float)(50) ) * _gthis->bufferSizeInSeconds)))) {
+HXLINE( 541)					_gthis->mutex->acquire();
+HXLINE( 542)					_gthis->waitForQ = true;
+HXLINE( 543)					_gthis->mutex->release();
             				}
             				else {
-HXLINE( 537)					_gthis->readyForPCMCallback();
+HXLINE( 545)					__hxcpp_enter_gc_free_zone();
+HXLINE( 546)					_gthis->readyForPCMCallback();
+HXLINE( 547)					__hxcpp_exit_gc_free_zone();
             				}
             			}
             			HX_END_LOCAL_FUNC0((void))
 
-HXLINE( 531)			this->eventLoop->run( ::Dynamic(new _hx_Closure_0(_gthis)));
+HXLINE( 539)			this->eventLoop->run( ::Dynamic(new _hx_Closure_0(_gthis)));
             		}
-HXLINE( 541)		if (fromCPP) { hx::SetTopOfStack((int*)0, true); };
+HXLINE( 551)		if (fromCPP) { hx::SetTopOfStack((int*)0, true); };
             	}
 
 
@@ -557,125 +563,119 @@ HX_DEFINE_DYNAMIC_FUNC1(MediaStreamTrack_obj,notifyReadyForData,(void))
 void MediaStreamTrack_obj::writePCM(::Array< short > pcm,int clockRate,int channels){
             		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0,int,channels,int,clockRate) HXARGC(1)
             		bool _hx_run( ::snikket::jingle::AudioFormat format){
-            			HX_STACKFRAME(&_hx_pos_199cfc803453bfcf_552_writePCM)
-HXLINE( 552)			if ((format->clockRate == clockRate)) {
-HXLINE( 552)				return (format->channels == channels);
+            			HX_STACKFRAME(&_hx_pos_199cfc803453bfcf_562_writePCM)
+HXLINE( 562)			if ((format->clockRate == clockRate)) {
+HXLINE( 562)				return (format->channels == channels);
             			}
             			else {
-HXLINE( 552)				return false;
+HXLINE( 562)				return false;
             			}
-HXDLIN( 552)			return false;
+HXDLIN( 562)			return false;
             		}
             		HX_END_LOCAL_FUNC1(return)
 
             		HX_BEGIN_LOCAL_FUNC_S5(::hx::LocalFunc,_hx_Closure_1,::Array< short >,pcm, ::snikket::jingle::MediaStreamTrack,_gthis,int,channels,int,clockRate, ::snikket::jingle::AudioFormat,format) HXARGC(0)
             		void _hx_run(){
-            			HX_STACKFRAME(&_hx_pos_199cfc803453bfcf_554_writePCM)
-HXLINE( 555)			int samples = ::Std_obj::_hx_int((( (Float)(pcm->length) ) / ( (Float)(channels) )));
-HXLINE( 556)			_gthis->mutex->acquire();
-HXLINE( 557)			Float stamp;
-HXDLIN( 557)			if ((_gthis->audioQ->length < 1)) {
-HXLINE( 558)				_gthis->bufferSizeInSeconds = ::Math_obj::max(_gthis->bufferSizeInSeconds,(_gthis->bufferSizeInSeconds + ((Float)0.1)));
-HXLINE( 559)				Float stamp1 =  ::__time_stamp();
-HXLINE( 557)				stamp = (stamp1 + _gthis->bufferSizeInSeconds);
+            			HX_STACKFRAME(&_hx_pos_199cfc803453bfcf_564_writePCM)
+HXLINE( 565)			int samples = ::Std_obj::_hx_int((( (Float)(pcm->length) ) / ( (Float)(channels) )));
+HXLINE( 566)			_gthis->mutex->acquire();
+HXLINE( 567)			Float stamp;
+HXDLIN( 567)			if ((_gthis->audioQ->length < 1)) {
+HXLINE( 568)				_gthis->bufferSizeInSeconds = ::Math_obj::max(_gthis->bufferSizeInSeconds,(_gthis->bufferSizeInSeconds + ((Float)0.1)));
+HXLINE( 569)				Float stamp1 =  ::__time_stamp();
+HXLINE( 567)				stamp = (stamp1 + _gthis->bufferSizeInSeconds);
             			}
             			else {
-HXLINE( 557)				stamp = ( (Float)((_gthis->audioQ->__get(0)->__Field(HX_("stamp",03,70,0b,84),::hx::paccDynamic) + ((( (Float)(samples) ) / (( (Float)(clockRate) ) / ( (Float)(1000) ))) / ((Float)1000.0)))) );
+HXLINE( 567)				stamp = ( (Float)((_gthis->audioQ->__get(0)->__Field(HX_("stamp",03,70,0b,84),::hx::paccDynamic) + ((( (Float)(samples) ) / (( (Float)(clockRate) ) / ( (Float)(1000) ))) / ((Float)1000.0)))) );
             			}
-HXLINE( 563)			_gthis->mutex->release();
-HXLINE( 564)			if ((format->format == HX_("PCMU",1b,2c,14,35))) {
-HXLINE( 565)				int channels1 = channels;
-HXDLIN( 565)				unsigned char format1 = format->payloadType;
-HXDLIN( 565)				int clockRate1 = clockRate;
-HXDLIN( 565)				 ::Dynamic f = ::snikket::jingle::MediaStreamTrack_obj::pcmToUlaw_dyn();
-HXDLIN( 565)				::Array< unsigned char > result = ::Array_obj< unsigned char >::__new(pcm->length);
-HXDLIN( 565)				{
-HXLINE( 565)					int _g = 0;
-HXDLIN( 565)					int _g1 = pcm->length;
-HXDLIN( 565)					while((_g < _g1)){
-HXLINE( 565)						_g = (_g + 1);
-HXDLIN( 565)						int i = (_g - 1);
-HXDLIN( 565)						{
-HXLINE( 565)							unsigned char inValue = ( (unsigned char)(f(_hx_array_unsafe_get(pcm,i))) );
-HXDLIN( 565)							result->__unsafe_set(i,inValue);
+HXLINE( 573)			_gthis->mutex->release();
+HXLINE( 574)			if ((format->format == HX_("PCMU",1b,2c,14,35))) {
+HXLINE( 575)				int channels1 = channels;
+HXDLIN( 575)				unsigned char format1 = format->payloadType;
+HXDLIN( 575)				int clockRate1 = clockRate;
+HXDLIN( 575)				 ::Dynamic f = ::snikket::jingle::MediaStreamTrack_obj::pcmToUlaw_dyn();
+HXDLIN( 575)				::Array< unsigned char > result = ::Array_obj< unsigned char >::__new(pcm->length);
+HXDLIN( 575)				{
+HXLINE( 575)					int _g = 0;
+HXDLIN( 575)					int _g1 = pcm->length;
+HXDLIN( 575)					while((_g < _g1)){
+HXLINE( 575)						_g = (_g + 1);
+HXDLIN( 575)						int i = (_g - 1);
+HXDLIN( 575)						{
+HXLINE( 575)							unsigned char inValue = ( (unsigned char)(f(_hx_array_unsafe_get(pcm,i))) );
+HXDLIN( 575)							result->__unsafe_set(i,inValue);
             						}
             					}
             				}
-HXDLIN( 565)				 ::Dynamic packet =  ::Dynamic(::hx::Anon_obj::Create(6)
+HXDLIN( 575)				 ::Dynamic packet =  ::Dynamic(::hx::Anon_obj::Create(6)
             					->setFixed(0,HX_("samples",09,c5,c9,83),samples)
             					->setFixed(1,HX_("stamp",03,70,0b,84),stamp)
             					->setFixed(2,HX_("payloadType",68,bd,49,af),format1)
             					->setFixed(3,HX_("payload",8e,bf,35,ed),result)
             					->setFixed(4,HX_("clockRate",ce,87,24,24),clockRate1)
             					->setFixed(5,HX_("channels",50,aa,ee,6a),channels1));
-HXLINE( 566)				_gthis->mutex->acquire();
-HXLINE( 567)				_gthis->audioQ->unshift(packet);
-HXLINE( 568)				_gthis->mutex->release();
+HXLINE( 576)				_gthis->mutex->acquire();
+HXLINE( 577)				_gthis->audioQ->unshift(packet);
+HXLINE( 578)				_gthis->mutex->release();
             			}
             			else {
-HXLINE( 569)				if ((format->format == HX_("opus",bf,11,b4,49))) {
-HXLINE( 570)					if (!_gthis->opusEncoder) {
-HXLINE( 571)						::cpp::Pointer< int > tmp = null();
-HXDLIN( 571)						int clockRate2 = clockRate;
-HXDLIN( 571)						int channels2 = channels;
-HXDLIN( 571)						int _hx_tmp = OPUS_APPLICATION_VOIP;
-HXDLIN( 571)						_gthis->opusEncoder = opus_encoder_create(clockRate2,channels2,_hx_tmp,tmp);
-HXLINE( 572)						opus_encoder_ctl(_gthis->opusEncoder, OPUS_SET_BITRATE(24000));
-HXLINE( 573)						opus_encoder_ctl(_gthis->opusEncoder, OPUS_SET_PACKET_LOSS_PERC(5));
-HXLINE( 574)						opus_encoder_ctl(_gthis->opusEncoder, OPUS_SET_INBAND_FEC(1));
+HXLINE( 579)				if ((format->format == HX_("opus",bf,11,b4,49))) {
+HXLINE( 580)					if (!_gthis->opusEncoder) {
+HXLINE( 581)						::cpp::Pointer< int > tmp = null();
+HXDLIN( 581)						int clockRate2 = clockRate;
+HXDLIN( 581)						int channels2 = channels;
+HXDLIN( 581)						int _hx_tmp = OPUS_APPLICATION_VOIP;
+HXDLIN( 581)						_gthis->opusEncoder = opus_encoder_create(clockRate2,channels2,_hx_tmp,tmp);
+HXLINE( 582)						opus_encoder_ctl(_gthis->opusEncoder, OPUS_SET_BITRATE(24000));
+HXLINE( 583)						opus_encoder_ctl(_gthis->opusEncoder, OPUS_SET_PACKET_LOSS_PERC(5));
+HXLINE( 584)						opus_encoder_ctl(_gthis->opusEncoder, OPUS_SET_INBAND_FEC(1));
             					}
-HXLINE( 576)					::Array< unsigned char > rawOpus = ::Array_obj< unsigned char >::__new((pcm->length * 2));
-HXLINE( 578)					::cpp::Pointer< short > tmp1 = ( (::cpp::Pointer< short >)(::cpp::Pointer_obj::ofArray(pcm)) );
-HXDLIN( 578)					::cpp::Pointer< unsigned char > tmp2 = ( (::cpp::Pointer< unsigned char >)(::cpp::Pointer_obj::ofArray(rawOpus)) );
-HXDLIN( 578)					int encoded = opus_encode(_gthis->opusEncoder,tmp1,samples,tmp2,rawOpus->length);
-HXLINE( 579)					if ((encoded < 0)) {
-HXLINE( 580)						::haxe::Log_obj::trace(HX_("Opus encode failed",86,4c,9a,50), ::Dynamic(::hx::Anon_obj::Create(5)
+HXLINE( 586)					::Array< unsigned char > rawOpus = ::Array_obj< unsigned char >::__new((pcm->length * 2));
+HXLINE( 588)					::cpp::Pointer< short > tmp1 = ( (::cpp::Pointer< short >)(::cpp::Pointer_obj::ofArray(pcm)) );
+HXDLIN( 588)					::cpp::Pointer< unsigned char > tmp2 = ( (::cpp::Pointer< unsigned char >)(::cpp::Pointer_obj::ofArray(rawOpus)) );
+HXDLIN( 588)					int encoded = opus_encode(_gthis->opusEncoder,tmp1,samples,tmp2,rawOpus->length);
+HXLINE( 589)					if ((encoded < 0)) {
+HXLINE( 590)						::haxe::Log_obj::trace(HX_("Opus encode failed",86,4c,9a,50), ::Dynamic(::hx::Anon_obj::Create(5)
             							->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.jingle.MediaStreamTrack",73,fe,80,a9))
             							->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(1)->init(0,encoded))
             							->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("writePCM",7b,97,f5,23))
             							->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/jingle/PeerConnection.cpp.hx",1d,b7,fa,f9))
-            							->setFixed(4,HX_("lineNumber",dd,81,22,76),580)));
+            							->setFixed(4,HX_("lineNumber",dd,81,22,76),590)));
             					}
             					else {
-HXLINE( 582)						rawOpus->resize(encoded);
-HXLINE( 583)						::haxe::Log_obj::trace(HX_("opus write",be,63,df,17), ::Dynamic(::hx::Anon_obj::Create(5)
-            							->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.jingle.MediaStreamTrack",73,fe,80,a9))
-            							->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(2)->init(0,encoded)->init(1,rawOpus))
-            							->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("writePCM",7b,97,f5,23))
-            							->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/jingle/PeerConnection.cpp.hx",1d,b7,fa,f9))
-            							->setFixed(4,HX_("lineNumber",dd,81,22,76),583)));
-HXLINE( 584)						 ::Dynamic packet1 =  ::Dynamic(::hx::Anon_obj::Create(6)
+HXLINE( 592)						rawOpus->resize(encoded);
+HXLINE( 593)						 ::Dynamic packet1 =  ::Dynamic(::hx::Anon_obj::Create(6)
             							->setFixed(0,HX_("samples",09,c5,c9,83),samples)
             							->setFixed(1,HX_("stamp",03,70,0b,84),stamp)
             							->setFixed(2,HX_("payloadType",68,bd,49,af),format->payloadType)
             							->setFixed(3,HX_("payload",8e,bf,35,ed),rawOpus)
             							->setFixed(4,HX_("clockRate",ce,87,24,24),clockRate)
             							->setFixed(5,HX_("channels",50,aa,ee,6a),channels));
-HXLINE( 585)						_gthis->mutex->acquire();
-HXLINE( 586)						_gthis->audioQ->unshift(packet1);
-HXLINE( 587)						_gthis->mutex->release();
+HXLINE( 594)						_gthis->mutex->acquire();
+HXLINE( 595)						_gthis->audioQ->unshift(packet1);
+HXLINE( 596)						_gthis->mutex->release();
             					}
             				}
             				else {
-HXLINE( 590)					::haxe::Log_obj::trace(HX_("Ignoring audio meant to go out as",e3,e7,4f,55), ::Dynamic(::hx::Anon_obj::Create(5)
+HXLINE( 599)					::haxe::Log_obj::trace(HX_("Ignoring audio meant to go out as",e3,e7,4f,55), ::Dynamic(::hx::Anon_obj::Create(5)
             						->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.jingle.MediaStreamTrack",73,fe,80,a9))
             						->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(3)->init(0,format->format)->init(1,format->clockRate)->init(2,format->channels))
             						->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("writePCM",7b,97,f5,23))
             						->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/jingle/PeerConnection.cpp.hx",1d,b7,fa,f9))
-            						->setFixed(4,HX_("lineNumber",dd,81,22,76),590)));
+            						->setFixed(4,HX_("lineNumber",dd,81,22,76),599)));
             				}
             			}
-HXLINE( 592)			_gthis->notifyReadyForData(false);
+HXLINE( 601)			_gthis->notifyReadyForData(false);
             		}
             		HX_END_LOCAL_FUNC0((void))
 
-            	HX_STACKFRAME(&_hx_pos_199cfc803453bfcf_551_writePCM)
-HXDLIN( 551)		 ::snikket::jingle::MediaStreamTrack _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 552)		 ::snikket::jingle::AudioFormat format = ( ( ::snikket::jingle::AudioFormat)(::Lambda_obj::find(this->get_supportedAudioFormats(), ::Dynamic(new _hx_Closure_0(channels,clockRate)))) );
-HXLINE( 553)		if (::hx::IsNull( format )) {
-HXLINE( 553)			HX_STACK_DO_THROW((((HX_("Unsupported audo format: ",93,2f,48,26) + clockRate) + HX_("/",2f,00,00,00)) + channels));
+            	HX_STACKFRAME(&_hx_pos_199cfc803453bfcf_561_writePCM)
+HXDLIN( 561)		 ::snikket::jingle::MediaStreamTrack _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 562)		 ::snikket::jingle::AudioFormat format = ( ( ::snikket::jingle::AudioFormat)(::Lambda_obj::find(this->get_supportedAudioFormats(), ::Dynamic(new _hx_Closure_0(channels,clockRate)))) );
+HXLINE( 563)		if (::hx::IsNull( format )) {
+HXLINE( 563)			HX_STACK_DO_THROW((((HX_("Unsupported audo format: ",93,2f,48,26) + clockRate) + HX_("/",2f,00,00,00)) + channels));
             		}
-HXLINE( 554)		this->eventLoop->run( ::Dynamic(new _hx_Closure_1(pcm,_gthis,channels,clockRate,format)));
+HXLINE( 564)		this->eventLoop->run( ::Dynamic(new _hx_Closure_1(pcm,_gthis,channels,clockRate,format)));
             	}
 
 
@@ -701,55 +701,55 @@ HXLINE( 252)		this->writePCM(_hx_tmp,clockRate,channels);
 HX_DEFINE_DYNAMIC_FUNC4(MediaStreamTrack_obj,writePCM__fromC,(void))
 
 void MediaStreamTrack_obj::onAudioLoop( ::Dynamic callback){
-            	HX_STACKFRAME(&_hx_pos_199cfc803453bfcf_598_onAudioLoop)
-HXDLIN( 598)		this->eventLoop->run(callback);
+            	HX_STACKFRAME(&_hx_pos_199cfc803453bfcf_607_onAudioLoop)
+HXDLIN( 607)		this->eventLoop->run(callback);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(MediaStreamTrack_obj,onAudioLoop,(void))
 
 void MediaStreamTrack_obj::write(::Array< unsigned char > payload,unsigned char payloadType,int clockRate){
-            	HX_STACKFRAME(&_hx_pos_199cfc803453bfcf_602_write)
-HXLINE( 603)		bool _hx_tmp;
-HXDLIN( 603)		if (!(!track)) {
-HXLINE( 603)			_hx_tmp = !(this->track->isOpen());
+            	HX_STACKFRAME(&_hx_pos_199cfc803453bfcf_611_write)
+HXLINE( 612)		bool _hx_tmp;
+HXDLIN( 612)		if (!(!track)) {
+HXLINE( 612)			_hx_tmp = !(this->track->isOpen());
             		}
             		else {
-HXLINE( 603)			_hx_tmp = true;
+HXLINE( 612)			_hx_tmp = true;
             		}
-HXDLIN( 603)		if (_hx_tmp) {
-HXLINE( 603)			return;
+HXDLIN( 612)		if (_hx_tmp) {
+HXLINE( 612)			return;
             		}
-HXLINE( 605)		this->rtpPacketizationConfig->payloadType = payloadType;
-HXLINE( 606)		this->rtpPacketizationConfig->clockRate = ( (unsigned int)(clockRate) );
-HXLINE( 607)		::cpp::Pointer<  std::byte > tmp = ( (::cpp::Pointer< unsigned char >)(::cpp::Pointer_obj::ofArray(payload)) )->reinterpret();
-HXDLIN( 607)		this->track->send(tmp,( (size_t)(payload->length) ));
+HXLINE( 614)		this->rtpPacketizationConfig->payloadType = payloadType;
+HXLINE( 615)		this->rtpPacketizationConfig->clockRate = ( (unsigned int)(clockRate) );
+HXLINE( 616)		::cpp::Pointer<  std::byte > tmp = ( (::cpp::Pointer< unsigned char >)(::cpp::Pointer_obj::ofArray(payload)) )->reinterpret();
+HXDLIN( 616)		this->track->send(tmp,( (size_t)(payload->length) ));
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC3(MediaStreamTrack_obj,write,(void))
 
 void MediaStreamTrack_obj::advanceTimestamp(int samples){
-            	HX_STACKFRAME(&_hx_pos_199cfc803453bfcf_614_advanceTimestamp)
-HXDLIN( 614)		this->rtpPacketizationConfig->timestamp = (this->rtpPacketizationConfig->timestamp + samples);
+            	HX_STACKFRAME(&_hx_pos_199cfc803453bfcf_623_advanceTimestamp)
+HXDLIN( 623)		this->rtpPacketizationConfig->timestamp = (this->rtpPacketizationConfig->timestamp + samples);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(MediaStreamTrack_obj,advanceTimestamp,(void))
 
 void MediaStreamTrack_obj::stop(){
-            	HX_STACKFRAME(&_hx_pos_199cfc803453bfcf_617_stop)
-HXLINE( 618)		this->timer->stop();
-HXLINE( 619)		this->mutex->acquire();
-HXLINE( 620)		this->alive = false;
-HXLINE( 621)		if (this->track->isOpen()) {
-HXLINE( 621)			this->track->close();
+            	HX_STACKFRAME(&_hx_pos_199cfc803453bfcf_626_stop)
+HXLINE( 627)		this->timer->stop();
+HXLINE( 628)		this->mutex->acquire();
+HXLINE( 629)		this->alive = false;
+HXLINE( 630)		if (this->track->isOpen()) {
+HXLINE( 630)			this->track->close();
             		}
-HXLINE( 622)		if (opus) {
-HXLINE( 623)			opus_decoder_destroy(this->opus);
-HXLINE( 624)			this->opus = null();
+HXLINE( 631)		if (opus) {
+HXLINE( 632)			opus_decoder_destroy(this->opus);
+HXLINE( 633)			this->opus = null();
             		}
-HXLINE( 626)		this->mutex->release();
+HXLINE( 635)		this->mutex->release();
             	}
 
 
diff --git a/Sources/c_snikket/src/snikket/jingle/OutgoingProposedSession.cpp b/Sources/c_snikket/src/snikket/jingle/OutgoingProposedSession.cpp
index 7dacaf6..be630dd 100644
--- a/Sources/c_snikket/src/snikket/jingle/OutgoingProposedSession.cpp
+++ b/Sources/c_snikket/src/snikket/jingle/OutgoingProposedSession.cpp
@@ -77,33 +77,34 @@
 #include <thenshim/_Promise/Promise_Impl_.h>
 #endif
 
-HX_DEFINE_STACK_FRAME(_hx_pos_3d104e43c930d498_164_new,"snikket.jingle.OutgoingProposedSession","new",0x73d7b0aa,"snikket.jingle.OutgoingProposedSession.new","snikket/jingle/Session.hx",164,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_189_propose,"snikket.jingle.OutgoingProposedSession","propose",0x4884cc48,"snikket.jingle.OutgoingProposedSession.propose","snikket/jingle/Session.hx",189,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_178_propose,"snikket.jingle.OutgoingProposedSession","propose",0x4884cc48,"snikket.jingle.OutgoingProposedSession.propose","snikket/jingle/Session.hx",178,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_206_hangup,"snikket.jingle.OutgoingProposedSession","hangup",0x5911bc43,"snikket.jingle.OutgoingProposedSession.hangup","snikket/jingle/Session.hx",206,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_203_hangup,"snikket.jingle.OutgoingProposedSession","hangup",0x5911bc43,"snikket.jingle.OutgoingProposedSession.hangup","snikket/jingle/Session.hx",203,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_219_retract,"snikket.jingle.OutgoingProposedSession","retract",0x4b54af4b,"snikket.jingle.OutgoingProposedSession.retract","snikket/jingle/Session.hx",219,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_223_terminate,"snikket.jingle.OutgoingProposedSession","terminate",0x42b2662b,"snikket.jingle.OutgoingProposedSession.terminate","snikket/jingle/Session.hx",223,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_227_contentAdd,"snikket.jingle.OutgoingProposedSession","contentAdd",0x432a835e,"snikket.jingle.OutgoingProposedSession.contentAdd","snikket/jingle/Session.hx",227,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_231_contentAccept,"snikket.jingle.OutgoingProposedSession","contentAccept",0xd468a5eb,"snikket.jingle.OutgoingProposedSession.contentAccept","snikket/jingle/Session.hx",231,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_234_transportInfo,"snikket.jingle.OutgoingProposedSession","transportInfo",0xaa361d81,"snikket.jingle.OutgoingProposedSession.transportInfo","snikket/jingle/Session.hx",234,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_240_accept,"snikket.jingle.OutgoingProposedSession","accept",0xac187cfe,"snikket.jingle.OutgoingProposedSession.accept","snikket/jingle/Session.hx",240,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_243_initiate,"snikket.jingle.OutgoingProposedSession","initiate",0xd8683dcf,"snikket.jingle.OutgoingProposedSession.initiate","snikket/jingle/Session.hx",243,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_254_addMedia,"snikket.jingle.OutgoingProposedSession","addMedia",0xf7f1fe79,"snikket.jingle.OutgoingProposedSession.addMedia","snikket/jingle/Session.hx",254,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_258_callStatus,"snikket.jingle.OutgoingProposedSession","callStatus",0x3078db66,"snikket.jingle.OutgoingProposedSession.callStatus","snikket/jingle/Session.hx",258,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_262_videoTracks,"snikket.jingle.OutgoingProposedSession","videoTracks",0x2250fcad,"snikket.jingle.OutgoingProposedSession.videoTracks","snikket/jingle/Session.hx",262,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_266_dtmf,"snikket.jingle.OutgoingProposedSession","dtmf",0xe2521b5f,"snikket.jingle.OutgoingProposedSession.dtmf","snikket/jingle/Session.hx",266,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_270_get_sid,"snikket.jingle.OutgoingProposedSession","get_sid",0x756734ef,"snikket.jingle.OutgoingProposedSession.get_sid","snikket/jingle/Session.hx",270,0x6db2dd54)
+HX_DEFINE_STACK_FRAME(_hx_pos_3d104e43c930d498_170_new,"snikket.jingle.OutgoingProposedSession","new",0x73d7b0aa,"snikket.jingle.OutgoingProposedSession.new","snikket/jingle/Session.hx",170,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_196_propose,"snikket.jingle.OutgoingProposedSession","propose",0x4884cc48,"snikket.jingle.OutgoingProposedSession.propose","snikket/jingle/Session.hx",196,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_185_propose,"snikket.jingle.OutgoingProposedSession","propose",0x4884cc48,"snikket.jingle.OutgoingProposedSession.propose","snikket/jingle/Session.hx",185,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_213_hangup,"snikket.jingle.OutgoingProposedSession","hangup",0x5911bc43,"snikket.jingle.OutgoingProposedSession.hangup","snikket/jingle/Session.hx",213,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_210_hangup,"snikket.jingle.OutgoingProposedSession","hangup",0x5911bc43,"snikket.jingle.OutgoingProposedSession.hangup","snikket/jingle/Session.hx",210,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_226_retract,"snikket.jingle.OutgoingProposedSession","retract",0x4b54af4b,"snikket.jingle.OutgoingProposedSession.retract","snikket/jingle/Session.hx",226,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_230_terminate,"snikket.jingle.OutgoingProposedSession","terminate",0x42b2662b,"snikket.jingle.OutgoingProposedSession.terminate","snikket/jingle/Session.hx",230,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_234_contentAdd,"snikket.jingle.OutgoingProposedSession","contentAdd",0x432a835e,"snikket.jingle.OutgoingProposedSession.contentAdd","snikket/jingle/Session.hx",234,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_238_contentAccept,"snikket.jingle.OutgoingProposedSession","contentAccept",0xd468a5eb,"snikket.jingle.OutgoingProposedSession.contentAccept","snikket/jingle/Session.hx",238,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_241_transportInfo,"snikket.jingle.OutgoingProposedSession","transportInfo",0xaa361d81,"snikket.jingle.OutgoingProposedSession.transportInfo","snikket/jingle/Session.hx",241,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_247_accept,"snikket.jingle.OutgoingProposedSession","accept",0xac187cfe,"snikket.jingle.OutgoingProposedSession.accept","snikket/jingle/Session.hx",247,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_250_initiate,"snikket.jingle.OutgoingProposedSession","initiate",0xd8683dcf,"snikket.jingle.OutgoingProposedSession.initiate","snikket/jingle/Session.hx",250,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_261_addMedia,"snikket.jingle.OutgoingProposedSession","addMedia",0xf7f1fe79,"snikket.jingle.OutgoingProposedSession.addMedia","snikket/jingle/Session.hx",261,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_265_callStatus,"snikket.jingle.OutgoingProposedSession","callStatus",0x3078db66,"snikket.jingle.OutgoingProposedSession.callStatus","snikket/jingle/Session.hx",265,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_269_videoTracks,"snikket.jingle.OutgoingProposedSession","videoTracks",0x2250fcad,"snikket.jingle.OutgoingProposedSession.videoTracks","snikket/jingle/Session.hx",269,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_273_dtmf,"snikket.jingle.OutgoingProposedSession","dtmf",0xe2521b5f,"snikket.jingle.OutgoingProposedSession.dtmf","snikket/jingle/Session.hx",273,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_277_get_sid,"snikket.jingle.OutgoingProposedSession","get_sid",0x756734ef,"snikket.jingle.OutgoingProposedSession.get_sid","snikket/jingle/Session.hx",277,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_3d104e43c930d498_281_get_chatId,"snikket.jingle.OutgoingProposedSession","get_chatId",0xa74b9192,"snikket.jingle.OutgoingProposedSession.get_chatId","snikket/jingle/Session.hx",281,0x6db2dd54)
 namespace snikket{
 namespace jingle{
 
 void OutgoingProposedSession_obj::__construct( ::snikket::Client client, ::snikket::JID to){
-            	HX_STACKFRAME(&_hx_pos_3d104e43c930d498_164_new)
-HXLINE( 170)		this->video = false;
-HXLINE( 169)		this->audio = false;
-HXLINE( 173)		this->client = client;
-HXLINE( 174)		this->to = to;
-HXLINE( 175)		this->_sid = ::snikket::ID_obj::_hx_long();
+            	HX_STACKFRAME(&_hx_pos_3d104e43c930d498_170_new)
+HXLINE( 177)		this->video = false;
+HXLINE( 176)		this->audio = false;
+HXLINE( 180)		this->client = client;
+HXLINE( 181)		this->to = to;
+HXLINE( 182)		this->_sid = ::snikket::ID_obj::_hx_long();
             	}
 
 Dynamic OutgoingProposedSession_obj::__CreateEmpty() { return new OutgoingProposedSession_obj; }
@@ -123,6 +124,7 @@ bool OutgoingProposedSession_obj::_hx_isInstanceOf(int inClassId) {
 
 static ::snikket::jingle::Session_obj _hx_snikket_jingle_OutgoingProposedSession__hx_snikket_jingle_Session= {
 	( ::String (::hx::Object::*)())&::snikket::jingle::OutgoingProposedSession_obj::get_sid,
+	( ::String (::hx::Object::*)())&::snikket::jingle::OutgoingProposedSession_obj::get_chatId,
 	(  ::snikket::jingle::InitiatedSession (::hx::Object::*)( ::snikket::Stanza))&::snikket::jingle::OutgoingProposedSession_obj::initiate_ef691953,
 	( void (::hx::Object::*)())&::snikket::jingle::OutgoingProposedSession_obj::accept,
 	( void (::hx::Object::*)())&::snikket::jingle::OutgoingProposedSession_obj::hangup,
@@ -154,40 +156,42 @@ void *OutgoingProposedSession_obj::_hx_getInterface(int inHash) {
 void OutgoingProposedSession_obj::propose(bool audio,bool video){
             		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_0, ::snikket::jingle::OutgoingProposedSession,_gthis, ::snikket::Stanza,event, ::snikket::ChatMessage,msg) HXARGC(1)
             		void _hx_run(::Array< ::Dynamic> stored){
-            			HX_GC_STACKFRAME(&_hx_pos_3d104e43c930d498_189_propose)
-HXLINE( 190)			::String stanza = _gthis->to->asString();
-HXDLIN( 190)			 ::snikket::Stanza stanza1 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("message",c7,35,11,9a), ::Dynamic(::hx::Anon_obj::Create(3)
+            			HX_GC_STACKFRAME(&_hx_pos_3d104e43c930d498_196_propose)
+HXLINE( 197)			::String stanza = _gthis->to->asString();
+HXDLIN( 197)			 ::snikket::Stanza stanza1 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("message",c7,35,11,9a), ::Dynamic(::hx::Anon_obj::Create(3)
             				->setFixed(0,HX_("id",db,5b,00,00),msg->localId)
             				->setFixed(1,HX_("to",7b,65,00,00),stanza)
             				->setFixed(2,HX_("type",ba,f2,08,4d),HX_("chat",d8,5e,bf,41))))->addChild(event)->tag(HX_("store",e1,13,16,84), ::Dynamic(::hx::Anon_obj::Create(1)
             				->setFixed(0,HX_("xmlns",dc,31,74,60),HX_("urn:xmpp:hints",70,b3,d6,fe))));
-HXLINE( 193)			_gthis->client->sendStanza(stanza1);
-HXLINE( 194)			_gthis->client->notifyMessageHandlers(stored->__get(0).StaticCast<  ::snikket::ChatMessage >(),0);
-HXLINE( 195)			 ::snikket::Client _gthis1 = _gthis->client;
-HXDLIN( 195)			_gthis1->trigger(HX_("call/ringing",81,75,54,f9), ::Dynamic(::hx::Anon_obj::Create(1)
-            				->setFixed(0,HX_("chatId",d3,04,77,b7),_gthis->to->asBare()->asString())));
+HXLINE( 200)			_gthis->client->sendStanza(stanza1);
+HXLINE( 201)			_gthis->client->notifyMessageHandlers(stored->__get(0).StaticCast<  ::snikket::ChatMessage >(),0);
+HXLINE( 202)			 ::snikket::Client _gthis1 = _gthis->client;
+HXDLIN( 202)			::String _hx_tmp = _gthis->get_chatId();
+HXDLIN( 202)			_gthis1->trigger(HX_("call/ringing",81,75,54,f9), ::Dynamic(::hx::Anon_obj::Create(2)
+            				->setFixed(0,HX_("chatId",d3,04,77,b7),_hx_tmp)
+            				->setFixed(1,HX_("sid",0e,9f,57,00),_gthis->get_sid())));
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_GC_STACKFRAME(&_hx_pos_3d104e43c930d498_178_propose)
-HXDLIN( 178)		 ::snikket::jingle::OutgoingProposedSession _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 179)		this->audio = audio;
-HXLINE( 180)		this->video = video;
-HXLINE( 181)		 ::snikket::Stanza event =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("propose",fe,fe,e9,f9), ::Dynamic(::hx::Anon_obj::Create(2)
+            	HX_GC_STACKFRAME(&_hx_pos_3d104e43c930d498_185_propose)
+HXDLIN( 185)		 ::snikket::jingle::OutgoingProposedSession _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 186)		this->audio = audio;
+HXLINE( 187)		this->video = video;
+HXLINE( 188)		 ::snikket::Stanza event =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("propose",fe,fe,e9,f9), ::Dynamic(::hx::Anon_obj::Create(2)
             			->setFixed(0,HX_("id",db,5b,00,00),this->get_sid())
             			->setFixed(1,HX_("xmlns",dc,31,74,60),HX_("urn:xmpp:jingle-message:0",fd,20,a5,07))));
-HXLINE( 182)		if (audio) {
-HXLINE( 183)			event->tag(HX_("description",fc,08,1d,5f), ::Dynamic(::hx::Anon_obj::Create(2)
+HXLINE( 189)		if (audio) {
+HXLINE( 190)			event->tag(HX_("description",fc,08,1d,5f), ::Dynamic(::hx::Anon_obj::Create(2)
             				->setFixed(0,HX_("media",e4,04,bc,05),HX_("audio",d6,78,80,27))
             				->setFixed(1,HX_("xmlns",dc,31,74,60),HX_("urn:xmpp:jingle:apps:rtp:1",ea,41,fe,5c))))->up();
             		}
-HXLINE( 185)		if (video) {
-HXLINE( 186)			event->tag(HX_("description",fc,08,1d,5f), ::Dynamic(::hx::Anon_obj::Create(2)
+HXLINE( 192)		if (video) {
+HXLINE( 193)			event->tag(HX_("description",fc,08,1d,5f), ::Dynamic(::hx::Anon_obj::Create(2)
             				->setFixed(0,HX_("media",e4,04,bc,05),HX_("video",7b,14,fc,36))
             				->setFixed(1,HX_("xmlns",dc,31,74,60),HX_("urn:xmpp:jingle:apps:rtp:1",ea,41,fe,5c))))->up();
             		}
-HXLINE( 188)		 ::snikket::ChatMessage msg = ::snikket::jingle::_Session::Session_Fields__obj::mkCallMessage(this->to,this->client->jid,event);
-HXLINE( 189)		this->client->storeMessages(::Array_obj< ::Dynamic>::__new(1)->init(0,msg), ::Dynamic(new _hx_Closure_0(_gthis,event,msg)));
+HXLINE( 195)		 ::snikket::ChatMessage msg = ::snikket::jingle::_Session::Session_Fields__obj::mkCallMessage(this->to,this->client->jid,event);
+HXLINE( 196)		this->client->storeMessages(::Array_obj< ::Dynamic>::__new(1)->init(0,msg), ::Dynamic(new _hx_Closure_0(_gthis,event,msg)));
             	}
 
 
@@ -196,29 +200,29 @@ HX_DEFINE_DYNAMIC_FUNC2(OutgoingProposedSession_obj,propose,(void))
 void OutgoingProposedSession_obj::hangup(){
             		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_0, ::snikket::jingle::OutgoingProposedSession,_gthis, ::snikket::Stanza,event, ::snikket::ChatMessage,msg) HXARGC(1)
             		void _hx_run(::Array< ::Dynamic> stored){
-            			HX_GC_STACKFRAME(&_hx_pos_3d104e43c930d498_206_hangup)
-HXLINE( 207)			 ::snikket::Client _gthis1 = _gthis->client;
-HXLINE( 208)			::String _hx_tmp = _gthis->to->asString();
-HXLINE( 207)			_gthis1->sendStanza( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("message",c7,35,11,9a), ::Dynamic(::hx::Anon_obj::Create(3)
+            			HX_GC_STACKFRAME(&_hx_pos_3d104e43c930d498_213_hangup)
+HXLINE( 214)			 ::snikket::Client _gthis1 = _gthis->client;
+HXLINE( 215)			::String _hx_tmp = _gthis->to->asString();
+HXLINE( 214)			_gthis1->sendStanza( ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("message",c7,35,11,9a), ::Dynamic(::hx::Anon_obj::Create(3)
             				->setFixed(0,HX_("id",db,5b,00,00),msg->versions->__get(0).StaticCast<  ::snikket::ChatMessage >()->localId)
             				->setFixed(1,HX_("to",7b,65,00,00),_hx_tmp)
             				->setFixed(2,HX_("type",ba,f2,08,4d),HX_("chat",d8,5e,bf,41))))->addChild(event)->tag(HX_("store",e1,13,16,84), ::Dynamic(::hx::Anon_obj::Create(1)
             				->setFixed(0,HX_("xmlns",dc,31,74,60),HX_("urn:xmpp:hints",70,b3,d6,fe)))));
-HXLINE( 212)			_gthis->client->notifyMessageHandlers(stored->__get(0).StaticCast<  ::snikket::ChatMessage >(),1);
+HXLINE( 219)			_gthis->client->notifyMessageHandlers(stored->__get(0).StaticCast<  ::snikket::ChatMessage >(),1);
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_GC_STACKFRAME(&_hx_pos_3d104e43c930d498_203_hangup)
-HXDLIN( 203)		 ::snikket::jingle::OutgoingProposedSession _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 204)		 ::snikket::Stanza event =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("retract",01,e2,b9,fc), ::Dynamic(::hx::Anon_obj::Create(2)
+            	HX_GC_STACKFRAME(&_hx_pos_3d104e43c930d498_210_hangup)
+HXDLIN( 210)		 ::snikket::jingle::OutgoingProposedSession _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 211)		 ::snikket::Stanza event =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("retract",01,e2,b9,fc), ::Dynamic(::hx::Anon_obj::Create(2)
             			->setFixed(0,HX_("id",db,5b,00,00),this->get_sid())
             			->setFixed(1,HX_("xmlns",dc,31,74,60),HX_("urn:xmpp:jingle-message:0",fd,20,a5,07))));
-HXLINE( 205)		 ::snikket::ChatMessage msg = ::snikket::jingle::_Session::Session_Fields__obj::mkCallMessage(this->to,this->client->jid,event);
-HXLINE( 206)		this->client->storeMessages(::Array_obj< ::Dynamic>::__new(1)->init(0,msg), ::Dynamic(new _hx_Closure_0(_gthis,event,msg)));
-HXLINE( 214)		{
-HXLINE( 214)			 ::snikket::Client this1 = this->client;
-HXDLIN( 214)			::Dynamic this2 = this1->getDirectChat(this->to->asBare()->asString(),false)->jingleSessions;
-HXDLIN( 214)			( ( ::haxe::ds::StringMap)(this2) )->remove(this->get_sid());
+HXLINE( 212)		 ::snikket::ChatMessage msg = ::snikket::jingle::_Session::Session_Fields__obj::mkCallMessage(this->to,this->client->jid,event);
+HXLINE( 213)		this->client->storeMessages(::Array_obj< ::Dynamic>::__new(1)->init(0,msg), ::Dynamic(new _hx_Closure_0(_gthis,event,msg)));
+HXLINE( 221)		{
+HXLINE( 221)			 ::snikket::Client this1 = this->client;
+HXDLIN( 221)			::Dynamic this2 = this1->getDirectChat(this->to->asBare()->asString(),false)->jingleSessions;
+HXDLIN( 221)			( ( ::haxe::ds::StringMap)(this2) )->remove(this->get_sid());
             		}
             	}
 
@@ -226,157 +230,167 @@ HXDLIN( 214)			( ( ::haxe::ds::StringMap)(this2) )->remove(this->get_sid());
 HX_DEFINE_DYNAMIC_FUNC0(OutgoingProposedSession_obj,hangup,(void))
 
 void OutgoingProposedSession_obj::retract(){
-            	HX_STACKFRAME(&_hx_pos_3d104e43c930d498_219_retract)
-HXDLIN( 219)		 ::snikket::Client _hx_tmp = this->client;
-HXDLIN( 219)		_hx_tmp->trigger(HX_("call/retract",50,bc,8d,db), ::Dynamic(::hx::Anon_obj::Create(1)
-            			->setFixed(0,HX_("chatId",d3,04,77,b7),this->to->asBare()->asString())));
+            	HX_STACKFRAME(&_hx_pos_3d104e43c930d498_226_retract)
+HXDLIN( 226)		 ::snikket::Client _hx_tmp = this->client;
+HXDLIN( 226)		::String _hx_tmp1 = this->get_chatId();
+HXDLIN( 226)		_hx_tmp->trigger(HX_("call/retract",50,bc,8d,db), ::Dynamic(::hx::Anon_obj::Create(2)
+            			->setFixed(0,HX_("chatId",d3,04,77,b7),_hx_tmp1)
+            			->setFixed(1,HX_("sid",0e,9f,57,00),this->get_sid())));
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(OutgoingProposedSession_obj,retract,(void))
 
 void OutgoingProposedSession_obj::terminate(){
-            	HX_STACKFRAME(&_hx_pos_3d104e43c930d498_223_terminate)
-HXDLIN( 223)		 ::Dynamic _hx_tmp = ::haxe::Log_obj::trace;
-HXDLIN( 223)		::String _hx_tmp1 = (HX_("Tried to terminate before session-initiate: ",a9,d4,f3,a4) + this->get_sid());
-HXDLIN( 223)		_hx_tmp(_hx_tmp1, ::Dynamic(::hx::Anon_obj::Create(5)
+            	HX_STACKFRAME(&_hx_pos_3d104e43c930d498_230_terminate)
+HXDLIN( 230)		 ::Dynamic _hx_tmp = ::haxe::Log_obj::trace;
+HXDLIN( 230)		::String _hx_tmp1 = (HX_("Tried to terminate before session-initiate: ",a9,d4,f3,a4) + this->get_sid());
+HXDLIN( 230)		_hx_tmp(_hx_tmp1, ::Dynamic(::hx::Anon_obj::Create(5)
             			->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.jingle.OutgoingProposedSession",b8,d3,7b,fd))
             			->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(1)->init(0,::hx::ObjectPtr<OBJ_>(this)))
             			->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("terminate",61,32,d2,fd))
             			->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/jingle/Session.hx",54,dd,b2,6d))
-            			->setFixed(4,HX_("lineNumber",dd,81,22,76),223)));
+            			->setFixed(4,HX_("lineNumber",dd,81,22,76),230)));
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(OutgoingProposedSession_obj,terminate,(void))
 
 void OutgoingProposedSession_obj::contentAdd( ::snikket::Stanza _){
-            	HX_STACKFRAME(&_hx_pos_3d104e43c930d498_227_contentAdd)
-HXDLIN( 227)		 ::Dynamic _hx_tmp = ::haxe::Log_obj::trace;
-HXDLIN( 227)		::String _hx_tmp1 = (HX_("Got content-add before session-initiate: ",10,d3,fa,8a) + this->get_sid());
-HXDLIN( 227)		_hx_tmp(_hx_tmp1, ::Dynamic(::hx::Anon_obj::Create(5)
+            	HX_STACKFRAME(&_hx_pos_3d104e43c930d498_234_contentAdd)
+HXDLIN( 234)		 ::Dynamic _hx_tmp = ::haxe::Log_obj::trace;
+HXDLIN( 234)		::String _hx_tmp1 = (HX_("Got content-add before session-initiate: ",10,d3,fa,8a) + this->get_sid());
+HXDLIN( 234)		_hx_tmp(_hx_tmp1, ::Dynamic(::hx::Anon_obj::Create(5)
             			->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.jingle.OutgoingProposedSession",b8,d3,7b,fd))
             			->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(1)->init(0,::hx::ObjectPtr<OBJ_>(this)))
             			->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("contentAdd",68,66,dd,43))
             			->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/jingle/Session.hx",54,dd,b2,6d))
-            			->setFixed(4,HX_("lineNumber",dd,81,22,76),227)));
+            			->setFixed(4,HX_("lineNumber",dd,81,22,76),234)));
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(OutgoingProposedSession_obj,contentAdd,(void))
 
 void OutgoingProposedSession_obj::contentAccept( ::snikket::Stanza _){
-            	HX_STACKFRAME(&_hx_pos_3d104e43c930d498_231_contentAccept)
-HXDLIN( 231)		 ::Dynamic _hx_tmp = ::haxe::Log_obj::trace;
-HXDLIN( 231)		::String _hx_tmp1 = (HX_("Got content-accept before session-initiate: ",47,72,87,71) + this->get_sid());
-HXDLIN( 231)		_hx_tmp(_hx_tmp1, ::Dynamic(::hx::Anon_obj::Create(5)
+            	HX_STACKFRAME(&_hx_pos_3d104e43c930d498_238_contentAccept)
+HXDLIN( 238)		 ::Dynamic _hx_tmp = ::haxe::Log_obj::trace;
+HXDLIN( 238)		::String _hx_tmp1 = (HX_("Got content-accept before session-initiate: ",47,72,87,71) + this->get_sid());
+HXDLIN( 238)		_hx_tmp(_hx_tmp1, ::Dynamic(::hx::Anon_obj::Create(5)
             			->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.jingle.OutgoingProposedSession",b8,d3,7b,fd))
             			->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(1)->init(0,::hx::ObjectPtr<OBJ_>(this)))
             			->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("contentAccept",21,c5,01,e1))
             			->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/jingle/Session.hx",54,dd,b2,6d))
-            			->setFixed(4,HX_("lineNumber",dd,81,22,76),231)));
+            			->setFixed(4,HX_("lineNumber",dd,81,22,76),238)));
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(OutgoingProposedSession_obj,contentAccept,(void))
 
 ::Dynamic OutgoingProposedSession_obj::transportInfo( ::snikket::Stanza _){
-            	HX_STACKFRAME(&_hx_pos_3d104e43c930d498_234_transportInfo)
-HXLINE( 235)		 ::Dynamic _hx_tmp = ::haxe::Log_obj::trace;
-HXDLIN( 235)		::String _hx_tmp1 = (HX_("Got transport-info before session-initiate: ",bd,bd,9d,08) + this->get_sid());
-HXDLIN( 235)		_hx_tmp(_hx_tmp1, ::Dynamic(::hx::Anon_obj::Create(5)
+            	HX_STACKFRAME(&_hx_pos_3d104e43c930d498_241_transportInfo)
+HXLINE( 242)		 ::Dynamic _hx_tmp = ::haxe::Log_obj::trace;
+HXDLIN( 242)		::String _hx_tmp1 = (HX_("Got transport-info before session-initiate: ",bd,bd,9d,08) + this->get_sid());
+HXDLIN( 242)		_hx_tmp(_hx_tmp1, ::Dynamic(::hx::Anon_obj::Create(5)
             			->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.jingle.OutgoingProposedSession",b8,d3,7b,fd))
             			->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(1)->init(0,::hx::ObjectPtr<OBJ_>(this)))
             			->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("transportInfo",b7,3c,cf,b6))
             			->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/jingle/Session.hx",54,dd,b2,6d))
-            			->setFixed(4,HX_("lineNumber",dd,81,22,76),235)));
-HXLINE( 236)		return ::thenshim::_Promise::Promise_Impl__obj::resolve(null());
+            			->setFixed(4,HX_("lineNumber",dd,81,22,76),242)));
+HXLINE( 243)		return ::thenshim::_Promise::Promise_Impl__obj::resolve(null());
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(OutgoingProposedSession_obj,transportInfo,return )
 
 void OutgoingProposedSession_obj::accept(){
-            	HX_STACKFRAME(&_hx_pos_3d104e43c930d498_240_accept)
-HXDLIN( 240)		 ::Dynamic _hx_tmp = ::haxe::Log_obj::trace;
-HXDLIN( 240)		::String _hx_tmp1 = (HX_("Tried to accept before initiate: ",77,4a,a0,ec) + this->get_sid());
-HXDLIN( 240)		_hx_tmp(_hx_tmp1, ::Dynamic(::hx::Anon_obj::Create(5)
+            	HX_STACKFRAME(&_hx_pos_3d104e43c930d498_247_accept)
+HXDLIN( 247)		 ::Dynamic _hx_tmp = ::haxe::Log_obj::trace;
+HXDLIN( 247)		::String _hx_tmp1 = (HX_("Tried to accept before initiate: ",77,4a,a0,ec) + this->get_sid());
+HXDLIN( 247)		_hx_tmp(_hx_tmp1, ::Dynamic(::hx::Anon_obj::Create(5)
             			->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.jingle.OutgoingProposedSession",b8,d3,7b,fd))
             			->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(1)->init(0,::hx::ObjectPtr<OBJ_>(this)))
             			->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("accept",08,93,06,0b))
             			->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/jingle/Session.hx",54,dd,b2,6d))
-            			->setFixed(4,HX_("lineNumber",dd,81,22,76),240)));
+            			->setFixed(4,HX_("lineNumber",dd,81,22,76),247)));
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(OutgoingProposedSession_obj,accept,(void))
 
  ::snikket::jingle::OutgoingSession OutgoingProposedSession_obj::initiate( ::snikket::Stanza stanza){
-            	HX_GC_STACKFRAME(&_hx_pos_3d104e43c930d498_243_initiate)
-HXLINE( 244)		 ::snikket::Stanza jmi = stanza->getChild(HX_("proceed",2e,96,4a,f1),HX_("urn:xmpp:jingle-message:0",fd,20,a5,07));
-HXLINE( 245)		if (::hx::IsNull( jmi )) {
-HXLINE( 245)			HX_STACK_DO_THROW((HX_("no jmi: ",4d,b1,bc,b7) + ::Std_obj::string(stanza)));
+            	HX_GC_STACKFRAME(&_hx_pos_3d104e43c930d498_250_initiate)
+HXLINE( 251)		 ::snikket::Stanza jmi = stanza->getChild(HX_("proceed",2e,96,4a,f1),HX_("urn:xmpp:jingle-message:0",fd,20,a5,07));
+HXLINE( 252)		if (::hx::IsNull( jmi )) {
+HXLINE( 252)			HX_STACK_DO_THROW((HX_("no jmi: ",4d,b1,bc,b7) + ::Std_obj::string(stanza)));
             		}
-HXLINE( 246)		::String _hx_tmp = ( (::String)(::Reflect_obj::field(jmi->attr,HX_("id",db,5b,00,00))) );
-HXDLIN( 246)		if ((_hx_tmp != this->get_sid())) {
-HXLINE( 246)			::String _hx_tmp1 = ((HX_("sid doesn't match: ",3b,d7,99,76) + ( (::String)(::Reflect_obj::field(jmi->attr,HX_("id",db,5b,00,00))) )) + HX_(" vs ",23,c2,80,15));
-HXDLIN( 246)			HX_STACK_DO_THROW((_hx_tmp1 + this->get_sid()));
+HXLINE( 253)		::String _hx_tmp = ( (::String)(::Reflect_obj::field(jmi->attr,HX_("id",db,5b,00,00))) );
+HXDLIN( 253)		if ((_hx_tmp != this->get_sid())) {
+HXLINE( 253)			::String _hx_tmp1 = ((HX_("sid doesn't match: ",3b,d7,99,76) + ( (::String)(::Reflect_obj::field(jmi->attr,HX_("id",db,5b,00,00))) )) + HX_(" vs ",23,c2,80,15));
+HXDLIN( 253)			HX_STACK_DO_THROW((_hx_tmp1 + this->get_sid()));
             		}
-HXLINE( 247)		 ::snikket::Client _hx_tmp2 = this->client;
-HXDLIN( 247)		_hx_tmp2->sendPresence(this->to->asString(),null());
-HXLINE( 248)		 ::snikket::Client session = this->client;
-HXDLIN( 248)		 ::snikket::JID session1 = ::snikket::JID_obj::parse(( (::String)(::Reflect_obj::field(stanza->attr,HX_("from",6a,a5,c2,43))) ));
-HXDLIN( 248)		 ::snikket::jingle::OutgoingSession session2 =  ::snikket::jingle::OutgoingSession_obj::__alloc( HX_CTX ,session,session1,this->get_sid());
-HXLINE( 249)		this->client->trigger(HX_("call/media",73,5d,1d,c7), ::Dynamic(::hx::Anon_obj::Create(3)
+HXLINE( 254)		 ::snikket::Client _hx_tmp2 = this->client;
+HXDLIN( 254)		_hx_tmp2->sendPresence(this->to->asString(),null());
+HXLINE( 255)		 ::snikket::Client session = this->client;
+HXDLIN( 255)		 ::snikket::JID session1 = ::snikket::JID_obj::parse(( (::String)(::Reflect_obj::field(stanza->attr,HX_("from",6a,a5,c2,43))) ));
+HXDLIN( 255)		 ::snikket::jingle::OutgoingSession session2 =  ::snikket::jingle::OutgoingSession_obj::__alloc( HX_CTX ,session,session1,this->get_sid());
+HXLINE( 256)		this->client->trigger(HX_("call/media",73,5d,1d,c7), ::Dynamic(::hx::Anon_obj::Create(3)
             			->setFixed(0,HX_("session",56,17,98,93),session2)
             			->setFixed(1,HX_("audio",d6,78,80,27),this->audio)
             			->setFixed(2,HX_("video",7b,14,fc,36),this->video)));
-HXLINE( 250)		return session2;
+HXLINE( 257)		return session2;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(OutgoingProposedSession_obj,initiate,return )
 
 void OutgoingProposedSession_obj::addMedia(::Array< ::Dynamic> _){
-            	HX_STACKFRAME(&_hx_pos_3d104e43c930d498_254_addMedia)
-HXDLIN( 254)		HX_STACK_DO_THROW(HX_("Cannot add media before call starts",aa,0a,79,d5));
+            	HX_STACKFRAME(&_hx_pos_3d104e43c930d498_261_addMedia)
+HXDLIN( 261)		HX_STACK_DO_THROW(HX_("Cannot add media before call starts",aa,0a,79,d5));
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(OutgoingProposedSession_obj,addMedia,(void))
 
 ::String OutgoingProposedSession_obj::callStatus(){
-            	HX_STACKFRAME(&_hx_pos_3d104e43c930d498_258_callStatus)
-HXDLIN( 258)		return HX_("outgoing",6c,18,89,c7);
+            	HX_STACKFRAME(&_hx_pos_3d104e43c930d498_265_callStatus)
+HXDLIN( 265)		return HX_("outgoing",6c,18,89,c7);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(OutgoingProposedSession_obj,callStatus,return )
 
 ::Array< ::Dynamic> OutgoingProposedSession_obj::videoTracks(){
-            	HX_STACKFRAME(&_hx_pos_3d104e43c930d498_262_videoTracks)
-HXDLIN( 262)		return ::Array_obj< ::Dynamic>::__new(0);
+            	HX_STACKFRAME(&_hx_pos_3d104e43c930d498_269_videoTracks)
+HXDLIN( 269)		return ::Array_obj< ::Dynamic>::__new(0);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(OutgoingProposedSession_obj,videoTracks,return )
 
  ::snikket::jingle::DTMFSender OutgoingProposedSession_obj::dtmf(){
-            	HX_STACKFRAME(&_hx_pos_3d104e43c930d498_266_dtmf)
-HXDLIN( 266)		return null();
+            	HX_STACKFRAME(&_hx_pos_3d104e43c930d498_273_dtmf)
+HXDLIN( 273)		return null();
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(OutgoingProposedSession_obj,dtmf,return )
 
 ::String OutgoingProposedSession_obj::get_sid(){
-            	HX_STACKFRAME(&_hx_pos_3d104e43c930d498_270_get_sid)
-HXDLIN( 270)		return this->_sid;
+            	HX_STACKFRAME(&_hx_pos_3d104e43c930d498_277_get_sid)
+HXDLIN( 277)		return this->_sid;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(OutgoingProposedSession_obj,get_sid,return )
 
+::String OutgoingProposedSession_obj::get_chatId(){
+            	HX_STACKFRAME(&_hx_pos_3d104e43c930d498_281_get_chatId)
+HXDLIN( 281)		return this->to->asBare()->asString();
+            	}
+
+
+HX_DEFINE_DYNAMIC_FUNC0(OutgoingProposedSession_obj,get_chatId,return )
+
 
 ::hx::ObjectPtr< OutgoingProposedSession_obj > OutgoingProposedSession_obj::__new( ::snikket::Client client, ::snikket::JID to) {
 	::hx::ObjectPtr< OutgoingProposedSession_obj > __this = new OutgoingProposedSession_obj();
@@ -399,6 +413,7 @@ void OutgoingProposedSession_obj::__Mark(HX_MARK_PARAMS)
 {
 	HX_MARK_BEGIN_CLASS(OutgoingProposedSession);
 	HX_MARK_MEMBER_NAME(sid,"sid");
+	HX_MARK_MEMBER_NAME(chatId,"chatId");
 	HX_MARK_MEMBER_NAME(client,"client");
 	HX_MARK_MEMBER_NAME(to,"to");
 	HX_MARK_MEMBER_NAME(_sid,"_sid");
@@ -410,6 +425,7 @@ void OutgoingProposedSession_obj::__Mark(HX_MARK_PARAMS)
 void OutgoingProposedSession_obj::__Visit(HX_VISIT_PARAMS)
 {
 	HX_VISIT_MEMBER_NAME(sid,"sid");
+	HX_VISIT_MEMBER_NAME(chatId,"chatId");
 	HX_VISIT_MEMBER_NAME(client,"client");
 	HX_VISIT_MEMBER_NAME(to,"to");
 	HX_VISIT_MEMBER_NAME(_sid,"_sid");
@@ -435,6 +451,7 @@ void OutgoingProposedSession_obj::__Visit(HX_VISIT_PARAMS)
 		if (HX_FIELD_EQ(inName,"video") ) { return ::hx::Val( video ); }
 		break;
 	case 6:
+		if (HX_FIELD_EQ(inName,"chatId") ) { return ::hx::Val( inCallProp == ::hx::paccAlways ? get_chatId() : chatId ); }
 		if (HX_FIELD_EQ(inName,"client") ) { return ::hx::Val( client ); }
 		if (HX_FIELD_EQ(inName,"hangup") ) { return ::hx::Val( hangup_dyn() ); }
 		if (HX_FIELD_EQ(inName,"accept") ) { return ::hx::Val( accept_dyn() ); }
@@ -454,6 +471,7 @@ void OutgoingProposedSession_obj::__Visit(HX_VISIT_PARAMS)
 	case 10:
 		if (HX_FIELD_EQ(inName,"contentAdd") ) { return ::hx::Val( contentAdd_dyn() ); }
 		if (HX_FIELD_EQ(inName,"callStatus") ) { return ::hx::Val( callStatus_dyn() ); }
+		if (HX_FIELD_EQ(inName,"get_chatId") ) { return ::hx::Val( get_chatId_dyn() ); }
 		break;
 	case 11:
 		if (HX_FIELD_EQ(inName,"videoTracks") ) { return ::hx::Val( videoTracks_dyn() ); }
@@ -482,6 +500,7 @@ void OutgoingProposedSession_obj::__Visit(HX_VISIT_PARAMS)
 		if (HX_FIELD_EQ(inName,"video") ) { video=inValue.Cast< bool >(); return inValue; }
 		break;
 	case 6:
+		if (HX_FIELD_EQ(inName,"chatId") ) { chatId=inValue.Cast< ::String >(); return inValue; }
 		if (HX_FIELD_EQ(inName,"client") ) { client=inValue.Cast<  ::snikket::Client >(); return inValue; }
 	}
 	return super::__SetField(inName,inValue,inCallProp);
@@ -490,6 +509,7 @@ void OutgoingProposedSession_obj::__Visit(HX_VISIT_PARAMS)
 void OutgoingProposedSession_obj::__GetFields(Array< ::String> &outFields)
 {
 	outFields->push(HX_("sid",0e,9f,57,00));
+	outFields->push(HX_("chatId",d3,04,77,b7));
 	outFields->push(HX_("client",4b,ca,4f,0a));
 	outFields->push(HX_("to",7b,65,00,00));
 	outFields->push(HX_("_sid",0f,e4,22,3f));
@@ -501,6 +521,7 @@ void OutgoingProposedSession_obj::__GetFields(Array< ::String> &outFields)
 #ifdef HXCPP_SCRIPTABLE
 static ::hx::StorageInfo OutgoingProposedSession_obj_sMemberStorageInfo[] = {
 	{::hx::fsString,(int)offsetof(OutgoingProposedSession_obj,sid),HX_("sid",0e,9f,57,00)},
+	{::hx::fsString,(int)offsetof(OutgoingProposedSession_obj,chatId),HX_("chatId",d3,04,77,b7)},
 	{::hx::fsObject /*  ::snikket::Client */ ,(int)offsetof(OutgoingProposedSession_obj,client),HX_("client",4b,ca,4f,0a)},
 	{::hx::fsObject /*  ::snikket::JID */ ,(int)offsetof(OutgoingProposedSession_obj,to),HX_("to",7b,65,00,00)},
 	{::hx::fsString,(int)offsetof(OutgoingProposedSession_obj,_sid),HX_("_sid",0f,e4,22,3f)},
@@ -513,6 +534,7 @@ static ::hx::StaticInfo *OutgoingProposedSession_obj_sStaticStorageInfo = 0;
 
 static ::String OutgoingProposedSession_obj_sMemberFields[] = {
 	HX_("sid",0e,9f,57,00),
+	HX_("chatId",d3,04,77,b7),
 	HX_("client",4b,ca,4f,0a),
 	HX_("to",7b,65,00,00),
 	HX_("_sid",0f,e4,22,3f),
@@ -532,6 +554,7 @@ static ::String OutgoingProposedSession_obj_sMemberFields[] = {
 	HX_("videoTracks",63,c2,24,be),
 	HX_("dtmf",e9,ba,71,42),
 	HX_("get_sid",a5,67,cc,26),
+	HX_("get_chatId",9c,74,fe,a7),
 	::String(null()) };
 
 ::hx::Class OutgoingProposedSession_obj::__mClass;
diff --git a/Sources/c_snikket/src/snikket/jingle/OutgoingSession.cpp b/Sources/c_snikket/src/snikket/jingle/OutgoingSession.cpp
index aa2da4a..9d329ad 100644
--- a/Sources/c_snikket/src/snikket/jingle/OutgoingSession.cpp
+++ b/Sources/c_snikket/src/snikket/jingle/OutgoingSession.cpp
@@ -38,16 +38,16 @@
 #include <thenshim/_Promise/Promise_Impl_.h>
 #endif
 
-HX_DEFINE_STACK_FRAME(_hx_pos_4d1e8fd6f72343e8_615_new,"snikket.jingle.OutgoingSession","new",0xd3491ab0,"snikket.jingle.OutgoingSession.new","snikket/jingle/Session.hx",615,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_4d1e8fd6f72343e8_619_onPeerConnection,"snikket.jingle.OutgoingSession","onPeerConnection",0xa4a0358f,"snikket.jingle.OutgoingSession.onPeerConnection","snikket/jingle/Session.hx",619,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_4d1e8fd6f72343e8_626_initiate,"snikket.jingle.OutgoingSession","initiate",0x19babe09,"snikket.jingle.OutgoingSession.initiate","snikket/jingle/Session.hx",626,0x6db2dd54)
-HX_LOCAL_STACK_FRAME(_hx_pos_4d1e8fd6f72343e8_622_initiate,"snikket.jingle.OutgoingSession","initiate",0x19babe09,"snikket.jingle.OutgoingSession.initiate","snikket/jingle/Session.hx",622,0x6db2dd54)
+HX_DEFINE_STACK_FRAME(_hx_pos_4d1e8fd6f72343e8_637_new,"snikket.jingle.OutgoingSession","new",0xd3491ab0,"snikket.jingle.OutgoingSession.new","snikket/jingle/Session.hx",637,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_4d1e8fd6f72343e8_641_onPeerConnection,"snikket.jingle.OutgoingSession","onPeerConnection",0xa4a0358f,"snikket.jingle.OutgoingSession.onPeerConnection","snikket/jingle/Session.hx",641,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_4d1e8fd6f72343e8_648_initiate,"snikket.jingle.OutgoingSession","initiate",0x19babe09,"snikket.jingle.OutgoingSession.initiate","snikket/jingle/Session.hx",648,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_4d1e8fd6f72343e8_644_initiate,"snikket.jingle.OutgoingSession","initiate",0x19babe09,"snikket.jingle.OutgoingSession.initiate","snikket/jingle/Session.hx",644,0x6db2dd54)
 namespace snikket{
 namespace jingle{
 
 void OutgoingSession_obj::__construct( ::snikket::Client client, ::snikket::JID counterpart,::String sid){
-            	HX_STACKFRAME(&_hx_pos_4d1e8fd6f72343e8_615_new)
-HXDLIN( 615)		super::__construct(client,counterpart,sid,null());
+            	HX_STACKFRAME(&_hx_pos_4d1e8fd6f72343e8_637_new)
+HXDLIN( 637)		super::__construct(client,counterpart,sid,null());
             	}
 
 Dynamic OutgoingSession_obj::__CreateEmpty() { return new OutgoingSession_obj; }
@@ -70,28 +70,28 @@ bool OutgoingSession_obj::_hx_isInstanceOf(int inClassId) {
 }
 
 ::Dynamic OutgoingSession_obj::onPeerConnection(){
-            	HX_STACKFRAME(&_hx_pos_4d1e8fd6f72343e8_619_onPeerConnection)
-HXDLIN( 619)		return this->setupLocalDescription(HX_("session-initiate",70,2d,30,f7),null(),null(),null());
+            	HX_STACKFRAME(&_hx_pos_4d1e8fd6f72343e8_641_onPeerConnection)
+HXDLIN( 641)		return this->setupLocalDescription(HX_("session-initiate",70,2d,30,f7),null(),null(),null());
             	}
 
 
  ::snikket::jingle::OutgoingSession OutgoingSession_obj::initiate( ::snikket::Stanza stanza){
             		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0, ::snikket::jingle::OutgoingSession,_gthis, ::snikket::Stanza,stanza) HXARGC(1)
             		::Dynamic _hx_run( ::Dynamic _){
-            			HX_STACKFRAME(&_hx_pos_4d1e8fd6f72343e8_626_initiate)
-HXLINE( 626)			return _gthis->transportInfo(stanza);
+            			HX_STACKFRAME(&_hx_pos_4d1e8fd6f72343e8_648_initiate)
+HXLINE( 648)			return _gthis->transportInfo(stanza);
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            	HX_STACKFRAME(&_hx_pos_4d1e8fd6f72343e8_622_initiate)
-HXDLIN( 622)		 ::snikket::jingle::OutgoingSession _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 623)		this->remoteDescription = ::snikket::jingle::SessionDescription_obj::fromStanza(stanza,true,null());
-HXLINE( 624)		this->peerDtlsSetup = this->remoteDescription->getDtlsSetup();
-HXLINE( 625)		 ::snikket::jingle::PeerConnection _hx_tmp = this->pc;
-HXDLIN( 625)		::thenshim::_Promise::Promise_Impl__obj::then(_hx_tmp->setRemoteDescription( ::Dynamic(::hx::Anon_obj::Create(2)
+            	HX_STACKFRAME(&_hx_pos_4d1e8fd6f72343e8_644_initiate)
+HXDLIN( 644)		 ::snikket::jingle::OutgoingSession _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 645)		this->remoteDescription = ::snikket::jingle::SessionDescription_obj::fromStanza(stanza,true,null());
+HXLINE( 646)		this->peerDtlsSetup = this->remoteDescription->getDtlsSetup();
+HXLINE( 647)		 ::snikket::jingle::PeerConnection _hx_tmp = this->pc;
+HXDLIN( 647)		::thenshim::_Promise::Promise_Impl__obj::then(_hx_tmp->setRemoteDescription( ::Dynamic(::hx::Anon_obj::Create(2)
             			->setFixed(0,HX_("sdp",bf,9a,57,00),this->remoteDescription->toSdp())
             			->setFixed(1,HX_("type",ba,f2,08,4d),cpp::Struct(rtc::Description::Type::Answer)))), ::Dynamic(new _hx_Closure_0(_gthis,stanza)),null());
-HXLINE( 627)		return ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 649)		return ::hx::ObjectPtr<OBJ_>(this);
             	}
 
 
diff --git a/Sources/c_snikket/src/snikket/jingle/PeerConnection.cpp b/Sources/c_snikket/src/snikket/jingle/PeerConnection.cpp
index 842c408..31d9820 100644
--- a/Sources/c_snikket/src/snikket/jingle/PeerConnection.cpp
+++ b/Sources/c_snikket/src/snikket/jingle/PeerConnection.cpp
@@ -49,104 +49,104 @@
 #include <thenshim/_Promise/Promise_Impl_.h>
 #endif
 
-HX_DEFINE_STACK_FRAME(_hx_pos_8cd3f69017bd5103_775_new,"snikket.jingle.PeerConnection","new",0x0e347f5e,"snikket.jingle.PeerConnection.new","snikket/jingle/PeerConnection.cpp.hx",775,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_823_onLocalDescription,"snikket.jingle.PeerConnection","onLocalDescription",0x9c63d352,"snikket.jingle.PeerConnection.onLocalDescription","snikket/jingle/PeerConnection.cpp.hx",823,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_821_onLocalDescription,"snikket.jingle.PeerConnection","onLocalDescription",0x9c63d352,"snikket.jingle.PeerConnection.onLocalDescription","snikket/jingle/PeerConnection.cpp.hx",821,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_835_onLocalCandidate,"snikket.jingle.PeerConnection","onLocalCandidate",0xfc129d19,"snikket.jingle.PeerConnection.onLocalCandidate","snikket/jingle/PeerConnection.cpp.hx",835,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_832_onLocalCandidate,"snikket.jingle.PeerConnection","onLocalCandidate",0xfc129d19,"snikket.jingle.PeerConnection.onLocalCandidate","snikket/jingle/PeerConnection.cpp.hx",832,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_850_onStateChange,"snikket.jingle.PeerConnection","onStateChange",0xc45a9400,"snikket.jingle.PeerConnection.onStateChange","snikket/jingle/PeerConnection.cpp.hx",850,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_847_onStateChange,"snikket.jingle.PeerConnection","onStateChange",0xc45a9400,"snikket.jingle.PeerConnection.onStateChange","snikket/jingle/PeerConnection.cpp.hx",847,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_858_onGatheringStateChange,"snikket.jingle.PeerConnection","onGatheringStateChange",0x35b9a25b,"snikket.jingle.PeerConnection.onGatheringStateChange","snikket/jingle/PeerConnection.cpp.hx",858,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_863_onGatheringStateChange,"snikket.jingle.PeerConnection","onGatheringStateChange",0x35b9a25b,"snikket.jingle.PeerConnection.onGatheringStateChange","snikket/jingle/PeerConnection.cpp.hx",863,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_875_onTrack,"snikket.jingle.PeerConnection","onTrack",0x22f432ea,"snikket.jingle.PeerConnection.onTrack","snikket/jingle/PeerConnection.cpp.hx",875,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_874_onTrack,"snikket.jingle.PeerConnection","onTrack",0x22f432ea,"snikket.jingle.PeerConnection.onTrack","snikket/jingle/PeerConnection.cpp.hx",874,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_872_onTrack,"snikket.jingle.PeerConnection","onTrack",0x22f432ea,"snikket.jingle.PeerConnection.onTrack","snikket/jingle/PeerConnection.cpp.hx",872,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_892_get_connectionState,"snikket.jingle.PeerConnection","get_connectionState",0x98e8f328,"snikket.jingle.PeerConnection.get_connectionState","snikket/jingle/PeerConnection.cpp.hx",892,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_895_get_localDescription,"snikket.jingle.PeerConnection","get_localDescription",0xf881419c,"snikket.jingle.PeerConnection.get_localDescription","snikket/jingle/PeerConnection.cpp.hx",895,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_905_setLocalDescription,"snikket.jingle.PeerConnection","setLocalDescription",0xc3beb011,"snikket.jingle.PeerConnection.setLocalDescription","snikket/jingle/PeerConnection.cpp.hx",905,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_904_setLocalDescription,"snikket.jingle.PeerConnection","setLocalDescription",0xc3beb011,"snikket.jingle.PeerConnection.setLocalDescription","snikket/jingle/PeerConnection.cpp.hx",904,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_912_setRemoteDescription,"snikket.jingle.PeerConnection","setRemoteDescription",0x03bc2956,"snikket.jingle.PeerConnection.setRemoteDescription","snikket/jingle/PeerConnection.cpp.hx",912,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_918_addIceCandidate,"snikket.jingle.PeerConnection","addIceCandidate",0x0c0d6f37,"snikket.jingle.PeerConnection.addIceCandidate","snikket/jingle/PeerConnection.cpp.hx",918,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_923_addPendingTracks,"snikket.jingle.PeerConnection","addPendingTracks",0xfb3dbaa0,"snikket.jingle.PeerConnection.addPendingTracks","snikket/jingle/PeerConnection.cpp.hx",923,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_932_addTrack,"snikket.jingle.PeerConnection","addTrack",0xdd0aecec,"snikket.jingle.PeerConnection.addTrack","snikket/jingle/PeerConnection.cpp.hx",932,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_940_getTransceivers,"snikket.jingle.PeerConnection","getTransceivers",0x24b14243,"snikket.jingle.PeerConnection.getTransceivers","snikket/jingle/PeerConnection.cpp.hx",940,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_953_close,"snikket.jingle.PeerConnection","close",0x130c0236,"snikket.jingle.PeerConnection.close","snikket/jingle/PeerConnection.cpp.hx",953,0xf9fab71d)
-HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_956_addEventListener,"snikket.jingle.PeerConnection","addEventListener",0xae27560f,"snikket.jingle.PeerConnection.addEventListener","snikket/jingle/PeerConnection.cpp.hx",956,0xf9fab71d)
+HX_DEFINE_STACK_FRAME(_hx_pos_8cd3f69017bd5103_784_new,"snikket.jingle.PeerConnection","new",0x0e347f5e,"snikket.jingle.PeerConnection.new","snikket/jingle/PeerConnection.cpp.hx",784,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_832_onLocalDescription,"snikket.jingle.PeerConnection","onLocalDescription",0x9c63d352,"snikket.jingle.PeerConnection.onLocalDescription","snikket/jingle/PeerConnection.cpp.hx",832,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_830_onLocalDescription,"snikket.jingle.PeerConnection","onLocalDescription",0x9c63d352,"snikket.jingle.PeerConnection.onLocalDescription","snikket/jingle/PeerConnection.cpp.hx",830,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_844_onLocalCandidate,"snikket.jingle.PeerConnection","onLocalCandidate",0xfc129d19,"snikket.jingle.PeerConnection.onLocalCandidate","snikket/jingle/PeerConnection.cpp.hx",844,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_841_onLocalCandidate,"snikket.jingle.PeerConnection","onLocalCandidate",0xfc129d19,"snikket.jingle.PeerConnection.onLocalCandidate","snikket/jingle/PeerConnection.cpp.hx",841,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_858_onStateChange,"snikket.jingle.PeerConnection","onStateChange",0xc45a9400,"snikket.jingle.PeerConnection.onStateChange","snikket/jingle/PeerConnection.cpp.hx",858,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_856_onStateChange,"snikket.jingle.PeerConnection","onStateChange",0xc45a9400,"snikket.jingle.PeerConnection.onStateChange","snikket/jingle/PeerConnection.cpp.hx",856,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_868_onGatheringStateChange,"snikket.jingle.PeerConnection","onGatheringStateChange",0x35b9a25b,"snikket.jingle.PeerConnection.onGatheringStateChange","snikket/jingle/PeerConnection.cpp.hx",868,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_873_onGatheringStateChange,"snikket.jingle.PeerConnection","onGatheringStateChange",0x35b9a25b,"snikket.jingle.PeerConnection.onGatheringStateChange","snikket/jingle/PeerConnection.cpp.hx",873,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_885_onTrack,"snikket.jingle.PeerConnection","onTrack",0x22f432ea,"snikket.jingle.PeerConnection.onTrack","snikket/jingle/PeerConnection.cpp.hx",885,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_884_onTrack,"snikket.jingle.PeerConnection","onTrack",0x22f432ea,"snikket.jingle.PeerConnection.onTrack","snikket/jingle/PeerConnection.cpp.hx",884,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_882_onTrack,"snikket.jingle.PeerConnection","onTrack",0x22f432ea,"snikket.jingle.PeerConnection.onTrack","snikket/jingle/PeerConnection.cpp.hx",882,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_902_get_connectionState,"snikket.jingle.PeerConnection","get_connectionState",0x98e8f328,"snikket.jingle.PeerConnection.get_connectionState","snikket/jingle/PeerConnection.cpp.hx",902,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_905_get_localDescription,"snikket.jingle.PeerConnection","get_localDescription",0xf881419c,"snikket.jingle.PeerConnection.get_localDescription","snikket/jingle/PeerConnection.cpp.hx",905,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_915_setLocalDescription,"snikket.jingle.PeerConnection","setLocalDescription",0xc3beb011,"snikket.jingle.PeerConnection.setLocalDescription","snikket/jingle/PeerConnection.cpp.hx",915,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_914_setLocalDescription,"snikket.jingle.PeerConnection","setLocalDescription",0xc3beb011,"snikket.jingle.PeerConnection.setLocalDescription","snikket/jingle/PeerConnection.cpp.hx",914,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_922_setRemoteDescription,"snikket.jingle.PeerConnection","setRemoteDescription",0x03bc2956,"snikket.jingle.PeerConnection.setRemoteDescription","snikket/jingle/PeerConnection.cpp.hx",922,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_928_addIceCandidate,"snikket.jingle.PeerConnection","addIceCandidate",0x0c0d6f37,"snikket.jingle.PeerConnection.addIceCandidate","snikket/jingle/PeerConnection.cpp.hx",928,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_933_addPendingTracks,"snikket.jingle.PeerConnection","addPendingTracks",0xfb3dbaa0,"snikket.jingle.PeerConnection.addPendingTracks","snikket/jingle/PeerConnection.cpp.hx",933,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_942_addTrack,"snikket.jingle.PeerConnection","addTrack",0xdd0aecec,"snikket.jingle.PeerConnection.addTrack","snikket/jingle/PeerConnection.cpp.hx",942,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_950_getTransceivers,"snikket.jingle.PeerConnection","getTransceivers",0x24b14243,"snikket.jingle.PeerConnection.getTransceivers","snikket/jingle/PeerConnection.cpp.hx",950,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_963_close,"snikket.jingle.PeerConnection","close",0x130c0236,"snikket.jingle.PeerConnection.close","snikket/jingle/PeerConnection.cpp.hx",963,0xf9fab71d)
+HX_LOCAL_STACK_FRAME(_hx_pos_8cd3f69017bd5103_966_addEventListener,"snikket.jingle.PeerConnection","addEventListener",0xae27560f,"snikket.jingle.PeerConnection.addEventListener","snikket/jingle/PeerConnection.cpp.hx",966,0xf9fab71d)
 namespace snikket{
 namespace jingle{
 
 void PeerConnection_obj::__construct( ::Dynamic configuration, ::Dynamic constraints){
-            	HX_GC_STACKFRAME(&_hx_pos_8cd3f69017bd5103_775_new)
-HXLINE( 789)		this->pendingTracks = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE( 788)		this->hasRemote = false;
-HXLINE( 787)		this->hasLocal = false;
-HXLINE( 785)		this->stateChangeListeners = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE( 784)		this->localCandidateListeners = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE( 783)		this->trackListeners = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE( 782)		this->tracks =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
-HXLINE( 781)		this->waitingOnLocal = null();
-HXLINE( 792)		if (::hx::IsNotNull( ::Sys_obj::getEnv(HX_("SNIKKET_WEBRTC_DEBUG",e3,43,ef,ce)) )) {
-HXLINE( 793)			rtc::InitLogger(rtc::LogLevel::Verbose);;
+            	HX_GC_STACKFRAME(&_hx_pos_8cd3f69017bd5103_784_new)
+HXLINE( 798)		this->pendingTracks = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE( 797)		this->hasRemote = false;
+HXLINE( 796)		this->hasLocal = false;
+HXLINE( 794)		this->stateChangeListeners = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE( 793)		this->localCandidateListeners = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE( 792)		this->trackListeners = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE( 791)		this->tracks =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
+HXLINE( 790)		this->waitingOnLocal = null();
+HXLINE( 801)		if (::hx::IsNotNull( ::Sys_obj::getEnv(HX_("SNIKKET_WEBRTC_DEBUG",e3,43,ef,ce)) )) {
+HXLINE( 802)			rtc::InitLogger(rtc::LogLevel::Verbose);;
             		}
-HXLINE( 795)		this->mainLoop = ::sys::thread::_Thread::Thread_Impl__obj::get_events(::sys::thread::_Thread::HaxeThread_obj::current());
-HXLINE( 796)		rtc::Configuration configRaw;;
-HXLINE( 797)		::cpp::Pointer<  rtc::Configuration > config = &configRaw;
-HXLINE( 798)		bool _hx_tmp;
-HXDLIN( 798)		if (::hx::IsNotNull( configuration )) {
-HXLINE( 798)			_hx_tmp = ::hx::IsNotNull( configuration->__Field(HX_("iceServers",45,14,49,d2),::hx::paccDynamic) );
+HXLINE( 804)		this->mainLoop = ::sys::thread::_Thread::Thread_Impl__obj::get_events(::sys::thread::_Thread::HaxeThread_obj::current());
+HXLINE( 805)		rtc::Configuration configRaw;;
+HXLINE( 806)		::cpp::Pointer<  rtc::Configuration > config = &configRaw;
+HXLINE( 807)		bool _hx_tmp;
+HXDLIN( 807)		if (::hx::IsNotNull( configuration )) {
+HXLINE( 807)			_hx_tmp = ::hx::IsNotNull( configuration->__Field(HX_("iceServers",45,14,49,d2),::hx::paccDynamic) );
             		}
             		else {
-HXLINE( 798)			_hx_tmp = false;
+HXLINE( 807)			_hx_tmp = false;
             		}
-HXDLIN( 798)		if (_hx_tmp) {
-HXLINE( 799)			int _g = 0;
-HXDLIN( 799)			::Array< ::Dynamic> _g1 = ( (::Array< ::Dynamic>)(configuration->__Field(HX_("iceServers",45,14,49,d2),::hx::paccDynamic)) );
-HXDLIN( 799)			while((_g < _g1->length)){
-HXLINE( 799)				 ::Dynamic server = _g1->__get(_g);
-HXDLIN( 799)				_g = (_g + 1);
-HXLINE( 800)				bool _hx_tmp1;
-HXDLIN( 800)				bool _hx_tmp2;
-HXDLIN( 800)				if (::hx::IsNotNull( server->__Field(HX_("urls",24,d6,ac,4d),::hx::paccDynamic) )) {
-HXLINE( 800)					_hx_tmp2 = (( (::Array< ::String >)(server->__Field(HX_("urls",24,d6,ac,4d),::hx::paccDynamic)) )->length == 1);
+HXDLIN( 807)		if (_hx_tmp) {
+HXLINE( 808)			int _g = 0;
+HXDLIN( 808)			::Array< ::Dynamic> _g1 = ( (::Array< ::Dynamic>)(configuration->__Field(HX_("iceServers",45,14,49,d2),::hx::paccDynamic)) );
+HXDLIN( 808)			while((_g < _g1->length)){
+HXLINE( 808)				 ::Dynamic server = _g1->__get(_g);
+HXDLIN( 808)				_g = (_g + 1);
+HXLINE( 809)				bool _hx_tmp1;
+HXDLIN( 809)				bool _hx_tmp2;
+HXDLIN( 809)				if (::hx::IsNotNull( server->__Field(HX_("urls",24,d6,ac,4d),::hx::paccDynamic) )) {
+HXLINE( 809)					_hx_tmp2 = (( (::Array< ::String >)(server->__Field(HX_("urls",24,d6,ac,4d),::hx::paccDynamic)) )->length == 1);
             				}
             				else {
-HXLINE( 800)					_hx_tmp2 = false;
+HXLINE( 809)					_hx_tmp2 = false;
             				}
-HXDLIN( 800)				if (_hx_tmp2) {
-HXLINE( 800)					_hx_tmp1 = (( (::String)( ::Dynamic(server->__Field(HX_("urls",24,d6,ac,4d),::hx::paccDynamic))->__GetItem(0)) ).indexOf(HX_("stuns",f9,9d,1a,84),null()) != 0);
+HXDLIN( 809)				if (_hx_tmp2) {
+HXLINE( 809)					_hx_tmp1 = (( (::String)( ::Dynamic(server->__Field(HX_("urls",24,d6,ac,4d),::hx::paccDynamic))->__GetItem(0)) ).indexOf(HX_("stuns",f9,9d,1a,84),null()) != 0);
             				}
             				else {
-HXLINE( 800)					_hx_tmp1 = false;
+HXLINE( 809)					_hx_tmp1 = false;
             				}
-HXDLIN( 800)				if (_hx_tmp1) {
-HXLINE( 801)					 hx::StdString url = ::hx::StdString(( (::String)( ::Dynamic(server->__Field(HX_("urls",24,d6,ac,4d),::hx::paccDynamic))->__GetItem(0)) ));
-HXLINE( 802)					rtc::IceServer iceServerRaw(url);;
-HXLINE( 803)					::cpp::Pointer<  rtc::IceServer > iceServer = &iceServerRaw;
-HXLINE( 804)					if (::hx::IsNotNull( server->__Field(HX_("username",16,86,eb,20),::hx::paccDynamic) )) {
-HXLINE( 804)						iceServer->get_ref().username = ::hx::StdString(( (::String)(server->__Field(HX_("username",16,86,eb,20),::hx::paccDynamic)) ));
+HXDLIN( 809)				if (_hx_tmp1) {
+HXLINE( 810)					 hx::StdString url = ::hx::StdString(( (::String)( ::Dynamic(server->__Field(HX_("urls",24,d6,ac,4d),::hx::paccDynamic))->__GetItem(0)) ));
+HXLINE( 811)					rtc::IceServer iceServerRaw(url);;
+HXLINE( 812)					::cpp::Pointer<  rtc::IceServer > iceServer = &iceServerRaw;
+HXLINE( 813)					if (::hx::IsNotNull( server->__Field(HX_("username",16,86,eb,20),::hx::paccDynamic) )) {
+HXLINE( 813)						iceServer->get_ref().username = ::hx::StdString(( (::String)(server->__Field(HX_("username",16,86,eb,20),::hx::paccDynamic)) ));
             					}
-HXLINE( 805)					if (::hx::IsNotNull( server->__Field(HX_("credential",d7,89,b2,20),::hx::paccDynamic) )) {
-HXLINE( 805)						iceServer->get_ref().password = ::hx::StdString(( (::String)(server->__Field(HX_("credential",d7,89,b2,20),::hx::paccDynamic)) ));
+HXLINE( 814)					if (::hx::IsNotNull( server->__Field(HX_("credential",d7,89,b2,20),::hx::paccDynamic) )) {
+HXLINE( 814)						iceServer->get_ref().password = ::hx::StdString(( (::String)(server->__Field(HX_("credential",d7,89,b2,20),::hx::paccDynamic)) ));
             					}
-HXLINE( 806)					::cpp::Pointer<  std::vector<  rtc::IceServer > > iceServers = &configRaw.iceServers;
-HXLINE( 807)					 std::vector<  rtc::IceServer > & _hx_tmp3 = iceServers->get_ref();
-HXDLIN( 807)					 rtc::IceServer & _hx_tmp4 = iceServer->get_ref();
-HXDLIN( 807)					_hx_tmp3.push_back(_hx_tmp4);
+HXLINE( 815)					::cpp::Pointer<  std::vector<  rtc::IceServer > > iceServers = &configRaw.iceServers;
+HXLINE( 816)					 std::vector<  rtc::IceServer > & _hx_tmp3 = iceServers->get_ref();
+HXDLIN( 816)					 rtc::IceServer & _hx_tmp4 = iceServer->get_ref();
+HXDLIN( 816)					_hx_tmp3.push_back(_hx_tmp4);
             				}
             			}
             		}
-HXLINE( 811)		this->_pc = std::make_shared<rtc::PeerConnection>(config->get_ref());
-HXLINE( 812)		this->pc = ::cpp::Pointer_obj::fromRaw(this->_pc.get());
-HXLINE( 813)		 rtc::PeerConnection & _hx_tmp5 = this->pc->get_ref();
-HXDLIN( 813)		_hx_tmp5.onLocalDescription([this](auto d) { this->onLocalDescription(); });
-HXLINE( 814)		 rtc::PeerConnection & _hx_tmp6 = this->pc->get_ref();
-HXDLIN( 814)		_hx_tmp6.onTrack([this](auto t) { this->onTrack(t); });
-HXLINE( 815)		 rtc::PeerConnection & _hx_tmp7 = this->pc->get_ref();
-HXDLIN( 815)		_hx_tmp7.onLocalCandidate([this](auto c) { this->onLocalCandidate(c); });
-HXLINE( 816)		 rtc::PeerConnection & _hx_tmp8 = this->pc->get_ref();
-HXDLIN( 816)		_hx_tmp8.onStateChange([this](auto s) { this->onStateChange(s); });
-HXLINE( 817)		 rtc::PeerConnection & _hx_tmp9 = this->pc->get_ref();
-HXDLIN( 817)		_hx_tmp9.onGatheringStateChange([this](auto s) { this->onGatheringStateChange(s); });
+HXLINE( 820)		this->_pc = std::make_shared<rtc::PeerConnection>(config->get_ref());
+HXLINE( 821)		this->pc = ::cpp::Pointer_obj::fromRaw(this->_pc.get());
+HXLINE( 822)		 rtc::PeerConnection & _hx_tmp5 = this->pc->get_ref();
+HXDLIN( 822)		_hx_tmp5.onLocalDescription([this](auto d) { this->onLocalDescription(); });
+HXLINE( 823)		 rtc::PeerConnection & _hx_tmp6 = this->pc->get_ref();
+HXDLIN( 823)		_hx_tmp6.onTrack([this](auto t) { this->onTrack(t); });
+HXLINE( 824)		 rtc::PeerConnection & _hx_tmp7 = this->pc->get_ref();
+HXDLIN( 824)		_hx_tmp7.onLocalCandidate([this](auto c) { this->onLocalCandidate(c); });
+HXLINE( 825)		 rtc::PeerConnection & _hx_tmp8 = this->pc->get_ref();
+HXDLIN( 825)		_hx_tmp8.onStateChange([this](auto s) { this->onStateChange(s); });
+HXLINE( 826)		 rtc::PeerConnection & _hx_tmp9 = this->pc->get_ref();
+HXDLIN( 826)		_hx_tmp9.onGatheringStateChange([this](auto s) { this->onGatheringStateChange(s); });
             	}
 
 Dynamic PeerConnection_obj::__CreateEmpty() { return new PeerConnection_obj; }
@@ -167,20 +167,20 @@ bool PeerConnection_obj::_hx_isInstanceOf(int inClassId) {
 void PeerConnection_obj::onLocalDescription(){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::jingle::PeerConnection,_gthis) HXARGC(0)
             		void _hx_run(){
-            			HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_823_onLocalDescription)
-HXLINE( 824)			_gthis->addPendingTracks();
-HXLINE( 825)			if (::hx::IsNotNull( _gthis->waitingOnLocal )) {
-HXLINE( 825)				_gthis->waitingOnLocal(null());
+            			HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_832_onLocalDescription)
+HXLINE( 833)			_gthis->addPendingTracks();
+HXLINE( 834)			if (::hx::IsNotNull( _gthis->waitingOnLocal )) {
+HXLINE( 834)				_gthis->waitingOnLocal(null());
             			}
-HXLINE( 826)			_gthis->waitingOnLocal = null();
+HXLINE( 835)			_gthis->waitingOnLocal = null();
             		}
             		HX_END_LOCAL_FUNC0((void))
 
-            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_821_onLocalDescription)
-HXDLIN( 821)		 ::snikket::jingle::PeerConnection _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 822)		int base = 0; hx::SetTopOfStack(&base, true);;
-HXLINE( 823)		this->mainLoop->run( ::Dynamic(new _hx_Closure_0(_gthis)));
-HXLINE( 828)		hx::SetTopOfStack((int*)0, true);;
+            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_830_onLocalDescription)
+HXDLIN( 830)		 ::snikket::jingle::PeerConnection _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 831)		int base = 0; hx::SetTopOfStack(&base, true);;
+HXLINE( 832)		this->mainLoop->run( ::Dynamic(new _hx_Closure_0(_gthis)));
+HXLINE( 837)		hx::SetTopOfStack((int*)0, true);;
             	}
 
 
@@ -189,18 +189,18 @@ HX_DEFINE_DYNAMIC_FUNC0(PeerConnection_obj,onLocalDescription,(void))
 void PeerConnection_obj::onLocalCandidate( rtc::Candidate candidate){
             		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0, ::snikket::jingle::PeerConnection,_gthis, rtc::Candidate,candidate) HXARGC(0)
             		void _hx_run(){
-            			HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_835_onLocalCandidate)
-HXLINE( 835)			int _g = 0;
-HXDLIN( 835)			::Array< ::Dynamic> _g1 = _gthis->localCandidateListeners;
-HXDLIN( 835)			while((_g < _g1->length)){
-HXLINE( 835)				 ::Dynamic cb = _g1->__get(_g);
-HXDLIN( 835)				_g = (_g + 1);
-HXLINE( 837)				 std::string this1 = candidate.candidate();
-HXDLIN( 837)				::String _hx_tmp = ( ( hx::StdString)(::hx::StdString(this1)) ).toString();
-HXLINE( 838)				 std::string this2 = candidate.mid();
-HXDLIN( 838)				::String _hx_tmp1 = ( ( hx::StdString)(::hx::StdString(this2)) ).toString();
-HXLINE( 839)				 std::string this3 = ( ( std::string)(( (cpp::Struct<  std::string >)(( ( rtc::Description)(( (cpp::Struct<  rtc::Description >)(_gthis->pc->get_ref().localDescription().value()) )) ).iceUfrag().value()) )) );
-HXLINE( 836)				cb( ::Dynamic(::hx::Anon_obj::Create(1)
+            			HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_844_onLocalCandidate)
+HXLINE( 844)			int _g = 0;
+HXDLIN( 844)			::Array< ::Dynamic> _g1 = _gthis->localCandidateListeners;
+HXDLIN( 844)			while((_g < _g1->length)){
+HXLINE( 844)				 ::Dynamic cb = _g1->__get(_g);
+HXDLIN( 844)				_g = (_g + 1);
+HXLINE( 846)				 std::string this1 = candidate.candidate();
+HXDLIN( 846)				::String _hx_tmp = ( ( hx::StdString)(::hx::StdString(this1)) ).toString();
+HXLINE( 847)				 std::string this2 = candidate.mid();
+HXDLIN( 847)				::String _hx_tmp1 = ( ( hx::StdString)(::hx::StdString(this2)) ).toString();
+HXLINE( 848)				 std::string this3 = ( ( std::string)(( (cpp::Struct<  std::string >)(( ( rtc::Description)(( (cpp::Struct<  rtc::Description >)(_gthis->pc->get_ref().localDescription().value()) )) ).iceUfrag().value()) )) );
+HXLINE( 845)				cb( ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("candidate",43,34,d8,d0), ::Dynamic(::hx::Anon_obj::Create(3)
             						->setFixed(0,HX_("usernameFragment",06,a8,37,89),( ( hx::StdString)(::hx::StdString(this3)) ).toString())
             						->setFixed(1,HX_("candidate",43,34,d8,d0),_hx_tmp)
@@ -209,61 +209,90 @@ HXLINE( 836)				cb( ::Dynamic(::hx::Anon_obj::Create(1)
             		}
             		HX_END_LOCAL_FUNC0((void))
 
-            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_832_onLocalCandidate)
-HXDLIN( 832)		 ::snikket::jingle::PeerConnection _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 833)		int base = 0; hx::SetTopOfStack(&base, true);;
-HXLINE( 834)		this->mainLoop->run( ::Dynamic(new _hx_Closure_0(_gthis,candidate)));
-HXLINE( 843)		hx::SetTopOfStack((int*)0, true);;
+            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_841_onLocalCandidate)
+HXDLIN( 841)		 ::snikket::jingle::PeerConnection _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 842)		int base = 0; hx::SetTopOfStack(&base, true);;
+HXLINE( 843)		this->mainLoop->run( ::Dynamic(new _hx_Closure_0(_gthis,candidate)));
+HXLINE( 852)		hx::SetTopOfStack((int*)0, true);;
             	}
 
 
 void PeerConnection_obj::onStateChange(cpp::Struct<  rtc::PeerConnection::State > state){
-            		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::jingle::PeerConnection,_gthis) HXARGC(0)
+            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0, ::snikket::jingle::PeerConnection,_gthis,cpp::Struct<  rtc::PeerConnection::State >,state) HXARGC(0)
             		void _hx_run(){
-            			HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_850_onStateChange)
-HXLINE( 850)			int _g = 0;
-HXDLIN( 850)			::Array< ::Dynamic> _g1 = _gthis->stateChangeListeners;
-HXDLIN( 850)			while((_g < _g1->length)){
-HXLINE( 850)				 ::Dynamic cb = _g1->__get(_g);
-HXDLIN( 850)				_g = (_g + 1);
-HXLINE( 851)				cb(null());
+            			HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_858_onStateChange)
+HXLINE( 859)			::String stateString;
+HXDLIN( 859)			 rtc::PeerConnection::State _hx_switch_0 = ( ( rtc::PeerConnection::State)(state) );
+            			if (  (_hx_switch_0==rtc::PeerConnection::State::Closed) ){
+HXLINE( 859)				stateString = HX_("closed",ac,a9,51,0e);
+HXDLIN( 859)				goto _hx_goto_7;
+            			}
+            			if (  (_hx_switch_0==rtc::PeerConnection::State::Connected) ){
+HXLINE( 859)				stateString = HX_("connected",c9,e2,f6,a2);
+HXDLIN( 859)				goto _hx_goto_7;
+            			}
+            			if (  (_hx_switch_0==rtc::PeerConnection::State::Connecting) ){
+HXLINE( 859)				stateString = HX_("connecting",38,9f,12,f5);
+HXDLIN( 859)				goto _hx_goto_7;
+            			}
+            			if (  (_hx_switch_0==rtc::PeerConnection::State::Disconnected) ){
+HXLINE( 859)				stateString = HX_("disconnected",bb,8b,6b,8e);
+HXDLIN( 859)				goto _hx_goto_7;
+            			}
+            			if (  (_hx_switch_0==rtc::PeerConnection::State::Failed) ){
+HXLINE( 859)				stateString = HX_("failed",bd,c5,fe,e7);
+HXDLIN( 859)				goto _hx_goto_7;
+            			}
+            			if (  (_hx_switch_0==rtc::PeerConnection::State::New) ){
+HXLINE( 859)				stateString = HX_("new",60,d0,53,00);
+HXDLIN( 859)				goto _hx_goto_7;
+            			}
+            			_hx_goto_7:;
+HXLINE( 860)			{
+HXLINE( 860)				int _g = 0;
+HXDLIN( 860)				::Array< ::Dynamic> _g1 = _gthis->stateChangeListeners;
+HXDLIN( 860)				while((_g < _g1->length)){
+HXLINE( 860)					 ::Dynamic cb = _g1->__get(_g);
+HXDLIN( 860)					_g = (_g + 1);
+HXLINE( 861)					cb(stateString);
+            				}
             			}
             		}
             		HX_END_LOCAL_FUNC0((void))
 
-            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_847_onStateChange)
-HXDLIN( 847)		 ::snikket::jingle::PeerConnection _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 848)		int base = 0; hx::SetTopOfStack(&base, true);;
-HXLINE( 849)		this->mainLoop->run( ::Dynamic(new _hx_Closure_0(_gthis)));
-HXLINE( 854)		hx::SetTopOfStack((int*)0, true);;
+            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_856_onStateChange)
+HXDLIN( 856)		 ::snikket::jingle::PeerConnection _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 857)		int base = 0; hx::SetTopOfStack(&base, true);;
+HXLINE( 858)		this->mainLoop->run( ::Dynamic(new _hx_Closure_0(_gthis,state)));
+HXLINE( 864)		hx::SetTopOfStack((int*)0, true);;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(PeerConnection_obj,onStateChange,(void))
 
 void PeerConnection_obj::onGatheringStateChange(cpp::Struct<  rtc::PeerConnection::GatheringState > state){
-            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_858_onGatheringStateChange)
-HXDLIN( 858)		 ::snikket::jingle::PeerConnection _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 859)		int base = 0; hx::SetTopOfStack(&base, true);;
-HXLINE( 860)		cpp::Struct<  rtc::PeerConnection::GatheringState > c = rtc::PeerConnection::GatheringState::Complete;
-HXLINE( 861)		if (::hx::IsEq( state,c )) {
+            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_868_onGatheringStateChange)
+HXDLIN( 868)		 ::snikket::jingle::PeerConnection _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 869)		int base = 0; hx::SetTopOfStack(&base, true);;
+HXLINE( 870)		cpp::Struct<  rtc::PeerConnection::GatheringState > c = rtc::PeerConnection::GatheringState::Complete;
+HXLINE( 871)		if (::hx::IsEq( state,c )) {
             			HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::jingle::PeerConnection,_gthis) HXARGC(0)
             			void _hx_run(){
-            				HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_863_onGatheringStateChange)
-HXLINE( 863)				int _g = 0;
-HXDLIN( 863)				::Array< ::Dynamic> _g1 = _gthis->localCandidateListeners;
-HXDLIN( 863)				while((_g < _g1->length)){
-HXLINE( 863)					 ::Dynamic cb = _g1->__get(_g);
-HXDLIN( 863)					_g = (_g + 1);
-HXLINE( 864)					cb( ::Dynamic(::hx::Anon_obj::Create(1)
+            				HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_873_onGatheringStateChange)
+HXLINE( 873)				int _g = 0;
+HXDLIN( 873)				::Array< ::Dynamic> _g1 = _gthis->localCandidateListeners;
+HXDLIN( 873)				while((_g < _g1->length)){
+HXLINE( 873)					 ::Dynamic cb = _g1->__get(_g);
+HXDLIN( 873)					_g = (_g + 1);
+HXLINE( 874)					cb( ::Dynamic(::hx::Anon_obj::Create(1)
             						->setFixed(0,HX_("candidate",43,34,d8,d0),null())));
             				}
             			}
             			HX_END_LOCAL_FUNC0((void))
 
-HXLINE( 862)			this->mainLoop->run( ::Dynamic(new _hx_Closure_0(_gthis)));
+HXLINE( 872)			this->mainLoop->run( ::Dynamic(new _hx_Closure_0(_gthis)));
             		}
-HXLINE( 868)		hx::SetTopOfStack((int*)0, true);;
+HXLINE( 878)		hx::SetTopOfStack((int*)0, true);;
             	}
 
 
@@ -274,48 +303,48 @@ void PeerConnection_obj::onTrack( std::shared_ptr<  rtc::Track > track){
             		void _hx_run(){
             			HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, std::shared_ptr<  rtc::Track >,track) HXARGC(1)
             			bool _hx_run( ::snikket::jingle::MediaStreamTrack t){
-            				HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_875_onTrack)
-HXLINE( 875)				::String matchingTrack = t->get_kind();
-HXDLIN( 875)				 std::string this1 = track->description().type();
-HXDLIN( 875)				return (matchingTrack == ( ( hx::StdString)(::hx::StdString(this1)) ).toString());
+            				HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_885_onTrack)
+HXLINE( 885)				::String matchingTrack = t->get_kind();
+HXDLIN( 885)				 std::string this1 = track->description().type();
+HXDLIN( 885)				return (matchingTrack == ( ( hx::StdString)(::hx::StdString(this1)) ).toString());
             			}
             			HX_END_LOCAL_FUNC1(return)
 
-            			HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_874_onTrack)
-HXLINE( 875)			 ::snikket::jingle::MediaStreamTrack matchingTrack = ( ( ::snikket::jingle::MediaStreamTrack)(::Lambda_obj::find(_gthis->pendingTracks, ::Dynamic(new _hx_Closure_0(track)))) );
-HXLINE( 876)			 ::snikket::jingle::MediaStreamTrack media;
-HXDLIN( 876)			if (::hx::IsNull( matchingTrack )) {
-HXLINE( 876)				media = ::snikket::jingle::MediaStreamTrack_obj::fromTrack(track);
+            			HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_884_onTrack)
+HXLINE( 885)			 ::snikket::jingle::MediaStreamTrack matchingTrack = ( ( ::snikket::jingle::MediaStreamTrack)(::Lambda_obj::find(_gthis->pendingTracks, ::Dynamic(new _hx_Closure_0(track)))) );
+HXLINE( 886)			 ::snikket::jingle::MediaStreamTrack media;
+HXDLIN( 886)			if (::hx::IsNull( matchingTrack )) {
+HXLINE( 886)				media = ::snikket::jingle::MediaStreamTrack_obj::fromTrack(track);
             			}
             			else {
-HXLINE( 879)				::Array< ::Dynamic> _g = ::Array_obj< ::Dynamic>::__new(0);
-HXDLIN( 879)				{
-HXLINE( 879)					int _g1 = 0;
-HXDLIN( 879)					::Array< ::Dynamic> _g2 = _gthis->pendingTracks;
-HXDLIN( 879)					while((_g1 < _g2->length)){
-HXLINE( 879)						 ::snikket::jingle::MediaStreamTrack v = _g2->__get(_g1).StaticCast<  ::snikket::jingle::MediaStreamTrack >();
-HXDLIN( 879)						_g1 = (_g1 + 1);
-HXDLIN( 879)						::String media1 = v->get_id();
-HXDLIN( 879)						if ((media1 != matchingTrack->get_id())) {
-HXLINE( 879)							_g->push(v);
+HXLINE( 889)				::Array< ::Dynamic> _g = ::Array_obj< ::Dynamic>::__new(0);
+HXDLIN( 889)				{
+HXLINE( 889)					int _g1 = 0;
+HXDLIN( 889)					::Array< ::Dynamic> _g2 = _gthis->pendingTracks;
+HXDLIN( 889)					while((_g1 < _g2->length)){
+HXLINE( 889)						 ::snikket::jingle::MediaStreamTrack v = _g2->__get(_g1).StaticCast<  ::snikket::jingle::MediaStreamTrack >();
+HXDLIN( 889)						_g1 = (_g1 + 1);
+HXDLIN( 889)						::String media1 = v->get_id();
+HXDLIN( 889)						if ((media1 != matchingTrack->get_id())) {
+HXLINE( 889)							_g->push(v);
             						}
             					}
             				}
-HXDLIN( 879)				_gthis->pendingTracks = _g;
-HXLINE( 880)				matchingTrack->set_track(track);
-HXLINE( 876)				media = matchingTrack;
+HXDLIN( 889)				_gthis->pendingTracks = _g;
+HXLINE( 890)				matchingTrack->set_track(track);
+HXLINE( 886)				media = matchingTrack;
             			}
-HXLINE( 883)			{
-HXLINE( 883)				::Dynamic this1 = _gthis->tracks;
-HXDLIN( 883)				( ( ::haxe::ds::StringMap)(this1) )->set(media->get_id(),media);
+HXLINE( 893)			{
+HXLINE( 893)				::Dynamic this1 = _gthis->tracks;
+HXDLIN( 893)				( ( ::haxe::ds::StringMap)(this1) )->set(media->get_id(),media);
             			}
-HXLINE( 884)			{
-HXLINE( 884)				int _g3 = 0;
-HXDLIN( 884)				::Array< ::Dynamic> _g4 = _gthis->trackListeners;
-HXDLIN( 884)				while((_g3 < _g4->length)){
-HXLINE( 884)					 ::Dynamic cb = _g4->__get(_g3);
-HXDLIN( 884)					_g3 = (_g3 + 1);
-HXLINE( 885)					cb( ::Dynamic(::hx::Anon_obj::Create(2)
+HXLINE( 894)			{
+HXLINE( 894)				int _g3 = 0;
+HXDLIN( 894)				::Array< ::Dynamic> _g4 = _gthis->trackListeners;
+HXDLIN( 894)				while((_g3 < _g4->length)){
+HXLINE( 894)					 ::Dynamic cb = _g4->__get(_g3);
+HXDLIN( 894)					_g3 = (_g3 + 1);
+HXLINE( 895)					cb( ::Dynamic(::hx::Anon_obj::Create(2)
             						->setFixed(0,HX_("streams",f3,db,44,f6),::cpp::VirtualArray_obj::__new(0))
             						->setFixed(1,HX_("track",8b,8e,1f,16),media)));
             				}
@@ -323,60 +352,60 @@ HXLINE( 885)					cb( ::Dynamic(::hx::Anon_obj::Create(2)
             		}
             		HX_END_LOCAL_FUNC0((void))
 
-            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_872_onTrack)
-HXDLIN( 872)		 ::snikket::jingle::PeerConnection _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 873)		int base = 0; hx::SetTopOfStack(&base, true);;
-HXLINE( 874)		this->mainLoop->run( ::Dynamic(new _hx_Closure_1(_gthis,track)));
-HXLINE( 888)		hx::SetTopOfStack((int*)0, true);;
+            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_882_onTrack)
+HXDLIN( 882)		 ::snikket::jingle::PeerConnection _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 883)		int base = 0; hx::SetTopOfStack(&base, true);;
+HXLINE( 884)		this->mainLoop->run( ::Dynamic(new _hx_Closure_1(_gthis,track)));
+HXLINE( 898)		hx::SetTopOfStack((int*)0, true);;
             	}
 
 
 ::String PeerConnection_obj::get_connectionState(){
-            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_892_get_connectionState)
-HXDLIN( 892)		 rtc::PeerConnection::State _hx_switch_0 = this->pc->get_ref().state();
+            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_902_get_connectionState)
+HXDLIN( 902)		 rtc::PeerConnection::State _hx_switch_0 = this->pc->get_ref().state();
             		if (  (_hx_switch_0==rtc::PeerConnection::State::Closed) ){
-HXDLIN( 892)			return HX_("closed",ac,a9,51,0e);
-HXDLIN( 892)			goto _hx_goto_18;
+HXDLIN( 902)			return HX_("closed",ac,a9,51,0e);
+HXDLIN( 902)			goto _hx_goto_19;
             		}
             		if (  (_hx_switch_0==rtc::PeerConnection::State::Connected) ){
-HXDLIN( 892)			return HX_("connected",c9,e2,f6,a2);
-HXDLIN( 892)			goto _hx_goto_18;
+HXDLIN( 902)			return HX_("connected",c9,e2,f6,a2);
+HXDLIN( 902)			goto _hx_goto_19;
             		}
             		if (  (_hx_switch_0==rtc::PeerConnection::State::Connecting) ){
-HXDLIN( 892)			return HX_("connecting",38,9f,12,f5);
-HXDLIN( 892)			goto _hx_goto_18;
+HXDLIN( 902)			return HX_("connecting",38,9f,12,f5);
+HXDLIN( 902)			goto _hx_goto_19;
             		}
             		if (  (_hx_switch_0==rtc::PeerConnection::State::Disconnected) ){
-HXDLIN( 892)			return HX_("disconnected",bb,8b,6b,8e);
-HXDLIN( 892)			goto _hx_goto_18;
+HXDLIN( 902)			return HX_("disconnected",bb,8b,6b,8e);
+HXDLIN( 902)			goto _hx_goto_19;
             		}
             		if (  (_hx_switch_0==rtc::PeerConnection::State::Failed) ){
-HXDLIN( 892)			return HX_("failed",bd,c5,fe,e7);
-HXDLIN( 892)			goto _hx_goto_18;
+HXDLIN( 902)			return HX_("failed",bd,c5,fe,e7);
+HXDLIN( 902)			goto _hx_goto_19;
             		}
             		if (  (_hx_switch_0==rtc::PeerConnection::State::New) ){
-HXDLIN( 892)			return HX_("new",60,d0,53,00);
-HXDLIN( 892)			goto _hx_goto_18;
+HXDLIN( 902)			return HX_("new",60,d0,53,00);
+HXDLIN( 902)			goto _hx_goto_19;
             		}
-            		_hx_goto_18:;
-HXDLIN( 892)		return null();
+            		_hx_goto_19:;
+HXDLIN( 902)		return null();
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(PeerConnection_obj,get_connectionState,return )
 
  ::Dynamic PeerConnection_obj::get_localDescription(){
-            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_895_get_localDescription)
-HXLINE( 896)		 std::optional<  rtc::Description > desc = this->pc->get_ref().localDescription();
-HXLINE( 897)		if (desc.has_value()) {
-HXLINE( 898)			 std::string this1 = ( ( rtc::Description)(( (cpp::Struct<  rtc::Description >)(desc.value()) )) ).generateSdp();
-HXDLIN( 898)			return  ::Dynamic(::hx::Anon_obj::Create(1)
+            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_905_get_localDescription)
+HXLINE( 906)		 std::optional<  rtc::Description > desc = this->pc->get_ref().localDescription();
+HXLINE( 907)		if (desc.has_value()) {
+HXLINE( 908)			 std::string this1 = ( ( rtc::Description)(( (cpp::Struct<  rtc::Description >)(desc.value()) )) ).generateSdp();
+HXDLIN( 908)			return  ::Dynamic(::hx::Anon_obj::Create(1)
             				->setFixed(0,HX_("sdp",bf,9a,57,00),( ( hx::StdString)(::hx::StdString(this1)) ).toString()));
             		}
             		else {
-HXLINE( 900)			return null();
+HXLINE( 910)			return null();
             		}
-HXLINE( 897)		return null();
+HXLINE( 907)		return null();
             	}
 
 
@@ -385,86 +414,86 @@ HX_DEFINE_DYNAMIC_FUNC0(PeerConnection_obj,get_localDescription,return )
 ::Dynamic PeerConnection_obj::setLocalDescription(cpp::Struct<  rtc::Description::Type > sdpType){
             		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0, ::snikket::jingle::PeerConnection,_gthis,cpp::Struct<  rtc::Description::Type >,sdpType) HXARGC(2)
             		void _hx_run( ::Dynamic resolve, ::Dynamic reject){
-            			HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_905_setLocalDescription)
-HXLINE( 906)			_gthis->waitingOnLocal = resolve;
-HXLINE( 907)			if (!(_gthis->hasRemote)) {
-HXLINE( 907)				_gthis->addPendingTracks();
+            			HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_915_setLocalDescription)
+HXLINE( 916)			_gthis->waitingOnLocal = resolve;
+HXLINE( 917)			if (!(_gthis->hasRemote)) {
+HXLINE( 917)				_gthis->addPendingTracks();
             			}
-HXLINE( 908)			 rtc::PeerConnection & _hx_tmp = _gthis->pc->get_ref();
-HXDLIN( 908)			cpp::Struct<  rtc::Description::Type > tmp = sdpType;
-HXDLIN( 908)			cpp::Struct<  rtc::Description::Type > _hx_tmp1;
-HXDLIN( 908)			if (::hx::IsNotNull( tmp )) {
-HXLINE( 908)				_hx_tmp1 = tmp;
+HXLINE( 918)			 rtc::PeerConnection & _hx_tmp = _gthis->pc->get_ref();
+HXDLIN( 918)			cpp::Struct<  rtc::Description::Type > tmp = sdpType;
+HXDLIN( 918)			cpp::Struct<  rtc::Description::Type > _hx_tmp1;
+HXDLIN( 918)			if (::hx::IsNotNull( tmp )) {
+HXLINE( 918)				_hx_tmp1 = tmp;
             			}
             			else {
-HXLINE( 908)				_hx_tmp1 = cpp::Struct(rtc::Description::Type::Unspec);
+HXLINE( 918)				_hx_tmp1 = cpp::Struct(rtc::Description::Type::Unspec);
             			}
-HXDLIN( 908)			_hx_tmp.setLocalDescription(_hx_tmp1);
+HXDLIN( 918)			_hx_tmp.setLocalDescription(_hx_tmp1);
             		}
             		HX_END_LOCAL_FUNC2((void))
 
-            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_904_setLocalDescription)
-HXDLIN( 904)		 ::snikket::jingle::PeerConnection _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 905)		return ::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_0(_gthis,sdpType)));
+            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_914_setLocalDescription)
+HXDLIN( 914)		 ::snikket::jingle::PeerConnection _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 915)		return ::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_0(_gthis,sdpType)));
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(PeerConnection_obj,setLocalDescription,return )
 
 ::Dynamic PeerConnection_obj::setRemoteDescription( ::Dynamic description){
-            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_912_setRemoteDescription)
-HXLINE( 913)		 rtc::PeerConnection & _hx_tmp = this->pc->get_ref();
-HXDLIN( 913)		 hx::StdString _hx_tmp1 = ::hx::StdString(( (::String)(description->__Field(HX_("sdp",bf,9a,57,00),::hx::paccDynamic)) ));
-HXDLIN( 913)		_hx_tmp.setRemoteDescription( rtc::Description(_hx_tmp1,::hx::TCast< cpp::Struct<  rtc::Description::Type > >::cast(description->__Field(HX_("type",ba,f2,08,4d),::hx::paccDynamic))));
-HXLINE( 914)		this->hasRemote = true;
-HXLINE( 915)		return ::thenshim::_Promise::Promise_Impl__obj::resolve(null());
+            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_922_setRemoteDescription)
+HXLINE( 923)		 rtc::PeerConnection & _hx_tmp = this->pc->get_ref();
+HXDLIN( 923)		 hx::StdString _hx_tmp1 = ::hx::StdString(( (::String)(description->__Field(HX_("sdp",bf,9a,57,00),::hx::paccDynamic)) ));
+HXDLIN( 923)		_hx_tmp.setRemoteDescription( rtc::Description(_hx_tmp1,::hx::TCast< cpp::Struct<  rtc::Description::Type > >::cast(description->__Field(HX_("type",ba,f2,08,4d),::hx::paccDynamic))));
+HXLINE( 924)		this->hasRemote = true;
+HXLINE( 925)		return ::thenshim::_Promise::Promise_Impl__obj::resolve(null());
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(PeerConnection_obj,setRemoteDescription,return )
 
 ::Dynamic PeerConnection_obj::addIceCandidate( ::Dynamic candidate){
-            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_918_addIceCandidate)
-HXLINE( 919)		 rtc::PeerConnection & _hx_tmp = this->pc->get_ref();
-HXDLIN( 919)		 hx::StdString _hx_tmp1 = ::hx::StdString(( (::String)(candidate->__Field(HX_("candidate",43,34,d8,d0),::hx::paccDynamic)) ));
-HXDLIN( 919)		 hx::StdString _hx_tmp2 = ::hx::StdString(( (::String)(candidate->__Field(HX_("sdpMid",09,30,5f,d9),::hx::paccDynamic)) ));
-HXDLIN( 919)		_hx_tmp.addRemoteCandidate( rtc::Candidate(_hx_tmp1,_hx_tmp2));
-HXLINE( 920)		return ::thenshim::_Promise::Promise_Impl__obj::resolve(null());
+            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_928_addIceCandidate)
+HXLINE( 929)		 rtc::PeerConnection & _hx_tmp = this->pc->get_ref();
+HXDLIN( 929)		 hx::StdString _hx_tmp1 = ::hx::StdString(( (::String)(candidate->__Field(HX_("candidate",43,34,d8,d0),::hx::paccDynamic)) ));
+HXDLIN( 929)		 hx::StdString _hx_tmp2 = ::hx::StdString(( (::String)(candidate->__Field(HX_("sdpMid",09,30,5f,d9),::hx::paccDynamic)) ));
+HXDLIN( 929)		_hx_tmp.addRemoteCandidate( rtc::Candidate(_hx_tmp1,_hx_tmp2));
+HXLINE( 930)		return ::thenshim::_Promise::Promise_Impl__obj::resolve(null());
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(PeerConnection_obj,addIceCandidate,return )
 
 void PeerConnection_obj::addPendingTracks(){
-            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_923_addPendingTracks)
-HXLINE( 924)		this->hasLocal = true;
-HXLINE( 925)		 ::snikket::jingle::MediaStreamTrack track;
-HXLINE( 926)		while(true){
-HXLINE( 926)			track = this->pendingTracks->shift().StaticCast<  ::snikket::jingle::MediaStreamTrack >();
-HXDLIN( 926)			if (!(::hx::IsNotNull( track ))) {
-HXLINE( 926)				goto _hx_goto_25;
+            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_933_addPendingTracks)
+HXLINE( 934)		this->hasLocal = true;
+HXLINE( 935)		 ::snikket::jingle::MediaStreamTrack track;
+HXLINE( 936)		while(true){
+HXLINE( 936)			track = this->pendingTracks->shift().StaticCast<  ::snikket::jingle::MediaStreamTrack >();
+HXDLIN( 936)			if (!(::hx::IsNotNull( track ))) {
+HXLINE( 936)				goto _hx_goto_26;
             			}
-HXLINE( 927)			this->addTrack(track,null());
+HXLINE( 937)			this->addTrack(track,null());
             		}
-            		_hx_goto_25:;
+            		_hx_goto_26:;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(PeerConnection_obj,addPendingTracks,(void))
 
 void PeerConnection_obj::addTrack( ::snikket::jingle::MediaStreamTrack track, ::snikket::jingle::MediaStream stream){
-            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_932_addTrack)
-HXDLIN( 932)		if (this->hasLocal) {
-HXLINE( 933)			 rtc::PeerConnection & _hx_tmp = this->pc->get_ref();
-HXDLIN( 933)			 rtc::Description::Media _hx_tmp1 = ( ( rtc::Description::Media)(( (cpp::Struct<  rtc::Description::Media >)(track->get_media().value()) )) );
-HXDLIN( 933)			track->set_track(_hx_tmp.addTrack(_hx_tmp1));
-HXLINE( 934)			{
-HXLINE( 934)				::Dynamic this1 = this->tracks;
-HXDLIN( 934)				( ( ::haxe::ds::StringMap)(this1) )->set(track->get_id(),track);
+            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_942_addTrack)
+HXDLIN( 942)		if (this->hasLocal) {
+HXLINE( 943)			 rtc::PeerConnection & _hx_tmp = this->pc->get_ref();
+HXDLIN( 943)			 rtc::Description::Media _hx_tmp1 = ( ( rtc::Description::Media)(( (cpp::Struct<  rtc::Description::Media >)(track->get_media().value()) )) );
+HXDLIN( 943)			track->set_track(_hx_tmp.addTrack(_hx_tmp1));
+HXLINE( 944)			{
+HXLINE( 944)				::Dynamic this1 = this->tracks;
+HXDLIN( 944)				( ( ::haxe::ds::StringMap)(this1) )->set(track->get_id(),track);
             			}
             		}
             		else {
-HXLINE( 936)			this->pendingTracks->push(track);
+HXLINE( 946)			this->pendingTracks->push(track);
             		}
             	}
 
@@ -472,19 +501,19 @@ HXLINE( 936)			this->pendingTracks->push(track);
 HX_DEFINE_DYNAMIC_FUNC2(PeerConnection_obj,addTrack,(void))
 
 ::Array< ::Dynamic> PeerConnection_obj::getTransceivers(){
-            	HX_GC_STACKFRAME(&_hx_pos_8cd3f69017bd5103_940_getTransceivers)
-HXLINE( 942)		::Array< ::Dynamic> ts = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE( 943)		{
-HXLINE( 943)			::Dynamic map = this->tracks;
-HXDLIN( 943)			::Dynamic _g_map = map;
-HXDLIN( 943)			 ::Dynamic _g_keys = ::haxe::IMap_obj::keys(map);
-HXDLIN( 943)			while(( (bool)(_g_keys->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE( 943)				::String key = ( (::String)(_g_keys->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
-HXDLIN( 943)				 ::snikket::jingle::MediaStreamTrack _g_value = ( ( ::snikket::jingle::MediaStreamTrack)(::haxe::IMap_obj::get(_g_map,key)) );
-HXDLIN( 943)				::String _g_key = key;
-HXDLIN( 943)				::String mid = _g_key;
-HXDLIN( 943)				 ::snikket::jingle::MediaStreamTrack track = _g_value;
-HXLINE( 944)				ts->push( ::Dynamic(::hx::Anon_obj::Create(2)
+            	HX_GC_STACKFRAME(&_hx_pos_8cd3f69017bd5103_950_getTransceivers)
+HXLINE( 952)		::Array< ::Dynamic> ts = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE( 953)		{
+HXLINE( 953)			::Dynamic map = this->tracks;
+HXDLIN( 953)			::Dynamic _g_map = map;
+HXDLIN( 953)			 ::Dynamic _g_keys = ::haxe::IMap_obj::keys(map);
+HXDLIN( 953)			while(( (bool)(_g_keys->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE( 953)				::String key = ( (::String)(_g_keys->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
+HXDLIN( 953)				 ::snikket::jingle::MediaStreamTrack _g_value = ( ( ::snikket::jingle::MediaStreamTrack)(::haxe::IMap_obj::get(_g_map,key)) );
+HXDLIN( 953)				::String _g_key = key;
+HXDLIN( 953)				::String mid = _g_key;
+HXDLIN( 953)				 ::snikket::jingle::MediaStreamTrack track = _g_value;
+HXLINE( 954)				ts->push( ::Dynamic(::hx::Anon_obj::Create(2)
             					->setFixed(0,HX_("receiver",2f,45,fd,e2), ::Dynamic(::hx::Anon_obj::Create(1)
             						->setFixed(0,HX_("track",8b,8e,1f,16),track)))
             					->setFixed(1,HX_("sender",b5,c7,84,6b), ::Dynamic(::hx::Anon_obj::Create(2)
@@ -492,30 +521,30 @@ HXLINE( 944)				ts->push( ::Dynamic(::hx::Anon_obj::Create(2)
             						->setFixed(1,HX_("dtmf",e9,ba,71,42), ::snikket::jingle::DTMFSender_obj::__alloc( HX_CTX ,track))))));
             			}
             		}
-HXLINE( 949)		return ts;
+HXLINE( 959)		return ts;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(PeerConnection_obj,getTransceivers,return )
 
 void PeerConnection_obj::close(){
-            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_953_close)
-HXDLIN( 953)		this->pc->get_ref().close();
+            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_963_close)
+HXDLIN( 963)		this->pc->get_ref().close();
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(PeerConnection_obj,close,(void))
 
 void PeerConnection_obj::addEventListener(::String event, ::Dynamic callback){
-            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_956_addEventListener)
-HXLINE( 957)		if ((event == HX_("track",8b,8e,1f,16))) {
-HXLINE( 957)			this->trackListeners->push(callback);
+            	HX_STACKFRAME(&_hx_pos_8cd3f69017bd5103_966_addEventListener)
+HXLINE( 967)		if ((event == HX_("track",8b,8e,1f,16))) {
+HXLINE( 967)			this->trackListeners->push(callback);
             		}
-HXLINE( 958)		if ((event == HX_("icecandidate",98,ef,c0,7b))) {
-HXLINE( 958)			this->localCandidateListeners->push(callback);
+HXLINE( 968)		if ((event == HX_("icecandidate",98,ef,c0,7b))) {
+HXLINE( 968)			this->localCandidateListeners->push(callback);
             		}
-HXLINE( 959)		if ((event == HX_("connectionstatechange",e3,a2,87,36))) {
-HXLINE( 959)			this->stateChangeListeners->push(callback);
+HXLINE( 969)		if ((event == HX_("connectionstatechange",e3,a2,87,36))) {
+HXLINE( 969)			this->stateChangeListeners->push(callback);
             		}
             	}
 
diff --git a/Sources/c_snikket/src/snikket/jingle/Session.cpp b/Sources/c_snikket/src/snikket/jingle/Session.cpp
index 04d9654..6ddb455 100644
--- a/Sources/c_snikket/src/snikket/jingle/Session.cpp
+++ b/Sources/c_snikket/src/snikket/jingle/Session.cpp
@@ -32,7 +32,9 @@ namespace jingle{
 
 static ::String Session_obj_sMemberFields[] = {
 	HX_("get_sid",a5,67,cc,26),
+	HX_("get_chatId",9c,74,fe,a7),
 	HX_("sid",0e,9f,57,00),
+	HX_("chatId",d3,04,77,b7),
 	HX_("initiate",59,6a,8f,5f),
 	HX_("accept",08,93,06,0b),
 	HX_("hangup",4d,d2,ff,b7),
diff --git a/Sources/c_snikket/src/snikket/jingle/_Session/Session_Fields_.cpp b/Sources/c_snikket/src/snikket/jingle/_Session/Session_Fields_.cpp
index 9a2e50d..12de4e9 100644
--- a/Sources/c_snikket/src/snikket/jingle/_Session/Session_Fields_.cpp
+++ b/Sources/c_snikket/src/snikket/jingle/_Session/Session_Fields_.cpp
@@ -32,7 +32,7 @@
 #include <snikket/jingle/_Session/Session_Fields_.h>
 #endif
 
-HX_LOCAL_STACK_FRAME(_hx_pos_02df9d92159f3aa0_40_mkCallMessage,"snikket.jingle._Session.Session_Fields_","mkCallMessage",0x268ca02f,"snikket.jingle._Session.Session_Fields_.mkCallMessage","snikket/jingle/Session.hx",40,0x6db2dd54)
+HX_LOCAL_STACK_FRAME(_hx_pos_02df9d92159f3aa0_41_mkCallMessage,"snikket.jingle._Session.Session_Fields_","mkCallMessage",0x268ca02f,"snikket.jingle._Session.Session_Fields_.mkCallMessage","snikket/jingle/Session.hx",41,0x6db2dd54)
 namespace snikket{
 namespace jingle{
 namespace _Session{
@@ -55,24 +55,24 @@ bool Session_Fields__obj::_hx_isInstanceOf(int inClassId) {
 }
 
  ::snikket::ChatMessage Session_Fields__obj::mkCallMessage( ::snikket::JID to, ::snikket::JID from, ::snikket::Stanza event){
-            	HX_GC_STACKFRAME(&_hx_pos_02df9d92159f3aa0_40_mkCallMessage)
-HXLINE(  41)		 ::snikket::ChatMessageBuilder m =  ::snikket::ChatMessageBuilder_obj::__alloc( HX_CTX );
-HXLINE(  42)		m->type = 1;
-HXLINE(  43)		m->to = to;
-HXLINE(  44)		m->recipients = ::Array_obj< ::Dynamic>::__new(1)->init(0,to->asBare());
-HXLINE(  45)		m->from = from;
-HXLINE(  46)		m->sender = m->from->asBare();
-HXLINE(  47)		m->replyTo = ::Array_obj< ::Dynamic>::__new(1)->init(0,m->sender);
-HXLINE(  48)		m->direction = 1;
-HXLINE(  49)		m->text = (HX_("call ",c2,71,1b,41) + event->name);
-HXLINE(  50)		m->timestamp = ::snikket::Date_obj::format(::Date_obj::now());
-HXLINE(  51)		m->payloads->push(event);
-HXLINE(  52)		m->localId = ::snikket::ID_obj::_hx_long();
-HXLINE(  53)		if ((event->name != HX_("propose",fe,fe,e9,f9))) {
-HXLINE(  54)			m->versions = ::Array_obj< ::Dynamic>::__new(1)->init(0,m->build());
+            	HX_GC_STACKFRAME(&_hx_pos_02df9d92159f3aa0_41_mkCallMessage)
+HXLINE(  42)		 ::snikket::ChatMessageBuilder m =  ::snikket::ChatMessageBuilder_obj::__alloc( HX_CTX );
+HXLINE(  43)		m->type = 1;
+HXLINE(  44)		m->to = to;
+HXLINE(  45)		m->recipients = ::Array_obj< ::Dynamic>::__new(1)->init(0,to->asBare());
+HXLINE(  46)		m->from = from;
+HXLINE(  47)		m->sender = m->from->asBare();
+HXLINE(  48)		m->replyTo = ::Array_obj< ::Dynamic>::__new(1)->init(0,m->sender);
+HXLINE(  49)		m->direction = 1;
+HXLINE(  50)		m->text = (HX_("call ",c2,71,1b,41) + event->name);
+HXLINE(  51)		m->timestamp = ::snikket::Date_obj::format(::Date_obj::now());
+HXLINE(  52)		m->payloads->push(event);
+HXLINE(  53)		m->localId = ::snikket::ID_obj::_hx_long();
+HXLINE(  54)		if ((event->name != HX_("propose",fe,fe,e9,f9))) {
+HXLINE(  55)			m->versions = ::Array_obj< ::Dynamic>::__new(1)->init(0,m->build());
             		}
-HXLINE(  56)		m->localId = ( (::String)(::Reflect_obj::field(event->attr,HX_("id",db,5b,00,00))) );
-HXLINE(  57)		return m->build();
+HXLINE(  57)		m->localId = ( (::String)(::Reflect_obj::field(event->attr,HX_("id",db,5b,00,00))) );
+HXLINE(  58)		return m->build();
             	}
 
 
diff --git a/Sources/c_snikket/src/snikket/persistence/Sqlite.cpp b/Sources/c_snikket/src/snikket/persistence/Sqlite.cpp
index fb36438..f7519fc 100644
--- a/Sources/c_snikket/src/snikket/persistence/Sqlite.cpp
+++ b/Sources/c_snikket/src/snikket/persistence/Sqlite.cpp
@@ -112,9 +112,6 @@
 #ifndef INCLUDED_snikket_persistence_SqliteDriver
 #include <snikket/persistence/SqliteDriver.h>
 #endif
-#ifndef INCLUDED_sys_db_ResultSet
-#include <sys/db/ResultSet.h>
-#endif
 #ifndef INCLUDED_thenshim_PromiseTools
 #include <thenshim/PromiseTools.h>
 #endif
@@ -125,240 +122,273 @@
 #include <thenshim/_Promise/Promise_Impl_.h>
 #endif
 
-HX_DEFINE_STACK_FRAME(_hx_pos_5b1a6b524efab4db_39_new,"snikket.persistence.Sqlite","new",0xb859925e,"snikket.persistence.Sqlite.new","snikket/persistence/Sqlite.hx",39,0x917a2510)
+HX_DEFINE_STACK_FRAME(_hx_pos_5b1a6b524efab4db_41_new,"snikket.persistence.Sqlite","new",0xb859925e,"snikket.persistence.Sqlite.new","snikket/persistence/Sqlite.hx",41,0x917a2510)
 static const ::String _hx_array_data_e415cb6c_1[] = {
-	HX_("CREATE TABLE messages (\n\t\t\t\t\taccount_id TEXT NOT NULL,\n\t\t\t\t\tmam_id TEXT NOT NULL,\n\t\t\t\t\tmam_by TEXT NOT NULL,\n\t\t\t\t\tstanza_id TEXT NOT NULL,\n\t\t\t\t\tcorrection_id TEXT NOT NULL,\n\t\t\t\t\tsync_point INTEGER NOT NULL,\n\t\t\t\t\tchat_id TEXT NOT NULL,\n\t\t\t\t\tsender_id TEXT NOT NULL,\n\t\t\t\t\tcreated_at INTEGER NOT NULL,\n\t\t\t\t\tstatus INTEGER NOT NULL,\n\t\t\t\t\tdirection INTEGER NOT NULL,\n\t\t\t\t\ttype INTEGER NOT NULL,\n\t\t\t\t\tstanza TEXT NOT NULL,\n\t\t\t\t\tPRIMARY KEY (account_id, mam_id, mam_by, stanza_id)\n\t\t\t\t) STRICT;",38,62,b7,eb),HX_("CREATE INDEX messages_created_at ON messages (account_id, chat_id, created_at);",f1,c3,db,39),HX_("CREATE INDEX messages_correction_id ON messages (correction_id);",7e,cd,37,3e),HX_("CREATE TABLE chats (\n\t\t\t\t\taccount_id TEXT NOT NULL,\n\t\t\t\t\tchat_id TEXT NOT NULL,\n\t\t\t\t\ttrusted INTEGER NOT NULL,\n\t\t\t\t\tavatar_sha1 BLOB,\n\t\t\t\t\tfn TEXT,\n\t\t\t\t\tui_state INTEGER NOT NULL,\n\t\t\t\t\tblocked INTEGER NOT NULL,\n\t\t\t\t\textensions TEXT,\n\t\t\t\t\tread_up_to_id TEXT,\n\t\t\t\t\tread_up_to_by TEXT,\n\t\t\t\t\tcaps_ver BLOB,\n\t\t\t\t\tpresence BLOB NOT NULL,\n\t\t\t\t\tclass TEXT NOT NULL,\n\t\t\t\t\tPRIMARY KEY (account_id, chat_id)\n\t\t\t\t) STRICT;",a4,aa,ac,05),HX_("CREATE TABLE keyvaluepairs (\n\t\t\t\t\tk TEXT NOT NULL PRIMARY KEY,\n\t\t\t\t\tv TEXT NOT NULL\n\t\t\t\t) STRICT;",fe,ac,6c,f0),HX_("CREATE TABLE caps (\n\t\t\t\t\tsha1 BLOB NOT NULL PRIMARY KEY,\n\t\t\t\t\tcaps BLOB NOT NULL\n\t\t\t\t) STRICT;",59,53,eb,29),HX_("CREATE TABLE services (\n\t\t\t\t\taccount_id TEXT NOT NULL,\n\t\t\t\t\tservice_id TEXT NOT NULL,\n\t\t\t\t\tname TEXT,\n\t\t\t\t\tnode TEXT,\n\t\t\t\t\tcaps BLOB NOT NULL,\n\t\t\t\t\tPRIMARY KEY (account_id, service_id)\n\t\t\t\t) STRICT;",d2,78,ff,3c),HX_("CREATE TABLE accounts (\n\t\t\t\t\taccount_id TEXT NOT NULL,\n\t\t\t\t\tclient_id TEXT NOT NULL,\n\t\t\t\t\tdisplay_name TEXT,\n\t\t\t\t\ttoken TEXT,\n\t\t\t\t\tfast_count INTEGER NOT NULL DEFAULT 0,\n\t\t\t\t\tsm_state BLOB,\n\t\t\t\t\tPRIMARY KEY (account_id)\n\t\t\t\t) STRICT;",b6,62,0e,48),HX_("CREATE TABLE reactions (\n\t\t\t\t\taccount_id TEXT NOT NULL,\n\t\t\t\t\tupdate_id TEXT NOT NULL,\n\t\t\t\t\tmam_id TEXT,\n\t\t\t\t\tmam_by TEXT,\n\t\t\t\t\tstanza_id TEXT,\n\t\t\t\t\tchat_id TEXT NOT NULL,\n\t\t\t\t\tsender_id TEXT NOT NULL,\n\t\t\t\t\tcreated_at INTEGER NOT NULL,\n\t\t\t\t\treactions BLOB NOT NULL,\n\t\t\t\t\tkind INTEGER NOT NULL,\n\t\t\t\t\tPRIMARY KEY (account_id, chat_id, sender_id, update_id)\n\t\t\t\t) STRICT;",49,eb,c8,c2),HX_("PRAGMA user_version = 1;",45,c2,55,a9),
+	HX_("CREATE TABLE messages (\n\t\t\t\t\t\t\taccount_id TEXT NOT NULL,\n\t\t\t\t\t\t\tmam_id TEXT NOT NULL,\n\t\t\t\t\t\t\tmam_by TEXT NOT NULL,\n\t\t\t\t\t\t\tstanza_id TEXT NOT NULL,\n\t\t\t\t\t\t\tcorrection_id TEXT NOT NULL,\n\t\t\t\t\t\t\tsync_point INTEGER NOT NULL,\n\t\t\t\t\t\t\tchat_id TEXT NOT NULL,\n\t\t\t\t\t\t\tsender_id TEXT NOT NULL,\n\t\t\t\t\t\t\tcreated_at INTEGER NOT NULL,\n\t\t\t\t\t\t\tstatus INTEGER NOT NULL,\n\t\t\t\t\t\t\tdirection INTEGER NOT NULL,\n\t\t\t\t\t\t\ttype INTEGER NOT NULL,\n\t\t\t\t\t\t\tstanza TEXT NOT NULL,\n\t\t\t\t\t\t\tPRIMARY KEY (account_id, mam_id, mam_by, stanza_id)\n\t\t\t\t\t\t) STRICT;",58,1c,57,a1),HX_("CREATE INDEX messages_created_at ON messages (account_id, chat_id, created_at);",f1,c3,db,39),HX_("CREATE INDEX messages_correction_id ON messages (correction_id);",7e,cd,37,3e),HX_("CREATE TABLE chats (\n\t\t\t\t\t\t\taccount_id TEXT NOT NULL,\n\t\t\t\t\t\t\tchat_id TEXT NOT NULL,\n\t\t\t\t\t\t\ttrusted INTEGER NOT NULL,\n\t\t\t\t\t\t\tavatar_sha1 BLOB,\n\t\t\t\t\t\t\tfn TEXT,\n\t\t\t\t\t\t\tui_state INTEGER NOT NULL,\n\t\t\t\t\t\t\tblocked INTEGER NOT NULL,\n\t\t\t\t\t\t\textensions TEXT,\n\t\t\t\t\t\t\tread_up_to_id TEXT,\n\t\t\t\t\t\t\tread_up_to_by TEXT,\n\t\t\t\t\t\t\tcaps_ver BLOB,\n\t\t\t\t\t\t\tpresence BLOB NOT NULL,\n\t\t\t\t\t\t\tclass TEXT NOT NULL,\n\t\t\t\t\t\t\tPRIMARY KEY (account_id, chat_id)\n\t\t\t\t\t\t) STRICT;",84,84,f7,05),HX_("CREATE TABLE keyvaluepairs (\n\t\t\t\t\t\t\tk TEXT NOT NULL PRIMARY KEY,\n\t\t\t\t\t\t\tv TEXT NOT NULL\n\t\t\t\t\t\t) STRICT;",1e,36,08,e6),HX_("CREATE TABLE caps (\n\t\t\t\t\t\t\tsha1 BLOB NOT NULL PRIMARY KEY,\n\t\t\t\t\t\t\tcaps BLOB NOT NULL\n\t\t\t\t\t\t) STRICT;",79,bf,78,20),HX_("CREATE TABLE services (\n\t\t\t\t\t\t\taccount_id TEXT NOT NULL,\n\t\t\t\t\t\t\tservice_id TEXT NOT NULL,\n\t\t\t\t\t\t\tname TEXT,\n\t\t\t\t\t\t\tnode TEXT,\n\t\t\t\t\t\t\tcaps BLOB NOT NULL,\n\t\t\t\t\t\t\tPRIMARY KEY (account_id, service_id)\n\t\t\t\t\t\t) STRICT;",32,46,2e,5c),HX_("CREATE TABLE accounts (\n\t\t\t\t\t\t\taccount_id TEXT NOT NULL,\n\t\t\t\t\t\t\tclient_id TEXT NOT NULL,\n\t\t\t\t\t\t\tdisplay_name TEXT,\n\t\t\t\t\t\t\ttoken TEXT,\n\t\t\t\t\t\t\tfast_count INTEGER NOT NULL DEFAULT 0,\n\t\t\t\t\t\t\tsm_state BLOB,\n\t\t\t\t\t\t\tPRIMARY KEY (account_id)\n\t\t\t\t\t\t) STRICT;",b6,63,df,b2),HX_("CREATE TABLE reactions (\n\t\t\t\t\t\t\taccount_id TEXT NOT NULL,\n\t\t\t\t\t\t\tupdate_id TEXT NOT NULL,\n\t\t\t\t\t\t\tmam_id TEXT,\n\t\t\t\t\t\t\tmam_by TEXT,\n\t\t\t\t\t\t\tstanza_id TEXT,\n\t\t\t\t\t\t\tchat_id TEXT NOT NULL,\n\t\t\t\t\t\t\tsender_id TEXT NOT NULL,\n\t\t\t\t\t\t\tcreated_at INTEGER NOT NULL,\n\t\t\t\t\t\t\treactions BLOB NOT NULL,\n\t\t\t\t\t\t\tkind INTEGER NOT NULL,\n\t\t\t\t\t\t\tPRIMARY KEY (account_id, chat_id, sender_id, update_id)\n\t\t\t\t\t\t) STRICT;",09,3c,de,e0),HX_("PRAGMA user_version = 1;",45,c2,55,a9),
 };
-static const ::String _hx_array_data_e415cb6c_2[] = {
+HX_DEFINE_STACK_FRAME(_hx_pos_5b1a6b524efab4db_118_new,"snikket.persistence.Sqlite","new",0xb859925e,"snikket.persistence.Sqlite.new","snikket/persistence/Sqlite.hx",118,0x917a2510)
+static const ::String _hx_array_data_e415cb6c_3[] = {
 	HX_("ALTER TABLE chats ADD COLUMN notifications_filtered INTEGER;",e5,d7,a4,6f),HX_("ALTER TABLE chats ADD COLUMN notify_mention INTEGER NOT NULL DEFAULT 0;",52,d4,13,7f),HX_("ALTER TABLE chats ADD COLUMN notify_reply INTEGER NOT NULL DEFAULT 0;",92,b1,9f,14),HX_("PRAGMA user_version = 2;",24,c3,55,a9),
 };
+HX_DEFINE_STACK_FRAME(_hx_pos_5b1a6b524efab4db_39_new,"snikket.persistence.Sqlite","new",0xb859925e,"snikket.persistence.Sqlite.new","snikket/persistence/Sqlite.hx",39,0x917a2510)
+HX_DEFINE_STACK_FRAME(_hx_pos_5b1a6b524efab4db_38_new,"snikket.persistence.Sqlite","new",0xb859925e,"snikket.persistence.Sqlite.new","snikket/persistence/Sqlite.hx",38,0x917a2510)
+static const ::String _hx_array_data_e415cb6c_6[] = {
+	HX_("PRAGMA user_version;",73,bf,dc,ae),
+};
 HX_DEFINE_STACK_FRAME(_hx_pos_5b1a6b524efab4db_24_new,"snikket.persistence.Sqlite","new",0xb859925e,"snikket.persistence.Sqlite.new","snikket/persistence/Sqlite.hx",24,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_127_get,"snikket.persistence.Sqlite","get",0xb8544294,"snikket.persistence.Sqlite.get","snikket/persistence/Sqlite.hx",127,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_138_set,"snikket.persistence.Sqlite","set",0xb85d5da0,"snikket.persistence.Sqlite.set","snikket/persistence/Sqlite.hx",138,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_140_set,"snikket.persistence.Sqlite","set",0xb85d5da0,"snikket.persistence.Sqlite.set","snikket/persistence/Sqlite.hx",140,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_133_get,"snikket.persistence.Sqlite","get",0xb8544294,"snikket.persistence.Sqlite.get","snikket/persistence/Sqlite.hx",133,0x917a2510)
 HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_144_set,"snikket.persistence.Sqlite","set",0xb85d5da0,"snikket.persistence.Sqlite.set","snikket/persistence/Sqlite.hx",144,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_161_lastId,"snikket.persistence.Sqlite","lastId",0xe7f21c93,"snikket.persistence.Sqlite.lastId","snikket/persistence/Sqlite.hx",161,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_150_lastId,"snikket.persistence.Sqlite","lastId",0xe7f21c93,"snikket.persistence.Sqlite.lastId","snikket/persistence/Sqlite.hx",150,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_178_storeChats,"snikket.persistence.Sqlite","storeChats",0xcde3e4bc,"snikket.persistence.Sqlite.storeChats","snikket/persistence/Sqlite.hx",178,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_177_storeChats,"snikket.persistence.Sqlite","storeChats",0xcde3e4bc,"snikket.persistence.Sqlite.storeChats","snikket/persistence/Sqlite.hx",177,0x917a2510)
-static const ::String _hx_array_data_e415cb6c_21[] = {
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_146_set,"snikket.persistence.Sqlite","set",0xb85d5da0,"snikket.persistence.Sqlite.set","snikket/persistence/Sqlite.hx",146,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_150_set,"snikket.persistence.Sqlite","set",0xb85d5da0,"snikket.persistence.Sqlite.set","snikket/persistence/Sqlite.hx",150,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_167_lastId,"snikket.persistence.Sqlite","lastId",0xe7f21c93,"snikket.persistence.Sqlite.lastId","snikket/persistence/Sqlite.hx",167,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_156_lastId,"snikket.persistence.Sqlite","lastId",0xe7f21c93,"snikket.persistence.Sqlite.lastId","snikket/persistence/Sqlite.hx",156,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_184_storeChats,"snikket.persistence.Sqlite","storeChats",0xcde3e4bc,"snikket.persistence.Sqlite.storeChats","snikket/persistence/Sqlite.hx",184,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_183_storeChats,"snikket.persistence.Sqlite","storeChats",0xcde3e4bc,"snikket.persistence.Sqlite.storeChats","snikket/persistence/Sqlite.hx",183,0x917a2510)
+static const ::String _hx_array_data_e415cb6c_25[] = {
 	HX_("INSERT OR REPLACE INTO chats VALUES ",3b,7d,10,d4),
 };
-static const ::String _hx_array_data_e415cb6c_22[] = {
+static const ::String _hx_array_data_e415cb6c_26[] = {
 	HX_(",",2c,00,00,00),
 };
-static const ::String _hx_array_data_e415cb6c_23[] = {
+static const ::String _hx_array_data_e415cb6c_27[] = {
 	HX_("(?,?,?,?,?,?,?,?,?,?,?,jsonb(?),?,?,?,?)",4e,16,2e,3d),
 };
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_168_storeChats,"snikket.persistence.Sqlite","storeChats",0xcde3e4bc,"snikket.persistence.Sqlite.storeChats","snikket/persistence/Sqlite.hx",168,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_174_storeChats,"snikket.persistence.Sqlite","storeChats",0xcde3e4bc,"snikket.persistence.Sqlite.storeChats","snikket/persistence/Sqlite.hx",174,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_248_getChats,"snikket.persistence.Sqlite","getChats",0x2aaef367,"snikket.persistence.Sqlite.getChats","snikket/persistence/Sqlite.hx",248,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_252_getChats,"snikket.persistence.Sqlite","getChats",0x2aaef367,"snikket.persistence.Sqlite.getChats","snikket/persistence/Sqlite.hx",252,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_235_getChats,"snikket.persistence.Sqlite","getChats",0x2aaef367,"snikket.persistence.Sqlite.getChats","snikket/persistence/Sqlite.hx",235,0x917a2510)
 HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_240_getChats,"snikket.persistence.Sqlite","getChats",0x2aaef367,"snikket.persistence.Sqlite.getChats","snikket/persistence/Sqlite.hx",240,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_244_getChats,"snikket.persistence.Sqlite","getChats",0x2aaef367,"snikket.persistence.Sqlite.getChats","snikket/persistence/Sqlite.hx",244,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_227_getChats,"snikket.persistence.Sqlite","getChats",0x2aaef367,"snikket.persistence.Sqlite.getChats","snikket/persistence/Sqlite.hx",227,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_232_getChats,"snikket.persistence.Sqlite","getChats",0x2aaef367,"snikket.persistence.Sqlite.getChats","snikket/persistence/Sqlite.hx",232,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_245_getChats,"snikket.persistence.Sqlite","getChats",0x2aaef367,"snikket.persistence.Sqlite.getChats","snikket/persistence/Sqlite.hx",245,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_249_getChats,"snikket.persistence.Sqlite","getChats",0x2aaef367,"snikket.persistence.Sqlite.getChats","snikket/persistence/Sqlite.hx",249,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_223_getChats,"snikket.persistence.Sqlite","getChats",0x2aaef367,"snikket.persistence.Sqlite.getChats","snikket/persistence/Sqlite.hx",223,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_304_storeMessages,"snikket.persistence.Sqlite","storeMessages",0x458d5d4b,"snikket.persistence.Sqlite.storeMessages","snikket/persistence/Sqlite.hx",304,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_319_storeMessages,"snikket.persistence.Sqlite","storeMessages",0x458d5d4b,"snikket.persistence.Sqlite.storeMessages","snikket/persistence/Sqlite.hx",319,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_253_getChats,"snikket.persistence.Sqlite","getChats",0x2aaef367,"snikket.persistence.Sqlite.getChats","snikket/persistence/Sqlite.hx",253,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_257_getChats,"snikket.persistence.Sqlite","getChats",0x2aaef367,"snikket.persistence.Sqlite.getChats","snikket/persistence/Sqlite.hx",257,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_231_getChats,"snikket.persistence.Sqlite","getChats",0x2aaef367,"snikket.persistence.Sqlite.getChats","snikket/persistence/Sqlite.hx",231,0x917a2510)
 HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_318_storeMessages,"snikket.persistence.Sqlite","storeMessages",0x458d5d4b,"snikket.persistence.Sqlite.storeMessages","snikket/persistence/Sqlite.hx",318,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_268_storeMessages,"snikket.persistence.Sqlite","storeMessages",0x458d5d4b,"snikket.persistence.Sqlite.storeMessages","snikket/persistence/Sqlite.hx",268,0x917a2510)
-static const ::String _hx_array_data_e415cb6c_49[] = {
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_333_storeMessages,"snikket.persistence.Sqlite","storeMessages",0x458d5d4b,"snikket.persistence.Sqlite.storeMessages","snikket/persistence/Sqlite.hx",333,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_281_storeMessages,"snikket.persistence.Sqlite","storeMessages",0x458d5d4b,"snikket.persistence.Sqlite.storeMessages","snikket/persistence/Sqlite.hx",281,0x917a2510)
+static const ::String _hx_array_data_e415cb6c_53[] = {
 	HX_("DELETE FROM messages WHERE account_id=? AND direction=? AND chat_id IN (",a1,9c,a2,06),
 };
-static const ::String _hx_array_data_e415cb6c_50[] = {
+static const ::String _hx_array_data_e415cb6c_54[] = {
 	HX_(") AND stanza_id IN (",e8,da,d3,eb),
 };
-static const ::String _hx_array_data_e415cb6c_51[] = {
+static const ::String _hx_array_data_e415cb6c_55[] = {
 	HX_(")",29,00,00,00),
 };
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_327_updateMessage,"snikket.persistence.Sqlite","updateMessage",0xc14f063c,"snikket.persistence.Sqlite.updateMessage","snikket/persistence/Sqlite.hx",327,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_341_getMessage,"snikket.persistence.Sqlite","getMessage",0x34245593,"snikket.persistence.Sqlite.getMessage","snikket/persistence/Sqlite.hx",341,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_347_getMessage,"snikket.persistence.Sqlite","getMessage",0x34245593,"snikket.persistence.Sqlite.getMessage","snikket/persistence/Sqlite.hx",347,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_330_getMessage,"snikket.persistence.Sqlite","getMessage",0x34245593,"snikket.persistence.Sqlite.getMessage","snikket/persistence/Sqlite.hx",330,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_341_updateMessage,"snikket.persistence.Sqlite","updateMessage",0xc14f063c,"snikket.persistence.Sqlite.updateMessage","snikket/persistence/Sqlite.hx",341,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_355_getMessage,"snikket.persistence.Sqlite","getMessage",0x34245593,"snikket.persistence.Sqlite.getMessage","snikket/persistence/Sqlite.hx",355,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_361_getMessage,"snikket.persistence.Sqlite","getMessage",0x34245593,"snikket.persistence.Sqlite.getMessage","snikket/persistence/Sqlite.hx",361,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_344_getMessage,"snikket.persistence.Sqlite","getMessage",0x34245593,"snikket.persistence.Sqlite.getMessage","snikket/persistence/Sqlite.hx",344,0x917a2510)
 HX_LOCAL_STACK_FRAME(_hx_pos_45dcb523da764b50_221_getMessage__fromC,"snikket.persistence.Sqlite","getMessage__fromC",0x61244346,"snikket.persistence.Sqlite.getMessage__fromC","HaxeCBridge.hx",221,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_45dcb523da764b50_252_getMessage__fromC,"snikket.persistence.Sqlite","getMessage__fromC",0x61244346,"snikket.persistence.Sqlite.getMessage__fromC","HaxeCBridge.hx",252,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_380_getMessages,"snikket.persistence.Sqlite","getMessages",0x6ba68b80,"snikket.persistence.Sqlite.getMessages","snikket/persistence/Sqlite.hx",380,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_393_getMessages,"snikket.persistence.Sqlite","getMessages",0x6ba68b80,"snikket.persistence.Sqlite.getMessages","snikket/persistence/Sqlite.hx",393,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_354_getMessages,"snikket.persistence.Sqlite","getMessages",0x6ba68b80,"snikket.persistence.Sqlite.getMessages","snikket/persistence/Sqlite.hx",354,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_398_getMessagesBefore,"snikket.persistence.Sqlite","getMessagesBefore",0x6d22f41f,"snikket.persistence.Sqlite.getMessagesBefore","snikket/persistence/Sqlite.hx",398,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_403_getMessagesAfter,"snikket.persistence.Sqlite","getMessagesAfter",0x143f9a7c,"snikket.persistence.Sqlite.getMessagesAfter","snikket/persistence/Sqlite.hx",403,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_419_getMessagesAround,"snikket.persistence.Sqlite","getMessagesAround",0x88f497ed,"snikket.persistence.Sqlite.getMessagesAround","snikket/persistence/Sqlite.hx",419,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_394_getMessages,"snikket.persistence.Sqlite","getMessages",0x6ba68b80,"snikket.persistence.Sqlite.getMessages","snikket/persistence/Sqlite.hx",394,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_407_getMessages,"snikket.persistence.Sqlite","getMessages",0x6ba68b80,"snikket.persistence.Sqlite.getMessages","snikket/persistence/Sqlite.hx",407,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_368_getMessages,"snikket.persistence.Sqlite","getMessages",0x6ba68b80,"snikket.persistence.Sqlite.getMessages","snikket/persistence/Sqlite.hx",368,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_412_getMessagesBefore,"snikket.persistence.Sqlite","getMessagesBefore",0x6d22f41f,"snikket.persistence.Sqlite.getMessagesBefore","snikket/persistence/Sqlite.hx",412,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_417_getMessagesAfter,"snikket.persistence.Sqlite","getMessagesAfter",0x143f9a7c,"snikket.persistence.Sqlite.getMessagesAfter","snikket/persistence/Sqlite.hx",417,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_433_getMessagesAround,"snikket.persistence.Sqlite","getMessagesAround",0x88f497ed,"snikket.persistence.Sqlite.getMessagesAround","snikket/persistence/Sqlite.hx",433,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_438_getMessagesAround,"snikket.persistence.Sqlite","getMessagesAround",0x88f497ed,"snikket.persistence.Sqlite.getMessagesAround","snikket/persistence/Sqlite.hx",438,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_421_getMessagesAround,"snikket.persistence.Sqlite","getMessagesAround",0x88f497ed,"snikket.persistence.Sqlite.getMessagesAround","snikket/persistence/Sqlite.hx",421,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_423_getMessagesAround,"snikket.persistence.Sqlite","getMessagesAround",0x88f497ed,"snikket.persistence.Sqlite.getMessagesAround","snikket/persistence/Sqlite.hx",423,0x917a2510)
 HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_424_getMessagesAround,"snikket.persistence.Sqlite","getMessagesAround",0x88f497ed,"snikket.persistence.Sqlite.getMessagesAround","snikket/persistence/Sqlite.hx",424,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_407_getMessagesAround,"snikket.persistence.Sqlite","getMessagesAround",0x88f497ed,"snikket.persistence.Sqlite.getMessagesAround","snikket/persistence/Sqlite.hx",407,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_409_getMessagesAround,"snikket.persistence.Sqlite","getMessagesAround",0x88f497ed,"snikket.persistence.Sqlite.getMessagesAround","snikket/persistence/Sqlite.hx",409,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_410_getMessagesAround,"snikket.persistence.Sqlite","getMessagesAround",0x88f497ed,"snikket.persistence.Sqlite.getMessagesAround","snikket/persistence/Sqlite.hx",410,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_413_getMessagesAround,"snikket.persistence.Sqlite","getMessagesAround",0x88f497ed,"snikket.persistence.Sqlite.getMessagesAround","snikket/persistence/Sqlite.hx",413,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_471_getChatsUnreadDetails,"snikket.persistence.Sqlite","getChatsUnreadDetails",0x81deee6c,"snikket.persistence.Sqlite.getChatsUnreadDetails","snikket/persistence/Sqlite.hx",471,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_472_getChatsUnreadDetails,"snikket.persistence.Sqlite","getChatsUnreadDetails",0x81deee6c,"snikket.persistence.Sqlite.getChatsUnreadDetails","snikket/persistence/Sqlite.hx",472,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_469_getChatsUnreadDetails,"snikket.persistence.Sqlite","getChatsUnreadDetails",0x81deee6c,"snikket.persistence.Sqlite.getChatsUnreadDetails","snikket/persistence/Sqlite.hx",469,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_429_getChatsUnreadDetails,"snikket.persistence.Sqlite","getChatsUnreadDetails",0x81deee6c,"snikket.persistence.Sqlite.getChatsUnreadDetails","snikket/persistence/Sqlite.hx",429,0x917a2510)
-static const ::String _hx_array_data_e415cb6c_87[] = {
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_427_getMessagesAround,"snikket.persistence.Sqlite","getMessagesAround",0x88f497ed,"snikket.persistence.Sqlite.getMessagesAround","snikket/persistence/Sqlite.hx",427,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_449_getChatsUnreadDetails,"snikket.persistence.Sqlite","getChatsUnreadDetails",0x81deee6c,"snikket.persistence.Sqlite.getChatsUnreadDetails","snikket/persistence/Sqlite.hx",449,0x917a2510)
+static const ::String _hx_array_data_e415cb6c_88[] = {
 	HX_("SELECT chat_id, ROWID as row, MAX(created_at) AS created_at FROM messages WHERE account_id=?",d0,69,08,92),
 };
-static const ::String _hx_array_data_e415cb6c_88[] = {
+static const ::String _hx_array_data_e415cb6c_89[] = {
 	HX_(" AND chat_id IN (",14,bd,7b,de),
 };
-static const ::String _hx_array_data_e415cb6c_89[] = {
+static const ::String _hx_array_data_e415cb6c_90[] = {
 	HX_(",",2c,00,00,00),
 };
-static const ::String _hx_array_data_e415cb6c_90[] = {
+static const ::String _hx_array_data_e415cb6c_91[] = {
 	HX_("?",3f,00,00,00),
 };
-static const ::String _hx_array_data_e415cb6c_91[] = {
+static const ::String _hx_array_data_e415cb6c_92[] = {
 	HX_(") AND (mam_id IN (",64,f4,1c,69),
 };
-static const ::String _hx_array_data_e415cb6c_92[] = {
+static const ::String _hx_array_data_e415cb6c_93[] = {
 	HX_(",",2c,00,00,00),
 };
-static const ::String _hx_array_data_e415cb6c_93[] = {
+static const ::String _hx_array_data_e415cb6c_94[] = {
 	HX_("?",3f,00,00,00),
 };
-static const ::String _hx_array_data_e415cb6c_94[] = {
+static const ::String _hx_array_data_e415cb6c_95[] = {
 	HX_(") OR direction=?) GROUP BY chat_id",cc,ab,94,e3),
 };
-static const ::String _hx_array_data_e415cb6c_95[] = {
+static const ::String _hx_array_data_e415cb6c_96[] = {
 	HX_("SELECT chat_id AS chatId, stanza, direction, type, status, sender_id, mam_id, mam_by, sync_point, CASE WHEN subq.created_at IS NULL THEN COUNT(*) ELSE COUNT(*) - 1 END AS unreadCount, strftime('%FT%H:%M:%fZ', MAX(messages.created_at) / 1000.0, 'unixepoch') AS timestamp FROM messages LEFT JOIN (",2a,b0,45,a6),
 };
-static const ::String _hx_array_data_e415cb6c_96[] = {
+static const ::String _hx_array_data_e415cb6c_97[] = {
 	HX_(") subq USING (chat_id) WHERE account_id=? AND (stanza_id IS NULL OR stanza_id='' OR stanza_id=correction_id) AND chat_id IN (",e7,a1,32,e5),
 };
-static const ::String _hx_array_data_e415cb6c_97[] = {
+static const ::String _hx_array_data_e415cb6c_98[] = {
 	HX_(",",2c,00,00,00),
 };
-static const ::String _hx_array_data_e415cb6c_98[] = {
+static const ::String _hx_array_data_e415cb6c_99[] = {
 	HX_("?",3f,00,00,00),
 };
-static const ::String _hx_array_data_e415cb6c_99[] = {
+static const ::String _hx_array_data_e415cb6c_100[] = {
 	HX_(") AND (subq.created_at IS NULL OR messages.created_at > subq.created_at OR (messages.created_at=subq.created_at AND messages.ROWID >= subq.row)) GROUP BY chat_id;",58,6f,52,ea),
 };
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_495_storeReaction,"snikket.persistence.Sqlite","storeReaction",0x07446c28,"snikket.persistence.Sqlite.storeReaction","snikket/persistence/Sqlite.hx",495,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_486_storeReaction,"snikket.persistence.Sqlite","storeReaction",0x07446c28,"snikket.persistence.Sqlite.storeReaction","snikket/persistence/Sqlite.hx",486,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_505_updateMessageStatus,"snikket.persistence.Sqlite","updateMessageStatus",0xa0efb68e,"snikket.persistence.Sqlite.updateMessageStatus","snikket/persistence/Sqlite.hx",505,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_509_updateMessageStatus,"snikket.persistence.Sqlite","updateMessageStatus",0xa0efb68e,"snikket.persistence.Sqlite.updateMessageStatus","snikket/persistence/Sqlite.hx",509,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_510_updateMessageStatus,"snikket.persistence.Sqlite","updateMessageStatus",0xa0efb68e,"snikket.persistence.Sqlite.updateMessageStatus","snikket/persistence/Sqlite.hx",510,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_515_updateMessageStatus,"snikket.persistence.Sqlite","updateMessageStatus",0xa0efb68e,"snikket.persistence.Sqlite.updateMessageStatus","snikket/persistence/Sqlite.hx",515,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_500_updateMessageStatus,"snikket.persistence.Sqlite","updateMessageStatus",0xa0efb68e,"snikket.persistence.Sqlite.updateMessageStatus","snikket/persistence/Sqlite.hx",500,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_523_hasMedia,"snikket.persistence.Sqlite","hasMedia",0x1738946c,"snikket.persistence.Sqlite.hasMedia","snikket/persistence/Sqlite.hx",523,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_528_removeMedia,"snikket.persistence.Sqlite","removeMedia",0x14a4d1fe,"snikket.persistence.Sqlite.removeMedia","snikket/persistence/Sqlite.hx",528,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_533_storeMedia,"snikket.persistence.Sqlite","storeMedia",0x8dec4b05,"snikket.persistence.Sqlite.storeMedia","snikket/persistence/Sqlite.hx",533,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_538_storeCaps,"snikket.persistence.Sqlite","storeCaps",0x986fb520,"snikket.persistence.Sqlite.storeCaps","snikket/persistence/Sqlite.hx",538,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_555_getCaps,"snikket.persistence.Sqlite","getCaps",0x487e64d5,"snikket.persistence.Sqlite.getCaps","snikket/persistence/Sqlite.hx",555,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_558_getCaps,"snikket.persistence.Sqlite","getCaps",0x487e64d5,"snikket.persistence.Sqlite.getCaps","snikket/persistence/Sqlite.hx",558,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_545_getCaps,"snikket.persistence.Sqlite","getCaps",0x487e64d5,"snikket.persistence.Sqlite.getCaps","snikket/persistence/Sqlite.hx",545,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_566_storeLogin,"snikket.persistence.Sqlite","storeLogin",0x01241f8a,"snikket.persistence.Sqlite.storeLogin","snikket/persistence/Sqlite.hx",566,0x917a2510)
-static const ::String _hx_array_data_e415cb6c_118[] = {
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_486_getChatsUnreadDetails,"snikket.persistence.Sqlite","getChatsUnreadDetails",0x81deee6c,"snikket.persistence.Sqlite.getChatsUnreadDetails","snikket/persistence/Sqlite.hx",486,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_488_getChatsUnreadDetails,"snikket.persistence.Sqlite","getChatsUnreadDetails",0x81deee6c,"snikket.persistence.Sqlite.getChatsUnreadDetails","snikket/persistence/Sqlite.hx",488,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_487_getChatsUnreadDetails,"snikket.persistence.Sqlite","getChatsUnreadDetails",0x81deee6c,"snikket.persistence.Sqlite.getChatsUnreadDetails","snikket/persistence/Sqlite.hx",487,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_443_getChatsUnreadDetails,"snikket.persistence.Sqlite","getChatsUnreadDetails",0x81deee6c,"snikket.persistence.Sqlite.getChatsUnreadDetails","snikket/persistence/Sqlite.hx",443,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_512_storeReaction,"snikket.persistence.Sqlite","storeReaction",0x07446c28,"snikket.persistence.Sqlite.storeReaction","snikket/persistence/Sqlite.hx",512,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_503_storeReaction,"snikket.persistence.Sqlite","storeReaction",0x07446c28,"snikket.persistence.Sqlite.storeReaction","snikket/persistence/Sqlite.hx",503,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_522_updateMessageStatus,"snikket.persistence.Sqlite","updateMessageStatus",0xa0efb68e,"snikket.persistence.Sqlite.updateMessageStatus","snikket/persistence/Sqlite.hx",522,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_526_updateMessageStatus,"snikket.persistence.Sqlite","updateMessageStatus",0xa0efb68e,"snikket.persistence.Sqlite.updateMessageStatus","snikket/persistence/Sqlite.hx",526,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_533_updateMessageStatus,"snikket.persistence.Sqlite","updateMessageStatus",0xa0efb68e,"snikket.persistence.Sqlite.updateMessageStatus","snikket/persistence/Sqlite.hx",533,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_517_updateMessageStatus,"snikket.persistence.Sqlite","updateMessageStatus",0xa0efb68e,"snikket.persistence.Sqlite.updateMessageStatus","snikket/persistence/Sqlite.hx",517,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_541_hasMedia,"snikket.persistence.Sqlite","hasMedia",0x1738946c,"snikket.persistence.Sqlite.hasMedia","snikket/persistence/Sqlite.hx",541,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_546_removeMedia,"snikket.persistence.Sqlite","removeMedia",0x14a4d1fe,"snikket.persistence.Sqlite.removeMedia","snikket/persistence/Sqlite.hx",546,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_551_storeMedia,"snikket.persistence.Sqlite","storeMedia",0x8dec4b05,"snikket.persistence.Sqlite.storeMedia","snikket/persistence/Sqlite.hx",551,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_556_storeCaps,"snikket.persistence.Sqlite","storeCaps",0x986fb520,"snikket.persistence.Sqlite.storeCaps","snikket/persistence/Sqlite.hx",556,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_559_storeCapsSet,"snikket.persistence.Sqlite","storeCapsSet",0xcff59262,"snikket.persistence.Sqlite.storeCapsSet","snikket/persistence/Sqlite.hx",559,0x917a2510)
+static const ::String _hx_array_data_e415cb6c_120[] = {
+	HX_("INSERT OR IGNORE INTO caps VALUES ",27,4b,68,bf),
+};
+static const ::String _hx_array_data_e415cb6c_121[] = {
+	HX_(",",2c,00,00,00),
+};
+static const ::String _hx_array_data_e415cb6c_122[] = {
+	HX_("(?,jsonb(?))",1c,61,06,9e),
+};
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_586_getCaps,"snikket.persistence.Sqlite","getCaps",0x487e64d5,"snikket.persistence.Sqlite.getCaps","snikket/persistence/Sqlite.hx",586,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_589_getCaps,"snikket.persistence.Sqlite","getCaps",0x487e64d5,"snikket.persistence.Sqlite.getCaps","snikket/persistence/Sqlite.hx",589,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_576_getCaps,"snikket.persistence.Sqlite","getCaps",0x487e64d5,"snikket.persistence.Sqlite.getCaps","snikket/persistence/Sqlite.hx",576,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_597_storeLogin,"snikket.persistence.Sqlite","storeLogin",0x01241f8a,"snikket.persistence.Sqlite.storeLogin","snikket/persistence/Sqlite.hx",597,0x917a2510)
+static const ::String _hx_array_data_e415cb6c_128[] = {
 	HX_("INSERT INTO accounts (account_id, client_id, display_name",03,b0,6a,0b),
 };
-static const ::String _hx_array_data_e415cb6c_119[] = {
+static const ::String _hx_array_data_e415cb6c_129[] = {
 	HX_(", token, fast_count",a5,56,e4,ae),
 };
-static const ::String _hx_array_data_e415cb6c_120[] = {
+static const ::String _hx_array_data_e415cb6c_130[] = {
 	HX_(") VALUES (?,?,?",c4,1c,e3,67),
 };
-static const ::String _hx_array_data_e415cb6c_121[] = {
+static const ::String _hx_array_data_e415cb6c_131[] = {
 	HX_(",?",93,26,00,00),
 };
-static const ::String _hx_array_data_e415cb6c_122[] = {
+static const ::String _hx_array_data_e415cb6c_132[] = {
 	HX_(",0",84,26,00,00),
 };
-static const ::String _hx_array_data_e415cb6c_123[] = {
+static const ::String _hx_array_data_e415cb6c_133[] = {
 	HX_(") ON CONFLICT DO UPDATE SET client_id=?",cd,99,0c,96),
 };
-static const ::String _hx_array_data_e415cb6c_124[] = {
+static const ::String _hx_array_data_e415cb6c_134[] = {
 	HX_(", display_name=?",7e,ad,5b,0f),
 };
-static const ::String _hx_array_data_e415cb6c_125[] = {
+static const ::String _hx_array_data_e415cb6c_135[] = {
 	HX_(", token=?",a7,78,19,80),
 };
-static const ::String _hx_array_data_e415cb6c_126[] = {
+static const ::String _hx_array_data_e415cb6c_136[] = {
 	HX_(", fast_count=0",73,a8,4f,82),
 };
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_596_getLogin,"snikket.persistence.Sqlite","getLogin",0x5def2e35,"snikket.persistence.Sqlite.getLogin","snikket/persistence/Sqlite.hx",596,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_592_getLogin,"snikket.persistence.Sqlite","getLogin",0x5def2e35,"snikket.persistence.Sqlite.getLogin","snikket/persistence/Sqlite.hx",592,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_609_removeAccount,"snikket.persistence.Sqlite","removeAccount",0xd5e3c447,"snikket.persistence.Sqlite.removeAccount","snikket/persistence/Sqlite.hx",609,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_622_listAccounts,"snikket.persistence.Sqlite","listAccounts",0x83858fe6,"snikket.persistence.Sqlite.listAccounts","snikket/persistence/Sqlite.hx",622,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_621_listAccounts,"snikket.persistence.Sqlite","listAccounts",0x83858fe6,"snikket.persistence.Sqlite.listAccounts","snikket/persistence/Sqlite.hx",621,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_627_getLogin,"snikket.persistence.Sqlite","getLogin",0x5def2e35,"snikket.persistence.Sqlite.getLogin","snikket/persistence/Sqlite.hx",627,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_623_getLogin,"snikket.persistence.Sqlite","getLogin",0x5def2e35,"snikket.persistence.Sqlite.getLogin","snikket/persistence/Sqlite.hx",623,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_640_removeAccount,"snikket.persistence.Sqlite","removeAccount",0xd5e3c447,"snikket.persistence.Sqlite.removeAccount","snikket/persistence/Sqlite.hx",640,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_653_listAccounts,"snikket.persistence.Sqlite","listAccounts",0x83858fe6,"snikket.persistence.Sqlite.listAccounts","snikket/persistence/Sqlite.hx",653,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_652_listAccounts,"snikket.persistence.Sqlite","listAccounts",0x83858fe6,"snikket.persistence.Sqlite.listAccounts","snikket/persistence/Sqlite.hx",652,0x917a2510)
 HX_LOCAL_STACK_FRAME(_hx_pos_45dcb523da764b50_221_listAccounts__fromC,"snikket.persistence.Sqlite","listAccounts__fromC",0x29194953,"snikket.persistence.Sqlite.listAccounts__fromC","HaxeCBridge.hx",221,0xa18550d8)
 HX_LOCAL_STACK_FRAME(_hx_pos_45dcb523da764b50_252_listAccounts__fromC,"snikket.persistence.Sqlite","listAccounts__fromC",0x29194953,"snikket.persistence.Sqlite.listAccounts__fromC","HaxeCBridge.hx",252,0xa18550d8)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_629_storeStreamManagement,"snikket.persistence.Sqlite","storeStreamManagement",0x8a3c36a2,"snikket.persistence.Sqlite.storeStreamManagement","snikket/persistence/Sqlite.hx",629,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_636_storeStreamManagement,"snikket.persistence.Sqlite","storeStreamManagement",0x8a3c36a2,"snikket.persistence.Sqlite.storeStreamManagement","snikket/persistence/Sqlite.hx",636,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_645_getStreamManagement,"snikket.persistence.Sqlite","getStreamManagement",0xfe2e21d7,"snikket.persistence.Sqlite.getStreamManagement","snikket/persistence/Sqlite.hx",645,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_656_storeService,"snikket.persistence.Sqlite","storeService",0x2b93ec96,"snikket.persistence.Sqlite.storeService","snikket/persistence/Sqlite.hx",656,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_671_findServicesWithFeature,"snikket.persistence.Sqlite","findServicesWithFeature",0x83994397,"snikket.persistence.Sqlite.findServicesWithFeature","snikket/persistence/Sqlite.hx",671,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_668_findServicesWithFeature,"snikket.persistence.Sqlite","findServicesWithFeature",0x83994397,"snikket.persistence.Sqlite.findServicesWithFeature","snikket/persistence/Sqlite.hx",668,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_690_hydrateReactions,"snikket.persistence.Sqlite","hydrateReactions",0xe3b51cd9,"snikket.persistence.Sqlite.hydrateReactions","snikket/persistence/Sqlite.hx",690,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_693_hydrateReactions,"snikket.persistence.Sqlite","hydrateReactions",0xe3b51cd9,"snikket.persistence.Sqlite.hydrateReactions","snikket/persistence/Sqlite.hx",693,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_718_fetchReactions,"snikket.persistence.Sqlite","fetchReactions",0x5819e3d2,"snikket.persistence.Sqlite.fetchReactions","snikket/persistence/Sqlite.hx",718,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_702_fetchReactions,"snikket.persistence.Sqlite","fetchReactions",0x5819e3d2,"snikket.persistence.Sqlite.fetchReactions","snikket/persistence/Sqlite.hx",702,0x917a2510)
-static const ::String _hx_array_data_e415cb6c_162[] = {
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_660_storeStreamManagement,"snikket.persistence.Sqlite","storeStreamManagement",0x8a3c36a2,"snikket.persistence.Sqlite.storeStreamManagement","snikket/persistence/Sqlite.hx",660,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_667_storeStreamManagement,"snikket.persistence.Sqlite","storeStreamManagement",0x8a3c36a2,"snikket.persistence.Sqlite.storeStreamManagement","snikket/persistence/Sqlite.hx",667,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_676_getStreamManagement,"snikket.persistence.Sqlite","getStreamManagement",0xfe2e21d7,"snikket.persistence.Sqlite.getStreamManagement","snikket/persistence/Sqlite.hx",676,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_687_storeService,"snikket.persistence.Sqlite","storeService",0x2b93ec96,"snikket.persistence.Sqlite.storeService","snikket/persistence/Sqlite.hx",687,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_702_findServicesWithFeature,"snikket.persistence.Sqlite","findServicesWithFeature",0x83994397,"snikket.persistence.Sqlite.findServicesWithFeature","snikket/persistence/Sqlite.hx",702,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_699_findServicesWithFeature,"snikket.persistence.Sqlite","findServicesWithFeature",0x83994397,"snikket.persistence.Sqlite.findServicesWithFeature","snikket/persistence/Sqlite.hx",699,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_721_hydrateReactions,"snikket.persistence.Sqlite","hydrateReactions",0xe3b51cd9,"snikket.persistence.Sqlite.hydrateReactions","snikket/persistence/Sqlite.hx",721,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_749_fetchReactions,"snikket.persistence.Sqlite","fetchReactions",0x5819e3d2,"snikket.persistence.Sqlite.fetchReactions","snikket/persistence/Sqlite.hx",749,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_733_fetchReactions,"snikket.persistence.Sqlite","fetchReactions",0x5819e3d2,"snikket.persistence.Sqlite.fetchReactions","snikket/persistence/Sqlite.hx",733,0x917a2510)
+static const ::String _hx_array_data_e415cb6c_172[] = {
 	HX_("SELECT kind, chat_id, mam_id, mam_by, stanza_id, sender_id, json(reactions) AS reactions FROM reactions WHERE 1=0",d2,04,de,a3),
 };
-static const ::String _hx_array_data_e415cb6c_163[] = {
+static const ::String _hx_array_data_e415cb6c_173[] = {
 	HX_(" OR (mam_id=? AND mam_by=?)",0f,bb,c5,e5),
 };
-static const ::String _hx_array_data_e415cb6c_164[] = {
+static const ::String _hx_array_data_e415cb6c_174[] = {
 	HX_(" OR stanza_id=?",6a,1d,f2,5b),
 };
-static const ::String _hx_array_data_e415cb6c_165[] = {
+static const ::String _hx_array_data_e415cb6c_175[] = {
 	HX_(" ORDER BY created_at, ROWID",00,65,8d,0e),
 };
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_775_hydrateReplyTo,"snikket.persistence.Sqlite","hydrateReplyTo",0x94f407b4,"snikket.persistence.Sqlite.hydrateReplyTo","snikket/persistence/Sqlite.hx",775,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_777_hydrateReplyTo,"snikket.persistence.Sqlite","hydrateReplyTo",0x94f407b4,"snikket.persistence.Sqlite.hydrateReplyTo","snikket/persistence/Sqlite.hx",777,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_780_hydrateReplyTo,"snikket.persistence.Sqlite","hydrateReplyTo",0x94f407b4,"snikket.persistence.Sqlite.hydrateReplyTo","snikket/persistence/Sqlite.hx",780,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_755_hydrateReplyTo,"snikket.persistence.Sqlite","hydrateReplyTo",0x94f407b4,"snikket.persistence.Sqlite.hydrateReplyTo","snikket/persistence/Sqlite.hx",755,0x917a2510)
-static const ::String _hx_array_data_e415cb6c_172[] = {
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_806_hydrateReplyTo,"snikket.persistence.Sqlite","hydrateReplyTo",0x94f407b4,"snikket.persistence.Sqlite.hydrateReplyTo","snikket/persistence/Sqlite.hx",806,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_808_hydrateReplyTo,"snikket.persistence.Sqlite","hydrateReplyTo",0x94f407b4,"snikket.persistence.Sqlite.hydrateReplyTo","snikket/persistence/Sqlite.hx",808,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_786_hydrateReplyTo,"snikket.persistence.Sqlite","hydrateReplyTo",0x94f407b4,"snikket.persistence.Sqlite.hydrateReplyTo","snikket/persistence/Sqlite.hx",786,0x917a2510)
+static const ::String _hx_array_data_e415cb6c_182[] = {
 	HX_("SELECT chat_id, stanza_id, stanza, direction, type, status, strftime('%FT%H:%M:%fZ', created_at / 1000.0, 'unixepoch') AS timestamp, sender_id, mam_id, mam_by, sync_point FROM messages WHERE account_id=? AND (",56,f2,9f,31),
 };
-static const ::String _hx_array_data_e415cb6c_173[] = {
+static const ::String _hx_array_data_e415cb6c_183[] = {
 	HX_(")",29,00,00,00),
 };
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_789_hydrateMessages,"snikket.persistence.Sqlite","hydrateMessages",0xcda7e37d,"snikket.persistence.Sqlite.hydrateMessages","snikket/persistence/Sqlite.hx",789,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_792_hydrateMessages,"snikket.persistence.Sqlite","hydrateMessages",0xcda7e37d,"snikket.persistence.Sqlite.hydrateMessages","snikket/persistence/Sqlite.hx",792,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_822_hydrateMessages,"snikket.persistence.Sqlite","hydrateMessages",0xcda7e37d,"snikket.persistence.Sqlite.hydrateMessages","snikket/persistence/Sqlite.hx",822,0x917a2510)
-HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_812_hydrateMessages,"snikket.persistence.Sqlite","hydrateMessages",0xcda7e37d,"snikket.persistence.Sqlite.hydrateMessages","snikket/persistence/Sqlite.hx",812,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_820_hydrateMessages,"snikket.persistence.Sqlite","hydrateMessages",0xcda7e37d,"snikket.persistence.Sqlite.hydrateMessages","snikket/persistence/Sqlite.hx",820,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_823_hydrateMessages,"snikket.persistence.Sqlite","hydrateMessages",0xcda7e37d,"snikket.persistence.Sqlite.hydrateMessages","snikket/persistence/Sqlite.hx",823,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_853_hydrateMessages,"snikket.persistence.Sqlite","hydrateMessages",0xcda7e37d,"snikket.persistence.Sqlite.hydrateMessages","snikket/persistence/Sqlite.hx",853,0x917a2510)
+HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_843_hydrateMessages,"snikket.persistence.Sqlite","hydrateMessages",0xcda7e37d,"snikket.persistence.Sqlite.hydrateMessages","snikket/persistence/Sqlite.hx",843,0x917a2510)
 HX_LOCAL_STACK_FRAME(_hx_pos_5b1a6b524efab4db_24_boot,"snikket.persistence.Sqlite","boot",0x8e1f8074,"snikket.persistence.Sqlite.boot","snikket/persistence/Sqlite.hx",24,0x917a2510)
 namespace snikket{
 namespace persistence{
 
 void Sqlite_obj::__construct(::String dbfile,::Dynamic media){
-            		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::persistence::Sqlite,_gthis) HXARGC(1)
-            		void _hx_run(::Dynamic iter){
-            			HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_39_new)
-HXLINE(  40)			int version;
-HXDLIN(  40)			 ::Dynamic tmp = ::sys::db::ResultSet_obj::next(iter);
-HXDLIN(  40)			 ::Dynamic tmp1;
-HXDLIN(  40)			if (::hx::IsNotNull( tmp )) {
-HXLINE(  40)				tmp1 =  ::Dynamic(tmp->__Field(HX_("user_version",e4,95,f3,73),::hx::paccDynamic));
-            			}
-            			else {
-HXLINE(  40)				tmp1 = null();
-            			}
-HXDLIN(  40)			 ::Dynamic tmp2 = ::Std_obj::parseInt(( (::String)(tmp1) ));
-HXDLIN(  40)			if (::hx::IsNotNull( tmp2 )) {
-HXLINE(  40)				version = ( (int)(tmp2) );
-            			}
-            			else {
-HXLINE(  40)				version = 0;
-            			}
-HXLINE(  41)			if ((version < 1)) {
-HXLINE(  42)				_gthis->db->exec(::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_1,10),null());
-            			}
-HXLINE( 116)			if ((version < 2)) {
-HXLINE( 117)				_gthis->db->exec(::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_2,4),null());
+            		HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_3) HXARGC(1)
+            		::Dynamic _hx_run( ::Dynamic exec){
+            			HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_2, ::Dynamic,exec) HXARGC(1)
+            			::Dynamic _hx_run( ::haxe::iterators::ArrayIterator iter){
+            				HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0, ::Dynamic,exec,int,version) HXARGC(1)
+            				::Dynamic _hx_run( ::Dynamic _){
+            					HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_41_new)
+HXLINE(  42)					if ((version < 1)) {
+HXLINE(  43)						return exec(::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_1,10));
+            					}
+HXLINE( 117)					return ::thenshim::_Promise::Promise_Impl__obj::resolve(null());
+            				}
+            				HX_END_LOCAL_FUNC1(return)
+
+            				HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_1, ::Dynamic,exec,int,version) HXARGC(1)
+            				::Dynamic _hx_run( ::haxe::iterators::ArrayIterator _){
+            					HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_118_new)
+HXLINE( 119)					if ((version < 2)) {
+HXLINE( 120)						return exec(::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_3,4));
+            					}
+HXLINE( 125)					return ::thenshim::_Promise::Promise_Impl__obj::resolve(null());
+            				}
+            				HX_END_LOCAL_FUNC1(return)
+
+            				HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_39_new)
+HXLINE(  40)				int version;
+HXDLIN(  40)				 ::Dynamic tmp = iter->array->__get(iter->current++);
+HXDLIN(  40)				 ::Dynamic tmp1;
+HXDLIN(  40)				if (::hx::IsNotNull( tmp )) {
+HXLINE(  40)					tmp1 =  ::Dynamic(tmp->__Field(HX_("user_version",e4,95,f3,73),::hx::paccDynamic));
+            				}
+            				else {
+HXLINE(  40)					tmp1 = null();
+            				}
+HXDLIN(  40)				 ::Dynamic tmp2 = ::Std_obj::parseInt(( (::String)(tmp1) ));
+HXDLIN(  40)				if (::hx::IsNotNull( tmp2 )) {
+HXLINE(  40)					version = ( (int)(tmp2) );
+            				}
+            				else {
+HXLINE(  40)					version = 0;
+            				}
+HXLINE(  41)				return ::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::resolve(null()), ::Dynamic(new _hx_Closure_0(exec,version)),null()), ::Dynamic(new _hx_Closure_1(exec,version)),null());
             			}
+            			HX_END_LOCAL_FUNC1(return)
+
+            			HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_38_new)
+HXLINE(  38)			return ::thenshim::_Promise::Promise_Impl__obj::then(exec(::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_6,1)), ::Dynamic(new _hx_Closure_2(exec)),null());
             		}
-            		HX_END_LOCAL_FUNC1((void))
+            		HX_END_LOCAL_FUNC1(return)
 
             	HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_24_new)
-HXLINE( 627)		this->smStoreNext = null();
-HXLINE( 626)		this->smStoreInProgress = false;
-HXLINE( 165)		this->storeChatTimer = null();
-HXLINE( 164)		this->storeChatBuffer =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
-HXLINE(  35)		 ::snikket::persistence::Sqlite _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 658)		this->smStoreNext = null();
+HXLINE( 657)		this->smStoreInProgress = false;
+HXLINE( 171)		this->storeChatTimer = null();
+HXLINE( 170)		this->storeChatBuffer =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
 HXLINE(  36)		this->media = media;
 HXLINE(  37)		::snikket::persistence::MediaStore_obj::setKV(media,::hx::ObjectPtr<OBJ_>(this));
-HXLINE(  38)		this->db =  ::snikket::persistence::SqliteDriver_obj::__alloc( HX_CTX ,dbfile);
-HXLINE(  39)		::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(HX_("PRAGMA user_version;",73,bf,dc,ae),null()), ::Dynamic(new _hx_Closure_0(_gthis)),null());
+HXLINE(  38)		this->db =  ::snikket::persistence::SqliteDriver_obj::__alloc( HX_CTX ,dbfile, ::Dynamic(new _hx_Closure_3()));
             	}
 
 Dynamic Sqlite_obj::__CreateEmpty() { return new Sqlite_obj; }
@@ -423,48 +453,48 @@ void *Sqlite_obj::_hx_getInterface(int inHash) {
 
 void Sqlite_obj::get(::String k, ::Dynamic callback){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::Dynamic,callback) HXARGC(1)
-            		void _hx_run(::Dynamic iter){
-            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_127_get)
-HXLINE( 128)			{
-HXLINE( 128)				::Dynamic row = iter;
-HXDLIN( 128)				while(::sys::db::ResultSet_obj::hasNext(row)){
-HXLINE( 128)					 ::Dynamic row1 = ::sys::db::ResultSet_obj::next(row);
-HXLINE( 129)					callback( ::Dynamic(row1->__Field(HX_("v",76,00,00,00),::hx::paccDynamic)));
-HXLINE( 130)					return;
+            		void _hx_run( ::haxe::iterators::ArrayIterator iter){
+            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_133_get)
+HXLINE( 134)			{
+HXLINE( 134)				 ::haxe::iterators::ArrayIterator _g = iter;
+HXDLIN( 134)				while((_g->current < _g->array->get_length())){
+HXLINE( 134)					 ::Dynamic row = _g->array->__get(_g->current++);
+HXLINE( 135)					callback( ::Dynamic(row->__Field(HX_("v",76,00,00,00),::hx::paccDynamic)));
+HXLINE( 136)					return;
             				}
             			}
-HXLINE( 132)			callback(null());
+HXLINE( 138)			callback(null());
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_127_get)
-HXDLIN( 127)		::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(HX_("SELECT v FROM keyvaluepairs WHERE k=? LIMIT 1",5f,f1,14,07),::cpp::VirtualArray_obj::__new(1)->init(0,k)), ::Dynamic(new _hx_Closure_0(callback)),null());
+            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_133_get)
+HXDLIN( 133)		::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(HX_("SELECT v FROM keyvaluepairs WHERE k=? LIMIT 1",5f,f1,14,07),::cpp::VirtualArray_obj::__new(1)->init(0,k)), ::Dynamic(new _hx_Closure_0(callback)),null());
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC2(Sqlite_obj,get,(void))
 
 void Sqlite_obj::set(::String k,::String v, ::Dynamic callback){
-            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_138_set)
-HXDLIN( 138)		if (::hx::IsNull( v )) {
+            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_144_set)
+HXDLIN( 144)		if (::hx::IsNull( v )) {
             			HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::Dynamic,callback) HXARGC(1)
-            			void _hx_run(::Dynamic _){
-            				HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_140_set)
-HXLINE( 140)				callback();
+            			void _hx_run( ::haxe::iterators::ArrayIterator _){
+            				HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_146_set)
+HXLINE( 146)				callback();
             			}
             			HX_END_LOCAL_FUNC1((void))
 
-HXLINE( 139)			::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(HX_("DELETE FROM keyvaluepairs WHERE k=?",1a,ab,19,78),::cpp::VirtualArray_obj::__new(1)->init(0,k)), ::Dynamic(new _hx_Closure_0(callback)),null());
+HXLINE( 145)			::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(HX_("DELETE FROM keyvaluepairs WHERE k=?",1a,ab,19,78),::cpp::VirtualArray_obj::__new(1)->init(0,k)), ::Dynamic(new _hx_Closure_0(callback)),null());
             		}
             		else {
             			HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_1, ::Dynamic,callback) HXARGC(1)
-            			void _hx_run(::Dynamic _){
-            				HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_144_set)
-HXLINE( 144)				callback();
+            			void _hx_run( ::haxe::iterators::ArrayIterator _){
+            				HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_150_set)
+HXLINE( 150)				callback();
             			}
             			HX_END_LOCAL_FUNC1((void))
 
-HXLINE( 143)			::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(HX_("INSERT OR REPLACE INTO keyvaluepairs VALUES (?,?)",18,81,b5,d3),::cpp::VirtualArray_obj::__new(2)->init(0,k)->init(1,v)), ::Dynamic(new _hx_Closure_1(callback)),null());
+HXLINE( 149)			::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(HX_("INSERT OR REPLACE INTO keyvaluepairs VALUES (?,?)",18,81,b5,d3),::cpp::VirtualArray_obj::__new(2)->init(0,k)->init(1,v)), ::Dynamic(new _hx_Closure_1(callback)),null());
             		}
             	}
 
@@ -473,41 +503,41 @@ HX_DEFINE_DYNAMIC_FUNC3(Sqlite_obj,set,(void))
 
 void Sqlite_obj::lastId(::String accountId,::String chatId, ::Dynamic callback){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::Dynamic,callback) HXARGC(1)
-            		void _hx_run(::Dynamic iter){
-            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_161_lastId)
-HXLINE( 161)			 ::Dynamic callback1 = callback;
-HXDLIN( 161)			 ::Dynamic tmp = ::sys::db::ResultSet_obj::next(iter);
-HXDLIN( 161)			 ::Dynamic _hx_tmp;
-HXDLIN( 161)			if (::hx::IsNotNull( tmp )) {
-HXLINE( 161)				_hx_tmp =  ::Dynamic(tmp->__Field(HX_("mam_id",01,4d,19,b7),::hx::paccDynamic));
+            		void _hx_run( ::haxe::iterators::ArrayIterator iter){
+            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_167_lastId)
+HXLINE( 167)			 ::Dynamic callback1 = callback;
+HXDLIN( 167)			 ::Dynamic tmp = iter->array->__get(iter->current++);
+HXDLIN( 167)			 ::Dynamic _hx_tmp;
+HXDLIN( 167)			if (::hx::IsNotNull( tmp )) {
+HXLINE( 167)				_hx_tmp =  ::Dynamic(tmp->__Field(HX_("mam_id",01,4d,19,b7),::hx::paccDynamic));
             			}
             			else {
-HXLINE( 161)				_hx_tmp = null();
+HXLINE( 167)				_hx_tmp = null();
             			}
-HXDLIN( 161)			callback1(_hx_tmp);
+HXDLIN( 167)			callback1(_hx_tmp);
             		}
             		HX_END_LOCAL_FUNC1((void))
 
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_1, ::Dynamic,callback) HXARGC(1)
             		void _hx_run( ::Dynamic _){
-            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_161_lastId)
-HXLINE( 161)			callback(null());
+            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_167_lastId)
+HXLINE( 167)			callback(null());
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_150_lastId)
-HXLINE( 151)		::Array< ::String > params = ::Array_obj< ::String >::__new(1)->init(0,accountId);
-HXLINE( 152)		::String q = HX_("SELECT mam_id FROM messages WHERE mam_id IS NOT NULL AND sync_point AND account_id=?",20,14,35,bc);
-HXLINE( 153)		if (::hx::IsNull( chatId )) {
-HXLINE( 154)			q = (q + HX_(" AND mam_by=?",48,20,9b,c4));
-HXLINE( 155)			params->push(accountId);
+            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_156_lastId)
+HXLINE( 157)		::Array< ::String > params = ::Array_obj< ::String >::__new(1)->init(0,accountId);
+HXLINE( 158)		::String q = HX_("SELECT mam_id FROM messages WHERE mam_id IS NOT NULL AND sync_point AND account_id=?",20,14,35,bc);
+HXLINE( 159)		if (::hx::IsNull( chatId )) {
+HXLINE( 160)			q = (q + HX_(" AND mam_by=?",48,20,9b,c4));
+HXLINE( 161)			params->push(accountId);
             		}
             		else {
-HXLINE( 157)			q = (q + HX_(" AND chat_id=?",3b,95,e7,43));
-HXLINE( 158)			params->push(chatId);
+HXLINE( 163)			q = (q + HX_(" AND chat_id=?",3b,95,e7,43));
+HXLINE( 164)			params->push(chatId);
             		}
-HXLINE( 160)		q = (q + HX_(" ORDER BY ROWID DESC LIMIT 1",1f,5d,e2,de));
-HXLINE( 161)		::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(q,params), ::Dynamic(new _hx_Closure_0(callback)), ::Dynamic(new _hx_Closure_1(callback)));
+HXLINE( 166)		q = (q + HX_(" ORDER BY ROWID DESC LIMIT 1",1f,5d,e2,de));
+HXLINE( 167)		::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(q,params), ::Dynamic(new _hx_Closure_0(callback)), ::Dynamic(new _hx_Closure_1(callback)));
             	}
 
 
@@ -518,184 +548,190 @@ void Sqlite_obj::storeChats(::String accountId,::Array< ::Dynamic> chats){
             		void _hx_run(){
             			HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::persistence::Sqlite,_gthis) HXARGC(1)
             			 ::Dynamic _hx_run( ::snikket::Chat chat){
-            				HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_178_storeChats)
-HXLINE( 179)				 ::Dynamic storePresence =  ::Dynamic(::hx::Anon_obj::Create(0));
-HXLINE( 180)				{
-HXLINE( 180)					::Dynamic map = chat->presence;
-HXDLIN( 180)					::Dynamic _g_map = map;
-HXDLIN( 180)					 ::Dynamic _g_keys = ::haxe::IMap_obj::keys(map);
-HXDLIN( 180)					while(( (bool)(_g_keys->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE( 180)						::String key = ( (::String)(_g_keys->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
-HXDLIN( 180)						 ::snikket::Presence _g_value = ( ( ::snikket::Presence)(::haxe::IMap_obj::get(_g_map,key)) );
-HXDLIN( 180)						::String _g_key = key;
-HXDLIN( 180)						::String resource = _g_key;
-HXDLIN( 180)						 ::snikket::Presence presence = _g_value;
-HXDLIN( 180)						{
-HXLINE( 181)							{
-HXLINE( 181)								 ::Dynamic value =  ::Dynamic(::hx::Anon_obj::Create(0));
-HXDLIN( 181)								::String tmp = resource;
-HXDLIN( 181)								::String mapPresence;
-HXDLIN( 181)								if (::hx::IsNotNull( tmp )) {
-HXLINE( 181)									mapPresence = tmp;
+            				HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_184_storeChats)
+HXLINE( 185)				 ::Dynamic storePresence =  ::Dynamic(::hx::Anon_obj::Create(0));
+HXLINE( 186)				 ::haxe::ds::ObjectMap caps =  ::haxe::ds::ObjectMap_obj::__alloc( HX_CTX );
+HXLINE( 187)				{
+HXLINE( 187)					::Dynamic map = chat->presence;
+HXDLIN( 187)					::Dynamic _g_map = map;
+HXDLIN( 187)					 ::Dynamic _g_keys = ::haxe::IMap_obj::keys(map);
+HXDLIN( 187)					while(( (bool)(_g_keys->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE( 187)						::String key = ( (::String)(_g_keys->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
+HXDLIN( 187)						 ::snikket::Presence _g_value = ( ( ::snikket::Presence)(::haxe::IMap_obj::get(_g_map,key)) );
+HXDLIN( 187)						::String _g_key = key;
+HXDLIN( 187)						::String resource = _g_key;
+HXDLIN( 187)						 ::snikket::Presence presence = _g_value;
+HXDLIN( 187)						{
+HXLINE( 188)							{
+HXLINE( 188)								 ::Dynamic value =  ::Dynamic(::hx::Anon_obj::Create(0));
+HXDLIN( 188)								::String tmp = resource;
+HXDLIN( 188)								::String mapPresence;
+HXDLIN( 188)								if (::hx::IsNotNull( tmp )) {
+HXLINE( 188)									mapPresence = tmp;
             								}
             								else {
-HXLINE( 181)									mapPresence = HX_("",00,00,00,00);
+HXLINE( 188)									mapPresence = HX_("",00,00,00,00);
             								}
-HXDLIN( 181)								::Reflect_obj::setField(storePresence,mapPresence,value);
+HXDLIN( 188)								::Reflect_obj::setField(storePresence,mapPresence,value);
             							}
-HXLINE( 182)							if (::hx::IsNotNull( presence->caps )) {
-HXLINE( 183)								_gthis->storeCaps(presence->caps);
-HXLINE( 184)								::String tmp1 = resource;
-HXDLIN( 184)								::String mapPresence1;
-HXDLIN( 184)								if (::hx::IsNotNull( tmp1 )) {
-HXLINE( 184)									mapPresence1 = tmp1;
+HXLINE( 189)							if (::hx::IsNotNull( presence->caps )) {
+HXLINE( 190)								{
+HXLINE( 190)									::Array< unsigned char > k = presence->caps->verRaw()->hash;
+HXDLIN( 190)									 ::snikket::Caps v = presence->caps;
+HXDLIN( 190)									caps->set(k,v);
+            								}
+HXLINE( 191)								::String tmp1 = resource;
+HXDLIN( 191)								::String mapPresence1;
+HXDLIN( 191)								if (::hx::IsNotNull( tmp1 )) {
+HXLINE( 191)									mapPresence1 = tmp1;
             								}
             								else {
-HXLINE( 184)									mapPresence1 = HX_("",00,00,00,00);
+HXLINE( 191)									mapPresence1 = HX_("",00,00,00,00);
             								}
-HXDLIN( 184)								::Reflect_obj::field(storePresence,mapPresence1)->__SetField(HX_("caps",21,1c,ba,41),presence->caps->ver(),::hx::paccDynamic);
+HXDLIN( 191)								::Reflect_obj::field(storePresence,mapPresence1)->__SetField(HX_("caps",21,1c,ba,41),presence->caps->ver(),::hx::paccDynamic);
             							}
-HXLINE( 186)							if (::hx::IsNotNull( presence->mucUser )) {
-HXLINE( 187)								::String tmp2 = resource;
-HXDLIN( 187)								::String mapPresence2;
-HXDLIN( 187)								if (::hx::IsNotNull( tmp2 )) {
-HXLINE( 187)									mapPresence2 = tmp2;
+HXLINE( 193)							if (::hx::IsNotNull( presence->mucUser )) {
+HXLINE( 194)								::String tmp2 = resource;
+HXDLIN( 194)								::String mapPresence2;
+HXDLIN( 194)								if (::hx::IsNotNull( tmp2 )) {
+HXLINE( 194)									mapPresence2 = tmp2;
             								}
             								else {
-HXLINE( 187)									mapPresence2 = HX_("",00,00,00,00);
+HXLINE( 194)									mapPresence2 = HX_("",00,00,00,00);
             								}
-HXDLIN( 187)								::Reflect_obj::field(storePresence,mapPresence2)->__SetField(HX_("mucUser",e6,f3,96,b5),presence->mucUser->toString(),::hx::paccDynamic);
+HXDLIN( 194)								::Reflect_obj::field(storePresence,mapPresence2)->__SetField(HX_("mucUser",e6,f3,96,b5),presence->mucUser->toString(),::hx::paccDynamic);
             							}
             						}
             					}
             				}
-HXLINE( 190)				return storePresence;
+HXLINE( 197)				_gthis->storeCapsSet(caps);
+HXLINE( 198)				return storePresence;
             			}
             			HX_END_LOCAL_FUNC1(return)
 
-            			HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_177_storeChats)
-HXLINE( 178)			 ::Dynamic mapPresence =  ::Dynamic(new _hx_Closure_0(_gthis));
-HXLINE( 192)			 ::StringBuf q =  ::StringBuf_obj::__alloc( HX_CTX );
-HXLINE( 193)			{
-HXLINE( 193)				if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 193)					q->flush();
+            			HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_183_storeChats)
+HXLINE( 184)			 ::Dynamic mapPresence =  ::Dynamic(new _hx_Closure_0(_gthis));
+HXLINE( 200)			 ::StringBuf q =  ::StringBuf_obj::__alloc( HX_CTX );
+HXLINE( 201)			{
+HXLINE( 201)				if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 201)					q->flush();
             				}
-HXDLIN( 193)				if (::hx::IsNull( q->b )) {
-HXLINE( 193)					q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_21,1);
+HXDLIN( 201)				if (::hx::IsNull( q->b )) {
+HXLINE( 201)					q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_25,1);
             				}
             				else {
-HXLINE( 193)					q->b->push(HX_("INSERT OR REPLACE INTO chats VALUES ",3b,7d,10,d4));
+HXLINE( 201)					q->b->push(HX_("INSERT OR REPLACE INTO chats VALUES ",3b,7d,10,d4));
             				}
             			}
-HXLINE( 194)			bool first = true;
-HXLINE( 195)			{
-HXLINE( 195)				 ::Dynamic _ = _gthis->storeChatBuffer->iterator();
-HXDLIN( 195)				while(( (bool)(_->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE( 195)					 ::snikket::Chat _1 = ( ( ::snikket::Chat)(_->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
-HXLINE( 196)					if (!(first)) {
-HXLINE( 196)						if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 196)							q->flush();
+HXLINE( 202)			bool first = true;
+HXLINE( 203)			{
+HXLINE( 203)				 ::Dynamic _ = _gthis->storeChatBuffer->iterator();
+HXDLIN( 203)				while(( (bool)(_->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE( 203)					 ::snikket::Chat _1 = ( ( ::snikket::Chat)(_->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
+HXLINE( 204)					if (!(first)) {
+HXLINE( 204)						if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 204)							q->flush();
             						}
-HXDLIN( 196)						if (::hx::IsNull( q->b )) {
-HXLINE( 196)							q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_22,1);
+HXDLIN( 204)						if (::hx::IsNull( q->b )) {
+HXLINE( 204)							q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_26,1);
             						}
             						else {
-HXLINE( 196)							q->b->push(HX_(",",2c,00,00,00));
+HXLINE( 204)							q->b->push(HX_(",",2c,00,00,00));
             						}
             					}
-HXLINE( 197)					first = false;
-HXLINE( 198)					{
-HXLINE( 198)						if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 198)							q->flush();
+HXLINE( 205)					first = false;
+HXLINE( 206)					{
+HXLINE( 206)						if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 206)							q->flush();
             						}
-HXDLIN( 198)						if (::hx::IsNull( q->b )) {
-HXLINE( 198)							q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_23,1);
+HXDLIN( 206)						if (::hx::IsNull( q->b )) {
+HXLINE( 206)							q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_27,1);
             						}
             						else {
-HXLINE( 198)							q->b->push(HX_("(?,?,?,?,?,?,?,?,?,?,?,jsonb(?),?,?,?,?)",4e,16,2e,3d));
+HXLINE( 206)							q->b->push(HX_("(?,?,?,?,?,?,?,?,?,?,?,jsonb(?),?,?,?,?)",4e,16,2e,3d));
             						}
             					}
             				}
             			}
-HXLINE( 201)			 ::snikket::persistence::SqliteDriver _gthis1 = _gthis->db;
-HXLINE( 202)			::String _hx_tmp = q->toString();
-HXLINE( 203)			::Array< ::Dynamic> _g = ::Array_obj< ::Dynamic>::__new(0);
-HXDLIN( 203)			{
-HXLINE( 203)				 ::Dynamic x = _gthis->storeChatBuffer->__Field(HX_("iterator",ee,49,9a,93),::hx::paccDynamic)();
-HXDLIN( 203)				while(( (bool)(x->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE( 203)					 ::snikket::Chat x1 = ( ( ::snikket::Chat)(x->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
-HXLINE( 204)					 ::snikket::Channel channel = ( ( ::snikket::Channel)(::Std_obj::downcast(x1,::hx::ClassOf< ::snikket::Channel >())) );
-HXLINE( 205)					if (::hx::IsNotNull( channel )) {
-HXLINE( 205)						_gthis->storeCaps(channel->disco);
-            					}
-HXLINE( 207)					::String accountId1 = accountId;
-HXDLIN( 207)					::String x2 = x1->chatId;
-HXDLIN( 207)					bool row = x1->isTrusted();
-HXDLIN( 207)					::Array< unsigned char > x3 = x1->avatarSha1;
-HXLINE( 208)					::String row1 = x1->getDisplayName();
-HXDLIN( 208)					int x4 = x1->uiState;
-HXDLIN( 208)					bool x5 = x1->isBlocked;
-HXLINE( 209)					::String row2 = x1->extensions->toString();
-HXDLIN( 209)					::String row3 = x1->readUpTo();
-HXDLIN( 209)					::String x6 = x1->readUpToBy;
-HXLINE( 210)					 ::snikket::Caps tmp;
-HXDLIN( 210)					if (::hx::IsNotNull( channel )) {
-HXLINE( 210)						tmp = channel->disco;
+HXLINE( 209)			 ::snikket::persistence::SqliteDriver _gthis1 = _gthis->db;
+HXLINE( 210)			::String _hx_tmp = q->toString();
+HXLINE( 211)			::Array< ::Dynamic> _g = ::Array_obj< ::Dynamic>::__new(0);
+HXDLIN( 211)			{
+HXLINE( 211)				 ::Dynamic x = _gthis->storeChatBuffer->__Field(HX_("iterator",ee,49,9a,93),::hx::paccDynamic)();
+HXDLIN( 211)				while(( (bool)(x->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE( 211)					 ::snikket::Chat x1 = ( ( ::snikket::Chat)(x->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
+HXLINE( 212)					 ::snikket::Channel channel = ( ( ::snikket::Channel)(::Std_obj::downcast(x1,::hx::ClassOf< ::snikket::Channel >())) );
+HXLINE( 213)					if (::hx::IsNotNull( channel )) {
+HXLINE( 213)						_gthis->storeCaps(channel->disco);
+            					}
+HXLINE( 215)					::String accountId1 = accountId;
+HXDLIN( 215)					::String x2 = x1->chatId;
+HXDLIN( 215)					bool row = x1->isTrusted();
+HXDLIN( 215)					::Array< unsigned char > x3 = x1->avatarSha1;
+HXLINE( 216)					::String row1 = x1->getDisplayName();
+HXDLIN( 216)					int x4 = x1->uiState;
+HXDLIN( 216)					bool x5 = x1->isBlocked;
+HXLINE( 217)					::String row2 = x1->extensions->toString();
+HXDLIN( 217)					::String row3 = x1->readUpTo();
+HXDLIN( 217)					::String x6 = x1->readUpToBy;
+HXLINE( 218)					 ::snikket::Caps tmp;
+HXDLIN( 218)					if (::hx::IsNotNull( channel )) {
+HXLINE( 218)						tmp = channel->disco;
             					}
             					else {
-HXLINE( 210)						tmp = null();
+HXLINE( 218)						tmp = null();
             					}
-HXDLIN( 210)					::Array< unsigned char > row4;
-HXDLIN( 210)					if (::hx::IsNotNull( tmp )) {
-HXLINE( 210)						row4 = tmp->verRaw()->hash;
+HXDLIN( 218)					::Array< unsigned char > row4;
+HXDLIN( 218)					if (::hx::IsNotNull( tmp )) {
+HXLINE( 218)						row4 = tmp->verRaw()->hash;
             					}
             					else {
-HXLINE( 210)						row4 = null();
-            					}
-HXDLIN( 210)					 ::Dynamic replacer = null();
-HXDLIN( 210)					::String space = null();
-HXDLIN( 210)					::String row5 = ::haxe::format::JsonPrinter_obj::print(mapPresence(x1),replacer,space);
-HXLINE( 211)					::String row6 = ( (::String)(::Type_obj::getClassName(::Type_obj::getClass(x1)).split(HX_(".",2e,00,00,00))->pop()) );
-HXLINE( 212)					bool row7 = x1->notificationsFiltered();
-HXDLIN( 212)					bool row8 = x1->notifyMention();
-HXLINE( 206)					::cpp::VirtualArray row9 = ::cpp::VirtualArray_obj::__new(16)->init(0,accountId1)->init(1,x2)->init(2,row)->init(3,x3)->init(4,row1)->init(5,x4)->init(6,x5)->init(7,row2)->init(8,row3)->init(9,x6)->init(10,row4)->init(11,row5)->init(12,row6)->init(13,row7)->init(14,row8)->init(15,x1->notifyReply());
-HXLINE( 203)					_g->push(row9);
-            				}
-            			}
-HXDLIN( 203)			::cpp::VirtualArray _g1 = ::cpp::VirtualArray_obj::__new(0);
-HXDLIN( 203)			{
-HXLINE( 203)				 ::Dynamic e = _g->__Field(HX_("iterator",ee,49,9a,93),::hx::paccDynamic)();
-HXDLIN( 203)				while(( (bool)(e->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE( 203)					 ::Dynamic e1 = e->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
-HXDLIN( 203)					{
-HXLINE( 203)						 ::Dynamic x7 = e1->__Field(HX_("iterator",ee,49,9a,93),::hx::paccDynamic)();
-HXDLIN( 203)						while(( (bool)(x7->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE( 203)							 ::Dynamic x8 = x7->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
-HXDLIN( 203)							_g1->push(x8);
+HXLINE( 218)						row4 = null();
+            					}
+HXDLIN( 218)					 ::Dynamic replacer = null();
+HXDLIN( 218)					::String space = null();
+HXDLIN( 218)					::String row5 = ::haxe::format::JsonPrinter_obj::print(mapPresence(x1),replacer,space);
+HXLINE( 219)					::String row6 = ( (::String)(::Type_obj::getClassName(::Type_obj::getClass(x1)).split(HX_(".",2e,00,00,00))->pop()) );
+HXLINE( 220)					bool row7 = x1->notificationsFiltered();
+HXDLIN( 220)					bool row8 = x1->notifyMention();
+HXLINE( 214)					::cpp::VirtualArray row9 = ::cpp::VirtualArray_obj::__new(16)->init(0,accountId1)->init(1,x2)->init(2,row)->init(3,x3)->init(4,row1)->init(5,x4)->init(6,x5)->init(7,row2)->init(8,row3)->init(9,x6)->init(10,row4)->init(11,row5)->init(12,row6)->init(13,row7)->init(14,row8)->init(15,x1->notifyReply());
+HXLINE( 211)					_g->push(row9);
+            				}
+            			}
+HXDLIN( 211)			::cpp::VirtualArray _g1 = ::cpp::VirtualArray_obj::__new(0);
+HXDLIN( 211)			{
+HXLINE( 211)				 ::Dynamic e = _g->__Field(HX_("iterator",ee,49,9a,93),::hx::paccDynamic)();
+HXDLIN( 211)				while(( (bool)(e->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE( 211)					 ::Dynamic e1 = e->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
+HXDLIN( 211)					{
+HXLINE( 211)						 ::Dynamic x7 = e1->__Field(HX_("iterator",ee,49,9a,93),::hx::paccDynamic)();
+HXDLIN( 211)						while(( (bool)(x7->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE( 211)							 ::Dynamic x8 = x7->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
+HXDLIN( 211)							_g1->push(x8);
             						}
             					}
             				}
             			}
-HXLINE( 201)			_gthis1->exec(_hx_tmp,_g1);
-HXLINE( 217)			_gthis->storeChatTimer = null();
-HXLINE( 218)			_gthis->storeChatBuffer->clear();
+HXLINE( 209)			_gthis1->exec(_hx_tmp,_g1);
+HXLINE( 225)			_gthis->storeChatBuffer->clear();
+HXLINE( 226)			_gthis->storeChatTimer = null();
             		}
             		HX_END_LOCAL_FUNC0((void))
 
-            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_168_storeChats)
-HXDLIN( 168)		 ::snikket::persistence::Sqlite _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 169)		if (::hx::IsNotNull( this->storeChatTimer )) {
-HXLINE( 170)			this->storeChatTimer->stop();
+            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_174_storeChats)
+HXDLIN( 174)		 ::snikket::persistence::Sqlite _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 175)		if (::hx::IsNotNull( this->storeChatTimer )) {
+HXLINE( 176)			this->storeChatTimer->stop();
             		}
-HXLINE( 173)		{
-HXLINE( 173)			int _g = 0;
-HXDLIN( 173)			while((_g < chats->length)){
-HXLINE( 173)				 ::snikket::Chat chat = chats->__get(_g).StaticCast<  ::snikket::Chat >();
-HXDLIN( 173)				_g = (_g + 1);
-HXLINE( 174)				this->storeChatBuffer->set(((accountId + HX_("\n",0a,00,00,00)) + chat->chatId),chat);
+HXLINE( 179)		{
+HXLINE( 179)			int _g = 0;
+HXDLIN( 179)			while((_g < chats->length)){
+HXLINE( 179)				 ::snikket::Chat chat = chats->__get(_g).StaticCast<  ::snikket::Chat >();
+HXDLIN( 179)				_g = (_g + 1);
+HXLINE( 180)				this->storeChatBuffer->set(((accountId + HX_("\n",0a,00,00,00)) + chat->chatId),chat);
             			}
             		}
-HXLINE( 177)		this->storeChatTimer = ::haxe::Timer_obj::delay( ::Dynamic(new _hx_Closure_1(_gthis,accountId)),100);
+HXLINE( 183)		this->storeChatTimer = ::haxe::Timer_obj::delay( ::Dynamic(new _hx_Closure_1(_gthis,accountId)),100);
             	}
 
 
@@ -703,192 +739,190 @@ HX_DEFINE_DYNAMIC_FUNC2(Sqlite_obj,storeChats,(void))
 
 void Sqlite_obj::getChats(::String accountId, ::Dynamic callback){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_3, ::snikket::persistence::Sqlite,_gthis) HXARGC(1)
-            		::Dynamic _hx_run(::Dynamic result){
+            		::Dynamic _hx_run( ::haxe::iterators::ArrayIterator result){
             			HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_1, ::haxe::ds::ObjectMap,fetchCaps) HXARGC(0)
             			 ::Dynamic _hx_run(){
-            				HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_240_getChats)
-HXLINE( 240)				return fetchCaps->keys();
+            				HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_248_getChats)
+HXLINE( 248)				return fetchCaps->keys();
             			}
             			HX_END_LOCAL_FUNC0(return)
 
             			HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_2,::cpp::VirtualArray,chats) HXARGC(1)
-            			 ::Dynamic _hx_run(::Dynamic capsResult){
-            				HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_244_getChats)
-HXLINE( 244)				return  ::Dynamic(::hx::Anon_obj::Create(2)
+            			 ::Dynamic _hx_run( ::haxe::iterators::ArrayIterator capsResult){
+            				HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_252_getChats)
+HXLINE( 252)				return  ::Dynamic(::hx::Anon_obj::Create(2)
             					->setFixed(0,HX_("caps",21,1c,ba,41),capsResult)
             					->setFixed(1,HX_("chats",9b,9e,b3,45),chats));
             			}
             			HX_END_LOCAL_FUNC1(return)
 
-            			HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_227_getChats)
-HXLINE( 228)			 ::haxe::ds::ObjectMap fetchCaps =  ::haxe::ds::ObjectMap_obj::__alloc( HX_CTX );
-HXLINE( 229)			::cpp::VirtualArray chats = ::cpp::VirtualArray_obj::__new(0);
-HXLINE( 230)			{
-HXLINE( 230)				::Dynamic row = result;
-HXDLIN( 230)				while(::sys::db::ResultSet_obj::hasNext(row)){
-HXLINE( 230)					 ::Dynamic row1 = ::sys::db::ResultSet_obj::next(row);
-HXLINE( 231)					 ::Dynamic capsJson;
-HXDLIN( 231)					if (::hx::IsNull( row1->__Field(HX_("caps",21,1c,ba,41),::hx::paccDynamic) )) {
-HXLINE( 231)						capsJson = null();
+            			HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_235_getChats)
+HXLINE( 236)			 ::haxe::ds::ObjectMap fetchCaps =  ::haxe::ds::ObjectMap_obj::__alloc( HX_CTX );
+HXLINE( 237)			::cpp::VirtualArray chats = ::cpp::VirtualArray_obj::__new(0);
+HXLINE( 238)			{
+HXLINE( 238)				 ::haxe::iterators::ArrayIterator _g = result;
+HXDLIN( 238)				while((_g->current < _g->array->get_length())){
+HXLINE( 238)					 ::Dynamic row = _g->array->__get(_g->current++);
+HXLINE( 239)					 ::Dynamic capsJson;
+HXDLIN( 239)					if (::hx::IsNull( row->__Field(HX_("caps",21,1c,ba,41),::hx::paccDynamic) )) {
+HXLINE( 239)						capsJson = null();
             					}
             					else {
-HXLINE( 231)						capsJson =  ::haxe::format::JsonParser_obj::__alloc( HX_CTX ,( (::String)(row1->__Field(HX_("caps",21,1c,ba,41),::hx::paccDynamic)) ))->doParse();
+HXLINE( 239)						capsJson =  ::haxe::format::JsonParser_obj::__alloc( HX_CTX ,( (::String)(row->__Field(HX_("caps",21,1c,ba,41),::hx::paccDynamic)) ))->doParse();
             					}
-HXLINE( 232)					 ::snikket::Caps _hx_tmp;
-HXDLIN( 232)					if (::hx::IsNull( capsJson )) {
-HXLINE( 232)						_hx_tmp = null();
+HXLINE( 240)					 ::snikket::Caps _hx_tmp;
+HXDLIN( 240)					if (::hx::IsNull( capsJson )) {
+HXLINE( 240)						_hx_tmp = null();
             					}
             					else {
             						HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_0) HXARGC(1)
             						 ::snikket::Identity _hx_run( ::Dynamic i){
-            							HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_232_getChats)
-HXLINE( 232)							return  ::snikket::Identity_obj::__alloc( HX_CTX ,( (::String)(i->__Field(HX_("category",fe,2a,6c,ad),::hx::paccDynamic)) ),( (::String)(i->__Field(HX_("type",ba,f2,08,4d),::hx::paccDynamic)) ),( (::String)(i->__Field(HX_("name",4b,72,ff,48),::hx::paccDynamic)) ));
+            							HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_240_getChats)
+HXLINE( 240)							return  ::snikket::Identity_obj::__alloc( HX_CTX ,( (::String)(i->__Field(HX_("category",fe,2a,6c,ad),::hx::paccDynamic)) ),( (::String)(i->__Field(HX_("type",ba,f2,08,4d),::hx::paccDynamic)) ),( (::String)(i->__Field(HX_("name",4b,72,ff,48),::hx::paccDynamic)) ));
             						}
             						HX_END_LOCAL_FUNC1(return)
 
-HXLINE( 232)						::String capsJson1 = ( (::String)(capsJson->__Field(HX_("node",02,0a,0a,49),::hx::paccDynamic)) );
-HXDLIN( 232)						::Array< ::Dynamic> _hx_tmp1 = ( (::Array< ::Dynamic>)( ::Dynamic(capsJson->__Field(HX_("identities",1c,c5,6d,d7),::hx::paccDynamic))->__Field(HX_("map",9c,0a,53,00),::hx::paccDynamic)( ::Dynamic(new _hx_Closure_0()))) );
-HXDLIN( 232)						_hx_tmp =  ::snikket::Caps_obj::__alloc( HX_CTX ,capsJson1,_hx_tmp1,( (::Array< ::String >)(capsJson->__Field(HX_("features",fd,6c,d7,12),::hx::paccDynamic)) ));
-            					}
-HXDLIN( 232)					row1->__SetField(HX_("capsObj",56,b6,8b,a6),_hx_tmp,::hx::paccDynamic);
-HXLINE( 233)					 ::Dynamic presenceJson =  ::haxe::format::JsonParser_obj::__alloc( HX_CTX ,( (::String)(row1->__Field(HX_("presence",3b,52,d7,66),::hx::paccDynamic)) ))->doParse();
-HXLINE( 234)					row1->__SetField(HX_("presenceJson",03,fa,cd,23),presenceJson,::hx::paccDynamic);
-HXLINE( 235)					{
-HXLINE( 235)						 ::Dynamic access = presenceJson;
-HXDLIN( 235)						 ::Dynamic _g_access = access;
-HXDLIN( 235)						::Array< ::String > _g_keys = ::Reflect_obj::fields(access);
-HXDLIN( 235)						int _g_index = 0;
-HXDLIN( 235)						while((_g_index < _g_keys->length)){
-HXLINE( 235)							_g_index = (_g_index + 1);
-HXDLIN( 235)							::String key = _g_keys->__get((_g_index - 1));
-HXDLIN( 235)							 ::Dynamic _g_value = ::Reflect_obj::field(_g_access,key);
-HXDLIN( 235)							::String _g_key = key;
-HXDLIN( 235)							::String resource = _g_key;
-HXDLIN( 235)							 ::Dynamic presence = _g_value;
-HXLINE( 236)							if (( (bool)(presence->__Field(HX_("caps",21,1c,ba,41),::hx::paccDynamic)) )) {
-HXLINE( 236)								::Array< unsigned char > k = ::haxe::crypto::Base64_obj::decode(( (::String)(presence->__Field(HX_("caps",21,1c,ba,41),::hx::paccDynamic)) ),null())->b;
-HXDLIN( 236)								fetchCaps->set(k,true);
+HXLINE( 240)						::String capsJson1 = ( (::String)(capsJson->__Field(HX_("node",02,0a,0a,49),::hx::paccDynamic)) );
+HXDLIN( 240)						::Array< ::Dynamic> _hx_tmp1 = ( (::Array< ::Dynamic>)( ::Dynamic(capsJson->__Field(HX_("identities",1c,c5,6d,d7),::hx::paccDynamic))->__Field(HX_("map",9c,0a,53,00),::hx::paccDynamic)( ::Dynamic(new _hx_Closure_0()), ::Dynamic(row->__Field(HX_("caps_ver",05,68,56,1e),::hx::paccDynamic)))) );
+HXDLIN( 240)						_hx_tmp =  ::snikket::Caps_obj::__alloc( HX_CTX ,capsJson1,_hx_tmp1,( (::Array< ::String >)(capsJson->__Field(HX_("features",fd,6c,d7,12),::hx::paccDynamic)) ),null());
+            					}
+HXDLIN( 240)					row->__SetField(HX_("capsObj",56,b6,8b,a6),_hx_tmp,::hx::paccDynamic);
+HXLINE( 241)					 ::Dynamic presenceJson =  ::haxe::format::JsonParser_obj::__alloc( HX_CTX ,( (::String)(row->__Field(HX_("presence",3b,52,d7,66),::hx::paccDynamic)) ))->doParse();
+HXLINE( 242)					row->__SetField(HX_("presenceJson",03,fa,cd,23),presenceJson,::hx::paccDynamic);
+HXLINE( 243)					{
+HXLINE( 243)						 ::Dynamic access = presenceJson;
+HXDLIN( 243)						 ::Dynamic _g_access = access;
+HXDLIN( 243)						::Array< ::String > _g_keys = ::Reflect_obj::fields(access);
+HXDLIN( 243)						int _g_index = 0;
+HXDLIN( 243)						while((_g_index < _g_keys->length)){
+HXLINE( 243)							_g_index = (_g_index + 1);
+HXDLIN( 243)							::String key = _g_keys->__get((_g_index - 1));
+HXDLIN( 243)							 ::Dynamic _g_value = ::Reflect_obj::field(_g_access,key);
+HXDLIN( 243)							::String _g_key = key;
+HXDLIN( 243)							::String resource = _g_key;
+HXDLIN( 243)							 ::Dynamic presence = _g_value;
+HXLINE( 244)							if (( (bool)(presence->__Field(HX_("caps",21,1c,ba,41),::hx::paccDynamic)) )) {
+HXLINE( 244)								::Array< unsigned char > k = ::haxe::crypto::Base64_obj::decode(( (::String)(presence->__Field(HX_("caps",21,1c,ba,41),::hx::paccDynamic)) ),null())->b;
+HXDLIN( 244)								fetchCaps->set(k,true);
             							}
             						}
             					}
-HXLINE( 238)					chats->push(row1);
+HXLINE( 246)					chats->push(row);
             				}
             			}
-HXLINE( 240)			::Array< ::Dynamic> fetchCapsSha1s = ::Lambda_obj::array( ::Dynamic(::hx::Anon_obj::Create(1)
+HXLINE( 248)			::Array< ::Dynamic> fetchCapsSha1s = ::Lambda_obj::array( ::Dynamic(::hx::Anon_obj::Create(1)
             				->setFixed(0,HX_("iterator",ee,49,9a,93), ::Dynamic(new _hx_Closure_1(fetchCaps)))));
-HXLINE( 241)			 ::snikket::persistence::SqliteDriver _gthis1 = _gthis->db;
-HXLINE( 242)			::Array< ::String > result1 = ::Array_obj< ::String >::__new(fetchCapsSha1s->length);
-HXDLIN( 242)			{
-HXLINE( 242)				int _g = 0;
-HXDLIN( 242)				int _g1 = fetchCapsSha1s->length;
-HXDLIN( 242)				while((_g < _g1)){
-HXLINE( 242)					_g = (_g + 1);
-HXDLIN( 242)					int i = (_g - 1);
-HXDLIN( 242)					{
-HXLINE( 242)						::Array< unsigned char > _ = ( (::Array< unsigned char >)(_hx_array_unsafe_get(fetchCapsSha1s,i)) );
-HXDLIN( 242)						result1->__unsafe_set(i,HX_("?",3f,00,00,00));
+HXLINE( 249)			 ::snikket::persistence::SqliteDriver _gthis1 = _gthis->db;
+HXLINE( 250)			::Array< ::String > result1 = ::Array_obj< ::String >::__new(fetchCapsSha1s->length);
+HXDLIN( 250)			{
+HXLINE( 250)				int _g1 = 0;
+HXDLIN( 250)				int _g2 = fetchCapsSha1s->length;
+HXDLIN( 250)				while((_g1 < _g2)){
+HXLINE( 250)					_g1 = (_g1 + 1);
+HXDLIN( 250)					int i = (_g1 - 1);
+HXDLIN( 250)					{
+HXLINE( 250)						::Array< unsigned char > _ = ( (::Array< unsigned char >)(_hx_array_unsafe_get(fetchCapsSha1s,i)) );
+HXDLIN( 250)						result1->__unsafe_set(i,HX_("?",3f,00,00,00));
             					}
             				}
             			}
-HXLINE( 241)			return ::thenshim::_Promise::Promise_Impl__obj::then(_gthis1->exec(((HX_("SELECT sha1, json(caps) AS caps FROM caps WHERE sha1 IN (",5a,e4,9c,e2) + result1->join(HX_(",",2c,00,00,00))) + HX_(")",29,00,00,00)),fetchCapsSha1s), ::Dynamic(new _hx_Closure_2(chats)),null());
+HXLINE( 249)			return ::thenshim::_Promise::Promise_Impl__obj::then(_gthis1->exec(((HX_("SELECT sha1, json(caps) AS caps FROM caps WHERE sha1 IN (",5a,e4,9c,e2) + result1->join(HX_(",",2c,00,00,00))) + HX_(")",29,00,00,00)),fetchCapsSha1s), ::Dynamic(new _hx_Closure_2(chats)),null());
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_5, ::Dynamic,callback) HXARGC(1)
-            		void _hx_run( ::Dynamic result){
-            			HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_245_getChats)
-HXLINE( 246)			 ::haxe::ds::StringMap capsMap =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
-HXLINE( 247)			{
-HXLINE( 247)				::Dynamic row =  ::Dynamic(result->__Field(HX_("caps",21,1c,ba,41),::hx::paccDynamic));
-HXDLIN( 247)				while(::sys::db::ResultSet_obj::hasNext(row)){
-HXLINE( 247)					 ::Dynamic row1 = ::sys::db::ResultSet_obj::next(row);
-HXLINE( 248)					 ::Dynamic json =  ::haxe::format::JsonParser_obj::__alloc( HX_CTX ,( (::String)(row1->__Field(HX_("caps",21,1c,ba,41),::hx::paccDynamic)) ))->doParse();
-HXLINE( 249)					{
+            		HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_5) HXARGC(1)
+            		::Array< ::Dynamic> _hx_run( ::Dynamic result){
+            			HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_253_getChats)
+HXLINE( 254)			 ::haxe::ds::StringMap capsMap =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
+HXLINE( 255)			{
+HXLINE( 255)				 ::haxe::iterators::ArrayIterator _g = ( ( ::haxe::iterators::ArrayIterator)(result->__Field(HX_("caps",21,1c,ba,41),::hx::paccDynamic)) );
+HXDLIN( 255)				while((_g->current < _g->array->get_length())){
+HXLINE( 255)					 ::Dynamic row = _g->array->__get(_g->current++);
+HXLINE( 256)					 ::Dynamic json =  ::haxe::format::JsonParser_obj::__alloc( HX_CTX ,( (::String)(row->__Field(HX_("caps",21,1c,ba,41),::hx::paccDynamic)) ))->doParse();
+HXLINE( 257)					{
             						HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_4) HXARGC(1)
             						 ::snikket::Identity _hx_run( ::Dynamic i){
-            							HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_249_getChats)
-HXLINE( 249)							return  ::snikket::Identity_obj::__alloc( HX_CTX ,( (::String)(i->__Field(HX_("category",fe,2a,6c,ad),::hx::paccDynamic)) ),( (::String)(i->__Field(HX_("type",ba,f2,08,4d),::hx::paccDynamic)) ),( (::String)(i->__Field(HX_("name",4b,72,ff,48),::hx::paccDynamic)) ));
+            							HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_257_getChats)
+HXLINE( 257)							return  ::snikket::Identity_obj::__alloc( HX_CTX ,( (::String)(i->__Field(HX_("category",fe,2a,6c,ad),::hx::paccDynamic)) ),( (::String)(i->__Field(HX_("type",ba,f2,08,4d),::hx::paccDynamic)) ),( (::String)(i->__Field(HX_("name",4b,72,ff,48),::hx::paccDynamic)) ));
             						}
             						HX_END_LOCAL_FUNC1(return)
 
-HXLINE( 249)						::String k = ::haxe::crypto::Base64_obj::encode(::haxe::io::Bytes_obj::ofData(( (::Array< unsigned char >)(row1->__Field(HX_("sha1",85,c8,52,4c),::hx::paccDynamic)) )),null());
-HXDLIN( 249)						::String json1 = ( (::String)(json->__Field(HX_("node",02,0a,0a,49),::hx::paccDynamic)) );
-HXDLIN( 249)						::Array< ::Dynamic> v = ( (::Array< ::Dynamic>)( ::Dynamic(json->__Field(HX_("identities",1c,c5,6d,d7),::hx::paccDynamic))->__Field(HX_("map",9c,0a,53,00),::hx::paccDynamic)( ::Dynamic(new _hx_Closure_4()))) );
-HXDLIN( 249)						 ::snikket::Caps v1 =  ::snikket::Caps_obj::__alloc( HX_CTX ,json1,v,( (::Array< ::String >)(json->__Field(HX_("features",fd,6c,d7,12),::hx::paccDynamic)) ));
-HXDLIN( 249)						capsMap->set(k,v1);
-            					}
-            				}
-            			}
-HXLINE( 251)			::Array< ::Dynamic> chats = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE( 252)			{
-HXLINE( 252)				int _g = 0;
-HXDLIN( 252)				::cpp::VirtualArray _g1 = ( (::cpp::VirtualArray)(result->__Field(HX_("chats",9b,9e,b3,45),::hx::paccDynamic)) );
-HXDLIN( 252)				while((_g < _g1->get_length())){
-HXLINE( 252)					 ::Dynamic row2 = _g1->__get(_g);
-HXDLIN( 252)					_g = (_g + 1);
-HXLINE( 253)					 ::haxe::ds::StringMap presenceMap =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
-HXLINE( 254)					 ::Dynamic presenceJson =  ::Dynamic(row2->__Field(HX_("presenceJson",03,fa,cd,23),::hx::paccDynamic));
-HXLINE( 255)					{
-HXLINE( 255)						 ::Dynamic access = presenceJson;
-HXDLIN( 255)						 ::Dynamic _g_access = access;
-HXDLIN( 255)						::Array< ::String > _g_keys = ::Reflect_obj::fields(access);
-HXDLIN( 255)						int _g_index = 0;
-HXDLIN( 255)						while((_g_index < _g_keys->length)){
-HXLINE( 255)							_g_index = (_g_index + 1);
-HXDLIN( 255)							::String key = _g_keys->__get((_g_index - 1));
-HXDLIN( 255)							 ::Dynamic _g_value = ::Reflect_obj::field(_g_access,key);
-HXDLIN( 255)							::String _g_key = key;
-HXDLIN( 255)							::String resource = _g_key;
-HXDLIN( 255)							 ::Dynamic presence = _g_value;
-HXLINE( 256)							{
-HXLINE( 257)								 ::snikket::Caps v2;
-HXDLIN( 257)								if (::hx::IsNull( presence->__Field(HX_("caps",21,1c,ba,41),::hx::paccDynamic) )) {
-HXLINE( 257)									v2 = null();
-            								}
-            								else {
-HXLINE( 257)									v2 = ( ( ::snikket::Caps)(capsMap->get(( (::String)(presence->__Field(HX_("caps",21,1c,ba,41),::hx::paccDynamic)) ))) );
-            								}
-HXLINE( 258)								 ::snikket::Stanza v3;
-HXDLIN( 258)								if (::hx::IsNull( presence->__Field(HX_("mucUser",e6,f3,96,b5),::hx::paccDynamic) )) {
-HXLINE( 258)									v3 = null();
-            								}
-            								else {
-HXLINE( 258)									v3 = ::snikket::Stanza_obj::parse(( (::String)(presence->__Field(HX_("mucUser",e6,f3,96,b5),::hx::paccDynamic)) ));
-            								}
-HXLINE( 256)								 ::snikket::Presence v4 =  ::snikket::Presence_obj::__alloc( HX_CTX ,v2,v3);
-HXDLIN( 256)								presenceMap->set(resource,v4);
+HXLINE( 257)						::String k = ::haxe::crypto::Base64_obj::encode(::haxe::io::Bytes_obj::ofData(( (::Array< unsigned char >)(row->__Field(HX_("sha1",85,c8,52,4c),::hx::paccDynamic)) )),null());
+HXDLIN( 257)						::String json1 = ( (::String)(json->__Field(HX_("node",02,0a,0a,49),::hx::paccDynamic)) );
+HXDLIN( 257)						::Array< ::Dynamic> v = ( (::Array< ::Dynamic>)( ::Dynamic(json->__Field(HX_("identities",1c,c5,6d,d7),::hx::paccDynamic))->__Field(HX_("map",9c,0a,53,00),::hx::paccDynamic)( ::Dynamic(new _hx_Closure_4()), ::Dynamic(row->__Field(HX_("sha1",85,c8,52,4c),::hx::paccDynamic)))) );
+HXDLIN( 257)						 ::snikket::Caps v1 =  ::snikket::Caps_obj::__alloc( HX_CTX ,json1,v,( (::Array< ::String >)(json->__Field(HX_("features",fd,6c,d7,12),::hx::paccDynamic)) ),null());
+HXDLIN( 257)						capsMap->set(k,v1);
+            					}
+            				}
+            			}
+HXLINE( 259)			result->__SetField(HX_("caps",21,1c,ba,41),null(),::hx::paccDynamic);
+HXLINE( 260)			::Array< ::Dynamic> chats = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE( 261)			 ::Dynamic row1 = null();
+HXLINE( 262)			while(true){
+HXLINE( 262)				row1 = ( (::cpp::VirtualArray)(result->__Field(HX_("chats",9b,9e,b3,45),::hx::paccDynamic)) )->pop();
+HXDLIN( 262)				if (!(::hx::IsNotNull( row1 ))) {
+HXLINE( 262)					goto _hx_goto_33;
+            				}
+HXLINE( 263)				 ::haxe::ds::StringMap presenceMap =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
+HXLINE( 264)				 ::haxe::ds::StringMap parsedMucUsers =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
+HXLINE( 265)				 ::Dynamic presenceJson =  ::Dynamic(row1->__Field(HX_("presenceJson",03,fa,cd,23),::hx::paccDynamic));
+HXLINE( 266)				{
+HXLINE( 266)					int _g1 = 0;
+HXDLIN( 266)					::Array< ::String > _g2 = ::Reflect_obj::fields(presenceJson);
+HXDLIN( 266)					while((_g1 < _g2->length)){
+HXLINE( 266)						::String resource = _g2->__get(_g1);
+HXDLIN( 266)						_g1 = (_g1 + 1);
+HXLINE( 267)						 ::Dynamic presence = ::Reflect_obj::field(presenceJson,resource);
+HXLINE( 268)						::Reflect_obj::deleteField(presenceJson,resource);
+HXLINE( 269)						{
+HXLINE( 270)							 ::snikket::Caps v2;
+HXDLIN( 270)							if (::hx::IsNull( presence->__Field(HX_("caps",21,1c,ba,41),::hx::paccDynamic) )) {
+HXLINE( 270)								v2 = null();
+            							}
+            							else {
+HXLINE( 270)								v2 = ( ( ::snikket::Caps)(capsMap->get(( (::String)(presence->__Field(HX_("caps",21,1c,ba,41),::hx::paccDynamic)) ))) );
+            							}
+HXLINE( 271)							 ::snikket::Stanza v3;
+HXDLIN( 271)							if (::hx::IsNull( presence->__Field(HX_("mucUser",e6,f3,96,b5),::hx::paccDynamic) )) {
+HXLINE( 271)								v3 = null();
             							}
+            							else {
+HXLINE( 271)								v3 = ::snikket::Stanza_obj::parse(( (::String)(presence->__Field(HX_("mucUser",e6,f3,96,b5),::hx::paccDynamic)) ));
+            							}
+HXLINE( 269)							 ::snikket::Presence v4 =  ::snikket::Presence_obj::__alloc( HX_CTX ,v2,v3);
+HXDLIN( 269)							presenceMap->set(resource,v4);
             						}
             					}
-HXLINE( 261)					 ::Dynamic row3 =  ::Dynamic(row2->__Field(HX_("chat_id",22,ea,bd,d0),::hx::paccDynamic));
-HXDLIN( 261)					bool _hx_tmp = ::hx::IsNotEq( row2->__Field(HX_("trusted",f7,b7,a6,16),::hx::paccDynamic),0 );
-HXDLIN( 261)					 ::Dynamic row4 =  ::Dynamic(row2->__Field(HX_("avatar_sha1",ab,69,a3,a4),::hx::paccDynamic));
-HXDLIN( 261)					 ::Dynamic row5 =  ::Dynamic(row2->__Field(HX_("fn",48,59,00,00),::hx::paccDynamic));
-HXDLIN( 261)					 ::Dynamic row6 =  ::Dynamic(row2->__Field(HX_("ui_state",a6,9a,4e,b2),::hx::paccDynamic));
-HXDLIN( 261)					bool _hx_tmp1 = ::hx::IsNotEq( row2->__Field(HX_("blocked",ec,7a,fe,44),::hx::paccDynamic),0 );
-HXDLIN( 261)					 ::Dynamic row7 =  ::Dynamic(row2->__Field(HX_("extensions",14,7c,70,89),::hx::paccDynamic));
-HXDLIN( 261)					 ::Dynamic row8 =  ::Dynamic(row2->__Field(HX_("read_up_to_id",84,60,ad,9e),::hx::paccDynamic));
-HXDLIN( 261)					 ::Dynamic row9 =  ::Dynamic(row2->__Field(HX_("read_up_to_by",80,5a,ad,9e),::hx::paccDynamic));
-HXDLIN( 261)					 ::Dynamic _hx_tmp2;
-HXDLIN( 261)					if (::hx::IsNull( row2->__Field(HX_("notifications_filtered",4e,91,57,51),::hx::paccDynamic) )) {
-HXLINE( 261)						_hx_tmp2 = null();
-            					}
-            					else {
-HXLINE( 261)						_hx_tmp2 = ::hx::IsNotEq( row2->__Field(HX_("notifications_filtered",4e,91,57,51),::hx::paccDynamic),0 );
-            					}
-HXDLIN( 261)					bool _hx_tmp3 = ::hx::IsNotEq( row2->__Field(HX_("notify_mention",34,44,26,d0),::hx::paccDynamic),0 );
-HXDLIN( 261)					bool _hx_tmp4 = ::hx::IsNotEq( row2->__Field(HX_("notify_reply",f4,e7,df,1b),::hx::paccDynamic),0 );
-HXDLIN( 261)					 ::Dynamic row10 =  ::Dynamic(row2->__Field(HX_("capsObj",56,b6,8b,a6),::hx::paccDynamic));
-HXDLIN( 261)					chats->push( ::snikket::SerializedChat_obj::__alloc( HX_CTX ,( (::String)(row3) ),_hx_tmp,( (::Array< unsigned char >)(row4) ),presenceMap,( (::String)(row5) ),row6,_hx_tmp1,( (::String)(row7) ),( (::String)(row8) ),( (::String)(row9) ),_hx_tmp2,_hx_tmp3,_hx_tmp4,( ( ::snikket::Caps)(row10) ),( (::String)(::Reflect_obj::field(row2,HX_("class",38,78,58,48))) )));
             				}
+HXLINE( 274)				::String row2 = ( (::String)(row1->__Field(HX_("chat_id",22,ea,bd,d0),::hx::paccDynamic)) );
+HXDLIN( 274)				bool _hx_tmp = ::hx::IsNotEq( row1->__Field(HX_("trusted",f7,b7,a6,16),::hx::paccDynamic),0 );
+HXDLIN( 274)				::Array< unsigned char > row3 = ( (::Array< unsigned char >)(row1->__Field(HX_("avatar_sha1",ab,69,a3,a4),::hx::paccDynamic)) );
+HXDLIN( 274)				::String row4 = ( (::String)(row1->__Field(HX_("fn",48,59,00,00),::hx::paccDynamic)) );
+HXDLIN( 274)				 ::Dynamic row5 = row1->__Field(HX_("ui_state",a6,9a,4e,b2),::hx::paccDynamic);
+HXDLIN( 274)				bool _hx_tmp1 = ::hx::IsNotEq( row1->__Field(HX_("blocked",ec,7a,fe,44),::hx::paccDynamic),0 );
+HXDLIN( 274)				::String row6 = ( (::String)(row1->__Field(HX_("extensions",14,7c,70,89),::hx::paccDynamic)) );
+HXDLIN( 274)				::String row7 = ( (::String)(row1->__Field(HX_("read_up_to_id",84,60,ad,9e),::hx::paccDynamic)) );
+HXDLIN( 274)				::String row8 = ( (::String)(row1->__Field(HX_("read_up_to_by",80,5a,ad,9e),::hx::paccDynamic)) );
+HXDLIN( 274)				 ::Dynamic _hx_tmp2;
+HXDLIN( 274)				if (::hx::IsNull( row1->__Field(HX_("notifications_filtered",4e,91,57,51),::hx::paccDynamic) )) {
+HXLINE( 274)					_hx_tmp2 = null();
+            				}
+            				else {
+HXLINE( 274)					_hx_tmp2 = ::hx::IsNotEq( row1->__Field(HX_("notifications_filtered",4e,91,57,51),::hx::paccDynamic),0 );
+            				}
+HXDLIN( 274)				bool _hx_tmp3 = ::hx::IsNotEq( row1->__Field(HX_("notify_mention",34,44,26,d0),::hx::paccDynamic),0 );
+HXDLIN( 274)				bool _hx_tmp4 = ::hx::IsNotEq( row1->__Field(HX_("notify_reply",f4,e7,df,1b),::hx::paccDynamic),0 );
+HXDLIN( 274)				 ::snikket::Caps row9 = ( ( ::snikket::Caps)(row1->__Field(HX_("capsObj",56,b6,8b,a6),::hx::paccDynamic)) );
+HXDLIN( 274)				chats->push( ::snikket::SerializedChat_obj::__alloc( HX_CTX ,row2,_hx_tmp,row3,presenceMap,row4,row5,_hx_tmp1,row6,row7,row8,_hx_tmp2,_hx_tmp3,_hx_tmp4,row9,( (::String)(::Reflect_obj::field(row1,HX_("class",38,78,58,48))) )));
             			}
-HXLINE( 263)			callback(chats);
+            			_hx_goto_33:;
+HXLINE( 276)			return chats;
             		}
-            		HX_END_LOCAL_FUNC1((void))
+            		HX_END_LOCAL_FUNC1(return)
 
-            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_223_getChats)
-HXDLIN( 223)		 ::snikket::persistence::Sqlite _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 224)		::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(HX_("SELECT chat_id, trusted, avatar_sha1, fn, ui_state, blocked, extensions, read_up_to_id, read_up_to_by, notifications_filtered, notify_mention, notify_reply, json(caps) AS caps, json(presence) AS presence, class FROM chats LEFT JOIN caps ON chats.caps_ver=caps.sha1 WHERE account_id=?",f9,ff,8c,f1),::cpp::VirtualArray_obj::__new(1)->init(0,accountId)), ::Dynamic(new _hx_Closure_3(_gthis)),null()), ::Dynamic(new _hx_Closure_5(callback)),null());
+            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_231_getChats)
+HXDLIN( 231)		 ::snikket::persistence::Sqlite _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 232)		::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(HX_("SELECT chat_id, trusted, avatar_sha1, fn, ui_state, blocked, extensions, read_up_to_id, read_up_to_by, notifications_filtered, notify_mention, notify_reply, json(caps) AS caps, caps_ver, json(presence) AS presence, class FROM chats LEFT JOIN caps ON chats.caps_ver=caps.sha1 WHERE account_id=?",32,f7,06,7e),::cpp::VirtualArray_obj::__new(1)->init(0,accountId)), ::Dynamic(new _hx_Closure_3(_gthis)),null()), ::Dynamic(new _hx_Closure_5()),null()),callback,null());
             	}
 
 
@@ -896,289 +930,289 @@ HX_DEFINE_DYNAMIC_FUNC2(Sqlite_obj,getChats,(void))
 
 void Sqlite_obj::storeMessages(::String accountId,::Array< ::Dynamic> messages, ::Dynamic callback){
             		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_0,::Array< ::Dynamic>,messages, ::snikket::persistence::Sqlite,_gthis,::String,accountId) HXARGC(1)
-            		::Dynamic _hx_run(::Dynamic _){
-            			HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_304_storeMessages)
-HXLINE( 304)			 ::snikket::persistence::SqliteDriver _gthis1 = _gthis->db;
-HXLINE( 305)			::Array< ::String > result = ::Array_obj< ::String >::__new(messages->length);
-HXDLIN( 305)			{
-HXLINE( 305)				int _g = 0;
-HXDLIN( 305)				int _g1 = messages->length;
-HXDLIN( 305)				while((_g < _g1)){
-HXLINE( 305)					_g = (_g + 1);
-HXDLIN( 305)					int i = (_g - 1);
-HXDLIN( 305)					{
-HXLINE( 305)						 ::snikket::ChatMessage _1 = ( ( ::snikket::ChatMessage)(_hx_array_unsafe_get(messages,i)) );
-HXDLIN( 305)						result->__unsafe_set(i,HX_("(?,?,?,?,?,?,?,?,CAST(unixepoch(?, 'subsec') * 1000 AS INTEGER),?,?,?,?)",56,f5,42,e0));
-            					}
-            				}
-            			}
-HXDLIN( 305)			::String _hx_tmp = (HX_("INSERT OR REPLACE INTO messages VALUES ",28,32,a2,bc) + result->join(HX_(",",2c,00,00,00)));
-HXLINE( 306)			::Array< ::Dynamic> _g2 = ::Array_obj< ::Dynamic>::__new(0);
-HXDLIN( 306)			{
-HXLINE( 306)				int _g_current = 0;
-HXDLIN( 306)				::Array< ::Dynamic> _g_array = messages;
-HXDLIN( 306)				while((_g_current < _g_array->length)){
-HXLINE( 306)					_g_current = (_g_current + 1);
-HXDLIN( 306)					 ::snikket::ChatMessage x = _g_array->__get((_g_current - 1)).StaticCast<  ::snikket::ChatMessage >();
-HXLINE( 307)					 ::snikket::ChatMessage correctable = x;
-HXLINE( 308)					 ::snikket::ChatMessage message;
-HXDLIN( 308)					if ((x->versions->length == 1)) {
-HXLINE( 308)						message = x->versions->__get(0).StaticCast<  ::snikket::ChatMessage >();
+            		::Dynamic _hx_run( ::haxe::iterators::ArrayIterator _){
+            			HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_318_storeMessages)
+HXLINE( 318)			 ::snikket::persistence::SqliteDriver _gthis1 = _gthis->db;
+HXLINE( 319)			::Array< ::String > result = ::Array_obj< ::String >::__new(messages->length);
+HXDLIN( 319)			{
+HXLINE( 319)				int _g = 0;
+HXDLIN( 319)				int _g1 = messages->length;
+HXDLIN( 319)				while((_g < _g1)){
+HXLINE( 319)					_g = (_g + 1);
+HXDLIN( 319)					int i = (_g - 1);
+HXDLIN( 319)					{
+HXLINE( 319)						 ::snikket::ChatMessage _1 = ( ( ::snikket::ChatMessage)(_hx_array_unsafe_get(messages,i)) );
+HXDLIN( 319)						result->__unsafe_set(i,HX_("(?,?,?,?,?,?,?,?,CAST(unixepoch(?, 'subsec') * 1000 AS INTEGER),?,?,?,?)",56,f5,42,e0));
+            					}
+            				}
+            			}
+HXDLIN( 319)			::String _hx_tmp = (HX_("INSERT OR REPLACE INTO messages VALUES ",28,32,a2,bc) + result->join(HX_(",",2c,00,00,00)));
+HXLINE( 320)			::Array< ::Dynamic> _g2 = ::Array_obj< ::Dynamic>::__new(0);
+HXDLIN( 320)			{
+HXLINE( 320)				int _g_current = 0;
+HXDLIN( 320)				::Array< ::Dynamic> _g_array = messages;
+HXDLIN( 320)				while((_g_current < _g_array->length)){
+HXLINE( 320)					_g_current = (_g_current + 1);
+HXDLIN( 320)					 ::snikket::ChatMessage x = _g_array->__get((_g_current - 1)).StaticCast<  ::snikket::ChatMessage >();
+HXLINE( 321)					 ::snikket::ChatMessage correctable = x;
+HXLINE( 322)					 ::snikket::ChatMessage message;
+HXDLIN( 322)					if ((x->versions->length == 1)) {
+HXLINE( 322)						message = x->versions->__get(0).StaticCast<  ::snikket::ChatMessage >();
             					}
             					else {
-HXLINE( 308)						message = x;
+HXLINE( 322)						message = x;
             					}
-HXLINE( 310)					::String accountId1 = accountId;
-HXDLIN( 310)					::String _hx_tmp1;
-HXDLIN( 310)					::String tmp = message->serverId;
-HXDLIN( 310)					if (::hx::IsNotNull( tmp )) {
-HXLINE( 310)						_hx_tmp1 = tmp;
+HXLINE( 324)					::String accountId1 = accountId;
+HXDLIN( 324)					::String _hx_tmp1;
+HXDLIN( 324)					::String tmp = message->serverId;
+HXDLIN( 324)					if (::hx::IsNotNull( tmp )) {
+HXLINE( 324)						_hx_tmp1 = tmp;
             					}
             					else {
-HXLINE( 310)						_hx_tmp1 = HX_("",00,00,00,00);
+HXLINE( 324)						_hx_tmp1 = HX_("",00,00,00,00);
             					}
-HXDLIN( 310)					::String _hx_tmp2;
-HXDLIN( 310)					::String tmp1 = message->serverIdBy;
-HXDLIN( 310)					if (::hx::IsNotNull( tmp1 )) {
-HXLINE( 310)						_hx_tmp2 = tmp1;
+HXDLIN( 324)					::String _hx_tmp2;
+HXDLIN( 324)					::String tmp1 = message->serverIdBy;
+HXDLIN( 324)					if (::hx::IsNotNull( tmp1 )) {
+HXLINE( 324)						_hx_tmp2 = tmp1;
             					}
             					else {
-HXLINE( 310)						_hx_tmp2 = HX_("",00,00,00,00);
+HXLINE( 324)						_hx_tmp2 = HX_("",00,00,00,00);
             					}
-HXLINE( 311)					::String _hx_tmp3;
-HXDLIN( 311)					::String tmp2 = message->localId;
-HXDLIN( 311)					if (::hx::IsNotNull( tmp2 )) {
-HXLINE( 311)						_hx_tmp3 = tmp2;
+HXLINE( 325)					::String _hx_tmp3;
+HXDLIN( 325)					::String tmp2 = message->localId;
+HXDLIN( 325)					if (::hx::IsNotNull( tmp2 )) {
+HXLINE( 325)						_hx_tmp3 = tmp2;
             					}
             					else {
-HXLINE( 311)						_hx_tmp3 = HX_("",00,00,00,00);
+HXLINE( 325)						_hx_tmp3 = HX_("",00,00,00,00);
             					}
-HXDLIN( 311)					::String _hx_tmp4;
-HXDLIN( 311)					::String tmp3 = correctable->localId;
-HXDLIN( 311)					if (::hx::IsNotNull( tmp3 )) {
-HXLINE( 311)						_hx_tmp4 = tmp3;
+HXDLIN( 325)					::String _hx_tmp4;
+HXDLIN( 325)					::String tmp3 = correctable->localId;
+HXDLIN( 325)					if (::hx::IsNotNull( tmp3 )) {
+HXLINE( 325)						_hx_tmp4 = tmp3;
             					}
             					else {
-HXLINE( 311)						_hx_tmp4 = correctable->serverId;
-            					}
-HXDLIN( 311)					bool correctable1 = correctable->syncPoint;
-HXLINE( 312)					::String _hx_tmp5 = correctable->chatId();
-HXDLIN( 312)					::String correctable2 = correctable->senderId;
-HXLINE( 313)					::String message1 = message->timestamp;
-HXDLIN( 313)					int message2 = message->status;
-HXDLIN( 313)					int message3 = message->direction;
-HXDLIN( 313)					int message4 = message->type;
-HXLINE( 306)					_g2->push(::cpp::VirtualArray_obj::__new(13)->init(0,accountId1)->init(1,_hx_tmp1)->init(2,_hx_tmp2)->init(3,_hx_tmp3)->init(4,_hx_tmp4)->init(5,correctable1)->init(6,_hx_tmp5)->init(7,correctable2)->init(8,message1)->init(9,message2)->init(10,message3)->init(11,message4)->init(12,message->asStanza()->toString()));
-            				}
-            			}
-HXDLIN( 306)			::cpp::VirtualArray _g3 = ::cpp::VirtualArray_obj::__new(0);
-HXDLIN( 306)			{
-HXLINE( 306)				 ::Dynamic e = _g2->__Field(HX_("iterator",ee,49,9a,93),::hx::paccDynamic)();
-HXDLIN( 306)				while(( (bool)(e->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE( 306)					 ::Dynamic e1 = e->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
-HXDLIN( 306)					{
-HXLINE( 306)						 ::Dynamic x1 = e1->__Field(HX_("iterator",ee,49,9a,93),::hx::paccDynamic)();
-HXDLIN( 306)						while(( (bool)(x1->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE( 306)							 ::Dynamic x2 = x1->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
-HXDLIN( 306)							_g3->push(x2);
+HXLINE( 325)						_hx_tmp4 = correctable->serverId;
+            					}
+HXDLIN( 325)					bool correctable1 = correctable->syncPoint;
+HXLINE( 326)					::String _hx_tmp5 = correctable->chatId();
+HXDLIN( 326)					::String correctable2 = correctable->senderId;
+HXLINE( 327)					::String message1 = message->timestamp;
+HXDLIN( 327)					int message2 = message->status;
+HXDLIN( 327)					int message3 = message->direction;
+HXDLIN( 327)					int message4 = message->type;
+HXLINE( 320)					_g2->push(::cpp::VirtualArray_obj::__new(13)->init(0,accountId1)->init(1,_hx_tmp1)->init(2,_hx_tmp2)->init(3,_hx_tmp3)->init(4,_hx_tmp4)->init(5,correctable1)->init(6,_hx_tmp5)->init(7,correctable2)->init(8,message1)->init(9,message2)->init(10,message3)->init(11,message4)->init(12,message->asStanza()->toString()));
+            				}
+            			}
+HXDLIN( 320)			::cpp::VirtualArray _g3 = ::cpp::VirtualArray_obj::__new(0);
+HXDLIN( 320)			{
+HXLINE( 320)				 ::Dynamic e = _g2->__Field(HX_("iterator",ee,49,9a,93),::hx::paccDynamic)();
+HXDLIN( 320)				while(( (bool)(e->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE( 320)					 ::Dynamic e1 = e->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
+HXDLIN( 320)					{
+HXLINE( 320)						 ::Dynamic x1 = e1->__Field(HX_("iterator",ee,49,9a,93),::hx::paccDynamic)();
+HXDLIN( 320)						while(( (bool)(x1->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE( 320)							 ::Dynamic x2 = x1->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
+HXDLIN( 320)							_g3->push(x2);
             						}
             					}
             				}
             			}
-HXLINE( 304)			return _gthis1->exec(_hx_tmp,_g3);
+HXLINE( 318)			return _gthis1->exec(_hx_tmp,_g3);
             		}
             		HX_END_LOCAL_FUNC1(return)
 
             		HX_BEGIN_LOCAL_FUNC_S5(::hx::LocalFunc,_hx_Closure_2,::Array< ::Dynamic>,messages, ::snikket::persistence::Sqlite,_gthis,::Array< ::Dynamic>,replyTos,::String,accountId, ::Dynamic,callback) HXARGC(1)
-            		::Dynamic _hx_run(::Dynamic _){
+            		::Dynamic _hx_run( ::haxe::iterators::ArrayIterator _){
             			HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_1, ::snikket::persistence::Sqlite,_gthis,::String,accountId) HXARGC(1)
             			::Dynamic _hx_run(::Array< ::Dynamic> ms){
-            				HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_319_storeMessages)
-HXLINE( 319)				return _gthis->hydrateReactions(accountId,ms);
+            				HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_333_storeMessages)
+HXLINE( 333)				return _gthis->hydrateReactions(accountId,ms);
             			}
             			HX_END_LOCAL_FUNC1(return)
 
-            			HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_318_storeMessages)
-HXLINE( 319)			::Dynamic _hx_tmp = ::thenshim::_Promise::Promise_Impl__obj::then(_gthis->hydrateReplyTo(accountId,messages,replyTos), ::Dynamic(new _hx_Closure_1(_gthis,accountId)),null());
-HXLINE( 318)			return ::thenshim::_Promise::Promise_Impl__obj::then(_hx_tmp,callback,null());
+            			HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_333_storeMessages)
+HXLINE( 333)			::Dynamic _hx_tmp = ::thenshim::_Promise::Promise_Impl__obj::then(_gthis->hydrateReplyTo(accountId,messages,replyTos), ::Dynamic(new _hx_Closure_1(_gthis,accountId)),null());
+HXDLIN( 333)			return ::thenshim::_Promise::Promise_Impl__obj::then(_hx_tmp,callback,null());
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            	HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_268_storeMessages)
-HXDLIN( 268)		 ::snikket::persistence::Sqlite _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 269)		if ((messages->length < 1)) {
-HXLINE( 270)			callback(messages);
-HXLINE( 271)			return;
-            		}
-HXLINE( 274)		::Array< ::String > chatIds = ::Array_obj< ::String >::__new(0);
-HXLINE( 275)		::Array< ::String > localIds = ::Array_obj< ::String >::__new(0);
-HXLINE( 276)		::Array< ::Dynamic> replyTos = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE( 277)		{
-HXLINE( 277)			int _g = 0;
-HXDLIN( 277)			while((_g < messages->length)){
-HXLINE( 277)				 ::snikket::ChatMessage message = messages->__get(_g).StaticCast<  ::snikket::ChatMessage >();
-HXDLIN( 277)				_g = (_g + 1);
-HXLINE( 278)				bool _hx_tmp;
-HXDLIN( 278)				if (::hx::IsNull( message->serverId )) {
-HXLINE( 278)					_hx_tmp = ::hx::IsNull( message->localId );
+            	HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_281_storeMessages)
+HXDLIN( 281)		 ::snikket::persistence::Sqlite _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 282)		if ((messages->length < 1)) {
+HXLINE( 283)			callback(messages);
+HXLINE( 284)			return;
+            		}
+HXLINE( 287)		::Array< ::String > chatIds = ::Array_obj< ::String >::__new(0);
+HXLINE( 288)		::Array< ::String > localIds = ::Array_obj< ::String >::__new(0);
+HXLINE( 289)		::Array< ::Dynamic> replyTos = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE( 290)		{
+HXLINE( 290)			int _g = 0;
+HXDLIN( 290)			while((_g < messages->length)){
+HXLINE( 290)				 ::snikket::ChatMessage message = messages->__get(_g).StaticCast<  ::snikket::ChatMessage >();
+HXDLIN( 290)				_g = (_g + 1);
+HXLINE( 291)				bool _hx_tmp;
+HXDLIN( 291)				if (::hx::IsNull( message->serverId )) {
+HXLINE( 291)					_hx_tmp = ::hx::IsNull( message->localId );
             				}
             				else {
-HXLINE( 278)					_hx_tmp = false;
+HXLINE( 291)					_hx_tmp = false;
             				}
-HXDLIN( 278)				if (_hx_tmp) {
-HXLINE( 278)					HX_STACK_DO_THROW(HX_("Cannot store a message with no id",54,e5,b0,de));
+HXDLIN( 291)				if (_hx_tmp) {
+HXLINE( 291)					HX_STACK_DO_THROW(HX_("Cannot store a message with no id",54,e5,b0,de));
             				}
-HXLINE( 279)				bool _hx_tmp1;
-HXDLIN( 279)				if (::hx::IsNull( message->serverId )) {
-HXLINE( 279)					_hx_tmp1 = message->isIncoming();
+HXLINE( 292)				bool _hx_tmp1;
+HXDLIN( 292)				if (::hx::IsNull( message->serverId )) {
+HXLINE( 292)					_hx_tmp1 = message->isIncoming();
             				}
             				else {
-HXLINE( 279)					_hx_tmp1 = false;
+HXLINE( 292)					_hx_tmp1 = false;
             				}
-HXDLIN( 279)				if (_hx_tmp1) {
-HXLINE( 279)					HX_STACK_DO_THROW(HX_("Cannot store an incoming message with no server id",d7,6d,19,fb));
+HXDLIN( 292)				if (_hx_tmp1) {
+HXLINE( 292)					HX_STACK_DO_THROW(HX_("Cannot store an incoming message with no server id",d7,6d,19,fb));
             				}
-HXLINE( 280)				bool _hx_tmp2;
-HXDLIN( 280)				if (::hx::IsNotNull( message->serverId )) {
-HXLINE( 280)					_hx_tmp2 = ::hx::IsNull( message->serverIdBy );
+HXLINE( 293)				bool _hx_tmp2;
+HXDLIN( 293)				if (::hx::IsNotNull( message->serverId )) {
+HXLINE( 293)					_hx_tmp2 = ::hx::IsNull( message->serverIdBy );
             				}
             				else {
-HXLINE( 280)					_hx_tmp2 = false;
+HXLINE( 293)					_hx_tmp2 = false;
             				}
-HXDLIN( 280)				if (_hx_tmp2) {
-HXLINE( 280)					HX_STACK_DO_THROW(HX_("Cannot store a message with a server id and no by",00,9f,b7,38));
+HXDLIN( 293)				if (_hx_tmp2) {
+HXLINE( 293)					HX_STACK_DO_THROW(HX_("Cannot store a message with a server id and no by",00,9f,b7,38));
             				}
-HXLINE( 282)				bool _hx_tmp3;
-HXDLIN( 282)				if (!(message->isIncoming())) {
-HXLINE( 282)					_hx_tmp3 = (message->versions->length < 1);
+HXLINE( 295)				bool _hx_tmp3;
+HXDLIN( 295)				if (!(message->isIncoming())) {
+HXLINE( 295)					_hx_tmp3 = (message->versions->length < 1);
             				}
             				else {
-HXLINE( 282)					_hx_tmp3 = false;
+HXLINE( 295)					_hx_tmp3 = false;
             				}
-HXDLIN( 282)				if (_hx_tmp3) {
-HXLINE( 285)					chatIds->push(message->chatId());
-HXLINE( 286)					localIds->push(message->localId);
+HXDLIN( 295)				if (_hx_tmp3) {
+HXLINE( 298)					chatIds->push(message->chatId());
+HXLINE( 299)					localIds->push(message->localId);
             				}
-HXLINE( 288)				bool _hx_tmp4;
-HXDLIN( 288)				if (::hx::IsNotNull( message->replyToMessage )) {
-HXLINE( 288)					_hx_tmp4 = ::hx::IsNull( message->replyToMessage->serverIdBy );
+HXLINE( 301)				bool _hx_tmp4;
+HXDLIN( 301)				if (::hx::IsNotNull( message->replyToMessage )) {
+HXLINE( 301)					_hx_tmp4 = ::hx::IsNull( message->replyToMessage->serverIdBy );
             				}
             				else {
-HXLINE( 288)					_hx_tmp4 = false;
+HXLINE( 301)					_hx_tmp4 = false;
             				}
-HXDLIN( 288)				if (_hx_tmp4) {
-HXLINE( 289)					::Array< ::Dynamic> replyTos1 = replyTos;
-HXDLIN( 289)					::String _hx_tmp5 = message->chatId();
-HXDLIN( 289)					replyTos1->push( ::Dynamic(::hx::Anon_obj::Create(3)
+HXDLIN( 301)				if (_hx_tmp4) {
+HXLINE( 302)					::Array< ::Dynamic> replyTos1 = replyTos;
+HXDLIN( 302)					::String _hx_tmp5 = message->chatId();
+HXDLIN( 302)					replyTos1->push( ::Dynamic(::hx::Anon_obj::Create(3)
             						->setFixed(0,HX_("chatId",d3,04,77,b7),_hx_tmp5)
             						->setFixed(1,HX_("serverId",7e,01,b2,e2),message->replyToMessage->serverId)
             						->setFixed(2,HX_("localId",26,7a,c6,2d),message->replyToMessage->localId)));
             				}
             			}
             		}
-HXLINE( 293)		::Dynamic _hx_tmp6;
-HXDLIN( 293)		bool _hx_tmp7;
-HXDLIN( 293)		if ((chatIds->length > 0)) {
-HXLINE( 293)			_hx_tmp7 = (localIds->length > 0);
+HXLINE( 306)		::Dynamic _hx_tmp6;
+HXDLIN( 306)		bool _hx_tmp7;
+HXDLIN( 306)		if ((chatIds->length > 0)) {
+HXLINE( 306)			_hx_tmp7 = (localIds->length > 0);
             		}
             		else {
-HXLINE( 293)			_hx_tmp7 = false;
+HXLINE( 306)			_hx_tmp7 = false;
             		}
-HXDLIN( 293)		if (_hx_tmp7) {
-HXLINE( 294)			 ::StringBuf q =  ::StringBuf_obj::__alloc( HX_CTX );
-HXLINE( 295)			{
-HXLINE( 295)				if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 295)					q->flush();
+HXDLIN( 306)		if (_hx_tmp7) {
+HXLINE( 308)			 ::StringBuf q =  ::StringBuf_obj::__alloc( HX_CTX );
+HXLINE( 309)			{
+HXLINE( 309)				if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 309)					q->flush();
             				}
-HXDLIN( 295)				if (::hx::IsNull( q->b )) {
-HXLINE( 295)					q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_49,1);
+HXDLIN( 309)				if (::hx::IsNull( q->b )) {
+HXLINE( 309)					q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_53,1);
             				}
             				else {
-HXLINE( 295)					q->b->push(HX_("DELETE FROM messages WHERE account_id=? AND direction=? AND chat_id IN (",a1,9c,a2,06));
-            				}
-            			}
-HXLINE( 296)			{
-HXLINE( 296)				::Array< ::String > result = ::Array_obj< ::String >::__new(chatIds->length);
-HXDLIN( 296)				{
-HXLINE( 296)					int _g1 = 0;
-HXDLIN( 296)					int _g2 = chatIds->length;
-HXDLIN( 296)					while((_g1 < _g2)){
-HXLINE( 296)						_g1 = (_g1 + 1);
-HXDLIN( 296)						int i = (_g1 - 1);
-HXDLIN( 296)						{
-HXLINE( 296)							::String _ = ( (::String)(_hx_array_unsafe_get(chatIds,i)) );
-HXDLIN( 296)							result->__unsafe_set(i,HX_("?",3f,00,00,00));
+HXLINE( 309)					q->b->push(HX_("DELETE FROM messages WHERE account_id=? AND direction=? AND chat_id IN (",a1,9c,a2,06));
+            				}
+            			}
+HXLINE( 310)			{
+HXLINE( 310)				::Array< ::String > result = ::Array_obj< ::String >::__new(chatIds->length);
+HXDLIN( 310)				{
+HXLINE( 310)					int _g1 = 0;
+HXDLIN( 310)					int _g2 = chatIds->length;
+HXDLIN( 310)					while((_g1 < _g2)){
+HXLINE( 310)						_g1 = (_g1 + 1);
+HXDLIN( 310)						int i = (_g1 - 1);
+HXDLIN( 310)						{
+HXLINE( 310)							::String _ = ( (::String)(_hx_array_unsafe_get(chatIds,i)) );
+HXDLIN( 310)							result->__unsafe_set(i,HX_("?",3f,00,00,00));
             						}
             					}
             				}
-HXDLIN( 296)				::String x = result->join(HX_(",",2c,00,00,00));
-HXDLIN( 296)				if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 296)					q->flush();
+HXDLIN( 310)				::String x = result->join(HX_(",",2c,00,00,00));
+HXDLIN( 310)				if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 310)					q->flush();
             				}
-HXDLIN( 296)				if (::hx::IsNull( q->b )) {
-HXLINE( 296)					q->b = ::Array_obj< ::String >::__new(1)->init(0,::Std_obj::string(x));
+HXDLIN( 310)				if (::hx::IsNull( q->b )) {
+HXLINE( 310)					q->b = ::Array_obj< ::String >::__new(1)->init(0,::Std_obj::string(x));
             				}
             				else {
-HXLINE( 296)					::Array< ::String > q1 = q->b;
-HXDLIN( 296)					q1->push(::Std_obj::string(x));
+HXLINE( 310)					::Array< ::String > q1 = q->b;
+HXDLIN( 310)					q1->push(::Std_obj::string(x));
             				}
             			}
-HXLINE( 297)			{
-HXLINE( 297)				if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 297)					q->flush();
+HXLINE( 311)			{
+HXLINE( 311)				if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 311)					q->flush();
             				}
-HXDLIN( 297)				if (::hx::IsNull( q->b )) {
-HXLINE( 297)					q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_50,1);
+HXDLIN( 311)				if (::hx::IsNull( q->b )) {
+HXLINE( 311)					q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_54,1);
             				}
             				else {
-HXLINE( 297)					q->b->push(HX_(") AND stanza_id IN (",e8,da,d3,eb));
-            				}
-            			}
-HXLINE( 298)			{
-HXLINE( 298)				::Array< ::String > result1 = ::Array_obj< ::String >::__new(localIds->length);
-HXDLIN( 298)				{
-HXLINE( 298)					int _g3 = 0;
-HXDLIN( 298)					int _g4 = localIds->length;
-HXDLIN( 298)					while((_g3 < _g4)){
-HXLINE( 298)						_g3 = (_g3 + 1);
-HXDLIN( 298)						int i1 = (_g3 - 1);
-HXDLIN( 298)						{
-HXLINE( 298)							::String _1 = ( (::String)(_hx_array_unsafe_get(localIds,i1)) );
-HXDLIN( 298)							result1->__unsafe_set(i1,HX_("?",3f,00,00,00));
+HXLINE( 311)					q->b->push(HX_(") AND stanza_id IN (",e8,da,d3,eb));
+            				}
+            			}
+HXLINE( 312)			{
+HXLINE( 312)				::Array< ::String > result1 = ::Array_obj< ::String >::__new(localIds->length);
+HXDLIN( 312)				{
+HXLINE( 312)					int _g3 = 0;
+HXDLIN( 312)					int _g4 = localIds->length;
+HXDLIN( 312)					while((_g3 < _g4)){
+HXLINE( 312)						_g3 = (_g3 + 1);
+HXDLIN( 312)						int i1 = (_g3 - 1);
+HXDLIN( 312)						{
+HXLINE( 312)							::String _1 = ( (::String)(_hx_array_unsafe_get(localIds,i1)) );
+HXDLIN( 312)							result1->__unsafe_set(i1,HX_("?",3f,00,00,00));
             						}
             					}
             				}
-HXDLIN( 298)				::String x1 = result1->join(HX_(",",2c,00,00,00));
-HXDLIN( 298)				if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 298)					q->flush();
+HXDLIN( 312)				::String x1 = result1->join(HX_(",",2c,00,00,00));
+HXDLIN( 312)				if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 312)					q->flush();
             				}
-HXDLIN( 298)				if (::hx::IsNull( q->b )) {
-HXLINE( 298)					q->b = ::Array_obj< ::String >::__new(1)->init(0,::Std_obj::string(x1));
+HXDLIN( 312)				if (::hx::IsNull( q->b )) {
+HXLINE( 312)					q->b = ::Array_obj< ::String >::__new(1)->init(0,::Std_obj::string(x1));
             				}
             				else {
-HXLINE( 298)					::Array< ::String > q2 = q->b;
-HXDLIN( 298)					q2->push(::Std_obj::string(x1));
+HXLINE( 312)					::Array< ::String > q2 = q->b;
+HXDLIN( 312)					q2->push(::Std_obj::string(x1));
             				}
             			}
-HXLINE( 299)			{
-HXLINE( 299)				if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 299)					q->flush();
+HXLINE( 313)			{
+HXLINE( 313)				if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 313)					q->flush();
             				}
-HXDLIN( 299)				if (::hx::IsNull( q->b )) {
-HXLINE( 299)					q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_51,1);
+HXDLIN( 313)				if (::hx::IsNull( q->b )) {
+HXLINE( 313)					q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_55,1);
             				}
             				else {
-HXLINE( 299)					q->b->push(HX_(")",29,00,00,00));
+HXLINE( 313)					q->b->push(HX_(")",29,00,00,00));
             				}
             			}
-HXLINE( 300)			 ::snikket::persistence::SqliteDriver _hx_tmp8 = this->db;
-HXDLIN( 300)			::String _hx_tmp9 = q->toString();
-HXLINE( 293)			_hx_tmp6 = _hx_tmp8->exec(_hx_tmp9,::cpp::VirtualArray_obj::__new(2)->init(0,accountId)->init(1,1)->concat(chatIds)->concat(localIds));
+HXLINE( 314)			 ::snikket::persistence::SqliteDriver _hx_tmp8 = this->db;
+HXDLIN( 314)			::String _hx_tmp9 = q->toString();
+HXLINE( 306)			_hx_tmp6 = _hx_tmp8->exec(_hx_tmp9,::cpp::VirtualArray_obj::__new(2)->init(0,accountId)->init(1,1)->concat(chatIds)->concat(localIds));
             		}
             		else {
-HXLINE( 293)			_hx_tmp6 = ::thenshim::_Promise::Promise_Impl__obj::resolve(null());
+HXLINE( 306)			_hx_tmp6 = ::thenshim::_Promise::Promise_Impl__obj::resolve(null());
             		}
-HXDLIN( 293)		::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(_hx_tmp6, ::Dynamic(new _hx_Closure_0(messages,_gthis,accountId)),null()), ::Dynamic(new _hx_Closure_2(messages,_gthis,replyTos,accountId,callback)),null());
+HXDLIN( 306)		::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(_hx_tmp6, ::Dynamic(new _hx_Closure_0(messages,_gthis,accountId)),null()), ::Dynamic(new _hx_Closure_2(messages,_gthis,replyTos,accountId,callback)),null());
             	}
 
 
@@ -1187,12 +1221,12 @@ HX_DEFINE_DYNAMIC_FUNC3(Sqlite_obj,storeMessages,(void))
 void Sqlite_obj::updateMessage(::String accountId, ::snikket::ChatMessage message){
             		HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_0) HXARGC(1)
             		void _hx_run(::Array< ::Dynamic> _){
-            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_327_updateMessage)
+            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_341_updateMessage)
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_327_updateMessage)
-HXDLIN( 327)		this->storeMessages(accountId,::Array_obj< ::Dynamic>::__new(1)->init(0,message), ::Dynamic(new _hx_Closure_0()));
+            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_341_updateMessage)
+HXDLIN( 341)		this->storeMessages(accountId,::Array_obj< ::Dynamic>::__new(1)->init(0,message), ::Dynamic(new _hx_Closure_0()));
             	}
 
 
@@ -1200,68 +1234,68 @@ HX_DEFINE_DYNAMIC_FUNC2(Sqlite_obj,updateMessage,(void))
 
 void Sqlite_obj::getMessage(::String accountId,::String chatId,::String serverId,::String localId, ::Dynamic callback){
             		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0, ::snikket::persistence::Sqlite,_gthis,::String,accountId) HXARGC(1)
-            		::Array< ::Dynamic> _hx_run(::Dynamic result){
-            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_341_getMessage)
-HXLINE( 341)			return _gthis->hydrateMessages(accountId,result);
+            		::Array< ::Dynamic> _hx_run( ::haxe::iterators::ArrayIterator result){
+            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_355_getMessage)
+HXLINE( 355)			return _gthis->hydrateMessages(accountId,result);
             		}
             		HX_END_LOCAL_FUNC1(return)
 
             		HX_BEGIN_LOCAL_FUNC_S4(::hx::LocalFunc,_hx_Closure_3, ::snikket::persistence::Sqlite,_gthis,::String,chatId,::String,accountId, ::Dynamic,callback) HXARGC(1)
             		void _hx_run(::Array< ::Dynamic> messages){
-            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_341_getMessage)
-HXLINE( 342)			{
-HXLINE( 342)				int _g = 0;
-HXDLIN( 342)				while((_g < messages->length)){
+            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_355_getMessage)
+HXLINE( 356)			{
+HXLINE( 356)				int _g = 0;
+HXDLIN( 356)				while((_g < messages->length)){
             					HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_1, ::snikket::persistence::Sqlite,_gthis,::String,accountId) HXARGC(1)
             					::Dynamic _hx_run(::Array< ::Dynamic> messages){
-            						HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_347_getMessage)
-HXLINE( 347)						return _gthis->hydrateReactions(accountId,messages);
+            						HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_361_getMessage)
+HXLINE( 361)						return _gthis->hydrateReactions(accountId,messages);
             					}
             					HX_END_LOCAL_FUNC1(return)
 
             					HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_2, ::Dynamic,callback) HXARGC(1)
             					void _hx_run(::Array< ::Dynamic> hydrated){
-            						HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_347_getMessage)
-HXLINE( 347)						callback(hydrated->__get(0).StaticCast<  ::snikket::ChatMessage >());
+            						HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_361_getMessage)
+HXLINE( 361)						callback(hydrated->__get(0).StaticCast<  ::snikket::ChatMessage >());
             					}
             					HX_END_LOCAL_FUNC1((void))
 
-HXLINE( 342)					 ::snikket::ChatMessage message = messages->__get(_g).StaticCast<  ::snikket::ChatMessage >();
-HXDLIN( 342)					_g = (_g + 1);
-HXLINE( 343)					::Dynamic _hx_tmp;
-HXDLIN( 343)					if (::hx::IsNotNull( message->replyToMessage )) {
-HXLINE( 343)						_hx_tmp = _gthis->hydrateReplyTo(accountId,::Array_obj< ::Dynamic>::__new(1)->init(0,message),::Array_obj< ::Dynamic>::__new(1)->init(0, ::Dynamic(::hx::Anon_obj::Create(3)
+HXLINE( 356)					 ::snikket::ChatMessage message = messages->__get(_g).StaticCast<  ::snikket::ChatMessage >();
+HXDLIN( 356)					_g = (_g + 1);
+HXLINE( 357)					::Dynamic _hx_tmp;
+HXDLIN( 357)					if (::hx::IsNotNull( message->replyToMessage )) {
+HXLINE( 357)						_hx_tmp = _gthis->hydrateReplyTo(accountId,::Array_obj< ::Dynamic>::__new(1)->init(0,message),::Array_obj< ::Dynamic>::__new(1)->init(0, ::Dynamic(::hx::Anon_obj::Create(3)
             							->setFixed(0,HX_("chatId",d3,04,77,b7),chatId)
             							->setFixed(1,HX_("serverId",7e,01,b2,e2),message->replyToMessage->serverId)
             							->setFixed(2,HX_("localId",26,7a,c6,2d),message->replyToMessage->localId))));
             					}
             					else {
-HXLINE( 343)						_hx_tmp = ::thenshim::_Promise::Promise_Impl__obj::resolve(::Array_obj< ::Dynamic>::__new(1)->init(0,message));
+HXLINE( 357)						_hx_tmp = ::thenshim::_Promise::Promise_Impl__obj::resolve(::Array_obj< ::Dynamic>::__new(1)->init(0,message));
             					}
-HXDLIN( 343)					::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(_hx_tmp, ::Dynamic(new _hx_Closure_1(_gthis,accountId)),null()), ::Dynamic(new _hx_Closure_2(callback)),null());
-HXLINE( 348)					return;
+HXDLIN( 357)					::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(_hx_tmp, ::Dynamic(new _hx_Closure_1(_gthis,accountId)),null()), ::Dynamic(new _hx_Closure_2(callback)),null());
+HXLINE( 362)					return;
             				}
             			}
-HXLINE( 350)			callback(null());
+HXLINE( 364)			callback(null());
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_330_getMessage)
-HXDLIN( 330)		 ::snikket::persistence::Sqlite _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 331)		::String q = HX_("SELECT stanza, direction, type, status, strftime('%FT%H:%M:%fZ', created_at / 1000.0, 'unixepoch') AS timestamp, sender_id, mam_id, mam_by, sync_point FROM messages WHERE account_id=? AND chat_id=?",6f,5d,49,f4);
-HXLINE( 332)		::Array< ::String > params = ::Array_obj< ::String >::__new(2)->init(0,accountId)->init(1,chatId);
-HXLINE( 333)		if (::hx::IsNotNull( serverId )) {
-HXLINE( 334)			q = (q + HX_(" AND mam_id=?",4c,af,2b,c9));
-HXLINE( 335)			params->push(serverId);
+            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_344_getMessage)
+HXDLIN( 344)		 ::snikket::persistence::Sqlite _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 345)		::String q = HX_("SELECT stanza, direction, type, status, strftime('%FT%H:%M:%fZ', created_at / 1000.0, 'unixepoch') AS timestamp, sender_id, mam_id, mam_by, sync_point FROM messages WHERE account_id=? AND chat_id=?",6f,5d,49,f4);
+HXLINE( 346)		::Array< ::String > params = ::Array_obj< ::String >::__new(2)->init(0,accountId)->init(1,chatId);
+HXLINE( 347)		if (::hx::IsNotNull( serverId )) {
+HXLINE( 348)			q = (q + HX_(" AND mam_id=?",4c,af,2b,c9));
+HXLINE( 349)			params->push(serverId);
             		}
             		else {
-HXLINE( 336)			if (::hx::IsNotNull( localId )) {
-HXLINE( 337)				q = (q + HX_(" AND stanza_id=?",be,a8,32,e3));
-HXLINE( 338)				params->push(localId);
+HXLINE( 350)			if (::hx::IsNotNull( localId )) {
+HXLINE( 351)				q = (q + HX_(" AND stanza_id=?",be,a8,32,e3));
+HXLINE( 352)				params->push(localId);
             			}
             		}
-HXLINE( 340)		q = (q + HX_("LIMIT 1",ec,af,c7,0e));
-HXLINE( 341)		::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(q,params), ::Dynamic(new _hx_Closure_0(_gthis,accountId)),null()), ::Dynamic(new _hx_Closure_3(_gthis,chatId,accountId,callback)),null());
+HXLINE( 354)		q = (q + HX_("LIMIT 1",ec,af,c7,0e));
+HXLINE( 355)		::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(q,params), ::Dynamic(new _hx_Closure_0(_gthis,accountId)),null()), ::Dynamic(new _hx_Closure_3(_gthis,chatId,accountId,callback)),null());
             	}
 
 
@@ -1297,108 +1331,108 @@ HXDLIN( 252)		this->getMessage(accountId,chatId,serverId,localId, ::Dynamic(new
 
 ::Dynamic Sqlite_obj::getMessages(::String accountId,::String chatId,::String time,::String op){
             		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0, ::snikket::persistence::Sqlite,_gthis,::String,accountId) HXARGC(1)
-            		::Array< ::Dynamic> _hx_run(::Dynamic result){
-            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_380_getMessages)
-HXLINE( 380)			return _gthis->hydrateMessages(accountId,result);
+            		::Array< ::Dynamic> _hx_run( ::haxe::iterators::ArrayIterator result){
+            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_394_getMessages)
+HXLINE( 394)			return _gthis->hydrateMessages(accountId,result);
             		}
             		HX_END_LOCAL_FUNC1(return)
 
             		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_1, ::snikket::persistence::Sqlite,_gthis,::String,op,::String,accountId) HXARGC(1)
             		::Dynamic _hx_run(::Array< ::Dynamic> iter){
-            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_380_getMessages)
-HXLINE( 381)			::Array< ::Dynamic> arr = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE( 382)			::Array< ::Dynamic> replyTos = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE( 383)			{
-HXLINE( 383)				int _g = 0;
-HXDLIN( 383)				while((_g < iter->length)){
-HXLINE( 383)					 ::snikket::ChatMessage message = iter->__get(_g).StaticCast<  ::snikket::ChatMessage >();
-HXDLIN( 383)					_g = (_g + 1);
-HXLINE( 384)					arr->push(message);
-HXLINE( 385)					bool _hx_tmp;
-HXDLIN( 385)					if (::hx::IsNotNull( message->replyToMessage )) {
-HXLINE( 385)						_hx_tmp = ::hx::IsNull( message->replyToMessage->serverIdBy );
+            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_394_getMessages)
+HXLINE( 395)			::Array< ::Dynamic> arr = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE( 396)			::Array< ::Dynamic> replyTos = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE( 397)			{
+HXLINE( 397)				int _g = 0;
+HXDLIN( 397)				while((_g < iter->length)){
+HXLINE( 397)					 ::snikket::ChatMessage message = iter->__get(_g).StaticCast<  ::snikket::ChatMessage >();
+HXDLIN( 397)					_g = (_g + 1);
+HXLINE( 398)					arr->push(message);
+HXLINE( 399)					bool _hx_tmp;
+HXDLIN( 399)					if (::hx::IsNotNull( message->replyToMessage )) {
+HXLINE( 399)						_hx_tmp = ::hx::IsNull( message->replyToMessage->serverIdBy );
             					}
             					else {
-HXLINE( 385)						_hx_tmp = false;
+HXLINE( 399)						_hx_tmp = false;
             					}
-HXDLIN( 385)					if (_hx_tmp) {
-HXLINE( 386)						::String _hx_tmp1 = message->chatId();
-HXDLIN( 386)						replyTos->push( ::Dynamic(::hx::Anon_obj::Create(3)
+HXDLIN( 399)					if (_hx_tmp) {
+HXLINE( 400)						::String _hx_tmp1 = message->chatId();
+HXDLIN( 400)						replyTos->push( ::Dynamic(::hx::Anon_obj::Create(3)
             							->setFixed(0,HX_("chatId",d3,04,77,b7),_hx_tmp1)
             							->setFixed(1,HX_("serverId",7e,01,b2,e2),message->replyToMessage->serverId)
             							->setFixed(2,HX_("localId",26,7a,c6,2d),message->replyToMessage->localId)));
             					}
             				}
             			}
-HXLINE( 389)			bool _hx_tmp2;
-HXDLIN( 389)			if ((op != HX_("<",3c,00,00,00))) {
-HXLINE( 389)				_hx_tmp2 = (op == HX_("<=",81,34,00,00));
+HXLINE( 403)			bool _hx_tmp2;
+HXDLIN( 403)			if ((op != HX_("<",3c,00,00,00))) {
+HXLINE( 403)				_hx_tmp2 = (op == HX_("<=",81,34,00,00));
             			}
             			else {
-HXLINE( 389)				_hx_tmp2 = true;
+HXLINE( 403)				_hx_tmp2 = true;
             			}
-HXDLIN( 389)			if (_hx_tmp2) {
-HXLINE( 390)				arr->reverse();
+HXDLIN( 403)			if (_hx_tmp2) {
+HXLINE( 404)				arr->reverse();
             			}
-HXLINE( 392)			return _gthis->hydrateReplyTo(accountId,arr,replyTos);
+HXLINE( 406)			return _gthis->hydrateReplyTo(accountId,arr,replyTos);
             		}
             		HX_END_LOCAL_FUNC1(return)
 
             		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_2, ::snikket::persistence::Sqlite,_gthis,::String,accountId) HXARGC(1)
             		::Dynamic _hx_run(::Array< ::Dynamic> messages){
-            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_393_getMessages)
-HXLINE( 393)			return _gthis->hydrateReactions(accountId,messages);
+            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_407_getMessages)
+HXLINE( 407)			return _gthis->hydrateReactions(accountId,messages);
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_354_getMessages)
-HXDLIN( 354)		 ::snikket::persistence::Sqlite _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 355)		::String q = HX_("SELECT\n\t\t\tcorrection_id AS stanza_id,\n\t\t\tversions.stanza,\n\t\t\tjson_group_object(CASE WHEN versions.mam_id IS NULL OR versions.mam_id='' THEN versions.stanza_id ELSE versions.mam_id END, strftime('%FT%H:%M:%fZ', versions.created_at / 1000.0, 'unixepoch')) AS version_times,\n\t\t\tjson_group_object(CASE WHEN versions.mam_id IS NULL OR versions.mam_id='' THEN versions.stanza_id ELSE versions.mam_id END, versions.stanza) AS versions,\n\t\t\tmessages.direction,\n\t\t\tmessages.type,\n\t\t\tmessages.status,\n\t\t\tstrftime('%FT%H:%M:%fZ', messages.created_at / 1000.0, 'unixepoch') AS timestamp,\n\t\t\tmessages.sender_id,\n\t\t\tmessages.mam_id,\n\t\t\tmessages.mam_by,\n\t\t\tmessages.sync_point,\n\t\t\tMAX(versions.created_at)\n\t\t\tFROM messages INNER JOIN messages versions USING (correction_id) WHERE (messages.stanza_id IS NULL OR messages.stanza_id='' OR messages.stanza_id=correction_id) AND messages.account_id=? AND messages.chat_id=?",23,4e,0b,77);
-HXLINE( 370)		::Array< ::String > params = ::Array_obj< ::String >::__new(2)->init(0,accountId)->init(1,chatId);
-HXLINE( 371)		if (::hx::IsNotNull( time )) {
-HXLINE( 372)			q = (q + ((HX_(" AND messages.created_at ",3d,a0,ae,bb) + op) + HX_("CAST(unixepoch(?, 'subsec') * 1000 AS INTEGER)",17,de,5d,f8)));
-HXLINE( 373)			params->push(time);
+            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_368_getMessages)
+HXDLIN( 368)		 ::snikket::persistence::Sqlite _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 369)		::String q = HX_("SELECT\n\t\t\tcorrection_id AS stanza_id,\n\t\t\tversions.stanza,\n\t\t\tjson_group_object(CASE WHEN versions.mam_id IS NULL OR versions.mam_id='' THEN versions.stanza_id ELSE versions.mam_id END, strftime('%FT%H:%M:%fZ', versions.created_at / 1000.0, 'unixepoch')) AS version_times,\n\t\t\tjson_group_object(CASE WHEN versions.mam_id IS NULL OR versions.mam_id='' THEN versions.stanza_id ELSE versions.mam_id END, versions.stanza) AS versions,\n\t\t\tmessages.direction,\n\t\t\tmessages.type,\n\t\t\tmessages.status,\n\t\t\tstrftime('%FT%H:%M:%fZ', messages.created_at / 1000.0, 'unixepoch') AS timestamp,\n\t\t\tmessages.sender_id,\n\t\t\tmessages.mam_id,\n\t\t\tmessages.mam_by,\n\t\t\tmessages.sync_point,\n\t\t\tMAX(versions.created_at)\n\t\t\tFROM messages INNER JOIN messages versions USING (correction_id) WHERE (messages.stanza_id IS NULL OR messages.stanza_id='' OR messages.stanza_id=correction_id) AND messages.account_id=? AND messages.chat_id=?",23,4e,0b,77);
+HXLINE( 384)		::Array< ::String > params = ::Array_obj< ::String >::__new(2)->init(0,accountId)->init(1,chatId);
+HXLINE( 385)		if (::hx::IsNotNull( time )) {
+HXLINE( 386)			q = (q + ((HX_(" AND messages.created_at ",3d,a0,ae,bb) + op) + HX_("CAST(unixepoch(?, 'subsec') * 1000 AS INTEGER)",17,de,5d,f8)));
+HXLINE( 387)			params->push(time);
             		}
-HXLINE( 375)		q = (q + HX_(" GROUP BY correction_id ORDER BY messages.created_at",81,73,dc,54));
-HXLINE( 376)		bool _hx_tmp;
-HXDLIN( 376)		if ((op != HX_("<",3c,00,00,00))) {
-HXLINE( 376)			_hx_tmp = (op == HX_("<=",81,34,00,00));
+HXLINE( 389)		q = (q + HX_(" GROUP BY correction_id, messages.sender_id ORDER BY messages.created_at",6a,b6,3b,02));
+HXLINE( 390)		bool _hx_tmp;
+HXDLIN( 390)		if ((op != HX_("<",3c,00,00,00))) {
+HXLINE( 390)			_hx_tmp = (op == HX_("<=",81,34,00,00));
             		}
             		else {
-HXLINE( 376)			_hx_tmp = true;
+HXLINE( 390)			_hx_tmp = true;
             		}
-HXDLIN( 376)		if (_hx_tmp) {
-HXLINE( 376)			q = (q + HX_(" DESC",71,b6,f9,99));
+HXDLIN( 390)		if (_hx_tmp) {
+HXLINE( 390)			q = (q + HX_(" DESC",71,b6,f9,99));
             		}
-HXLINE( 377)		q = (q + HX_(", messages.ROWID",a7,cc,85,7b));
-HXLINE( 378)		bool _hx_tmp1;
-HXDLIN( 378)		if ((op != HX_("<",3c,00,00,00))) {
-HXLINE( 378)			_hx_tmp1 = (op == HX_("<=",81,34,00,00));
+HXLINE( 391)		q = (q + HX_(", messages.ROWID",a7,cc,85,7b));
+HXLINE( 392)		bool _hx_tmp1;
+HXDLIN( 392)		if ((op != HX_("<",3c,00,00,00))) {
+HXLINE( 392)			_hx_tmp1 = (op == HX_("<=",81,34,00,00));
             		}
             		else {
-HXLINE( 378)			_hx_tmp1 = true;
+HXLINE( 392)			_hx_tmp1 = true;
             		}
-HXDLIN( 378)		if (_hx_tmp1) {
-HXLINE( 378)			q = (q + HX_(" DESC",71,b6,f9,99));
+HXDLIN( 392)		if (_hx_tmp1) {
+HXLINE( 392)			q = (q + HX_(" DESC",71,b6,f9,99));
             		}
-HXLINE( 379)		q = (q + HX_(" LIMIT 50",60,62,1f,3e));
-HXLINE( 380)		return ::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(q,params), ::Dynamic(new _hx_Closure_0(_gthis,accountId)),null()), ::Dynamic(new _hx_Closure_1(_gthis,op,accountId)),null()), ::Dynamic(new _hx_Closure_2(_gthis,accountId)),null());
+HXLINE( 393)		q = (q + HX_(" LIMIT 50",60,62,1f,3e));
+HXLINE( 394)		return ::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(q,params), ::Dynamic(new _hx_Closure_0(_gthis,accountId)),null()), ::Dynamic(new _hx_Closure_1(_gthis,op,accountId)),null()), ::Dynamic(new _hx_Closure_2(_gthis,accountId)),null());
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC4(Sqlite_obj,getMessages,return )
 
 void Sqlite_obj::getMessagesBefore(::String accountId,::String chatId,::String beforeId,::String beforeTime, ::Dynamic callback){
-            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_398_getMessagesBefore)
-HXDLIN( 398)		::thenshim::_Promise::Promise_Impl__obj::then(this->getMessages(accountId,chatId,beforeTime,HX_("<",3c,00,00,00)),callback,null());
+            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_412_getMessagesBefore)
+HXDLIN( 412)		::thenshim::_Promise::Promise_Impl__obj::then(this->getMessages(accountId,chatId,beforeTime,HX_("<",3c,00,00,00)),callback,null());
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC5(Sqlite_obj,getMessagesBefore,(void))
 
 void Sqlite_obj::getMessagesAfter(::String accountId,::String chatId,::String afterId,::String afterTime, ::Dynamic callback){
-            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_403_getMessagesAfter)
-HXDLIN( 403)		::thenshim::_Promise::Promise_Impl__obj::then(this->getMessages(accountId,chatId,afterTime,HX_(">",3e,00,00,00)),callback,null());
+            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_417_getMessagesAfter)
+HXDLIN( 417)		::thenshim::_Promise::Promise_Impl__obj::then(this->getMessages(accountId,chatId,afterTime,HX_(">",3e,00,00,00)),callback,null());
             	}
 
 
@@ -1407,357 +1441,370 @@ HX_DEFINE_DYNAMIC_FUNC5(Sqlite_obj,getMessagesAfter,(void))
 void Sqlite_obj::getMessagesAround(::String accountId,::String chatId,::String aroundId,::String aroundTime, ::Dynamic callback){
             		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_4, ::snikket::persistence::Sqlite,_gthis,::String,chatId,::String,accountId) HXARGC(1)
             		::Dynamic _hx_run(::String aroundTime){
-            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_419_getMessagesAround)
-HXLINE( 420)			::Dynamic _hx_tmp = _gthis->getMessages(accountId,chatId,aroundTime,HX_("<",3c,00,00,00));
-HXLINE( 419)			return ::thenshim::PromiseTools_obj::all(::Array_obj< ::Dynamic>::__new(2)->init(0,_hx_tmp)->init(1,_gthis->getMessages(accountId,chatId,aroundTime,HX_(">=",3f,36,00,00))));
+            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_433_getMessagesAround)
+HXLINE( 434)			::Dynamic _hx_tmp = _gthis->getMessages(accountId,chatId,aroundTime,HX_("<",3c,00,00,00));
+HXLINE( 433)			return ::thenshim::PromiseTools_obj::all(::Array_obj< ::Dynamic>::__new(2)->init(0,_hx_tmp)->init(1,_gthis->getMessages(accountId,chatId,aroundTime,HX_(">=",3f,36,00,00))));
             		}
             		HX_END_LOCAL_FUNC1(return)
 
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_5, ::Dynamic,callback) HXARGC(1)
             		void _hx_run(::Array< ::Dynamic> results){
-            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_424_getMessagesAround)
-HXLINE( 424)			 ::Dynamic callback1 = callback;
-HXDLIN( 424)			::Array< ::Dynamic> _g = ::Array_obj< ::Dynamic>::__new(0);
-HXDLIN( 424)			{
-HXLINE( 424)				int _g_current = 0;
-HXDLIN( 424)				::Array< ::Dynamic> _g_array = results;
-HXDLIN( 424)				while((_g_current < _g_array->length)){
-HXLINE( 424)					_g_current = (_g_current + 1);
-HXDLIN( 424)					::Array< ::Dynamic> x = _g_array->__get((_g_current - 1)).StaticCast< ::Array< ::Dynamic> >();
-HXDLIN( 424)					_g->push(x);
-            				}
-            			}
-HXDLIN( 424)			::Array< ::Dynamic> _g1 = ::Array_obj< ::Dynamic>::__new(0);
-HXDLIN( 424)			{
-HXLINE( 424)				 ::Dynamic e = _g->__Field(HX_("iterator",ee,49,9a,93),::hx::paccDynamic)();
-HXDLIN( 424)				while(( (bool)(e->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE( 424)					 ::Dynamic e1 = e->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
-HXDLIN( 424)					{
-HXLINE( 424)						 ::Dynamic x1 = e1->__Field(HX_("iterator",ee,49,9a,93),::hx::paccDynamic)();
-HXDLIN( 424)						while(( (bool)(x1->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE( 424)							 ::snikket::ChatMessage x2 = ( ( ::snikket::ChatMessage)(x1->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
-HXDLIN( 424)							_g1->push(x2);
+            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_438_getMessagesAround)
+HXLINE( 438)			 ::Dynamic callback1 = callback;
+HXDLIN( 438)			::Array< ::Dynamic> _g = ::Array_obj< ::Dynamic>::__new(0);
+HXDLIN( 438)			{
+HXLINE( 438)				int _g_current = 0;
+HXDLIN( 438)				::Array< ::Dynamic> _g_array = results;
+HXDLIN( 438)				while((_g_current < _g_array->length)){
+HXLINE( 438)					_g_current = (_g_current + 1);
+HXDLIN( 438)					::Array< ::Dynamic> x = _g_array->__get((_g_current - 1)).StaticCast< ::Array< ::Dynamic> >();
+HXDLIN( 438)					_g->push(x);
+            				}
+            			}
+HXDLIN( 438)			::Array< ::Dynamic> _g1 = ::Array_obj< ::Dynamic>::__new(0);
+HXDLIN( 438)			{
+HXLINE( 438)				 ::Dynamic e = _g->__Field(HX_("iterator",ee,49,9a,93),::hx::paccDynamic)();
+HXDLIN( 438)				while(( (bool)(e->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE( 438)					 ::Dynamic e1 = e->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
+HXDLIN( 438)					{
+HXLINE( 438)						 ::Dynamic x1 = e1->__Field(HX_("iterator",ee,49,9a,93),::hx::paccDynamic)();
+HXDLIN( 438)						while(( (bool)(x1->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE( 438)							 ::snikket::ChatMessage x2 = ( ( ::snikket::ChatMessage)(x1->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
+HXDLIN( 438)							_g1->push(x2);
             						}
             					}
             				}
             			}
-HXDLIN( 424)			callback1(_g1);
+HXDLIN( 438)			callback1(_g1);
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_407_getMessagesAround)
-HXDLIN( 407)		 ::snikket::persistence::Sqlite _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 408)		::Dynamic _hx_tmp;
-HXDLIN( 408)		if (::hx::IsNull( aroundTime )) {
+            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_421_getMessagesAround)
+HXDLIN( 421)		 ::snikket::persistence::Sqlite _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 422)		::Dynamic _hx_tmp;
+HXDLIN( 422)		if (::hx::IsNull( aroundTime )) {
             			HX_BEGIN_LOCAL_FUNC_S4(::hx::LocalFunc,_hx_Closure_0, ::snikket::persistence::Sqlite,_gthis,::String,chatId,::String,aroundId,::String,accountId) HXARGC(2)
             			void _hx_run( ::Dynamic resolve, ::Dynamic reject){
-            				HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_409_getMessagesAround)
-HXLINE( 409)				_gthis->getMessage(accountId,chatId,aroundId,null(),resolve);
+            				HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_423_getMessagesAround)
+HXLINE( 423)				_gthis->getMessage(accountId,chatId,aroundId,null(),resolve);
             			}
             			HX_END_LOCAL_FUNC2((void))
 
             			HX_BEGIN_LOCAL_FUNC_S4(::hx::LocalFunc,_hx_Closure_3, ::snikket::persistence::Sqlite,_gthis,::String,chatId,::String,aroundId,::String,accountId) HXARGC(1)
             			::Dynamic _hx_run( ::snikket::ChatMessage m){
-            				HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_410_getMessagesAround)
-HXLINE( 410)				if (::hx::IsNotNull( m )) {
-HXLINE( 411)					return ::thenshim::_Promise::Promise_Impl__obj::resolve(m->timestamp);
+            				HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_424_getMessagesAround)
+HXLINE( 424)				if (::hx::IsNotNull( m )) {
+HXLINE( 425)					return ::thenshim::_Promise::Promise_Impl__obj::resolve(m->timestamp);
             				}
             				else {
             					HX_BEGIN_LOCAL_FUNC_S4(::hx::LocalFunc,_hx_Closure_1, ::snikket::persistence::Sqlite,_gthis,::String,chatId,::String,aroundId,::String,accountId) HXARGC(2)
             					void _hx_run( ::Dynamic resolve, ::Dynamic reject){
-            						HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_413_getMessagesAround)
-HXLINE( 413)						_gthis->getMessage(accountId,chatId,null(),aroundId,resolve);
+            						HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_427_getMessagesAround)
+HXLINE( 427)						_gthis->getMessage(accountId,chatId,null(),aroundId,resolve);
             					}
             					HX_END_LOCAL_FUNC2((void))
 
             					HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_2) HXARGC(1)
             					::String _hx_run( ::snikket::ChatMessage m){
-            						HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_413_getMessagesAround)
-HXLINE( 413)						if (::hx::IsNotNull( m )) {
-HXLINE( 413)							return m->timestamp;
+            						HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_427_getMessagesAround)
+HXLINE( 427)						if (::hx::IsNotNull( m )) {
+HXLINE( 427)							return m->timestamp;
             						}
             						else {
-HXLINE( 413)							return null();
+HXLINE( 427)							return null();
             						}
-HXDLIN( 413)						return null();
+HXDLIN( 427)						return null();
             					}
             					HX_END_LOCAL_FUNC1(return)
 
-HXLINE( 413)					return ::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_1(_gthis,chatId,aroundId,accountId))), ::Dynamic(new _hx_Closure_2()),null());
+HXLINE( 427)					return ::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_1(_gthis,chatId,aroundId,accountId))), ::Dynamic(new _hx_Closure_2()),null());
             				}
-HXLINE( 410)				return null();
+HXLINE( 424)				return null();
             			}
             			HX_END_LOCAL_FUNC1(return)
 
-HXLINE( 408)			_hx_tmp = ::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_0(_gthis,chatId,aroundId,accountId))), ::Dynamic(new _hx_Closure_3(_gthis,chatId,aroundId,accountId)),null());
+HXLINE( 422)			_hx_tmp = ::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_0(_gthis,chatId,aroundId,accountId))), ::Dynamic(new _hx_Closure_3(_gthis,chatId,aroundId,accountId)),null());
             		}
             		else {
-HXLINE( 408)			_hx_tmp = ::thenshim::_Promise::Promise_Impl__obj::resolve(aroundTime);
+HXLINE( 422)			_hx_tmp = ::thenshim::_Promise::Promise_Impl__obj::resolve(aroundTime);
             		}
-HXDLIN( 408)		::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(_hx_tmp, ::Dynamic(new _hx_Closure_4(_gthis,chatId,accountId)),null()), ::Dynamic(new _hx_Closure_5(callback)),null());
+HXDLIN( 422)		::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(_hx_tmp, ::Dynamic(new _hx_Closure_4(_gthis,chatId,accountId)),null()), ::Dynamic(new _hx_Closure_5(callback)),null());
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC5(Sqlite_obj,getMessagesAround,(void))
 
 void Sqlite_obj::getChatsUnreadDetails(::String accountId,::Array< ::Dynamic> chats, ::Dynamic callback){
-            		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_2, ::snikket::persistence::Sqlite,_gthis,::String,accountId, ::Dynamic,callback) HXARGC(1)
-            		::Dynamic _hx_run(::Dynamic result){
-            			HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0,::Dynamic,result) HXARGC(0)
-            			::Dynamic _hx_run(){
-            				HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_471_getChatsUnreadDetails)
-HXLINE( 471)				return result;
-            			}
-            			HX_END_LOCAL_FUNC0(return)
-
-            			HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_1,::cpp::VirtualArray,rows,::Array< ::Dynamic>,details, ::Dynamic,callback) HXARGC(1)
-            			void _hx_run(::Array< ::Dynamic> messages){
-            				HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_472_getChatsUnreadDetails)
-HXLINE( 473)				{
-HXLINE( 473)					int _g_current = 0;
-HXDLIN( 473)					::Array< ::Dynamic> _g_array = messages;
-HXDLIN( 473)					while((_g_current < _g_array->length)){
-HXLINE( 473)						 ::snikket::ChatMessage _g_value = _g_array->__get(_g_current).StaticCast<  ::snikket::ChatMessage >();
-HXDLIN( 473)						_g_current = (_g_current + 1);
-HXDLIN( 473)						int _g_key = (_g_current - 1);
-HXDLIN( 473)						int i = _g_key;
-HXDLIN( 473)						 ::snikket::ChatMessage m = _g_value;
-HXLINE( 474)						details->push( ::Dynamic(::hx::Anon_obj::Create(3)
-            							->setFixed(0,HX_("message",c7,35,11,9a),m)
-            							->setFixed(1,HX_("unreadCount",20,18,f1,a0), ::Dynamic(rows->__get(i)->__Field(HX_("unreadCount",20,18,f1,a0),::hx::paccDynamic)))
-            							->setFixed(2,HX_("chatId",d3,04,77,b7), ::Dynamic(rows->__get(i)->__Field(HX_("chatId",d3,04,77,b7),::hx::paccDynamic)))));
-            					}
+            		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_0, ::snikket::persistence::Sqlite,_gthis,::Array< ::Dynamic>,chats,::String,accountId) HXARGC(1)
+            		::Dynamic _hx_run( ::Dynamic _){
+            			HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_449_getChatsUnreadDetails)
+HXLINE( 450)			::cpp::VirtualArray params = ::cpp::VirtualArray_obj::__new(1)->init(0,accountId);
+HXLINE( 452)			 ::StringBuf subq =  ::StringBuf_obj::__alloc( HX_CTX );
+HXLINE( 453)			{
+HXLINE( 453)				if (::hx::IsNotNull( subq->charBuf )) {
+HXLINE( 453)					subq->flush();
+            				}
+HXDLIN( 453)				if (::hx::IsNull( subq->b )) {
+HXLINE( 453)					subq->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_88,1);
+            				}
+            				else {
+HXLINE( 453)					subq->b->push(HX_("SELECT chat_id, ROWID as row, MAX(created_at) AS created_at FROM messages WHERE account_id=?",d0,69,08,92));
             				}
-HXLINE( 480)				callback(details);
-            			}
-            			HX_END_LOCAL_FUNC1((void))
-
-            			HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_469_getChatsUnreadDetails)
-HXLINE( 470)			::Array< ::Dynamic> details = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE( 471)			::cpp::VirtualArray rows = ::Lambda_obj::array( ::Dynamic(::hx::Anon_obj::Create(1)
-            				->setFixed(0,HX_("iterator",ee,49,9a,93), ::Dynamic(new _hx_Closure_0(result)))));
-HXLINE( 472)			 ::snikket::persistence::Sqlite _gthis1 = _gthis;
-HXDLIN( 472)			::String accountId1 = accountId;
-HXDLIN( 472)			return ::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::resolve(_gthis1->hydrateMessages(accountId1, ::haxe::iterators::ArrayIterator_obj::__alloc( HX_CTX ,rows))), ::Dynamic(new _hx_Closure_1(rows,details,callback)),null());
-            		}
-            		HX_END_LOCAL_FUNC1(return)
-
-            	HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_429_getChatsUnreadDetails)
-HXDLIN( 429)		 ::snikket::persistence::Sqlite _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 430)		bool _hx_tmp;
-HXDLIN( 430)		if (::hx::IsNotNull( chats )) {
-HXLINE( 430)			_hx_tmp = (chats->length < 1);
-            		}
-            		else {
-HXLINE( 430)			_hx_tmp = true;
-            		}
-HXDLIN( 430)		if (_hx_tmp) {
-HXLINE( 431)			callback(::Array_obj< ::Dynamic>::__new(0));
-HXLINE( 432)			return;
-            		}
-HXLINE( 435)		::cpp::VirtualArray params = ::cpp::VirtualArray_obj::__new(1)->init(0,accountId);
-HXLINE( 437)		 ::StringBuf subq =  ::StringBuf_obj::__alloc( HX_CTX );
-HXLINE( 438)		{
-HXLINE( 438)			if (::hx::IsNotNull( subq->charBuf )) {
-HXLINE( 438)				subq->flush();
-            			}
-HXDLIN( 438)			if (::hx::IsNull( subq->b )) {
-HXLINE( 438)				subq->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_87,1);
-            			}
-            			else {
-HXLINE( 438)				subq->b->push(HX_("SELECT chat_id, ROWID as row, MAX(created_at) AS created_at FROM messages WHERE account_id=?",d0,69,08,92));
-            			}
-            		}
-HXLINE( 439)		{
-HXLINE( 439)			if (::hx::IsNotNull( subq->charBuf )) {
-HXLINE( 439)				subq->flush();
-            			}
-HXDLIN( 439)			if (::hx::IsNull( subq->b )) {
-HXLINE( 439)				subq->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_88,1);
             			}
-            			else {
-HXLINE( 439)				subq->b->push(HX_(" AND chat_id IN (",14,bd,7b,de));
-            			}
-            		}
-HXLINE( 440)		{
-HXLINE( 440)			int _g_current = 0;
-HXDLIN( 440)			::Array< ::Dynamic> _g_array = chats;
-HXDLIN( 440)			while((_g_current < _g_array->length)){
-HXLINE( 440)				 ::snikket::Chat _g_value = _g_array->__get(_g_current).StaticCast<  ::snikket::Chat >();
-HXDLIN( 440)				_g_current = (_g_current + 1);
-HXDLIN( 440)				int _g_key = (_g_current - 1);
-HXDLIN( 440)				int i = _g_key;
-HXDLIN( 440)				 ::snikket::Chat chat = _g_value;
-HXDLIN( 440)				{
-HXLINE( 441)					if ((i != 0)) {
-HXLINE( 441)						if (::hx::IsNotNull( subq->charBuf )) {
-HXLINE( 441)							subq->flush();
-            						}
-HXDLIN( 441)						if (::hx::IsNull( subq->b )) {
-HXLINE( 441)							subq->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_89,1);
+HXLINE( 454)			{
+HXLINE( 454)				if (::hx::IsNotNull( subq->charBuf )) {
+HXLINE( 454)					subq->flush();
+            				}
+HXDLIN( 454)				if (::hx::IsNull( subq->b )) {
+HXLINE( 454)					subq->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_89,1);
+            				}
+            				else {
+HXLINE( 454)					subq->b->push(HX_(" AND chat_id IN (",14,bd,7b,de));
+            				}
+            			}
+HXLINE( 455)			{
+HXLINE( 455)				int _g_current = 0;
+HXDLIN( 455)				::Array< ::Dynamic> _g_array = chats;
+HXDLIN( 455)				while((_g_current < _g_array->length)){
+HXLINE( 455)					 ::snikket::Chat _g_value = _g_array->__get(_g_current).StaticCast<  ::snikket::Chat >();
+HXDLIN( 455)					_g_current = (_g_current + 1);
+HXDLIN( 455)					int _g_key = (_g_current - 1);
+HXDLIN( 455)					int i = _g_key;
+HXDLIN( 455)					 ::snikket::Chat chat = _g_value;
+HXDLIN( 455)					{
+HXLINE( 456)						if ((i != 0)) {
+HXLINE( 456)							if (::hx::IsNotNull( subq->charBuf )) {
+HXLINE( 456)								subq->flush();
+            							}
+HXDLIN( 456)							if (::hx::IsNull( subq->b )) {
+HXLINE( 456)								subq->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_90,1);
+            							}
+            							else {
+HXLINE( 456)								subq->b->push(HX_(",",2c,00,00,00));
+            							}
             						}
-            						else {
-HXLINE( 441)							subq->b->push(HX_(",",2c,00,00,00));
+HXLINE( 457)						{
+HXLINE( 457)							if (::hx::IsNotNull( subq->charBuf )) {
+HXLINE( 457)								subq->flush();
+            							}
+HXDLIN( 457)							if (::hx::IsNull( subq->b )) {
+HXLINE( 457)								subq->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_91,1);
+            							}
+            							else {
+HXLINE( 457)								subq->b->push(HX_("?",3f,00,00,00));
+            							}
             						}
+HXLINE( 458)						params->push(chat->chatId);
             					}
-HXLINE( 442)					{
-HXLINE( 442)						if (::hx::IsNotNull( subq->charBuf )) {
-HXLINE( 442)							subq->flush();
-            						}
-HXDLIN( 442)						if (::hx::IsNull( subq->b )) {
-HXLINE( 442)							subq->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_90,1);
+            				}
+            			}
+HXLINE( 460)			{
+HXLINE( 460)				if (::hx::IsNotNull( subq->charBuf )) {
+HXLINE( 460)					subq->flush();
+            				}
+HXDLIN( 460)				if (::hx::IsNull( subq->b )) {
+HXLINE( 460)					subq->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_92,1);
+            				}
+            				else {
+HXLINE( 460)					subq->b->push(HX_(") AND (mam_id IN (",64,f4,1c,69));
+            				}
+            			}
+HXLINE( 461)			bool didOne = false;
+HXLINE( 462)			{
+HXLINE( 462)				int _g = 0;
+HXDLIN( 462)				while((_g < chats->length)){
+HXLINE( 462)					 ::snikket::Chat chat1 = chats->__get(_g).StaticCast<  ::snikket::Chat >();
+HXDLIN( 462)					_g = (_g + 1);
+HXLINE( 463)					if (::hx::IsNotNull( chat1->readUpTo() )) {
+HXLINE( 464)						if (didOne) {
+HXLINE( 464)							if (::hx::IsNotNull( subq->charBuf )) {
+HXLINE( 464)								subq->flush();
+            							}
+HXDLIN( 464)							if (::hx::IsNull( subq->b )) {
+HXLINE( 464)								subq->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_93,1);
+            							}
+            							else {
+HXLINE( 464)								subq->b->push(HX_(",",2c,00,00,00));
+            							}
             						}
-            						else {
-HXLINE( 442)							subq->b->push(HX_("?",3f,00,00,00));
+HXLINE( 465)						{
+HXLINE( 465)							if (::hx::IsNotNull( subq->charBuf )) {
+HXLINE( 465)								subq->flush();
+            							}
+HXDLIN( 465)							if (::hx::IsNull( subq->b )) {
+HXLINE( 465)								subq->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_94,1);
+            							}
+            							else {
+HXLINE( 465)								subq->b->push(HX_("?",3f,00,00,00));
+            							}
             						}
+HXLINE( 466)						params->push(chat1->readUpTo());
+HXLINE( 467)						didOne = true;
             					}
-HXLINE( 443)					params->push(chat->chatId);
             				}
             			}
-            		}
-HXLINE( 445)		{
-HXLINE( 445)			if (::hx::IsNotNull( subq->charBuf )) {
-HXLINE( 445)				subq->flush();
+HXLINE( 470)			{
+HXLINE( 470)				if (::hx::IsNotNull( subq->charBuf )) {
+HXLINE( 470)					subq->flush();
+            				}
+HXDLIN( 470)				if (::hx::IsNull( subq->b )) {
+HXLINE( 470)					subq->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_95,1);
+            				}
+            				else {
+HXLINE( 470)					subq->b->push(HX_(") OR direction=?) GROUP BY chat_id",cc,ab,94,e3));
+            				}
             			}
-HXDLIN( 445)			if (::hx::IsNull( subq->b )) {
-HXLINE( 445)				subq->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_91,1);
+HXLINE( 471)			params->push(1);
+HXLINE( 473)			 ::StringBuf q =  ::StringBuf_obj::__alloc( HX_CTX );
+HXLINE( 474)			{
+HXLINE( 474)				if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 474)					q->flush();
+            				}
+HXDLIN( 474)				if (::hx::IsNull( q->b )) {
+HXLINE( 474)					q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_96,1);
+            				}
+            				else {
+HXLINE( 474)					q->b->push(HX_("SELECT chat_id AS chatId, stanza, direction, type, status, sender_id, mam_id, mam_by, sync_point, CASE WHEN subq.created_at IS NULL THEN COUNT(*) ELSE COUNT(*) - 1 END AS unreadCount, strftime('%FT%H:%M:%fZ', MAX(messages.created_at) / 1000.0, 'unixepoch') AS timestamp FROM messages LEFT JOIN (",2a,b0,45,a6));
+            				}
             			}
-            			else {
-HXLINE( 445)				subq->b->push(HX_(") AND (mam_id IN (",64,f4,1c,69));
-            			}
-            		}
-HXLINE( 446)		bool didOne = false;
-HXLINE( 447)		{
-HXLINE( 447)			int _g = 0;
-HXDLIN( 447)			while((_g < chats->length)){
-HXLINE( 447)				 ::snikket::Chat chat1 = chats->__get(_g).StaticCast<  ::snikket::Chat >();
-HXDLIN( 447)				_g = (_g + 1);
-HXLINE( 448)				if (::hx::IsNotNull( chat1->readUpTo() )) {
-HXLINE( 449)					if (didOne) {
-HXLINE( 449)						if (::hx::IsNotNull( subq->charBuf )) {
-HXLINE( 449)							subq->flush();
-            						}
-HXDLIN( 449)						if (::hx::IsNull( subq->b )) {
-HXLINE( 449)							subq->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_92,1);
-            						}
-            						else {
-HXLINE( 449)							subq->b->push(HX_(",",2c,00,00,00));
-            						}
-            					}
-HXLINE( 450)					{
-HXLINE( 450)						if (::hx::IsNotNull( subq->charBuf )) {
-HXLINE( 450)							subq->flush();
-            						}
-HXDLIN( 450)						if (::hx::IsNull( subq->b )) {
-HXLINE( 450)							subq->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_93,1);
+HXLINE( 475)			{
+HXLINE( 475)				::String x = subq->toString();
+HXDLIN( 475)				if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 475)					q->flush();
+            				}
+HXDLIN( 475)				if (::hx::IsNull( q->b )) {
+HXLINE( 475)					q->b = ::Array_obj< ::String >::__new(1)->init(0,::Std_obj::string(x));
+            				}
+            				else {
+HXLINE( 475)					::Array< ::String > q1 = q->b;
+HXDLIN( 475)					q1->push(::Std_obj::string(x));
+            				}
+            			}
+HXLINE( 476)			{
+HXLINE( 476)				if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 476)					q->flush();
+            				}
+HXDLIN( 476)				if (::hx::IsNull( q->b )) {
+HXLINE( 476)					q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_97,1);
+            				}
+            				else {
+HXLINE( 476)					q->b->push(HX_(") subq USING (chat_id) WHERE account_id=? AND (stanza_id IS NULL OR stanza_id='' OR stanza_id=correction_id) AND chat_id IN (",e7,a1,32,e5));
+            				}
+            			}
+HXLINE( 477)			params->push(accountId);
+HXLINE( 478)			{
+HXLINE( 478)				int _g_current1 = 0;
+HXDLIN( 478)				::Array< ::Dynamic> _g_array1 = chats;
+HXDLIN( 478)				while((_g_current1 < _g_array1->length)){
+HXLINE( 478)					 ::snikket::Chat _g_value1 = _g_array1->__get(_g_current1).StaticCast<  ::snikket::Chat >();
+HXDLIN( 478)					_g_current1 = (_g_current1 + 1);
+HXDLIN( 478)					int _g_key1 = (_g_current1 - 1);
+HXDLIN( 478)					int i1 = _g_key1;
+HXDLIN( 478)					 ::snikket::Chat chat2 = _g_value1;
+HXDLIN( 478)					{
+HXLINE( 479)						if ((i1 != 0)) {
+HXLINE( 479)							if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 479)								q->flush();
+            							}
+HXDLIN( 479)							if (::hx::IsNull( q->b )) {
+HXLINE( 479)								q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_98,1);
+            							}
+            							else {
+HXLINE( 479)								q->b->push(HX_(",",2c,00,00,00));
+            							}
             						}
-            						else {
-HXLINE( 450)							subq->b->push(HX_("?",3f,00,00,00));
+HXLINE( 480)						{
+HXLINE( 480)							if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 480)								q->flush();
+            							}
+HXDLIN( 480)							if (::hx::IsNull( q->b )) {
+HXLINE( 480)								q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_99,1);
+            							}
+            							else {
+HXLINE( 480)								q->b->push(HX_("?",3f,00,00,00));
+            							}
             						}
+HXLINE( 481)						params->push(chat2->chatId);
             					}
-HXLINE( 451)					params->push(chat1->readUpTo());
-HXLINE( 452)					didOne = true;
             				}
             			}
-            		}
-HXLINE( 455)		{
-HXLINE( 455)			if (::hx::IsNotNull( subq->charBuf )) {
-HXLINE( 455)				subq->flush();
-            			}
-HXDLIN( 455)			if (::hx::IsNull( subq->b )) {
-HXLINE( 455)				subq->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_94,1);
-            			}
-            			else {
-HXLINE( 455)				subq->b->push(HX_(") OR direction=?) GROUP BY chat_id",cc,ab,94,e3));
-            			}
-            		}
-HXLINE( 456)		params->push(1);
-HXLINE( 458)		 ::StringBuf q =  ::StringBuf_obj::__alloc( HX_CTX );
-HXLINE( 459)		{
-HXLINE( 459)			if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 459)				q->flush();
-            			}
-HXDLIN( 459)			if (::hx::IsNull( q->b )) {
-HXLINE( 459)				q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_95,1);
-            			}
-            			else {
-HXLINE( 459)				q->b->push(HX_("SELECT chat_id AS chatId, stanza, direction, type, status, sender_id, mam_id, mam_by, sync_point, CASE WHEN subq.created_at IS NULL THEN COUNT(*) ELSE COUNT(*) - 1 END AS unreadCount, strftime('%FT%H:%M:%fZ', MAX(messages.created_at) / 1000.0, 'unixepoch') AS timestamp FROM messages LEFT JOIN (",2a,b0,45,a6));
+HXLINE( 483)			{
+HXLINE( 483)				if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 483)					q->flush();
+            				}
+HXDLIN( 483)				if (::hx::IsNull( q->b )) {
+HXLINE( 483)					q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_100,1);
+            				}
+            				else {
+HXLINE( 483)					q->b->push(HX_(") AND (subq.created_at IS NULL OR messages.created_at > subq.created_at OR (messages.created_at=subq.created_at AND messages.ROWID >= subq.row)) GROUP BY chat_id;",58,6f,52,ea));
+            				}
             			}
+HXLINE( 484)			 ::snikket::persistence::SqliteDriver _gthis1 = _gthis->db;
+HXDLIN( 484)			return _gthis1->exec(q->toString(),params);
             		}
-HXLINE( 460)		{
-HXLINE( 460)			::String x = subq->toString();
-HXDLIN( 460)			if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 460)				q->flush();
-            			}
-HXDLIN( 460)			if (::hx::IsNull( q->b )) {
-HXLINE( 460)				q->b = ::Array_obj< ::String >::__new(1)->init(0,::Std_obj::string(x));
-            			}
-            			else {
-HXLINE( 460)				::Array< ::String > q1 = q->b;
-HXDLIN( 460)				q1->push(::Std_obj::string(x));
+            		HX_END_LOCAL_FUNC1(return)
+
+            		HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_2) HXARGC(1)
+            		::cpp::VirtualArray _hx_run( ::haxe::iterators::ArrayIterator result){
+            			HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_1, ::haxe::iterators::ArrayIterator,result) HXARGC(0)
+            			 ::haxe::iterators::ArrayIterator _hx_run(){
+            				HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_486_getChatsUnreadDetails)
+HXLINE( 486)				return result;
             			}
+            			HX_END_LOCAL_FUNC0(return)
+
+            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_486_getChatsUnreadDetails)
+HXLINE( 486)			return ::Lambda_obj::array( ::Dynamic(::hx::Anon_obj::Create(1)
+            				->setFixed(0,HX_("iterator",ee,49,9a,93), ::Dynamic(new _hx_Closure_1(result)))));
             		}
-HXLINE( 461)		{
-HXLINE( 461)			if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 461)				q->flush();
-            			}
-HXDLIN( 461)			if (::hx::IsNull( q->b )) {
-HXLINE( 461)				q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_96,1);
-            			}
-            			else {
-HXLINE( 461)				q->b->push(HX_(") subq USING (chat_id) WHERE account_id=? AND (stanza_id IS NULL OR stanza_id='' OR stanza_id=correction_id) AND chat_id IN (",e7,a1,32,e5));
-            			}
-            		}
-HXLINE( 462)		params->push(accountId);
-HXLINE( 463)		{
-HXLINE( 463)			int _g_current1 = 0;
-HXDLIN( 463)			::Array< ::Dynamic> _g_array1 = chats;
-HXDLIN( 463)			while((_g_current1 < _g_array1->length)){
-HXLINE( 463)				 ::snikket::Chat _g_value1 = _g_array1->__get(_g_current1).StaticCast<  ::snikket::Chat >();
-HXDLIN( 463)				_g_current1 = (_g_current1 + 1);
-HXDLIN( 463)				int _g_key1 = (_g_current1 - 1);
-HXDLIN( 463)				int i1 = _g_key1;
-HXDLIN( 463)				 ::snikket::Chat chat2 = _g_value1;
-HXDLIN( 463)				{
-HXLINE( 464)					if ((i1 != 0)) {
-HXLINE( 464)						if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 464)							q->flush();
-            						}
-HXDLIN( 464)						if (::hx::IsNull( q->b )) {
-HXLINE( 464)							q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_97,1);
-            						}
-            						else {
-HXLINE( 464)							q->b->push(HX_(",",2c,00,00,00));
-            						}
-            					}
-HXLINE( 465)					{
-HXLINE( 465)						if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 465)							q->flush();
-            						}
-HXDLIN( 465)						if (::hx::IsNull( q->b )) {
-HXLINE( 465)							q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_98,1);
-            						}
-            						else {
-HXLINE( 465)							q->b->push(HX_("?",3f,00,00,00));
-            						}
+            		HX_END_LOCAL_FUNC1(return)
+
+            		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_4, ::snikket::persistence::Sqlite,_gthis,::String,accountId, ::Dynamic,callback) HXARGC(1)
+            		::Dynamic _hx_run(::cpp::VirtualArray rows){
+            			HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_3,::cpp::VirtualArray,rows, ::Dynamic,callback) HXARGC(1)
+            			void _hx_run(::Array< ::Dynamic> messages){
+            				HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_488_getChatsUnreadDetails)
+HXLINE( 489)				::Array< ::Dynamic> details = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE( 490)				{
+HXLINE( 490)					int _g_current = 0;
+HXDLIN( 490)					::Array< ::Dynamic> _g_array = messages;
+HXDLIN( 490)					while((_g_current < _g_array->length)){
+HXLINE( 490)						 ::snikket::ChatMessage _g_value = _g_array->__get(_g_current).StaticCast<  ::snikket::ChatMessage >();
+HXDLIN( 490)						_g_current = (_g_current + 1);
+HXDLIN( 490)						int _g_key = (_g_current - 1);
+HXDLIN( 490)						int i = _g_key;
+HXDLIN( 490)						 ::snikket::ChatMessage m = _g_value;
+HXLINE( 491)						details->push( ::Dynamic(::hx::Anon_obj::Create(3)
+            							->setFixed(0,HX_("message",c7,35,11,9a),m)
+            							->setFixed(1,HX_("unreadCount",20,18,f1,a0), ::Dynamic(rows->__get(i)->__Field(HX_("unreadCount",20,18,f1,a0),::hx::paccDynamic)))
+            							->setFixed(2,HX_("chatId",d3,04,77,b7), ::Dynamic(rows->__get(i)->__Field(HX_("chatId",d3,04,77,b7),::hx::paccDynamic)))));
             					}
-HXLINE( 466)					params->push(chat2->chatId);
             				}
+HXLINE( 497)				callback(details);
             			}
+            			HX_END_LOCAL_FUNC1((void))
+
+            			HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_487_getChatsUnreadDetails)
+HXLINE( 488)			 ::snikket::persistence::Sqlite _gthis1 = _gthis;
+HXDLIN( 488)			::String accountId1 = accountId;
+HXLINE( 487)			return ::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::resolve(_gthis1->hydrateMessages(accountId1, ::haxe::iterators::ArrayIterator_obj::__alloc( HX_CTX ,rows))), ::Dynamic(new _hx_Closure_3(rows,callback)),null());
             		}
-HXLINE( 468)		{
-HXLINE( 468)			if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 468)				q->flush();
-            			}
-HXDLIN( 468)			if (::hx::IsNull( q->b )) {
-HXLINE( 468)				q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_99,1);
-            			}
-            			else {
-HXLINE( 468)				q->b->push(HX_(") AND (subq.created_at IS NULL OR messages.created_at > subq.created_at OR (messages.created_at=subq.created_at AND messages.ROWID >= subq.row)) GROUP BY chat_id;",58,6f,52,ea));
-            			}
+            		HX_END_LOCAL_FUNC1(return)
+
+            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_443_getChatsUnreadDetails)
+HXDLIN( 443)		 ::snikket::persistence::Sqlite _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 444)		bool _hx_tmp;
+HXDLIN( 444)		if (::hx::IsNotNull( chats )) {
+HXLINE( 444)			_hx_tmp = (chats->length < 1);
+            		}
+            		else {
+HXLINE( 444)			_hx_tmp = true;
+            		}
+HXDLIN( 444)		if (_hx_tmp) {
+HXLINE( 445)			callback(::Array_obj< ::Dynamic>::__new(0));
+HXLINE( 446)			return;
             		}
-HXLINE( 469)		 ::snikket::persistence::SqliteDriver _hx_tmp1 = this->db;
-HXDLIN( 469)		::thenshim::_Promise::Promise_Impl__obj::then(_hx_tmp1->exec(q->toString(),params), ::Dynamic(new _hx_Closure_2(_gthis,accountId,callback)),null());
+HXLINE( 449)		::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::resolve(null()), ::Dynamic(new _hx_Closure_0(_gthis,chats,accountId)),null()), ::Dynamic(new _hx_Closure_2()),null()), ::Dynamic(new _hx_Closure_4(_gthis,accountId,callback)),null());
             	}
 
 
@@ -1765,25 +1812,25 @@ HX_DEFINE_DYNAMIC_FUNC3(Sqlite_obj,getChatsUnreadDetails,(void))
 
 void Sqlite_obj::storeReaction(::String accountId, ::snikket::ReactionUpdate update, ::Dynamic callback){
             		HX_BEGIN_LOCAL_FUNC_S4(::hx::LocalFunc,_hx_Closure_0, ::snikket::persistence::Sqlite,_gthis,::String,accountId, ::snikket::ReactionUpdate,update, ::Dynamic,callback) HXARGC(1)
-            		void _hx_run(::Dynamic _){
-            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_495_storeReaction)
-HXLINE( 495)			_gthis->getMessage(accountId,update->chatId,update->serverId,update->localId,callback);
+            		void _hx_run( ::haxe::iterators::ArrayIterator _){
+            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_512_storeReaction)
+HXLINE( 512)			_gthis->getMessage(accountId,update->chatId,update->serverId,update->localId,callback);
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_486_storeReaction)
-HXDLIN( 486)		 ::snikket::persistence::Sqlite _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 487)		 ::snikket::persistence::SqliteDriver _hx_tmp = this->db;
-HXLINE( 490)		::String accountId1 = accountId;
-HXDLIN( 490)		::String update1 = update->updateId;
-HXDLIN( 490)		::String update2 = update->serverId;
-HXDLIN( 490)		::String update3 = update->serverIdBy;
-HXLINE( 491)		::String update4 = update->localId;
-HXDLIN( 491)		::String update5 = update->chatId;
-HXDLIN( 491)		::String update6 = update->senderId;
-HXDLIN( 491)		::String update7 = update->timestamp;
-HXLINE( 492)		::String _hx_tmp1 = ::snikket::JsonPrinter_obj::print(update->reactions,null(),null());
-HXLINE( 487)		::thenshim::_Promise::Promise_Impl__obj::then(_hx_tmp->exec(HX_("INSERT OR REPLACE INTO reactions VALUES (?,?,?,?,?,?,?,CAST(unixepoch(?, 'subsec') * 1000 AS INTEGER),jsonb(?),?)",e2,55,57,48),::cpp::VirtualArray_obj::__new(10)->init(0,accountId1)->init(1,update1)->init(2,update2)->init(3,update3)->init(4,update4)->init(5,update5)->init(6,update6)->init(7,update7)->init(8,_hx_tmp1)->init(9,update->kind)), ::Dynamic(new _hx_Closure_0(_gthis,accountId,update,callback)),null());
+            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_503_storeReaction)
+HXDLIN( 503)		 ::snikket::persistence::Sqlite _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 504)		 ::snikket::persistence::SqliteDriver _hx_tmp = this->db;
+HXLINE( 507)		::String accountId1 = accountId;
+HXDLIN( 507)		::String update1 = update->updateId;
+HXDLIN( 507)		::String update2 = update->serverId;
+HXDLIN( 507)		::String update3 = update->serverIdBy;
+HXLINE( 508)		::String update4 = update->localId;
+HXDLIN( 508)		::String update5 = update->chatId;
+HXDLIN( 508)		::String update6 = update->senderId;
+HXDLIN( 508)		::String update7 = update->timestamp;
+HXLINE( 509)		::String _hx_tmp1 = ::snikket::JsonPrinter_obj::print(update->reactions,null(),null());
+HXLINE( 504)		::thenshim::_Promise::Promise_Impl__obj::then(_hx_tmp->exec(HX_("INSERT OR REPLACE INTO reactions VALUES (?,?,?,?,?,?,?,CAST(unixepoch(?, 'subsec') * 1000 AS INTEGER),jsonb(?),?)",e2,55,57,48),::cpp::VirtualArray_obj::__new(10)->init(0,accountId1)->init(1,update1)->init(2,update2)->init(3,update3)->init(4,update4)->init(5,update5)->init(6,update6)->init(7,update7)->init(8,_hx_tmp1)->init(9,update->kind)), ::Dynamic(new _hx_Closure_0(_gthis,accountId,update,callback)),null());
             	}
 
 
@@ -1791,268 +1838,329 @@ HX_DEFINE_DYNAMIC_FUNC3(Sqlite_obj,storeReaction,(void))
 
 void Sqlite_obj::updateMessageStatus(::String accountId,::String localId,int status, ::Dynamic callback){
             		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_0, ::snikket::persistence::Sqlite,_gthis,::String,localId,::String,accountId) HXARGC(1)
-            		::Dynamic _hx_run(::Dynamic _){
-            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_505_updateMessageStatus)
-HXLINE( 505)			return _gthis->db->exec(HX_("SELECT stanza, direction, type, status, strftime('%FT%H:%M:%fZ', created_at / 1000.0, 'unixepoch') AS timestamp, sender_id, mam_id, mam_by, sync_point FROM messages WHERE account_id=? AND stanza_id=? AND direction=?",4a,74,a8,69),::cpp::VirtualArray_obj::__new(3)->init(0,accountId)->init(1,localId)->init(2,1));
+            		::Dynamic _hx_run( ::haxe::iterators::ArrayIterator _){
+            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_522_updateMessageStatus)
+HXLINE( 522)			return _gthis->db->exec(HX_("SELECT stanza, direction, type, status, strftime('%FT%H:%M:%fZ', created_at / 1000.0, 'unixepoch') AS timestamp, sender_id, correction_id AS stanza_id, mam_id, mam_by, sync_point FROM messages WHERE account_id=? AND stanza_id=? AND direction=?",7b,f7,03,13),::cpp::VirtualArray_obj::__new(3)->init(0,accountId)->init(1,localId)->init(2,1));
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_1, ::snikket::persistence::Sqlite,_gthis,::String,accountId) HXARGC(1)
-            		::Array< ::Dynamic> _hx_run(::Dynamic result){
-            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_509_updateMessageStatus)
-HXLINE( 509)			return _gthis->hydrateMessages(accountId,result);
-            		}
-            		HX_END_LOCAL_FUNC1(return)
+            		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_3, ::snikket::persistence::Sqlite,_gthis,::String,accountId, ::Dynamic,callback) HXARGC(1)
+            		void _hx_run( ::haxe::iterators::ArrayIterator result){
+            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_526_updateMessageStatus)
+HXLINE( 527)			::Array< ::Dynamic> messages = _gthis->hydrateMessages(accountId,result);
+HXLINE( 528)			{
+HXLINE( 528)				int _g = 0;
+HXDLIN( 528)				while((_g < messages->length)){
+            					HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_1, ::snikket::persistence::Sqlite,_gthis,::String,accountId) HXARGC(1)
+            					::Dynamic _hx_run(::Array< ::Dynamic> messages){
+            						HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_533_updateMessageStatus)
+HXLINE( 533)						return _gthis->hydrateReactions(accountId,messages);
+            					}
+            					HX_END_LOCAL_FUNC1(return)
 
-            		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_4, ::snikket::persistence::Sqlite,_gthis,::String,accountId, ::Dynamic,callback) HXARGC(1)
-            		void _hx_run(::Array< ::Dynamic> messages){
-            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_510_updateMessageStatus)
-HXLINE( 510)			int _g = 0;
-HXDLIN( 510)			while((_g < messages->length)){
-            				HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_2, ::snikket::persistence::Sqlite,_gthis,::String,accountId) HXARGC(1)
-            				::Dynamic _hx_run(::Array< ::Dynamic> messages){
-            					HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_515_updateMessageStatus)
-HXLINE( 515)					return _gthis->hydrateReactions(accountId,messages);
-            				}
-            				HX_END_LOCAL_FUNC1(return)
+            					HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_2, ::Dynamic,callback) HXARGC(1)
+            					void _hx_run(::Array< ::Dynamic> hydrated){
+            						HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_533_updateMessageStatus)
+HXLINE( 533)						callback(hydrated->__get(0).StaticCast<  ::snikket::ChatMessage >());
+            					}
+            					HX_END_LOCAL_FUNC1((void))
 
-            				HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_3, ::Dynamic,callback) HXARGC(1)
-            				void _hx_run(::Array< ::Dynamic> hydrated){
-            					HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_515_updateMessageStatus)
-HXLINE( 515)					callback(hydrated->__get(0).StaticCast<  ::snikket::ChatMessage >());
-            				}
-            				HX_END_LOCAL_FUNC1((void))
-
-HXLINE( 510)				 ::snikket::ChatMessage message = messages->__get(_g).StaticCast<  ::snikket::ChatMessage >();
-HXDLIN( 510)				_g = (_g + 1);
-HXLINE( 511)				::Dynamic _hx_tmp;
-HXDLIN( 511)				if (::hx::IsNotNull( message->replyToMessage )) {
-HXLINE( 512)					 ::snikket::persistence::Sqlite _gthis1 = _gthis;
-HXDLIN( 512)					::String accountId1 = accountId;
-HXDLIN( 512)					::String _hx_tmp1 = message->chatId();
-HXLINE( 511)					_hx_tmp = _gthis1->hydrateReplyTo(accountId1,::Array_obj< ::Dynamic>::__new(1)->init(0,message),::Array_obj< ::Dynamic>::__new(1)->init(0, ::Dynamic(::hx::Anon_obj::Create(3)
-            						->setFixed(0,HX_("chatId",d3,04,77,b7),_hx_tmp1)
-            						->setFixed(1,HX_("serverId",7e,01,b2,e2),message->replyToMessage->serverId)
-            						->setFixed(2,HX_("localId",26,7a,c6,2d),message->replyToMessage->localId))));
-            				}
-            				else {
-HXLINE( 511)					_hx_tmp = ::thenshim::_Promise::Promise_Impl__obj::resolve(::Array_obj< ::Dynamic>::__new(1)->init(0,message));
+HXLINE( 528)					 ::snikket::ChatMessage message = messages->__get(_g).StaticCast<  ::snikket::ChatMessage >();
+HXDLIN( 528)					_g = (_g + 1);
+HXLINE( 529)					::Dynamic _hx_tmp;
+HXDLIN( 529)					if (::hx::IsNotNull( message->replyToMessage )) {
+HXLINE( 530)						 ::snikket::persistence::Sqlite _gthis1 = _gthis;
+HXDLIN( 530)						::String accountId1 = accountId;
+HXDLIN( 530)						::String _hx_tmp1 = message->chatId();
+HXLINE( 529)						_hx_tmp = _gthis1->hydrateReplyTo(accountId1,::Array_obj< ::Dynamic>::__new(1)->init(0,message),::Array_obj< ::Dynamic>::__new(1)->init(0, ::Dynamic(::hx::Anon_obj::Create(3)
+            							->setFixed(0,HX_("chatId",d3,04,77,b7),_hx_tmp1)
+            							->setFixed(1,HX_("serverId",7e,01,b2,e2),message->replyToMessage->serverId)
+            							->setFixed(2,HX_("localId",26,7a,c6,2d),message->replyToMessage->localId))));
+            					}
+            					else {
+HXLINE( 529)						_hx_tmp = ::thenshim::_Promise::Promise_Impl__obj::resolve(::Array_obj< ::Dynamic>::__new(1)->init(0,message));
+            					}
+HXDLIN( 529)					::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(_hx_tmp, ::Dynamic(new _hx_Closure_1(_gthis,accountId)),null()), ::Dynamic(new _hx_Closure_2(callback)),null());
+HXLINE( 534)					return;
             				}
-HXDLIN( 511)				::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(_hx_tmp, ::Dynamic(new _hx_Closure_2(_gthis,accountId)),null()), ::Dynamic(new _hx_Closure_3(callback)),null());
-HXLINE( 516)				return;
             			}
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_500_updateMessageStatus)
-HXDLIN( 500)		 ::snikket::persistence::Sqlite _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 501)		::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(HX_("UPDATE messages SET status=? WHERE account_id=? AND stanza_id=? AND direction=? AND status <> ?",75,90,3c,fc),::cpp::VirtualArray_obj::__new(5)->init(0,status)->init(1,accountId)->init(2,localId)->init(3,1)->init(4,2)), ::Dynamic(new _hx_Closure_0(_gthis,localId,accountId)),null()), ::Dynamic(new _hx_Closure_1(_gthis,accountId)),null()), ::Dynamic(new _hx_Closure_4(_gthis,accountId,callback)),null());
+            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_517_updateMessageStatus)
+HXDLIN( 517)		 ::snikket::persistence::Sqlite _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 518)		::thenshim::_Promise::Promise_Impl__obj::then(::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(HX_("UPDATE messages SET status=? WHERE account_id=? AND stanza_id=? AND direction=? AND status <> ?",75,90,3c,fc),::cpp::VirtualArray_obj::__new(5)->init(0,status)->init(1,accountId)->init(2,localId)->init(3,1)->init(4,2)), ::Dynamic(new _hx_Closure_0(_gthis,localId,accountId)),null()), ::Dynamic(new _hx_Closure_3(_gthis,accountId,callback)),null());
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC4(Sqlite_obj,updateMessageStatus,(void))
 
 void Sqlite_obj::hasMedia(::String hashAlgorithm,::Array< unsigned char > hash, ::Dynamic callback){
-            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_523_hasMedia)
-HXDLIN( 523)		::snikket::persistence::MediaStore_obj::hasMedia(this->media,hashAlgorithm,hash,callback);
+            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_541_hasMedia)
+HXDLIN( 541)		::snikket::persistence::MediaStore_obj::hasMedia(this->media,hashAlgorithm,hash,callback);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC3(Sqlite_obj,hasMedia,(void))
 
 void Sqlite_obj::removeMedia(::String hashAlgorithm,::Array< unsigned char > hash){
-            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_528_removeMedia)
-HXDLIN( 528)		::snikket::persistence::MediaStore_obj::removeMedia(this->media,hashAlgorithm,hash);
+            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_546_removeMedia)
+HXDLIN( 546)		::snikket::persistence::MediaStore_obj::removeMedia(this->media,hashAlgorithm,hash);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC2(Sqlite_obj,removeMedia,(void))
 
 void Sqlite_obj::storeMedia(::String mime,::Array< unsigned char > bd, ::Dynamic callback){
-            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_533_storeMedia)
-HXDLIN( 533)		::snikket::persistence::MediaStore_obj::storeMedia(this->media,mime,bd,callback);
+            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_551_storeMedia)
+HXDLIN( 551)		::snikket::persistence::MediaStore_obj::storeMedia(this->media,mime,bd,callback);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC3(Sqlite_obj,storeMedia,(void))
 
 void Sqlite_obj::storeCaps( ::snikket::Caps caps){
-            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_538_storeCaps)
-HXDLIN( 538)		 ::snikket::persistence::SqliteDriver _hx_tmp = this->db;
-HXLINE( 540)		::Array< unsigned char > _hx_tmp1 = caps->verRaw()->hash;
-HXDLIN( 540)		 ::Dynamic replacer = null();
-HXDLIN( 540)		::String space = null();
-HXLINE( 538)		_hx_tmp->exec(HX_("INSERT OR IGNORE INTO caps VALUES (?,jsonb(?))",c3,4a,86,de),::cpp::VirtualArray_obj::__new(2)->init(0,_hx_tmp1)->init(1,::haxe::format::JsonPrinter_obj::print( ::Dynamic(::hx::Anon_obj::Create(3)
-            			->setFixed(0,HX_("identities",1c,c5,6d,d7),caps->identities)
-            			->setFixed(1,HX_("features",fd,6c,d7,12),caps->features)
-            			->setFixed(2,HX_("node",02,0a,0a,49),caps->node)),replacer,space)));
+            	HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_556_storeCaps)
+HXDLIN( 556)		 ::haxe::ds::ObjectMap _g =  ::haxe::ds::ObjectMap_obj::__alloc( HX_CTX );
+HXDLIN( 556)		_g->set(caps->verRaw()->hash,caps);
+HXDLIN( 556)		this->storeCapsSet(_g);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(Sqlite_obj,storeCaps,(void))
 
+void Sqlite_obj::storeCapsSet( ::haxe::ds::ObjectMap capsSet){
+            	HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_559_storeCapsSet)
+HXLINE( 560)		::cpp::VirtualArray params = ::cpp::VirtualArray_obj::__new(0);
+HXLINE( 561)		 ::StringBuf q =  ::StringBuf_obj::__alloc( HX_CTX );
+HXLINE( 562)		{
+HXLINE( 562)			if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 562)				q->flush();
+            			}
+HXDLIN( 562)			if (::hx::IsNull( q->b )) {
+HXLINE( 562)				q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_120,1);
+            			}
+            			else {
+HXLINE( 562)				q->b->push(HX_("INSERT OR IGNORE INTO caps VALUES ",27,4b,68,bf));
+            			}
+            		}
+HXLINE( 563)		bool first = true;
+HXLINE( 564)		{
+HXLINE( 564)			::Dynamic map = capsSet;
+HXDLIN( 564)			::Dynamic _g_map = map;
+HXDLIN( 564)			 ::Dynamic _g_keys = ::haxe::IMap_obj::keys(map);
+HXDLIN( 564)			while(( (bool)(_g_keys->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE( 564)				::Array< unsigned char > key = ( (::Array< unsigned char >)(_g_keys->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
+HXDLIN( 564)				 ::snikket::Caps _g_value = ( ( ::snikket::Caps)(::haxe::IMap_obj::get(_g_map,key)) );
+HXDLIN( 564)				::Array< unsigned char > _g_key = key;
+HXDLIN( 564)				::Array< unsigned char > ver = _g_key;
+HXDLIN( 564)				 ::snikket::Caps caps = _g_value;
+HXDLIN( 564)				{
+HXLINE( 565)					if (!(first)) {
+HXLINE( 565)						if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 565)							q->flush();
+            						}
+HXDLIN( 565)						if (::hx::IsNull( q->b )) {
+HXLINE( 565)							q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_121,1);
+            						}
+            						else {
+HXLINE( 565)							q->b->push(HX_(",",2c,00,00,00));
+            						}
+            					}
+HXLINE( 566)					{
+HXLINE( 566)						if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 566)							q->flush();
+            						}
+HXDLIN( 566)						if (::hx::IsNull( q->b )) {
+HXLINE( 566)							q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_122,1);
+            						}
+            						else {
+HXLINE( 566)							q->b->push(HX_("(?,jsonb(?))",1c,61,06,9e));
+            						}
+            					}
+HXLINE( 567)					params->push(ver);
+HXLINE( 568)					 ::Dynamic replacer = null();
+HXDLIN( 568)					::String space = null();
+HXDLIN( 568)					params->push(::haxe::format::JsonPrinter_obj::print( ::Dynamic(::hx::Anon_obj::Create(3)
+            						->setFixed(0,HX_("identities",1c,c5,6d,d7),caps->identities)
+            						->setFixed(1,HX_("features",fd,6c,d7,12),caps->features)
+            						->setFixed(2,HX_("node",02,0a,0a,49),caps->node)),replacer,space));
+HXLINE( 569)					first = false;
+            				}
+            			}
+            		}
+HXLINE( 571)		if ((params->get_length() < 1)) {
+HXLINE( 571)			return;
+            		}
+HXLINE( 572)		 ::snikket::persistence::SqliteDriver _hx_tmp = this->db;
+HXDLIN( 572)		_hx_tmp->exec(q->toString(),params);
+            	}
+
+
+HX_DEFINE_DYNAMIC_FUNC1(Sqlite_obj,storeCapsSet,(void))
+
 void Sqlite_obj::getCaps(::String ver, ::Dynamic callback){
-            		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_1, ::Dynamic,callback) HXARGC(1)
-            		void _hx_run(::Dynamic result){
-            			HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_555_getCaps)
-HXLINE( 556)			{
-HXLINE( 556)				::Dynamic row = result;
-HXDLIN( 556)				while(::sys::db::ResultSet_obj::hasNext(row)){
+            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_1,::Array< unsigned char >,verData, ::Dynamic,callback) HXARGC(1)
+            		void _hx_run( ::haxe::iterators::ArrayIterator result){
+            			HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_586_getCaps)
+HXLINE( 587)			{
+HXLINE( 587)				 ::haxe::iterators::ArrayIterator _g = result;
+HXDLIN( 587)				while((_g->current < _g->array->get_length())){
             					HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_0) HXARGC(1)
             					 ::snikket::Identity _hx_run( ::Dynamic i){
-            						HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_558_getCaps)
-HXLINE( 558)						return  ::snikket::Identity_obj::__alloc( HX_CTX ,( (::String)(i->__Field(HX_("category",fe,2a,6c,ad),::hx::paccDynamic)) ),( (::String)(i->__Field(HX_("type",ba,f2,08,4d),::hx::paccDynamic)) ),( (::String)(i->__Field(HX_("name",4b,72,ff,48),::hx::paccDynamic)) ));
+            						HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_589_getCaps)
+HXLINE( 589)						return  ::snikket::Identity_obj::__alloc( HX_CTX ,( (::String)(i->__Field(HX_("category",fe,2a,6c,ad),::hx::paccDynamic)) ),( (::String)(i->__Field(HX_("type",ba,f2,08,4d),::hx::paccDynamic)) ),( (::String)(i->__Field(HX_("name",4b,72,ff,48),::hx::paccDynamic)) ));
             					}
             					HX_END_LOCAL_FUNC1(return)
 
-HXLINE( 556)					 ::Dynamic row1 = ::sys::db::ResultSet_obj::next(row);
-HXLINE( 557)					 ::Dynamic json =  ::haxe::format::JsonParser_obj::__alloc( HX_CTX ,( (::String)(row1->__Field(HX_("caps",21,1c,ba,41),::hx::paccDynamic)) ))->doParse();
-HXLINE( 558)					 ::Dynamic callback1 = callback;
-HXDLIN( 558)					::String json1 = ( (::String)(json->__Field(HX_("node",02,0a,0a,49),::hx::paccDynamic)) );
-HXDLIN( 558)					::Array< ::Dynamic> _hx_tmp = ( (::Array< ::Dynamic>)( ::Dynamic(json->__Field(HX_("identities",1c,c5,6d,d7),::hx::paccDynamic))->__Field(HX_("map",9c,0a,53,00),::hx::paccDynamic)( ::Dynamic(new _hx_Closure_0()))) );
-HXDLIN( 558)					callback1( ::snikket::Caps_obj::__alloc( HX_CTX ,json1,_hx_tmp,( (::Array< ::String >)(json->__Field(HX_("features",fd,6c,d7,12),::hx::paccDynamic)) )));
-HXLINE( 559)					return;
+HXLINE( 587)					 ::Dynamic row = _g->array->__get(_g->current++);
+HXLINE( 588)					 ::Dynamic json =  ::haxe::format::JsonParser_obj::__alloc( HX_CTX ,( (::String)(row->__Field(HX_("caps",21,1c,ba,41),::hx::paccDynamic)) ))->doParse();
+HXLINE( 589)					 ::Dynamic callback1 = callback;
+HXDLIN( 589)					::String json1 = ( (::String)(json->__Field(HX_("node",02,0a,0a,49),::hx::paccDynamic)) );
+HXDLIN( 589)					::Array< ::Dynamic> _hx_tmp = ( (::Array< ::Dynamic>)( ::Dynamic(json->__Field(HX_("identities",1c,c5,6d,d7),::hx::paccDynamic))->__Field(HX_("map",9c,0a,53,00),::hx::paccDynamic)( ::Dynamic(new _hx_Closure_0()))) );
+HXDLIN( 589)					callback1( ::snikket::Caps_obj::__alloc( HX_CTX ,json1,_hx_tmp,( (::Array< ::String >)(json->__Field(HX_("features",fd,6c,d7,12),::hx::paccDynamic)) ),verData));
+HXLINE( 590)					return;
             				}
             			}
-HXLINE( 561)			callback(null());
+HXLINE( 592)			callback(null());
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_545_getCaps)
-HXLINE( 546)		::Array< unsigned char > verData;
-HXDLIN( 546)		try {
+            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_576_getCaps)
+HXLINE( 577)		::Array< unsigned char > verData;
+HXDLIN( 577)		try {
             			HX_STACK_CATCHABLE( ::Dynamic, 0);
-HXLINE( 546)			verData = ::haxe::crypto::Base64_obj::decode(ver,null())->b;
+HXLINE( 577)			verData = ::haxe::crypto::Base64_obj::decode(ver,null())->b;
             		} catch( ::Dynamic _hx_e) {
             			if (_hx_e.IsClass<  ::Dynamic >() ){
             				HX_STACK_BEGIN_CATCH
             				 ::Dynamic _g = _hx_e;
-HXLINE( 549)				callback(null());
-HXLINE( 550)				return;
+HXLINE( 580)				callback(null());
+HXLINE( 581)				return;
             			}
             			else {
             				HX_STACK_DO_THROW(_hx_e);
             			}
             		}
-HXLINE( 552)		::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(HX_("SELECT json(caps) AS caps FROM caps WHERE sha1=? LIMIT 1",5a,98,24,09),::cpp::VirtualArray_obj::__new(1)->init(0,verData)), ::Dynamic(new _hx_Closure_1(callback)),null());
+HXLINE( 583)		::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(HX_("SELECT json(caps) AS caps FROM caps WHERE sha1=? LIMIT 1",5a,98,24,09),::cpp::VirtualArray_obj::__new(1)->init(0,verData)), ::Dynamic(new _hx_Closure_1(verData,callback)),null());
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC2(Sqlite_obj,getCaps,(void))
 
 void Sqlite_obj::storeLogin(::String accountId,::String clientId,::String displayName,::String token){
-            	HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_566_storeLogin)
-HXLINE( 567)		::Array< ::String > params = ::Array_obj< ::String >::__new(3)->init(0,accountId)->init(1,clientId)->init(2,displayName);
-HXLINE( 568)		 ::StringBuf q =  ::StringBuf_obj::__alloc( HX_CTX );
-HXLINE( 569)		{
-HXLINE( 569)			if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 569)				q->flush();
+            	HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_597_storeLogin)
+HXLINE( 598)		::Array< ::String > params = ::Array_obj< ::String >::__new(3)->init(0,accountId)->init(1,clientId)->init(2,displayName);
+HXLINE( 599)		 ::StringBuf q =  ::StringBuf_obj::__alloc( HX_CTX );
+HXLINE( 600)		{
+HXLINE( 600)			if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 600)				q->flush();
             			}
-HXDLIN( 569)			if (::hx::IsNull( q->b )) {
-HXLINE( 569)				q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_118,1);
+HXDLIN( 600)			if (::hx::IsNull( q->b )) {
+HXLINE( 600)				q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_128,1);
             			}
             			else {
-HXLINE( 569)				q->b->push(HX_("INSERT INTO accounts (account_id, client_id, display_name",03,b0,6a,0b));
+HXLINE( 600)				q->b->push(HX_("INSERT INTO accounts (account_id, client_id, display_name",03,b0,6a,0b));
             			}
             		}
-HXLINE( 570)		if (::hx::IsNotNull( token )) {
-HXLINE( 571)			if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 571)				q->flush();
+HXLINE( 601)		if (::hx::IsNotNull( token )) {
+HXLINE( 602)			if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 602)				q->flush();
             			}
-HXDLIN( 571)			if (::hx::IsNull( q->b )) {
-HXLINE( 571)				q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_119,1);
+HXDLIN( 602)			if (::hx::IsNull( q->b )) {
+HXLINE( 602)				q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_129,1);
             			}
             			else {
-HXLINE( 571)				q->b->push(HX_(", token, fast_count",a5,56,e4,ae));
+HXLINE( 602)				q->b->push(HX_(", token, fast_count",a5,56,e4,ae));
             			}
             		}
-HXLINE( 573)		{
-HXLINE( 573)			if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 573)				q->flush();
+HXLINE( 604)		{
+HXLINE( 604)			if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 604)				q->flush();
             			}
-HXDLIN( 573)			if (::hx::IsNull( q->b )) {
-HXLINE( 573)				q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_120,1);
+HXDLIN( 604)			if (::hx::IsNull( q->b )) {
+HXLINE( 604)				q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_130,1);
             			}
             			else {
-HXLINE( 573)				q->b->push(HX_(") VALUES (?,?,?",c4,1c,e3,67));
+HXLINE( 604)				q->b->push(HX_(") VALUES (?,?,?",c4,1c,e3,67));
             			}
             		}
-HXLINE( 574)		if (::hx::IsNotNull( token )) {
-HXLINE( 575)			{
-HXLINE( 575)				if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 575)					q->flush();
+HXLINE( 605)		if (::hx::IsNotNull( token )) {
+HXLINE( 606)			{
+HXLINE( 606)				if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 606)					q->flush();
             				}
-HXDLIN( 575)				if (::hx::IsNull( q->b )) {
-HXLINE( 575)					q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_121,1);
+HXDLIN( 606)				if (::hx::IsNull( q->b )) {
+HXLINE( 606)					q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_131,1);
             				}
             				else {
-HXLINE( 575)					q->b->push(HX_(",?",93,26,00,00));
+HXLINE( 606)					q->b->push(HX_(",?",93,26,00,00));
             				}
             			}
-HXLINE( 576)			params->push(token);
-HXLINE( 577)			{
-HXLINE( 577)				if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 577)					q->flush();
+HXLINE( 607)			params->push(token);
+HXLINE( 608)			{
+HXLINE( 608)				if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 608)					q->flush();
             				}
-HXDLIN( 577)				if (::hx::IsNull( q->b )) {
-HXLINE( 577)					q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_122,1);
+HXDLIN( 608)				if (::hx::IsNull( q->b )) {
+HXLINE( 608)					q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_132,1);
             				}
             				else {
-HXLINE( 577)					q->b->push(HX_(",0",84,26,00,00));
+HXLINE( 608)					q->b->push(HX_(",0",84,26,00,00));
             				}
             			}
             		}
-HXLINE( 579)		{
-HXLINE( 579)			if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 579)				q->flush();
+HXLINE( 610)		{
+HXLINE( 610)			if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 610)				q->flush();
             			}
-HXDLIN( 579)			if (::hx::IsNull( q->b )) {
-HXLINE( 579)				q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_123,1);
+HXDLIN( 610)			if (::hx::IsNull( q->b )) {
+HXLINE( 610)				q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_133,1);
             			}
             			else {
-HXLINE( 579)				q->b->push(HX_(") ON CONFLICT DO UPDATE SET client_id=?",cd,99,0c,96));
+HXLINE( 610)				q->b->push(HX_(") ON CONFLICT DO UPDATE SET client_id=?",cd,99,0c,96));
             			}
             		}
-HXLINE( 580)		params->push(clientId);
-HXLINE( 581)		{
-HXLINE( 581)			if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 581)				q->flush();
+HXLINE( 611)		params->push(clientId);
+HXLINE( 612)		{
+HXLINE( 612)			if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 612)				q->flush();
             			}
-HXDLIN( 581)			if (::hx::IsNull( q->b )) {
-HXLINE( 581)				q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_124,1);
+HXDLIN( 612)			if (::hx::IsNull( q->b )) {
+HXLINE( 612)				q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_134,1);
             			}
             			else {
-HXLINE( 581)				q->b->push(HX_(", display_name=?",7e,ad,5b,0f));
+HXLINE( 612)				q->b->push(HX_(", display_name=?",7e,ad,5b,0f));
             			}
             		}
-HXLINE( 582)		params->push(displayName);
-HXLINE( 583)		if (::hx::IsNotNull( token )) {
-HXLINE( 584)			{
-HXLINE( 584)				if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 584)					q->flush();
+HXLINE( 613)		params->push(displayName);
+HXLINE( 614)		if (::hx::IsNotNull( token )) {
+HXLINE( 615)			{
+HXLINE( 615)				if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 615)					q->flush();
             				}
-HXDLIN( 584)				if (::hx::IsNull( q->b )) {
-HXLINE( 584)					q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_125,1);
+HXDLIN( 615)				if (::hx::IsNull( q->b )) {
+HXLINE( 615)					q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_135,1);
             				}
             				else {
-HXLINE( 584)					q->b->push(HX_(", token=?",a7,78,19,80));
+HXLINE( 615)					q->b->push(HX_(", token=?",a7,78,19,80));
             				}
             			}
-HXLINE( 585)			params->push(token);
-HXLINE( 586)			{
-HXLINE( 586)				if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 586)					q->flush();
+HXLINE( 616)			params->push(token);
+HXLINE( 617)			{
+HXLINE( 617)				if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 617)					q->flush();
             				}
-HXDLIN( 586)				if (::hx::IsNull( q->b )) {
-HXLINE( 586)					q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_126,1);
+HXDLIN( 617)				if (::hx::IsNull( q->b )) {
+HXLINE( 617)					q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_136,1);
             				}
             				else {
-HXLINE( 586)					q->b->push(HX_(", fast_count=0",73,a8,4f,82));
+HXLINE( 617)					q->b->push(HX_(", fast_count=0",73,a8,4f,82));
             				}
             			}
             		}
-HXLINE( 588)		 ::snikket::persistence::SqliteDriver _hx_tmp = this->db;
-HXDLIN( 588)		_hx_tmp->exec(q->toString(),params);
+HXLINE( 619)		 ::snikket::persistence::SqliteDriver _hx_tmp = this->db;
+HXDLIN( 619)		_hx_tmp->exec(q->toString(),params);
             	}
 
 
@@ -2060,48 +2168,48 @@ HX_DEFINE_DYNAMIC_FUNC4(Sqlite_obj,storeLogin,(void))
 
 void Sqlite_obj::getLogin(::String accountId, ::Dynamic callback){
             		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_0, ::snikket::persistence::Sqlite,_gthis,::String,accountId, ::Dynamic,callback) HXARGC(1)
-            		void _hx_run(::Dynamic result){
-            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_596_getLogin)
-HXLINE( 597)			{
-HXLINE( 597)				::Dynamic row = result;
-HXDLIN( 597)				while(::sys::db::ResultSet_obj::hasNext(row)){
-HXLINE( 597)					 ::Dynamic row1 = ::sys::db::ResultSet_obj::next(row);
-HXLINE( 598)					if (::hx::IsNotNull( row1->__Field(HX_("token",f9,82,2b,14),::hx::paccDynamic) )) {
-HXLINE( 599)						_gthis->db->exec(HX_("UPDATE accounts SET fast_count=fast_count+1 WHERE account_id=?",a6,3f,55,2d),::cpp::VirtualArray_obj::__new(1)->init(0,accountId));
-            					}
-HXLINE( 601)					 ::Dynamic tmp = row1->__Field(HX_("fast_count",ac,2b,d2,5a),::hx::paccDynamic);
-HXDLIN( 601)					int _hx_tmp;
-HXDLIN( 601)					if (::hx::IsNotNull( tmp )) {
-HXLINE( 601)						_hx_tmp = ( (int)(tmp) );
+            		void _hx_run( ::haxe::iterators::ArrayIterator result){
+            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_627_getLogin)
+HXLINE( 628)			{
+HXLINE( 628)				 ::haxe::iterators::ArrayIterator _g = result;
+HXDLIN( 628)				while((_g->current < _g->array->get_length())){
+HXLINE( 628)					 ::Dynamic row = _g->array->__get(_g->current++);
+HXLINE( 629)					if (::hx::IsNotNull( row->__Field(HX_("token",f9,82,2b,14),::hx::paccDynamic) )) {
+HXLINE( 630)						_gthis->db->exec(HX_("UPDATE accounts SET fast_count=fast_count+1 WHERE account_id=?",a6,3f,55,2d),::cpp::VirtualArray_obj::__new(1)->init(0,accountId));
+            					}
+HXLINE( 632)					 ::Dynamic tmp = row->__Field(HX_("fast_count",ac,2b,d2,5a),::hx::paccDynamic);
+HXDLIN( 632)					int _hx_tmp;
+HXDLIN( 632)					if (::hx::IsNotNull( tmp )) {
+HXLINE( 632)						_hx_tmp = ( (int)(tmp) );
             					}
             					else {
-HXLINE( 601)						_hx_tmp = 0;
+HXLINE( 632)						_hx_tmp = 0;
             					}
-HXDLIN( 601)					callback( ::Dynamic(row1->__Field(HX_("client_id",8f,e8,05,c8),::hx::paccDynamic)), ::Dynamic(row1->__Field(HX_("token",f9,82,2b,14),::hx::paccDynamic)),_hx_tmp, ::Dynamic(row1->__Field(HX_("display_name",a8,f4,3b,75),::hx::paccDynamic)));
-HXLINE( 602)					return;
+HXDLIN( 632)					callback( ::Dynamic(row->__Field(HX_("client_id",8f,e8,05,c8),::hx::paccDynamic)), ::Dynamic(row->__Field(HX_("token",f9,82,2b,14),::hx::paccDynamic)),_hx_tmp, ::Dynamic(row->__Field(HX_("display_name",a8,f4,3b,75),::hx::paccDynamic)));
+HXLINE( 633)					return;
             				}
             			}
-HXLINE( 605)			callback(null(),null(),0,null());
+HXLINE( 636)			callback(null(),null(),0,null());
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_592_getLogin)
-HXDLIN( 592)		 ::snikket::persistence::Sqlite _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 593)		::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(HX_("SELECT client_id, display_name, token, fast_count FROM accounts WHERE account_id=? LIMIT 1",fa,f8,24,9e),::cpp::VirtualArray_obj::__new(1)->init(0,accountId)), ::Dynamic(new _hx_Closure_0(_gthis,accountId,callback)),null());
+            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_623_getLogin)
+HXDLIN( 623)		 ::snikket::persistence::Sqlite _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 624)		::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(HX_("SELECT client_id, display_name, token, fast_count FROM accounts WHERE account_id=? LIMIT 1",fa,f8,24,9e),::cpp::VirtualArray_obj::__new(1)->init(0,accountId)), ::Dynamic(new _hx_Closure_0(_gthis,accountId,callback)),null());
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC2(Sqlite_obj,getLogin,(void))
 
 void Sqlite_obj::removeAccount(::String accountId,bool completely){
-            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_609_removeAccount)
-HXLINE( 610)		this->db->exec(HX_("DELETE FROM accounts WHERE account_id=?",a1,e8,94,4e),::cpp::VirtualArray_obj::__new(1)->init(0,accountId));
-HXLINE( 612)		if (!(completely)) {
-HXLINE( 612)			return;
-            		}
-HXLINE( 614)		this->db->exec(HX_("DELETE FROM messages WHERE account_id=?",bb,0a,07,c2),::cpp::VirtualArray_obj::__new(1)->init(0,accountId));
-HXLINE( 615)		this->db->exec(HX_("DELETE FROM chats WHERE account_id=?",2e,3d,02,57),::cpp::VirtualArray_obj::__new(1)->init(0,accountId));
-HXLINE( 616)		this->db->exec(HX_("DELETE FROM services WHERE account_id=?",29,fc,5f,4f),::cpp::VirtualArray_obj::__new(1)->init(0,accountId));
+            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_640_removeAccount)
+HXLINE( 641)		this->db->exec(HX_("DELETE FROM accounts WHERE account_id=?",a1,e8,94,4e),::cpp::VirtualArray_obj::__new(1)->init(0,accountId));
+HXLINE( 643)		if (!(completely)) {
+HXLINE( 643)			return;
+            		}
+HXLINE( 645)		this->db->exec(HX_("DELETE FROM messages WHERE account_id=?",bb,0a,07,c2),::cpp::VirtualArray_obj::__new(1)->init(0,accountId));
+HXLINE( 646)		this->db->exec(HX_("DELETE FROM chats WHERE account_id=?",2e,3d,02,57),::cpp::VirtualArray_obj::__new(1)->init(0,accountId));
+HXLINE( 647)		this->db->exec(HX_("DELETE FROM services WHERE account_id=?",29,fc,5f,4f),::cpp::VirtualArray_obj::__new(1)->init(0,accountId));
             	}
 
 
@@ -2109,38 +2217,38 @@ HX_DEFINE_DYNAMIC_FUNC2(Sqlite_obj,removeAccount,(void))
 
 void Sqlite_obj::listAccounts( ::Dynamic callback){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_1, ::Dynamic,callback) HXARGC(1)
-            		void _hx_run(::Dynamic result){
-            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_622_listAccounts)
-HXLINE( 622)			 ::Dynamic callback1 = callback;
-HXDLIN( 622)			::Array< ::String > _hx_tmp;
-HXDLIN( 622)			if (::hx::IsNull( result )) {
-HXLINE( 622)				_hx_tmp = ::Array_obj< ::String >::__new(0);
+            		void _hx_run( ::haxe::iterators::ArrayIterator result){
+            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_653_listAccounts)
+HXLINE( 653)			 ::Dynamic callback1 = callback;
+HXDLIN( 653)			::Array< ::String > _hx_tmp;
+HXDLIN( 653)			if (::hx::IsNull( result )) {
+HXLINE( 653)				_hx_tmp = ::Array_obj< ::String >::__new(0);
             			}
             			else {
-HXLINE( 622)				::Array< ::String > _g = ::Array_obj< ::String >::__new(0);
-HXDLIN( 622)				{
-            					HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0,::Dynamic,result) HXARGC(0)
-            					::Dynamic _hx_run(){
-            						HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_622_listAccounts)
-HXLINE( 622)						return result;
+HXLINE( 653)				::Array< ::String > _g = ::Array_obj< ::String >::__new(0);
+HXDLIN( 653)				{
+            					HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::haxe::iterators::ArrayIterator,result) HXARGC(0)
+            					 ::haxe::iterators::ArrayIterator _hx_run(){
+            						HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_653_listAccounts)
+HXLINE( 653)						return result;
             					}
             					HX_END_LOCAL_FUNC0(return)
 
-HXLINE( 622)					 ::Dynamic x =  ::Dynamic(::hx::Anon_obj::Create(1)
+HXLINE( 653)					 ::Dynamic x =  ::Dynamic(::hx::Anon_obj::Create(1)
             						->setFixed(0,HX_("iterator",ee,49,9a,93), ::Dynamic(new _hx_Closure_0(result))))->__Field(HX_("iterator",ee,49,9a,93),::hx::paccDynamic)();
-HXDLIN( 622)					while(( (bool)(x->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE( 622)						 ::Dynamic x1 = x->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
-HXDLIN( 622)						_g->push( ::Dynamic(x1->__Field(HX_("account_id",6d,df,ad,00),::hx::paccDynamic)));
+HXDLIN( 653)					while(( (bool)(x->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE( 653)						 ::Dynamic x1 = x->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
+HXDLIN( 653)						_g->push( ::Dynamic(x1->__Field(HX_("account_id",6d,df,ad,00),::hx::paccDynamic)));
             					}
             				}
-HXDLIN( 622)				_hx_tmp = _g;
+HXDLIN( 653)				_hx_tmp = _g;
             			}
-HXDLIN( 622)			callback1(_hx_tmp);
+HXDLIN( 653)			callback1(_hx_tmp);
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_621_listAccounts)
-HXDLIN( 621)		::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(HX_("SELECT account_id FROM accounts",4d,82,81,0c),null()), ::Dynamic(new _hx_Closure_1(callback)),null());
+            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_652_listAccounts)
+HXDLIN( 652)		::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(HX_("SELECT account_id FROM accounts",4d,82,81,0c),null()), ::Dynamic(new _hx_Closure_1(callback)),null());
             	}
 
 
@@ -2203,22 +2311,22 @@ HXDLIN( 252)		this->listAccounts( ::Dynamic(new _hx_Closure_0(callback__context,
 
 
 void Sqlite_obj::storeStreamManagement(::String accountId,::Array< unsigned char > sm){
-            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_629_storeStreamManagement)
-HXDLIN( 629)		 ::snikket::persistence::Sqlite _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 630)		this->smStoreNext = sm;
-HXLINE( 631)		if (!(this->smStoreInProgress)) {
+            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_660_storeStreamManagement)
+HXDLIN( 660)		 ::snikket::persistence::Sqlite _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 661)		this->smStoreNext = sm;
+HXLINE( 662)		if (!(this->smStoreInProgress)) {
             			HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_0, ::snikket::persistence::Sqlite,_gthis,::String,accountId,::Array< unsigned char >,sm) HXARGC(1)
-            			void _hx_run(::Dynamic _){
-            				HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_636_storeStreamManagement)
-HXLINE( 637)				_gthis->smStoreInProgress = false;
-HXLINE( 638)				if (::hx::IsPointerNotEq( _gthis->smStoreNext,sm )) {
-HXLINE( 638)					_gthis->storeStreamManagement(accountId,sm);
+            			void _hx_run( ::haxe::iterators::ArrayIterator _){
+            				HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_667_storeStreamManagement)
+HXLINE( 668)				_gthis->smStoreInProgress = false;
+HXLINE( 669)				if (::hx::IsPointerNotEq( _gthis->smStoreNext,sm )) {
+HXLINE( 669)					_gthis->storeStreamManagement(accountId,sm);
             				}
             			}
             			HX_END_LOCAL_FUNC1((void))
 
-HXLINE( 632)			this->smStoreInProgress = true;
-HXLINE( 633)			::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(HX_("UPDATE accounts SET sm_state=? WHERE account_id=?",39,71,68,1b),::cpp::VirtualArray_obj::__new(2)->init(0,sm)->init(1,accountId)), ::Dynamic(new _hx_Closure_0(_gthis,accountId,sm)),null());
+HXLINE( 663)			this->smStoreInProgress = true;
+HXLINE( 664)			::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(HX_("UPDATE accounts SET sm_state=? WHERE account_id=?",39,71,68,1b),::cpp::VirtualArray_obj::__new(2)->init(0,sm)->init(1,accountId)), ::Dynamic(new _hx_Closure_0(_gthis,accountId,sm)),null());
             		}
             	}
 
@@ -2227,32 +2335,32 @@ HX_DEFINE_DYNAMIC_FUNC2(Sqlite_obj,storeStreamManagement,(void))
 
 void Sqlite_obj::getStreamManagement(::String accountId, ::Dynamic callback){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::Dynamic,callback) HXARGC(1)
-            		void _hx_run(::Dynamic result){
-            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_645_getStreamManagement)
-HXLINE( 646)			{
-HXLINE( 646)				::Dynamic row = result;
-HXDLIN( 646)				while(::sys::db::ResultSet_obj::hasNext(row)){
-HXLINE( 646)					 ::Dynamic row1 = ::sys::db::ResultSet_obj::next(row);
-HXLINE( 647)					callback( ::Dynamic(row1->__Field(HX_("sm_state",6c,91,3f,e6),::hx::paccDynamic)));
-HXLINE( 648)					return;
+            		void _hx_run( ::haxe::iterators::ArrayIterator result){
+            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_676_getStreamManagement)
+HXLINE( 677)			{
+HXLINE( 677)				 ::haxe::iterators::ArrayIterator _g = result;
+HXDLIN( 677)				while((_g->current < _g->array->get_length())){
+HXLINE( 677)					 ::Dynamic row = _g->array->__get(_g->current++);
+HXLINE( 678)					callback( ::Dynamic(row->__Field(HX_("sm_state",6c,91,3f,e6),::hx::paccDynamic)));
+HXLINE( 679)					return;
             				}
             			}
-HXLINE( 651)			callback(null());
+HXLINE( 682)			callback(null());
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_645_getStreamManagement)
-HXDLIN( 645)		::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(HX_("SELECT sm_state FROM accounts  WHERE account_id=?",94,7f,74,ea),::cpp::VirtualArray_obj::__new(1)->init(0,accountId)), ::Dynamic(new _hx_Closure_0(callback)),null());
+            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_676_getStreamManagement)
+HXDLIN( 676)		::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(HX_("SELECT sm_state FROM accounts  WHERE account_id=?",94,7f,74,ea),::cpp::VirtualArray_obj::__new(1)->init(0,accountId)), ::Dynamic(new _hx_Closure_0(callback)),null());
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC2(Sqlite_obj,getStreamManagement,(void))
 
 void Sqlite_obj::storeService(::String accountId,::String serviceId,::String name,::String node, ::snikket::Caps caps){
-            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_656_storeService)
-HXLINE( 657)		this->storeCaps(caps);
-HXLINE( 659)		 ::snikket::persistence::SqliteDriver _hx_tmp = this->db;
-HXDLIN( 659)		_hx_tmp->exec(HX_("INSERT OR REPLACE INTO services VALUES (?,?,?,?,?)",2c,3a,d9,f8),::cpp::VirtualArray_obj::__new(5)->init(0,accountId)->init(1,serviceId)->init(2,name)->init(3,node)->init(4,caps->verRaw()->hash));
+            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_687_storeService)
+HXLINE( 688)		this->storeCaps(caps);
+HXLINE( 690)		 ::snikket::persistence::SqliteDriver _hx_tmp = this->db;
+HXDLIN( 690)		_hx_tmp->exec(HX_("INSERT OR REPLACE INTO services VALUES (?,?,?,?,?)",2c,3a,d9,f8),::cpp::VirtualArray_obj::__new(5)->init(0,accountId)->init(1,serviceId)->init(2,name)->init(3,node)->init(4,caps->verRaw()->hash));
             	}
 
 
@@ -2260,141 +2368,146 @@ HX_DEFINE_DYNAMIC_FUNC5(Sqlite_obj,storeService,(void))
 
 void Sqlite_obj::findServicesWithFeature(::String accountId,::String feature, ::Dynamic callback){
             		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0, ::Dynamic,callback,::String,feature) HXARGC(1)
-            		void _hx_run(::Dynamic result){
-            			HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_671_findServicesWithFeature)
-HXLINE( 672)			::Array< ::Dynamic> services = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE( 673)			{
-HXLINE( 673)				::Dynamic row = result;
-HXDLIN( 673)				while(::sys::db::ResultSet_obj::hasNext(row)){
-HXLINE( 673)					 ::Dynamic row1 = ::sys::db::ResultSet_obj::next(row);
-HXLINE( 674)					 ::Dynamic json =  ::haxe::format::JsonParser_obj::__alloc( HX_CTX ,( (::String)(row1->__Field(HX_("caps",21,1c,ba,41),::hx::paccDynamic)) ))->doParse();
-HXLINE( 675)					::Array< ::String > features;
-HXDLIN( 675)					::Array< ::String > tmp;
-HXDLIN( 675)					if (::hx::IsNotNull( json )) {
-HXLINE( 675)						tmp = ( (::Array< ::String >)(json->__Field(HX_("features",fd,6c,d7,12),::hx::paccDynamic)) );
+            		void _hx_run( ::haxe::iterators::ArrayIterator result){
+            			HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_702_findServicesWithFeature)
+HXLINE( 703)			::Array< ::Dynamic> services = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE( 704)			{
+HXLINE( 704)				 ::haxe::iterators::ArrayIterator _g = result;
+HXDLIN( 704)				while((_g->current < _g->array->get_length())){
+HXLINE( 704)					 ::Dynamic row = _g->array->__get(_g->current++);
+HXLINE( 705)					 ::Dynamic json =  ::haxe::format::JsonParser_obj::__alloc( HX_CTX ,( (::String)(row->__Field(HX_("caps",21,1c,ba,41),::hx::paccDynamic)) ))->doParse();
+HXLINE( 706)					::Array< ::String > features;
+HXDLIN( 706)					::Array< ::String > tmp;
+HXDLIN( 706)					if (::hx::IsNotNull( json )) {
+HXLINE( 706)						tmp = ( (::Array< ::String >)(json->__Field(HX_("features",fd,6c,d7,12),::hx::paccDynamic)) );
             					}
             					else {
-HXLINE( 675)						tmp = null();
+HXLINE( 706)						tmp = null();
             					}
-HXDLIN( 675)					if (::hx::IsNotNull( tmp )) {
-HXLINE( 675)						features = tmp;
+HXDLIN( 706)					if (::hx::IsNotNull( tmp )) {
+HXLINE( 706)						features = tmp;
             					}
             					else {
-HXLINE( 675)						features = ::Array_obj< ::String >::__new(0);
-            					}
-HXLINE( 676)					if (features->contains(feature)) {
-HXLINE( 678)						::String row2 = ( (::String)(row1->__Field(HX_("service_id",e5,24,3d,7d),::hx::paccDynamic)) );
-HXLINE( 679)						::String row3 = ( (::String)(row1->__Field(HX_("name",4b,72,ff,48),::hx::paccDynamic)) );
-HXLINE( 680)						::String row4 = ( (::String)(row1->__Field(HX_("node",02,0a,0a,49),::hx::paccDynamic)) );
-HXLINE( 681)						::String json1 = ( (::String)(json->__Field(HX_("node",02,0a,0a,49),::hx::paccDynamic)) );
-HXDLIN( 681)						::Array< ::Dynamic> _this;
-HXDLIN( 681)						::Array< ::Dynamic> tmp1 = ( (::Array< ::Dynamic>)(json->__Field(HX_("identities",1c,c5,6d,d7),::hx::paccDynamic)) );
-HXDLIN( 681)						if (::hx::IsNotNull( tmp1 )) {
-HXLINE( 681)							_this = tmp1;
+HXLINE( 706)						features = ::Array_obj< ::String >::__new(0);
+            					}
+HXLINE( 707)					if (features->contains(feature)) {
+HXLINE( 709)						::String row1 = ( (::String)(row->__Field(HX_("service_id",e5,24,3d,7d),::hx::paccDynamic)) );
+HXLINE( 710)						::String row2 = ( (::String)(row->__Field(HX_("name",4b,72,ff,48),::hx::paccDynamic)) );
+HXLINE( 711)						::String row3 = ( (::String)(row->__Field(HX_("node",02,0a,0a,49),::hx::paccDynamic)) );
+HXLINE( 712)						::String json1 = ( (::String)(json->__Field(HX_("node",02,0a,0a,49),::hx::paccDynamic)) );
+HXDLIN( 712)						::Array< ::Dynamic> _this;
+HXDLIN( 712)						::Array< ::Dynamic> tmp1 = ( (::Array< ::Dynamic>)(json->__Field(HX_("identities",1c,c5,6d,d7),::hx::paccDynamic)) );
+HXDLIN( 712)						if (::hx::IsNotNull( tmp1 )) {
+HXLINE( 712)							_this = tmp1;
             						}
             						else {
-HXLINE( 681)							_this = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE( 712)							_this = ::Array_obj< ::Dynamic>::__new(0);
             						}
-HXDLIN( 681)						::Array< ::Dynamic> result1 = ::Array_obj< ::Dynamic>::__new(_this->length);
-HXDLIN( 681)						{
-HXLINE( 681)							int _g = 0;
-HXDLIN( 681)							int _g1 = _this->length;
-HXDLIN( 681)							while((_g < _g1)){
-HXLINE( 681)								_g = (_g + 1);
-HXDLIN( 681)								int i = (_g - 1);
-HXDLIN( 681)								{
-HXLINE( 681)									 ::Dynamic i1 = _hx_array_unsafe_get(_this,i);
-HXDLIN( 681)									 ::snikket::Identity inValue =  ::snikket::Identity_obj::__alloc( HX_CTX ,( (::String)(i1->__Field(HX_("category",fe,2a,6c,ad),::hx::paccDynamic)) ),( (::String)(i1->__Field(HX_("type",ba,f2,08,4d),::hx::paccDynamic)) ),( (::String)(i1->__Field(HX_("name",4b,72,ff,48),::hx::paccDynamic)) ));
-HXDLIN( 681)									result1->__unsafe_set(i,inValue);
+HXDLIN( 712)						::Array< ::Dynamic> result1 = ::Array_obj< ::Dynamic>::__new(_this->length);
+HXDLIN( 712)						{
+HXLINE( 712)							int _g1 = 0;
+HXDLIN( 712)							int _g2 = _this->length;
+HXDLIN( 712)							while((_g1 < _g2)){
+HXLINE( 712)								_g1 = (_g1 + 1);
+HXDLIN( 712)								int i = (_g1 - 1);
+HXDLIN( 712)								{
+HXLINE( 712)									 ::Dynamic i1 = _hx_array_unsafe_get(_this,i);
+HXDLIN( 712)									 ::snikket::Identity inValue =  ::snikket::Identity_obj::__alloc( HX_CTX ,( (::String)(i1->__Field(HX_("category",fe,2a,6c,ad),::hx::paccDynamic)) ),( (::String)(i1->__Field(HX_("type",ba,f2,08,4d),::hx::paccDynamic)) ),( (::String)(i1->__Field(HX_("name",4b,72,ff,48),::hx::paccDynamic)) ));
+HXDLIN( 712)									result1->__unsafe_set(i,inValue);
             								}
             							}
             						}
-HXLINE( 677)						services->push( ::Dynamic(::hx::Anon_obj::Create(4)
-            							->setFixed(0,HX_("serviceId",70,93,d4,bc),row2)
-            							->setFixed(1,HX_("caps",21,1c,ba,41), ::snikket::Caps_obj::__alloc( HX_CTX ,json1,result1,features))
-            							->setFixed(2,HX_("name",4b,72,ff,48),row3)
-            							->setFixed(3,HX_("node",02,0a,0a,49),row4)));
+HXLINE( 708)						services->push( ::Dynamic(::hx::Anon_obj::Create(4)
+            							->setFixed(0,HX_("serviceId",70,93,d4,bc),row1)
+            							->setFixed(1,HX_("caps",21,1c,ba,41), ::snikket::Caps_obj::__alloc( HX_CTX ,json1,result1,features,null()))
+            							->setFixed(2,HX_("name",4b,72,ff,48),row2)
+            							->setFixed(3,HX_("node",02,0a,0a,49),row3)));
             					}
             				}
             			}
-HXLINE( 685)			callback(services);
+HXLINE( 716)			callback(services);
             		}
             		HX_END_LOCAL_FUNC1((void))
 
-            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_668_findServicesWithFeature)
-HXDLIN( 668)		::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(HX_("SELECT service_id, name, node, json(caps.caps) AS caps FROM services INNER JOIN caps ON services.caps=caps.sha1 WHERE account_id=?",fc,fb,5f,40),::cpp::VirtualArray_obj::__new(1)->init(0,accountId)), ::Dynamic(new _hx_Closure_0(callback,feature)),null());
+            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_699_findServicesWithFeature)
+HXDLIN( 699)		::thenshim::_Promise::Promise_Impl__obj::then(this->db->exec(HX_("SELECT service_id, name, node, json(caps.caps) AS caps FROM services INNER JOIN caps ON services.caps=caps.sha1 WHERE account_id=?",fc,fb,5f,40),::cpp::VirtualArray_obj::__new(1)->init(0,accountId)), ::Dynamic(new _hx_Closure_0(callback,feature)),null());
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC3(Sqlite_obj,findServicesWithFeature,(void))
 
 ::Dynamic Sqlite_obj::hydrateReactions(::String accountId,::Array< ::Dynamic> messages){
-            		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_1,::Array< ::Dynamic>,messages) HXARGC(1)
+            		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0,::Array< ::Dynamic>,messages) HXARGC(1)
             		::Array< ::Dynamic> _hx_run( ::haxe::ds::StringMap result){
-            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_690_hydrateReactions)
-HXLINE( 691)			{
-HXLINE( 691)				::Dynamic map = result;
-HXDLIN( 691)				::Dynamic _g_map = map;
-HXDLIN( 691)				 ::Dynamic _g_keys = ::haxe::IMap_obj::keys(map);
-HXDLIN( 691)				while(( (bool)(_g_keys->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE( 691)					::String key = ( (::String)(_g_keys->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
-HXDLIN( 691)					 ::haxe::ds::StringMap _g_value = ( ( ::haxe::ds::StringMap)(::haxe::IMap_obj::get(_g_map,key)) );
-HXDLIN( 691)					::String _g_key = key;
-HXDLIN( 691)					::String id = _g_key;
-HXDLIN( 691)					 ::haxe::ds::StringMap reactions = _g_value;
-HXDLIN( 691)					{
-            						HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0,::String,id) HXARGC(1)
-            						bool _hx_run( ::snikket::ChatMessage m){
-            							HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_693_hydrateReactions)
-HXLINE( 693)							::String m1;
-HXDLIN( 693)							if (::hx::IsNull( m->serverId )) {
-HXLINE( 693)								m1 = m->localId;
-            							}
-            							else {
-HXLINE( 693)								m1 = ((m->serverId + HX_("\n",0a,00,00,00)) + m->serverIdBy);
-            							}
-HXDLIN( 693)							::String m2 = ((m1 + HX_("\n",0a,00,00,00)) + m->chatId());
-HXDLIN( 693)							if ((m2 != id)) {
-HXLINE( 694)								::String m3;
-HXDLIN( 694)								if (::hx::IsNull( m->localId )) {
-HXLINE( 694)									m3 = ((m->serverId + HX_("\n",0a,00,00,00)) + m->serverIdBy);
+            			HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_721_hydrateReactions)
+HXLINE( 722)			{
+HXLINE( 722)				::Dynamic map = result;
+HXDLIN( 722)				::Dynamic _g_map = map;
+HXDLIN( 722)				 ::Dynamic _g_keys = ::haxe::IMap_obj::keys(map);
+HXDLIN( 722)				while(( (bool)(_g_keys->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE( 722)					::String key = ( (::String)(_g_keys->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
+HXDLIN( 722)					 ::haxe::ds::StringMap _g_value = ( ( ::haxe::ds::StringMap)(::haxe::IMap_obj::get(_g_map,key)) );
+HXDLIN( 722)					::String _g_key = key;
+HXDLIN( 722)					::String id = _g_key;
+HXDLIN( 722)					 ::haxe::ds::StringMap reactions = _g_value;
+HXDLIN( 722)					{
+HXLINE( 723)						 ::snikket::ChatMessage result1 = null();
+HXDLIN( 723)						{
+HXLINE( 723)							int _g = 0;
+HXDLIN( 723)							while((_g < messages->length)){
+HXLINE( 723)								 ::snikket::ChatMessage v = messages->__get(_g).StaticCast<  ::snikket::ChatMessage >();
+HXDLIN( 723)								_g = (_g + 1);
+HXLINE( 724)								bool m;
+HXDLIN( 724)								::String m1;
+HXDLIN( 724)								if (::hx::IsNull( v->serverId )) {
+HXLINE( 724)									m1 = v->localId;
             								}
             								else {
-HXLINE( 694)									m3 = m->localId;
+HXLINE( 724)									m1 = ((v->serverId + HX_("\n",0a,00,00,00)) + v->serverIdBy);
+            								}
+HXDLIN( 724)								if ((((m1 + HX_("\n",0a,00,00,00)) + v->chatId()) != id)) {
+HXLINE( 725)									::String m2;
+HXDLIN( 725)									if (::hx::IsNull( v->localId )) {
+HXLINE( 725)										m2 = ((v->serverId + HX_("\n",0a,00,00,00)) + v->serverIdBy);
+            									}
+            									else {
+HXLINE( 725)										m2 = v->localId;
+            									}
+HXLINE( 724)									m = (((m2 + HX_("\n",0a,00,00,00)) + v->chatId()) == id);
+            								}
+            								else {
+HXLINE( 724)									m = true;
+            								}
+HXLINE( 723)								if (m) {
+HXLINE(  36)									result1 = v;
+HXLINE( 723)									goto _hx_goto_160;
             								}
-HXDLIN( 694)								::String m4 = ((m3 + HX_("\n",0a,00,00,00)) + m->chatId());
-HXDLIN( 694)								return (m4 == id);
-            							}
-            							else {
-HXLINE( 693)								return true;
             							}
-HXDLIN( 693)							return false;
+            							_hx_goto_160:;
             						}
-            						HX_END_LOCAL_FUNC1(return)
-
-HXLINE( 692)						 ::snikket::ChatMessage m = ( ( ::snikket::ChatMessage)(::Lambda_obj::find(messages, ::Dynamic(new _hx_Closure_0(id)))) );
-HXLINE( 696)						if (::hx::IsNotNull( m )) {
-HXLINE( 696)							m->set_reactions(reactions);
+HXDLIN( 723)						 ::snikket::ChatMessage m3 = result1;
+HXLINE( 727)						if (::hx::IsNotNull( m3 )) {
+HXLINE( 727)							m3->set_reactions(reactions);
             						}
             					}
             				}
             			}
-HXLINE( 698)			return messages;
+HXLINE( 729)			return messages;
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_690_hydrateReactions)
-HXDLIN( 690)		::Array< ::Dynamic> result = ::Array_obj< ::Dynamic>::__new(messages->length);
-HXDLIN( 690)		{
-HXDLIN( 690)			int _g = 0;
-HXDLIN( 690)			int _g1 = messages->length;
-HXDLIN( 690)			while((_g < _g1)){
-HXDLIN( 690)				_g = (_g + 1);
-HXDLIN( 690)				int i = (_g - 1);
-HXDLIN( 690)				{
-HXDLIN( 690)					 ::snikket::ChatMessage m = ( ( ::snikket::ChatMessage)(_hx_array_unsafe_get(messages,i)) );
-HXDLIN( 690)					::String inValue = m->chatId();
-HXDLIN( 690)					result->__unsafe_set(i, ::Dynamic(::hx::Anon_obj::Create(4)
+            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_721_hydrateReactions)
+HXDLIN( 721)		::Array< ::Dynamic> result = ::Array_obj< ::Dynamic>::__new(messages->length);
+HXDLIN( 721)		{
+HXDLIN( 721)			int _g = 0;
+HXDLIN( 721)			int _g1 = messages->length;
+HXDLIN( 721)			while((_g < _g1)){
+HXDLIN( 721)				_g = (_g + 1);
+HXDLIN( 721)				int i = (_g - 1);
+HXDLIN( 721)				{
+HXDLIN( 721)					 ::snikket::ChatMessage m = ( ( ::snikket::ChatMessage)(_hx_array_unsafe_get(messages,i)) );
+HXDLIN( 721)					::String inValue = m->chatId();
+HXDLIN( 721)					result->__unsafe_set(i, ::Dynamic(::hx::Anon_obj::Create(4)
             						->setFixed(0,HX_("chatId",d3,04,77,b7),inValue)
             						->setFixed(1,HX_("serverId",7e,01,b2,e2),m->serverId)
             						->setFixed(2,HX_("localId",26,7a,c6,2d),m->localId)
@@ -2402,7 +2515,7 @@ HXDLIN( 690)					result->__unsafe_set(i, ::Dynamic(::hx::Anon_obj::Create(4)
             				}
             			}
             		}
-HXDLIN( 690)		return ::thenshim::_Promise::Promise_Impl__obj::then(this->fetchReactions(accountId,result), ::Dynamic(new _hx_Closure_1(messages)),null());
+HXDLIN( 721)		return ::thenshim::_Promise::Promise_Impl__obj::then(this->fetchReactions(accountId,result), ::Dynamic(new _hx_Closure_0(messages)),null());
             	}
 
 
@@ -2410,461 +2523,467 @@ HX_DEFINE_DYNAMIC_FUNC2(Sqlite_obj,hydrateReactions,return )
 
 ::Dynamic Sqlite_obj::fetchReactions(::String accountId,::Array< ::Dynamic> ids){
             		HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_0) HXARGC(1)
-            		 ::haxe::ds::StringMap _hx_run(::Dynamic rows){
-            			HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_718_fetchReactions)
-HXLINE( 719)			 ::haxe::ds::StringMap agg =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
-HXLINE( 720)			{
-HXLINE( 720)				::Dynamic row = rows;
-HXDLIN( 720)				while(::sys::db::ResultSet_obj::hasNext(row)){
-HXLINE( 720)					 ::Dynamic row1 = ::sys::db::ResultSet_obj::next(row);
-HXLINE( 721)					::cpp::VirtualArray reactions = ( (::cpp::VirtualArray)( ::haxe::format::JsonParser_obj::__alloc( HX_CTX ,( (::String)(row1->__Field(HX_("reactions",aa,cc,95,e7),::hx::paccDynamic)) ))->doParse()) );
-HXLINE( 722)					::String mapId;
-HXDLIN( 722)					bool mapId1;
-HXDLIN( 722)					if (::hx::IsNotNull( row1->__Field(HX_("mam_id",01,4d,19,b7),::hx::paccDynamic) )) {
-HXLINE( 722)						mapId1 = ::hx::IsEq( row1->__Field(HX_("mam_id",01,4d,19,b7),::hx::paccDynamic),HX_("",00,00,00,00) );
+            		 ::haxe::ds::StringMap _hx_run( ::haxe::iterators::ArrayIterator rows){
+            			HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_749_fetchReactions)
+HXLINE( 750)			 ::haxe::ds::StringMap agg =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
+HXLINE( 751)			{
+HXLINE( 751)				 ::haxe::iterators::ArrayIterator _g = rows;
+HXDLIN( 751)				while((_g->current < _g->array->get_length())){
+HXLINE( 751)					 ::Dynamic row = _g->array->__get(_g->current++);
+HXLINE( 752)					::cpp::VirtualArray reactions = ( (::cpp::VirtualArray)( ::haxe::format::JsonParser_obj::__alloc( HX_CTX ,( (::String)(row->__Field(HX_("reactions",aa,cc,95,e7),::hx::paccDynamic)) ))->doParse()) );
+HXLINE( 753)					::String mapId;
+HXDLIN( 753)					bool mapId1;
+HXDLIN( 753)					if (::hx::IsNotNull( row->__Field(HX_("mam_id",01,4d,19,b7),::hx::paccDynamic) )) {
+HXLINE( 753)						mapId1 = ::hx::IsEq( row->__Field(HX_("mam_id",01,4d,19,b7),::hx::paccDynamic),HX_("",00,00,00,00) );
             					}
             					else {
-HXLINE( 722)						mapId1 = true;
+HXLINE( 753)						mapId1 = true;
             					}
-HXDLIN( 722)					if (mapId1) {
-HXLINE( 722)						mapId = ( (::String)(row1->__Field(HX_("stanza_id",25,7b,7a,e9),::hx::paccDynamic)) );
+HXDLIN( 753)					if (mapId1) {
+HXLINE( 753)						mapId = ( (::String)(row->__Field(HX_("stanza_id",25,7b,7a,e9),::hx::paccDynamic)) );
             					}
             					else {
-HXLINE( 722)						mapId = ( (::String)(((row1->__Field(HX_("mam_id",01,4d,19,b7),::hx::paccDynamic) + HX_("\n",0a,00,00,00)) + row1->__Field(HX_("mam_by",fd,46,19,b7),::hx::paccDynamic))) );
-            					}
-HXDLIN( 722)					::String mapId2 = ( (::String)(((mapId + HX_("\n",0a,00,00,00)) + row1->__Field(HX_("chat_id",22,ea,bd,d0),::hx::paccDynamic))) );
-HXLINE( 723)					if (!(agg->exists(mapId2))) {
-HXLINE( 723)						agg->set(mapId2, ::haxe::ds::StringMap_obj::__alloc( HX_CTX ));
-            					}
-HXLINE( 724)					 ::haxe::ds::StringMap map = ( ( ::haxe::ds::StringMap)(agg->get(mapId2)) );
-HXLINE( 725)					if (!(map->exists(( (::String)(row1->__Field(HX_("sender_id",65,a9,5d,a0),::hx::paccDynamic)) )))) {
-HXLINE( 725)						::cpp::VirtualArray v = ::cpp::VirtualArray_obj::__new(0);
-HXDLIN( 725)						map->set(( (::String)(row1->__Field(HX_("sender_id",65,a9,5d,a0),::hx::paccDynamic)) ),v);
-            					}
-HXLINE( 726)					if (::hx::IsEq( row1->__Field(HX_("kind",54,e1,09,47),::hx::paccDynamic),1 )) {
-HXLINE( 727)						int _g = 0;
-HXDLIN( 727)						while((_g < reactions->get_length())){
-HXLINE( 727)							 ::Dynamic reaction = reactions->__get(_g);
-HXDLIN( 727)							_g = (_g + 1);
-HXDLIN( 727)							( (::cpp::VirtualArray)(map->get( ::Dynamic(row1->__Field(HX_("sender_id",65,a9,5d,a0),::hx::paccDynamic)))) )->push(reaction);
+HXLINE( 753)						mapId = ( (::String)(((row->__Field(HX_("mam_id",01,4d,19,b7),::hx::paccDynamic) + HX_("\n",0a,00,00,00)) + row->__Field(HX_("mam_by",fd,46,19,b7),::hx::paccDynamic))) );
+            					}
+HXDLIN( 753)					::String mapId2 = ( (::String)(((mapId + HX_("\n",0a,00,00,00)) + row->__Field(HX_("chat_id",22,ea,bd,d0),::hx::paccDynamic))) );
+HXLINE( 754)					if (!(agg->exists(mapId2))) {
+HXLINE( 754)						agg->set(mapId2, ::haxe::ds::StringMap_obj::__alloc( HX_CTX ));
+            					}
+HXLINE( 755)					 ::haxe::ds::StringMap map = ( ( ::haxe::ds::StringMap)(agg->get(mapId2)) );
+HXLINE( 756)					if (!(map->exists(( (::String)(row->__Field(HX_("sender_id",65,a9,5d,a0),::hx::paccDynamic)) )))) {
+HXLINE( 756)						::cpp::VirtualArray v = ::cpp::VirtualArray_obj::__new(0);
+HXDLIN( 756)						map->set(( (::String)(row->__Field(HX_("sender_id",65,a9,5d,a0),::hx::paccDynamic)) ),v);
+            					}
+HXLINE( 757)					if (::hx::IsEq( row->__Field(HX_("kind",54,e1,09,47),::hx::paccDynamic),1 )) {
+HXLINE( 758)						int _g1 = 0;
+HXDLIN( 758)						while((_g1 < reactions->get_length())){
+HXLINE( 758)							 ::Dynamic reaction = reactions->__get(_g1);
+HXDLIN( 758)							_g1 = (_g1 + 1);
+HXDLIN( 758)							( (::cpp::VirtualArray)(map->get( ::Dynamic(row->__Field(HX_("sender_id",65,a9,5d,a0),::hx::paccDynamic)))) )->push(reaction);
             						}
             					}
             					else {
-HXLINE( 728)						if (::hx::IsEq( row1->__Field(HX_("kind",54,e1,09,47),::hx::paccDynamic),0 )) {
-HXLINE( 729)							::String k = ( (::String)(row1->__Field(HX_("sender_id",65,a9,5d,a0),::hx::paccDynamic)) );
-HXDLIN( 729)							::cpp::VirtualArray _g1 = ::cpp::VirtualArray_obj::__new(0);
-HXDLIN( 729)							{
-HXLINE( 729)								int _g2 = 0;
-HXDLIN( 729)								::cpp::VirtualArray _g3 = ( (::cpp::VirtualArray)(map->get( ::Dynamic(row1->__Field(HX_("sender_id",65,a9,5d,a0),::hx::paccDynamic)))) );
-HXDLIN( 729)								while((_g2 < _g3->get_length())){
-HXLINE( 729)									 ::Dynamic v1 = _g3->__get(_g2);
-HXDLIN( 729)									_g2 = (_g2 + 1);
-HXDLIN( 729)									if (::hx::IsNotNull( v1->__Field(HX_("uri",6c,2b,59,00),::hx::paccDynamic) )) {
-HXLINE( 729)										_g1->push(v1);
+HXLINE( 759)						if (::hx::IsEq( row->__Field(HX_("kind",54,e1,09,47),::hx::paccDynamic),0 )) {
+HXLINE( 760)							::String k = ( (::String)(row->__Field(HX_("sender_id",65,a9,5d,a0),::hx::paccDynamic)) );
+HXDLIN( 760)							::cpp::VirtualArray _g2 = ::cpp::VirtualArray_obj::__new(0);
+HXDLIN( 760)							{
+HXLINE( 760)								int _g3 = 0;
+HXDLIN( 760)								::cpp::VirtualArray _g4 = ( (::cpp::VirtualArray)(map->get( ::Dynamic(row->__Field(HX_("sender_id",65,a9,5d,a0),::hx::paccDynamic)))) );
+HXDLIN( 760)								while((_g3 < _g4->get_length())){
+HXLINE( 760)									 ::Dynamic v1 = _g4->__get(_g3);
+HXDLIN( 760)									_g3 = (_g3 + 1);
+HXDLIN( 760)									if (::hx::IsNotNull( v1->__Field(HX_("uri",6c,2b,59,00),::hx::paccDynamic) )) {
+HXLINE( 760)										_g2->push(v1);
             									}
             								}
             							}
-HXDLIN( 729)							::cpp::VirtualArray v2 = reactions->concat(_g1);
-HXDLIN( 729)							map->set(k,v2);
+HXDLIN( 760)							::cpp::VirtualArray v2 = reactions->concat(_g2);
+HXDLIN( 760)							map->set(k,v2);
             						}
             						else {
-HXLINE( 730)							if (::hx::IsEq( row1->__Field(HX_("kind",54,e1,09,47),::hx::paccDynamic),2 )) {
-HXLINE( 731)								map->set(( (::String)(row1->__Field(HX_("sender_id",65,a9,5d,a0),::hx::paccDynamic)) ),reactions);
+HXLINE( 761)							if (::hx::IsEq( row->__Field(HX_("kind",54,e1,09,47),::hx::paccDynamic),2 )) {
+HXLINE( 762)								map->set(( (::String)(row->__Field(HX_("sender_id",65,a9,5d,a0),::hx::paccDynamic)) ),reactions);
             							}
             						}
             					}
             				}
             			}
-HXLINE( 734)			 ::haxe::ds::StringMap result =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
-HXLINE( 735)			{
-HXLINE( 735)				::Dynamic map1 = agg;
-HXDLIN( 735)				::Dynamic _g_map = map1;
-HXDLIN( 735)				 ::Dynamic _g_keys = ::haxe::IMap_obj::keys(map1);
-HXDLIN( 735)				while(( (bool)(_g_keys->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE( 735)					::String key = ( (::String)(_g_keys->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
-HXDLIN( 735)					 ::haxe::ds::StringMap _g_value = ( ( ::haxe::ds::StringMap)(::haxe::IMap_obj::get(_g_map,key)) );
-HXDLIN( 735)					::String _g_key = key;
-HXDLIN( 735)					::String id = _g_key;
-HXDLIN( 735)					 ::haxe::ds::StringMap reactions1 = _g_value;
-HXDLIN( 735)					{
-HXLINE( 736)						 ::haxe::ds::StringMap map2 =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
-HXLINE( 737)						{
-HXLINE( 737)							 ::Dynamic reactionsBySender = reactions1->iterator();
-HXDLIN( 737)							while(( (bool)(reactionsBySender->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
-HXLINE( 737)								::cpp::VirtualArray reactionsBySender1 = ( (::cpp::VirtualArray)(reactionsBySender->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
-HXLINE( 738)								{
-HXLINE( 738)									int _g4 = 0;
-HXDLIN( 738)									while((_g4 < reactionsBySender1->get_length())){
-HXLINE( 738)										 ::Dynamic reactionD = reactionsBySender1->__get(_g4);
-HXDLIN( 738)										_g4 = (_g4 + 1);
-HXLINE( 739)										 ::snikket::Reaction reaction1;
-HXDLIN( 739)										if (::hx::IsNull( reactionD->__Field(HX_("uri",6c,2b,59,00),::hx::paccDynamic) )) {
-HXLINE( 739)											reaction1 =  ::snikket::Reaction_obj::__alloc( HX_CTX ,( (::String)(reactionD->__Field(HX_("senderId",f0,1e,0e,ec),::hx::paccDynamic)) ),( (::String)(reactionD->__Field(HX_("timestamp",d6,d4,ce,a5),::hx::paccDynamic)) ),( (::String)(reactionD->__Field(HX_("text",ad,cc,f9,4c),::hx::paccDynamic)) ),( (::String)(reactionD->__Field(HX_("envelopeId",0b,03,af,a8),::hx::paccDynamic)) ),( (::String)(reactionD->__Field(HX_("key",9f,89,51,00),::hx::paccDynamic)) ));
+HXLINE( 765)			 ::haxe::ds::StringMap result =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
+HXLINE( 766)			{
+HXLINE( 766)				::Dynamic map1 = agg;
+HXDLIN( 766)				::Dynamic _g_map = map1;
+HXDLIN( 766)				 ::Dynamic _g_keys = ::haxe::IMap_obj::keys(map1);
+HXDLIN( 766)				while(( (bool)(_g_keys->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE( 766)					::String key = ( (::String)(_g_keys->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
+HXDLIN( 766)					 ::haxe::ds::StringMap _g_value = ( ( ::haxe::ds::StringMap)(::haxe::IMap_obj::get(_g_map,key)) );
+HXDLIN( 766)					::String _g_key = key;
+HXDLIN( 766)					::String id = _g_key;
+HXDLIN( 766)					 ::haxe::ds::StringMap reactions1 = _g_value;
+HXDLIN( 766)					{
+HXLINE( 767)						 ::haxe::ds::StringMap map2 =  ::haxe::ds::StringMap_obj::__alloc( HX_CTX );
+HXLINE( 768)						{
+HXLINE( 768)							 ::Dynamic reactionsBySender = reactions1->iterator();
+HXDLIN( 768)							while(( (bool)(reactionsBySender->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE( 768)								::cpp::VirtualArray reactionsBySender1 = ( (::cpp::VirtualArray)(reactionsBySender->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)()) );
+HXLINE( 769)								{
+HXLINE( 769)									int _g5 = 0;
+HXDLIN( 769)									while((_g5 < reactionsBySender1->get_length())){
+HXLINE( 769)										 ::Dynamic reactionD = reactionsBySender1->__get(_g5);
+HXDLIN( 769)										_g5 = (_g5 + 1);
+HXLINE( 770)										 ::snikket::Reaction reaction1;
+HXDLIN( 770)										if (::hx::IsNull( reactionD->__Field(HX_("uri",6c,2b,59,00),::hx::paccDynamic) )) {
+HXLINE( 770)											reaction1 =  ::snikket::Reaction_obj::__alloc( HX_CTX ,( (::String)(reactionD->__Field(HX_("senderId",f0,1e,0e,ec),::hx::paccDynamic)) ),( (::String)(reactionD->__Field(HX_("timestamp",d6,d4,ce,a5),::hx::paccDynamic)) ),( (::String)(reactionD->__Field(HX_("text",ad,cc,f9,4c),::hx::paccDynamic)) ),( (::String)(reactionD->__Field(HX_("envelopeId",0b,03,af,a8),::hx::paccDynamic)) ),( (::String)(reactionD->__Field(HX_("key",9f,89,51,00),::hx::paccDynamic)) ));
             										}
             										else {
-HXLINE( 739)											reaction1 =  ::snikket::CustomEmojiReaction_obj::__alloc( HX_CTX ,( (::String)(reactionD->__Field(HX_("senderId",f0,1e,0e,ec),::hx::paccDynamic)) ),( (::String)(reactionD->__Field(HX_("timestamp",d6,d4,ce,a5),::hx::paccDynamic)) ),( (::String)(reactionD->__Field(HX_("text",ad,cc,f9,4c),::hx::paccDynamic)) ),( (::String)(reactionD->__Field(HX_("uri",6c,2b,59,00),::hx::paccDynamic)) ),( (::String)(reactionD->__Field(HX_("envelopeId",0b,03,af,a8),::hx::paccDynamic)) ));
+HXLINE( 770)											reaction1 =  ::snikket::CustomEmojiReaction_obj::__alloc( HX_CTX ,( (::String)(reactionD->__Field(HX_("senderId",f0,1e,0e,ec),::hx::paccDynamic)) ),( (::String)(reactionD->__Field(HX_("timestamp",d6,d4,ce,a5),::hx::paccDynamic)) ),( (::String)(reactionD->__Field(HX_("text",ad,cc,f9,4c),::hx::paccDynamic)) ),( (::String)(reactionD->__Field(HX_("uri",6c,2b,59,00),::hx::paccDynamic)) ),( (::String)(reactionD->__Field(HX_("envelopeId",0b,03,af,a8),::hx::paccDynamic)) ));
             										}
-HXLINE( 745)										if (!(map2->exists(reaction1->key))) {
-HXLINE( 745)											::Array< ::Dynamic> v3 = ::Array_obj< ::Dynamic>::__new(0);
-HXDLIN( 745)											map2->set(reaction1->key,v3);
+HXLINE( 776)										if (!(map2->exists(reaction1->key))) {
+HXLINE( 776)											::Array< ::Dynamic> v3 = ::Array_obj< ::Dynamic>::__new(0);
+HXDLIN( 776)											map2->set(reaction1->key,v3);
             										}
-HXLINE( 746)										( (::Array< ::Dynamic>)(map2->get(reaction1->key)) )->push(reaction1);
+HXLINE( 777)										( (::Array< ::Dynamic>)(map2->get(reaction1->key)) )->push(reaction1);
             									}
             								}
             							}
             						}
-HXLINE( 749)						result->set(id,map2);
+HXLINE( 780)						result->set(id,map2);
             					}
             				}
             			}
-HXLINE( 751)			return result;
+HXLINE( 782)			return result;
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            	HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_702_fetchReactions)
-HXLINE( 703)		 ::StringBuf q =  ::StringBuf_obj::__alloc( HX_CTX );
-HXLINE( 704)		{
-HXLINE( 704)			if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 704)				q->flush();
+            	HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_733_fetchReactions)
+HXLINE( 734)		 ::StringBuf q =  ::StringBuf_obj::__alloc( HX_CTX );
+HXLINE( 735)		{
+HXLINE( 735)			if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 735)				q->flush();
             			}
-HXDLIN( 704)			if (::hx::IsNull( q->b )) {
-HXLINE( 704)				q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_162,1);
+HXDLIN( 735)			if (::hx::IsNull( q->b )) {
+HXLINE( 735)				q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_172,1);
             			}
             			else {
-HXLINE( 704)				q->b->push(HX_("SELECT kind, chat_id, mam_id, mam_by, stanza_id, sender_id, json(reactions) AS reactions FROM reactions WHERE 1=0",d2,04,de,a3));
-            			}
-            		}
-HXLINE( 705)		::Array< ::String > params = ::Array_obj< ::String >::__new(0);
-HXLINE( 706)		{
-HXLINE( 706)			int _g = 0;
-HXDLIN( 706)			while((_g < ids->length)){
-HXLINE( 706)				 ::Dynamic item = ids->__get(_g);
-HXDLIN( 706)				_g = (_g + 1);
-HXLINE( 707)				if (::hx::IsNotNull( item->__Field(HX_("serverId",7e,01,b2,e2),::hx::paccDynamic) )) {
-HXLINE( 708)					{
-HXLINE( 708)						if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 708)							q->flush();
+HXLINE( 735)				q->b->push(HX_("SELECT kind, chat_id, mam_id, mam_by, stanza_id, sender_id, json(reactions) AS reactions FROM reactions WHERE 1=0",d2,04,de,a3));
+            			}
+            		}
+HXLINE( 736)		::Array< ::String > params = ::Array_obj< ::String >::__new(0);
+HXLINE( 737)		{
+HXLINE( 737)			int _g = 0;
+HXDLIN( 737)			while((_g < ids->length)){
+HXLINE( 737)				 ::Dynamic item = ids->__get(_g);
+HXDLIN( 737)				_g = (_g + 1);
+HXLINE( 738)				if (::hx::IsNotNull( item->__Field(HX_("serverId",7e,01,b2,e2),::hx::paccDynamic) )) {
+HXLINE( 739)					{
+HXLINE( 739)						if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 739)							q->flush();
             						}
-HXDLIN( 708)						if (::hx::IsNull( q->b )) {
-HXLINE( 708)							q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_163,1);
+HXDLIN( 739)						if (::hx::IsNull( q->b )) {
+HXLINE( 739)							q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_173,1);
             						}
             						else {
-HXLINE( 708)							q->b->push(HX_(" OR (mam_id=? AND mam_by=?)",0f,bb,c5,e5));
+HXLINE( 739)							q->b->push(HX_(" OR (mam_id=? AND mam_by=?)",0f,bb,c5,e5));
             						}
             					}
-HXLINE( 709)					params->push( ::Dynamic(item->__Field(HX_("serverId",7e,01,b2,e2),::hx::paccDynamic)));
-HXLINE( 710)					params->push( ::Dynamic(item->__Field(HX_("serverIdBy",f5,16,54,74),::hx::paccDynamic)));
+HXLINE( 740)					params->push( ::Dynamic(item->__Field(HX_("serverId",7e,01,b2,e2),::hx::paccDynamic)));
+HXLINE( 741)					params->push( ::Dynamic(item->__Field(HX_("serverIdBy",f5,16,54,74),::hx::paccDynamic)));
             				}
-HXLINE( 712)				if (::hx::IsNotNull( item->__Field(HX_("localId",26,7a,c6,2d),::hx::paccDynamic) )) {
-HXLINE( 713)					{
-HXLINE( 713)						if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 713)							q->flush();
+HXLINE( 743)				if (::hx::IsNotNull( item->__Field(HX_("localId",26,7a,c6,2d),::hx::paccDynamic) )) {
+HXLINE( 744)					{
+HXLINE( 744)						if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 744)							q->flush();
             						}
-HXDLIN( 713)						if (::hx::IsNull( q->b )) {
-HXLINE( 713)							q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_164,1);
+HXDLIN( 744)						if (::hx::IsNull( q->b )) {
+HXLINE( 744)							q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_174,1);
             						}
             						else {
-HXLINE( 713)							q->b->push(HX_(" OR stanza_id=?",6a,1d,f2,5b));
+HXLINE( 744)							q->b->push(HX_(" OR stanza_id=?",6a,1d,f2,5b));
             						}
             					}
-HXLINE( 714)					params->push( ::Dynamic(item->__Field(HX_("localId",26,7a,c6,2d),::hx::paccDynamic)));
+HXLINE( 745)					params->push( ::Dynamic(item->__Field(HX_("localId",26,7a,c6,2d),::hx::paccDynamic)));
             				}
             			}
             		}
-HXLINE( 717)		{
-HXLINE( 717)			if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 717)				q->flush();
+HXLINE( 748)		{
+HXLINE( 748)			if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 748)				q->flush();
             			}
-HXDLIN( 717)			if (::hx::IsNull( q->b )) {
-HXLINE( 717)				q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_165,1);
+HXDLIN( 748)			if (::hx::IsNull( q->b )) {
+HXLINE( 748)				q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_175,1);
             			}
             			else {
-HXLINE( 717)				q->b->push(HX_(" ORDER BY created_at, ROWID",00,65,8d,0e));
+HXLINE( 748)				q->b->push(HX_(" ORDER BY created_at, ROWID",00,65,8d,0e));
             			}
             		}
-HXLINE( 718)		 ::snikket::persistence::SqliteDriver _hx_tmp = this->db;
-HXDLIN( 718)		return ::thenshim::_Promise::Promise_Impl__obj::then(_hx_tmp->exec(q->toString(),params), ::Dynamic(new _hx_Closure_0()),null());
+HXLINE( 749)		 ::snikket::persistence::SqliteDriver _hx_tmp = this->db;
+HXDLIN( 749)		return ::thenshim::_Promise::Promise_Impl__obj::then(_hx_tmp->exec(q->toString(),params), ::Dynamic(new _hx_Closure_0()),null());
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC2(Sqlite_obj,fetchReactions,return )
 
 ::Dynamic Sqlite_obj::hydrateReplyTo(::String accountId,::Array< ::Dynamic> messages,::Array< ::Dynamic> replyTos){
-            		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_2,::Array< ::Dynamic>,messages, ::snikket::persistence::Sqlite,_gthis,::String,accountId) HXARGC(1)
-            		::Array< ::Dynamic> _hx_run(::Dynamic iter){
-            			HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_775_hydrateReplyTo)
-HXLINE( 776)			if (::hx::IsNotNull( iter )) {
-            				HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0,::Dynamic,iter) HXARGC(0)
-            				::Dynamic _hx_run(){
-            					HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_777_hydrateReplyTo)
-HXLINE( 777)					return iter;
+            		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_1,::Array< ::Dynamic>,messages, ::snikket::persistence::Sqlite,_gthis,::String,accountId) HXARGC(1)
+            		::Array< ::Dynamic> _hx_run( ::haxe::iterators::ArrayIterator iter){
+            			HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_806_hydrateReplyTo)
+HXLINE( 807)			if (::hx::IsNotNull( iter )) {
+            				HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::haxe::iterators::ArrayIterator,iter) HXARGC(0)
+            				 ::haxe::iterators::ArrayIterator _hx_run(){
+            					HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_808_hydrateReplyTo)
+HXLINE( 808)					return iter;
             				}
             				HX_END_LOCAL_FUNC0(return)
 
-HXLINE( 777)				::Array< ::Dynamic> parents = ::Lambda_obj::array( ::Dynamic(::hx::Anon_obj::Create(1)
+HXLINE( 808)				::Array< ::Dynamic> parents = ::Lambda_obj::array( ::Dynamic(::hx::Anon_obj::Create(1)
             					->setFixed(0,HX_("iterator",ee,49,9a,93), ::Dynamic(new _hx_Closure_0(iter)))));
-HXLINE( 778)				{
-HXLINE( 778)					int _g = 0;
-HXDLIN( 778)					while((_g < messages->length)){
-HXLINE( 778)						 ::snikket::ChatMessage message = messages->__get(_g).StaticCast<  ::snikket::ChatMessage >();
-HXDLIN( 778)						_g = (_g + 1);
-HXLINE( 779)						if (::hx::IsNotNull( message->replyToMessage )) {
-            							HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_1, ::snikket::ChatMessage,message) HXARGC(1)
-            							bool _hx_run( ::Dynamic p){
-            								HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_780_hydrateReplyTo)
-HXLINE( 780)								bool found;
-HXDLIN( 780)								::String p1 = ( (::String)(p->__Field(HX_("chat_id",22,ea,bd,d0),::hx::paccDynamic)) );
-HXDLIN( 780)								if ((p1 == message->chatId())) {
-HXLINE( 780)									if (::hx::IsNotNull( message->replyToMessage->serverId )) {
-HXLINE( 780)										found = ::hx::IsEq( p->__Field(HX_("mam_id",01,4d,19,b7),::hx::paccDynamic),message->replyToMessage->serverId );
+HXLINE( 809)				{
+HXLINE( 809)					int _g = 0;
+HXDLIN( 809)					while((_g < messages->length)){
+HXLINE( 809)						 ::snikket::ChatMessage message = messages->__get(_g).StaticCast<  ::snikket::ChatMessage >();
+HXDLIN( 809)						_g = (_g + 1);
+HXLINE( 810)						if (::hx::IsNotNull( message->replyToMessage )) {
+HXLINE( 811)							 ::Dynamic result = null();
+HXDLIN( 811)							{
+HXLINE( 811)								int _g1 = 0;
+HXDLIN( 811)								while((_g1 < parents->length)){
+HXLINE( 811)									 ::Dynamic v = parents->__get(_g1);
+HXDLIN( 811)									_g1 = (_g1 + 1);
+HXDLIN( 811)									bool found;
+HXDLIN( 811)									bool found1;
+HXDLIN( 811)									::String v1 = ( (::String)(v->__Field(HX_("chat_id",22,ea,bd,d0),::hx::paccDynamic)) );
+HXDLIN( 811)									if ((v1 == message->chatId())) {
+HXLINE( 811)										if (::hx::IsNotNull( message->replyToMessage->serverId )) {
+HXLINE( 811)											found1 = ::hx::IsEq( v->__Field(HX_("mam_id",01,4d,19,b7),::hx::paccDynamic),message->replyToMessage->serverId );
+            										}
+            										else {
+HXLINE( 811)											found1 = true;
+            										}
             									}
             									else {
-HXLINE( 780)										found = true;
+HXLINE( 811)										found1 = false;
             									}
-            								}
-            								else {
-HXLINE( 780)									found = false;
-            								}
-HXDLIN( 780)								if (found) {
-HXLINE( 780)									if (::hx::IsNotNull( message->replyToMessage->localId )) {
-HXLINE( 780)										return ::hx::IsEq( p->__Field(HX_("stanza_id",25,7b,7a,e9),::hx::paccDynamic),message->replyToMessage->localId );
+HXDLIN( 811)									if (found1) {
+HXLINE( 811)										if (::hx::IsNotNull( message->replyToMessage->localId )) {
+HXLINE( 811)											found = ::hx::IsEq( v->__Field(HX_("stanza_id",25,7b,7a,e9),::hx::paccDynamic),message->replyToMessage->localId );
+            										}
+            										else {
+HXLINE( 811)											found = true;
+            										}
             									}
             									else {
-HXLINE( 780)										return true;
+HXLINE( 811)										found = false;
+            									}
+HXDLIN( 811)									if (found) {
+HXLINE( 811)										result = v;
+HXDLIN( 811)										goto _hx_goto_178;
             									}
             								}
-            								else {
-HXLINE( 780)									return false;
-            								}
-HXDLIN( 780)								return false;
+            								_hx_goto_178:;
             							}
-            							HX_END_LOCAL_FUNC1(return)
-
-HXLINE( 780)							 ::Dynamic found = ::Lambda_obj::find(parents, ::Dynamic(new _hx_Closure_1(message)));
-HXLINE( 781)							if (::hx::IsNotNull( found )) {
-HXLINE( 781)								 ::snikket::ChatMessage message1 = message;
-HXDLIN( 781)								 ::snikket::persistence::Sqlite _gthis1 = _gthis;
-HXDLIN( 781)								::String accountId1 = accountId;
-HXDLIN( 781)								message1->set_replyToMessage(_gthis1->hydrateMessages(accountId1, ::haxe::iterators::ArrayIterator_obj::__alloc( HX_CTX ,::cpp::VirtualArray_obj::__new(1)->init(0,found)))->__get(0).StaticCast<  ::snikket::ChatMessage >());
+HXDLIN( 811)							 ::Dynamic found2 = result;
+HXLINE( 812)							if (::hx::IsNotNull( found2 )) {
+HXLINE( 812)								 ::snikket::persistence::Sqlite _gthis1 = _gthis;
+HXDLIN( 812)								::String accountId1 = accountId;
+HXDLIN( 812)								message->set_replyToMessage(_gthis1->hydrateMessages(accountId1, ::haxe::iterators::ArrayIterator_obj::__alloc( HX_CTX ,::cpp::VirtualArray_obj::__new(1)->init(0,found2)))->__get(0).StaticCast<  ::snikket::ChatMessage >());
             							}
             						}
             					}
             				}
             			}
-HXLINE( 785)			return messages;
+HXLINE( 816)			return messages;
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            	HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_755_hydrateReplyTo)
-HXDLIN( 755)		 ::snikket::persistence::Sqlite _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 756)		::Dynamic _hx_tmp;
-HXDLIN( 756)		if ((replyTos->length < 1)) {
-HXLINE( 756)			_hx_tmp = ::thenshim::_Promise::Promise_Impl__obj::resolve(null());
+            	HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_786_hydrateReplyTo)
+HXDLIN( 786)		 ::snikket::persistence::Sqlite _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 787)		::Dynamic _hx_tmp;
+HXDLIN( 787)		if ((replyTos->length < 1)) {
+HXLINE( 787)			_hx_tmp = ::thenshim::_Promise::Promise_Impl__obj::resolve(null());
             		}
             		else {
-HXLINE( 759)			::Array< ::String > params = ::Array_obj< ::String >::__new(1)->init(0,accountId);
-HXLINE( 760)			 ::StringBuf q =  ::StringBuf_obj::__alloc( HX_CTX );
-HXLINE( 761)			{
-HXLINE( 761)				if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 761)					q->flush();
+HXLINE( 790)			::Array< ::String > params = ::Array_obj< ::String >::__new(1)->init(0,accountId);
+HXLINE( 791)			 ::StringBuf q =  ::StringBuf_obj::__alloc( HX_CTX );
+HXLINE( 792)			{
+HXLINE( 792)				if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 792)					q->flush();
             				}
-HXDLIN( 761)				if (::hx::IsNull( q->b )) {
-HXLINE( 761)					q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_172,1);
+HXDLIN( 792)				if (::hx::IsNull( q->b )) {
+HXLINE( 792)					q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_182,1);
             				}
             				else {
-HXLINE( 761)					q->b->push(HX_("SELECT chat_id, stanza_id, stanza, direction, type, status, strftime('%FT%H:%M:%fZ', created_at / 1000.0, 'unixepoch') AS timestamp, sender_id, mam_id, mam_by, sync_point FROM messages WHERE account_id=? AND (",56,f2,9f,31));
-            				}
-            			}
-HXLINE( 762)			{
-HXLINE( 762)				::Array< ::String > result = ::Array_obj< ::String >::__new(replyTos->length);
-HXDLIN( 762)				{
-HXLINE( 762)					int _g = 0;
-HXDLIN( 762)					int _g1 = replyTos->length;
-HXDLIN( 762)					while((_g < _g1)){
-HXLINE( 762)						_g = (_g + 1);
-HXDLIN( 762)						int i = (_g - 1);
-HXDLIN( 762)						{
-HXLINE( 763)							 ::Dynamic parent = _hx_array_unsafe_get(replyTos,i);
-HXLINE( 762)							::String inValue;
-HXLINE( 763)							if (::hx::IsNotNull( parent->__Field(HX_("serverId",7e,01,b2,e2),::hx::paccDynamic) )) {
-HXLINE( 764)								params->push( ::Dynamic(parent->__Field(HX_("chatId",d3,04,77,b7),::hx::paccDynamic)));
-HXLINE( 765)								params->push( ::Dynamic(parent->__Field(HX_("serverId",7e,01,b2,e2),::hx::paccDynamic)));
-HXLINE( 762)								inValue = HX_(" (chat_id=? AND mam_id=?)",59,03,f2,84);
+HXLINE( 792)					q->b->push(HX_("SELECT chat_id, stanza_id, stanza, direction, type, status, strftime('%FT%H:%M:%fZ', created_at / 1000.0, 'unixepoch') AS timestamp, sender_id, mam_id, mam_by, sync_point FROM messages WHERE account_id=? AND (",56,f2,9f,31));
+            				}
+            			}
+HXLINE( 793)			{
+HXLINE( 793)				::Array< ::String > result = ::Array_obj< ::String >::__new(replyTos->length);
+HXDLIN( 793)				{
+HXLINE( 793)					int _g = 0;
+HXDLIN( 793)					int _g1 = replyTos->length;
+HXDLIN( 793)					while((_g < _g1)){
+HXLINE( 793)						_g = (_g + 1);
+HXDLIN( 793)						int i = (_g - 1);
+HXDLIN( 793)						{
+HXLINE( 794)							 ::Dynamic parent = _hx_array_unsafe_get(replyTos,i);
+HXLINE( 793)							::String inValue;
+HXLINE( 794)							if (::hx::IsNotNull( parent->__Field(HX_("serverId",7e,01,b2,e2),::hx::paccDynamic) )) {
+HXLINE( 795)								params->push( ::Dynamic(parent->__Field(HX_("chatId",d3,04,77,b7),::hx::paccDynamic)));
+HXLINE( 796)								params->push( ::Dynamic(parent->__Field(HX_("serverId",7e,01,b2,e2),::hx::paccDynamic)));
+HXLINE( 793)								inValue = HX_(" (chat_id=? AND mam_id=?)",59,03,f2,84);
             							}
             							else {
-HXLINE( 768)								params->push( ::Dynamic(parent->__Field(HX_("chatId",d3,04,77,b7),::hx::paccDynamic)));
-HXLINE( 769)								params->push( ::Dynamic(parent->__Field(HX_("localId",26,7a,c6,2d),::hx::paccDynamic)));
-HXLINE( 762)								inValue = HX_(" (chat_id=? AND stanza_id=?)",2f,d3,29,86);
+HXLINE( 799)								params->push( ::Dynamic(parent->__Field(HX_("chatId",d3,04,77,b7),::hx::paccDynamic)));
+HXLINE( 800)								params->push( ::Dynamic(parent->__Field(HX_("localId",26,7a,c6,2d),::hx::paccDynamic)));
+HXLINE( 793)								inValue = HX_(" (chat_id=? AND stanza_id=?)",2f,d3,29,86);
             							}
-HXDLIN( 762)							result->__unsafe_set(i,inValue);
+HXDLIN( 793)							result->__unsafe_set(i,inValue);
             						}
             					}
             				}
-HXDLIN( 762)				::String x = result->join(HX_(" OR ",7d,0d,63,15));
-HXDLIN( 762)				if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 762)					q->flush();
+HXDLIN( 793)				::String x = result->join(HX_(" OR ",7d,0d,63,15));
+HXDLIN( 793)				if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 793)					q->flush();
             				}
-HXDLIN( 762)				if (::hx::IsNull( q->b )) {
-HXLINE( 762)					q->b = ::Array_obj< ::String >::__new(1)->init(0,::Std_obj::string(x));
+HXDLIN( 793)				if (::hx::IsNull( q->b )) {
+HXLINE( 793)					q->b = ::Array_obj< ::String >::__new(1)->init(0,::Std_obj::string(x));
             				}
             				else {
-HXLINE( 762)					::Array< ::String > q1 = q->b;
-HXDLIN( 762)					q1->push(::Std_obj::string(x));
+HXLINE( 793)					::Array< ::String > q1 = q->b;
+HXDLIN( 793)					q1->push(::Std_obj::string(x));
             				}
             			}
-HXLINE( 773)			{
-HXLINE( 773)				if (::hx::IsNotNull( q->charBuf )) {
-HXLINE( 773)					q->flush();
+HXLINE( 804)			{
+HXLINE( 804)				if (::hx::IsNotNull( q->charBuf )) {
+HXLINE( 804)					q->flush();
             				}
-HXDLIN( 773)				if (::hx::IsNull( q->b )) {
-HXLINE( 773)					q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_173,1);
+HXDLIN( 804)				if (::hx::IsNull( q->b )) {
+HXLINE( 804)					q->b = ::Array_obj< ::String >::fromData( _hx_array_data_e415cb6c_183,1);
             				}
             				else {
-HXLINE( 773)					q->b->push(HX_(")",29,00,00,00));
+HXLINE( 804)					q->b->push(HX_(")",29,00,00,00));
             				}
             			}
-HXLINE( 774)			 ::snikket::persistence::SqliteDriver _hx_tmp1 = this->db;
-HXLINE( 756)			_hx_tmp = _hx_tmp1->exec(q->toString(),params);
+HXLINE( 805)			 ::snikket::persistence::SqliteDriver _hx_tmp1 = this->db;
+HXLINE( 787)			_hx_tmp = _hx_tmp1->exec(q->toString(),params);
             		}
-HXDLIN( 756)		return ::thenshim::_Promise::Promise_Impl__obj::then(_hx_tmp, ::Dynamic(new _hx_Closure_2(messages,_gthis,accountId)),null());
+HXDLIN( 787)		return ::thenshim::_Promise::Promise_Impl__obj::then(_hx_tmp, ::Dynamic(new _hx_Closure_1(messages,_gthis,accountId)),null());
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC3(Sqlite_obj,hydrateReplyTo,return )
 
 ::Array< ::Dynamic> Sqlite_obj::hydrateMessages(::String accountId, ::Dynamic rows){
-            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_789_hydrateMessages)
-HXLINE( 791)		 ::snikket::JID accountJid = ::snikket::JID_obj::parse(accountId);
-HXLINE( 792)		::Array< ::Dynamic> _g = ::Array_obj< ::Dynamic>::__new(0);
-HXDLIN( 792)		{
+            	HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_820_hydrateMessages)
+HXLINE( 822)		 ::snikket::JID accountJid = ::snikket::JID_obj::parse(accountId);
+HXLINE( 823)		::Array< ::Dynamic> _g = ::Array_obj< ::Dynamic>::__new(0);
+HXDLIN( 823)		{
             			HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::Dynamic,rows) HXARGC(0)
             			 ::Dynamic _hx_run(){
-            				HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_792_hydrateMessages)
-HXLINE( 792)				return rows;
+            				HX_STACKFRAME(&_hx_pos_5b1a6b524efab4db_823_hydrateMessages)
+HXLINE( 823)				return rows;
             			}
             			HX_END_LOCAL_FUNC0(return)
 
-HXLINE( 792)			 ::Dynamic inlobj_iterator =  ::Dynamic(new _hx_Closure_0(rows));
-HXDLIN( 792)			 ::Dynamic x = inlobj_iterator();
-HXDLIN( 792)			while(( (bool)(x->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
+HXLINE( 823)			 ::Dynamic inlobj_iterator =  ::Dynamic(new _hx_Closure_0(rows));
+HXDLIN( 823)			 ::Dynamic x = inlobj_iterator();
+HXDLIN( 823)			while(( (bool)(x->__Field(HX_("hasNext",6d,a5,46,18),::hx::paccDynamic)()) )){
             				HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_3, ::snikket::JID,accountJid, ::Dynamic,row) HXARGC(2)
             				 ::snikket::ChatMessageBuilder _hx_run( ::snikket::ChatMessageBuilder builder, ::snikket::Stanza _){
-            					HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_792_hydrateMessages)
-HXLINE( 793)					builder->syncPoint = ::hx::IsNotEq( row->__Field(HX_("sync_point",2c,6c,7f,80),::hx::paccDynamic),0 );
-HXLINE( 794)					builder->timestamp = ( (::String)(row->__Field(HX_("timestamp",d6,d4,ce,a5),::hx::paccDynamic)) );
-HXLINE( 795)					builder->type = ( (int)(row->__Field(HX_("type",ba,f2,08,4d),::hx::paccDynamic)) );
-HXLINE( 796)					builder->status = ( (int)(row->__Field(HX_("status",32,e7,fb,05),::hx::paccDynamic)) );
-HXLINE( 797)					builder->senderId = ( (::String)(row->__Field(HX_("sender_id",65,a9,5d,a0),::hx::paccDynamic)) );
-HXLINE( 798)					::String _hx_tmp;
-HXDLIN( 798)					if (::hx::IsEq( row->__Field(HX_("mam_id",01,4d,19,b7),::hx::paccDynamic),HX_("",00,00,00,00) )) {
-HXLINE( 798)						_hx_tmp = null();
+            					HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_823_hydrateMessages)
+HXLINE( 824)					builder->syncPoint = ::hx::IsNotEq( row->__Field(HX_("sync_point",2c,6c,7f,80),::hx::paccDynamic),0 );
+HXLINE( 825)					builder->timestamp = ( (::String)(row->__Field(HX_("timestamp",d6,d4,ce,a5),::hx::paccDynamic)) );
+HXLINE( 826)					builder->type = ( (int)(row->__Field(HX_("type",ba,f2,08,4d),::hx::paccDynamic)) );
+HXLINE( 827)					builder->status = ( (int)(row->__Field(HX_("status",32,e7,fb,05),::hx::paccDynamic)) );
+HXLINE( 828)					builder->senderId = ( (::String)(row->__Field(HX_("sender_id",65,a9,5d,a0),::hx::paccDynamic)) );
+HXLINE( 829)					::String _hx_tmp;
+HXDLIN( 829)					if (::hx::IsEq( row->__Field(HX_("mam_id",01,4d,19,b7),::hx::paccDynamic),HX_("",00,00,00,00) )) {
+HXLINE( 829)						_hx_tmp = null();
             					}
             					else {
-HXLINE( 798)						_hx_tmp = ( (::String)(row->__Field(HX_("mam_id",01,4d,19,b7),::hx::paccDynamic)) );
+HXLINE( 829)						_hx_tmp = ( (::String)(row->__Field(HX_("mam_id",01,4d,19,b7),::hx::paccDynamic)) );
             					}
-HXDLIN( 798)					builder->serverId = _hx_tmp;
-HXLINE( 799)					::String _hx_tmp1;
-HXDLIN( 799)					if (::hx::IsEq( row->__Field(HX_("mam_by",fd,46,19,b7),::hx::paccDynamic),HX_("",00,00,00,00) )) {
-HXLINE( 799)						_hx_tmp1 = null();
+HXDLIN( 829)					builder->serverId = _hx_tmp;
+HXLINE( 830)					::String _hx_tmp1;
+HXDLIN( 830)					if (::hx::IsEq( row->__Field(HX_("mam_by",fd,46,19,b7),::hx::paccDynamic),HX_("",00,00,00,00) )) {
+HXLINE( 830)						_hx_tmp1 = null();
             					}
             					else {
-HXLINE( 799)						_hx_tmp1 = ( (::String)(row->__Field(HX_("mam_by",fd,46,19,b7),::hx::paccDynamic)) );
+HXLINE( 830)						_hx_tmp1 = ( (::String)(row->__Field(HX_("mam_by",fd,46,19,b7),::hx::paccDynamic)) );
             					}
-HXDLIN( 799)					builder->serverIdBy = _hx_tmp1;
-HXLINE( 800)					if (::hx::IsNotEq( builder->direction,row->__Field(HX_("direction",3f,62,40,10),::hx::paccDynamic) )) {
-HXLINE( 801)						builder->direction = ( (int)(row->__Field(HX_("direction",3f,62,40,10),::hx::paccDynamic)) );
-HXLINE( 802)						::Array< ::Dynamic> replyTo = builder->replyTo;
-HXLINE( 803)						builder->replyTo = builder->recipients;
-HXLINE( 804)						builder->recipients = replyTo;
+HXDLIN( 830)					builder->serverIdBy = _hx_tmp1;
+HXLINE( 831)					if (::hx::IsNotEq( builder->direction,row->__Field(HX_("direction",3f,62,40,10),::hx::paccDynamic) )) {
+HXLINE( 832)						builder->direction = ( (int)(row->__Field(HX_("direction",3f,62,40,10),::hx::paccDynamic)) );
+HXLINE( 833)						::Array< ::Dynamic> replyTo = builder->replyTo;
+HXLINE( 834)						builder->replyTo = builder->recipients;
+HXLINE( 835)						builder->recipients = replyTo;
             					}
-HXLINE( 806)					bool _hx_tmp2;
-HXDLIN( 806)					if (::hx::IsNotNull( row->__Field(HX_("stanza_id",25,7b,7a,e9),::hx::paccDynamic) )) {
-HXLINE( 806)						_hx_tmp2 = ::hx::IsNotEq( row->__Field(HX_("stanza_id",25,7b,7a,e9),::hx::paccDynamic),HX_("",00,00,00,00) );
+HXLINE( 837)					bool _hx_tmp2;
+HXDLIN( 837)					if (::hx::IsNotNull( row->__Field(HX_("stanza_id",25,7b,7a,e9),::hx::paccDynamic) )) {
+HXLINE( 837)						_hx_tmp2 = ::hx::IsNotEq( row->__Field(HX_("stanza_id",25,7b,7a,e9),::hx::paccDynamic),HX_("",00,00,00,00) );
             					}
             					else {
-HXLINE( 806)						_hx_tmp2 = false;
+HXLINE( 837)						_hx_tmp2 = false;
             					}
-HXDLIN( 806)					if (_hx_tmp2) {
-HXLINE( 806)						builder->localId = ( (::String)(row->__Field(HX_("stanza_id",25,7b,7a,e9),::hx::paccDynamic)) );
+HXDLIN( 837)					if (_hx_tmp2) {
+HXLINE( 837)						builder->localId = ( (::String)(row->__Field(HX_("stanza_id",25,7b,7a,e9),::hx::paccDynamic)) );
             					}
-HXLINE( 807)					if (::hx::IsNotNull( row->__Field(HX_("versions",5b,4e,b8,d6),::hx::paccDynamic) )) {
-HXLINE( 808)						 ::Dynamic versionTimes =  ::haxe::format::JsonParser_obj::__alloc( HX_CTX ,( (::String)(row->__Field(HX_("version_times",1f,50,f9,17),::hx::paccDynamic)) ))->doParse();
-HXLINE( 809)						 ::Dynamic versions =  ::haxe::format::JsonParser_obj::__alloc( HX_CTX ,( (::String)(row->__Field(HX_("versions",5b,4e,b8,d6),::hx::paccDynamic)) ))->doParse();
-HXLINE( 810)						if ((::Reflect_obj::fields(versions)->length > 1)) {
+HXLINE( 838)					if (::hx::IsNotNull( row->__Field(HX_("versions",5b,4e,b8,d6),::hx::paccDynamic) )) {
+HXLINE( 839)						 ::Dynamic versionTimes =  ::haxe::format::JsonParser_obj::__alloc( HX_CTX ,( (::String)(row->__Field(HX_("version_times",1f,50,f9,17),::hx::paccDynamic)) ))->doParse();
+HXLINE( 840)						 ::Dynamic versions =  ::haxe::format::JsonParser_obj::__alloc( HX_CTX ,( (::String)(row->__Field(HX_("versions",5b,4e,b8,d6),::hx::paccDynamic)) ))->doParse();
+HXLINE( 841)						if ((::Reflect_obj::fields(versions)->length > 1)) {
             							HX_BEGIN_LOCAL_FUNC_S0(::hx::LocalFunc,_hx_Closure_2) HXARGC(2)
             							int _hx_run( ::snikket::ChatMessage a, ::snikket::ChatMessage b){
-            								HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_822_hydrateMessages)
-HXLINE( 822)								return ::Reflect_obj::compare(b->timestamp,a->timestamp);
+            								HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_853_hydrateMessages)
+HXLINE( 853)								return ::Reflect_obj::compare(b->timestamp,a->timestamp);
             							}
             							HX_END_LOCAL_FUNC2(return)
 
-HXLINE( 811)							{
-HXLINE( 811)								 ::Dynamic access = versions;
-HXDLIN( 811)								 ::Dynamic _g_access = access;
-HXDLIN( 811)								::Array< ::String > _g_keys = ::Reflect_obj::fields(access);
-HXDLIN( 811)								int _g_index = 0;
-HXDLIN( 811)								while((_g_index < _g_keys->length)){
-HXLINE( 811)									_g_index = (_g_index + 1);
-HXDLIN( 811)									::String key = _g_keys->__get((_g_index - 1));
-HXDLIN( 811)									::String _g_value = ( (::String)(::Reflect_obj::field(_g_access,key)) );
-HXDLIN( 811)									::String _g_key = key;
-HXDLIN( 811)									::String versionId = _g_key;
-HXDLIN( 811)									::String version = _g_value;
-HXDLIN( 811)									{
+HXLINE( 842)							{
+HXLINE( 842)								 ::Dynamic access = versions;
+HXDLIN( 842)								 ::Dynamic _g_access = access;
+HXDLIN( 842)								::Array< ::String > _g_keys = ::Reflect_obj::fields(access);
+HXDLIN( 842)								int _g_index = 0;
+HXDLIN( 842)								while((_g_index < _g_keys->length)){
+HXLINE( 842)									_g_index = (_g_index + 1);
+HXDLIN( 842)									::String key = _g_keys->__get((_g_index - 1));
+HXDLIN( 842)									::String _g_value = ( (::String)(::Reflect_obj::field(_g_access,key)) );
+HXDLIN( 842)									::String _g_key = key;
+HXDLIN( 842)									::String versionId = _g_key;
+HXDLIN( 842)									::String version = _g_value;
+HXDLIN( 842)									{
             										HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_1, ::Dynamic,versionTimes,::String,versionId) HXARGC(2)
             										 ::snikket::ChatMessageBuilder _hx_run( ::snikket::ChatMessageBuilder toPushB, ::snikket::Stanza _){
-            											HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_812_hydrateMessages)
-HXLINE( 813)											bool versionM;
-HXDLIN( 813)											if (::hx::IsNull( toPushB->serverId )) {
-HXLINE( 813)												versionM = (versionId != toPushB->localId);
+            											HX_GC_STACKFRAME(&_hx_pos_5b1a6b524efab4db_843_hydrateMessages)
+HXLINE( 844)											bool versionM;
+HXDLIN( 844)											if (::hx::IsNull( toPushB->serverId )) {
+HXLINE( 844)												versionM = (versionId != toPushB->localId);
             											}
             											else {
-HXLINE( 813)												versionM = false;
+HXLINE( 844)												versionM = false;
             											}
-HXDLIN( 813)											if (versionM) {
-HXLINE( 813)												toPushB->serverId = versionId;
+HXDLIN( 844)											if (versionM) {
+HXLINE( 844)												toPushB->serverId = versionId;
             											}
-HXLINE( 814)											toPushB->timestamp = ( (::String)(::Reflect_obj::field(versionTimes,versionId)) );
-HXLINE( 815)											return toPushB;
+HXLINE( 845)											toPushB->timestamp = ( (::String)(::Reflect_obj::field(versionTimes,versionId)) );
+HXLINE( 846)											return toPushB;
             										}
             										HX_END_LOCAL_FUNC2(return)
 
-HXLINE( 812)										 ::snikket::Stanza versionM = ::snikket::Stanza_obj::parse(version);
-HXDLIN( 812)										 ::snikket::ChatMessage versionM1 = ::snikket::ChatMessage_obj::fromStanza(versionM,accountJid, ::Dynamic(new _hx_Closure_1(versionTimes,versionId)));
-HXLINE( 817)										 ::snikket::ChatMessage toPush;
-HXDLIN( 817)										bool toPush1;
-HXDLIN( 817)										if (::hx::IsNotNull( versionM1 )) {
-HXLINE( 817)											toPush1 = (versionM1->versions->length < 1);
+HXLINE( 843)										 ::snikket::Stanza versionM = ::snikket::Stanza_obj::parse(version);
+HXDLIN( 843)										 ::snikket::ChatMessage versionM1 = ::snikket::ChatMessage_obj::fromStanza(versionM,accountJid, ::Dynamic(new _hx_Closure_1(versionTimes,versionId)));
+HXLINE( 848)										 ::snikket::ChatMessage toPush;
+HXDLIN( 848)										bool toPush1;
+HXDLIN( 848)										if (::hx::IsNotNull( versionM1 )) {
+HXLINE( 848)											toPush1 = (versionM1->versions->length < 1);
             										}
             										else {
-HXLINE( 817)											toPush1 = true;
+HXLINE( 848)											toPush1 = true;
             										}
-HXDLIN( 817)										if (toPush1) {
-HXLINE( 817)											toPush = versionM1;
+HXDLIN( 848)										if (toPush1) {
+HXLINE( 848)											toPush = versionM1;
             										}
             										else {
-HXLINE( 817)											toPush = versionM1->versions->__get(0).StaticCast<  ::snikket::ChatMessage >();
+HXLINE( 848)											toPush = versionM1->versions->__get(0).StaticCast<  ::snikket::ChatMessage >();
             										}
-HXLINE( 818)										if (::hx::IsNotNull( toPush )) {
-HXLINE( 819)											builder->versions->push(toPush);
+HXLINE( 849)										if (::hx::IsNotNull( toPush )) {
+HXLINE( 850)											builder->versions->push(toPush);
             										}
             									}
             								}
             							}
-HXLINE( 822)							builder->versions->sort( ::Dynamic(new _hx_Closure_2()));
+HXLINE( 853)							builder->versions->sort( ::Dynamic(new _hx_Closure_2()));
             						}
             					}
-HXLINE( 825)					return builder;
+HXLINE( 856)					return builder;
             				}
             				HX_END_LOCAL_FUNC2(return)
 
-HXLINE( 792)				 ::Dynamic x1 = x->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
-HXDLIN( 792)				 ::Dynamic row = x1;
-HXDLIN( 792)				 ::snikket::Stanza _hx_tmp = ::snikket::Stanza_obj::parse(( (::String)(row->__Field(HX_("stanza",f5,5d,f7,05),::hx::paccDynamic)) ));
-HXDLIN( 792)				_g->push(::snikket::ChatMessage_obj::fromStanza(_hx_tmp,accountJid, ::Dynamic(new _hx_Closure_3(accountJid,row))));
+HXLINE( 823)				 ::Dynamic x1 = x->__Field(HX_("next",f3,84,02,49),::hx::paccDynamic)();
+HXDLIN( 823)				 ::Dynamic row = x1;
+HXDLIN( 823)				 ::snikket::Stanza _hx_tmp = ::snikket::Stanza_obj::parse(( (::String)(row->__Field(HX_("stanza",f5,5d,f7,05),::hx::paccDynamic)) ));
+HXDLIN( 823)				_g->push(::snikket::ChatMessage_obj::fromStanza(_hx_tmp,accountJid, ::Dynamic(new _hx_Closure_3(accountJid,row))));
             			}
             		}
-HXDLIN( 792)		return _g;
+HXDLIN( 823)		return _g;
             	}
 
 
@@ -2949,6 +3068,7 @@ void Sqlite_obj::__Visit(HX_VISIT_PARAMS)
 		if (HX_FIELD_EQ(inName,"smStoreNext") ) { return ::hx::Val( smStoreNext ); }
 		break;
 	case 12:
+		if (HX_FIELD_EQ(inName,"storeCapsSet") ) { return ::hx::Val( storeCapsSet_dyn() ); }
 		if (HX_FIELD_EQ(inName,"listAccounts") ) { return ::hx::Val( listAccounts_dyn() ); }
 		if (HX_FIELD_EQ(inName,"storeService") ) { return ::hx::Val( storeService_dyn() ); }
 		break;
@@ -3062,6 +3182,7 @@ static ::String Sqlite_obj_sMemberFields[] = {
 	HX_("removeMedia",00,e2,ef,03),
 	HX_("storeMedia",43,b1,3a,43),
 	HX_("storeCaps",a2,60,d7,9d),
+	HX_("storeCapsSet",20,84,58,42),
 	HX_("getCaps",d7,cb,3c,14),
 	HX_("storeLogin",c8,85,72,b6),
 	HX_("getLogin",f3,e8,ca,d8),
diff --git a/Sources/c_snikket/src/snikket/persistence/SqliteDriver.cpp b/Sources/c_snikket/src/snikket/persistence/SqliteDriver.cpp
index 470f06a..8a3017f 100644
--- a/Sources/c_snikket/src/snikket/persistence/SqliteDriver.cpp
+++ b/Sources/c_snikket/src/snikket/persistence/SqliteDriver.cpp
@@ -4,9 +4,15 @@
 #ifndef INCLUDED_EReg
 #include <EReg.h>
 #endif
+#ifndef INCLUDED_Lambda
+#include <Lambda.h>
+#endif
 #ifndef INCLUDED_Std
 #include <Std.h>
 #endif
+#ifndef INCLUDED_StringTools
+#include <StringTools.h>
+#endif
 #ifndef INCLUDED_Type
 #include <Type.h>
 #endif
@@ -16,9 +22,18 @@
 #ifndef INCLUDED_haxe_Exception
 #include <haxe/Exception.h>
 #endif
+#ifndef INCLUDED_haxe_Log
+#include <haxe/Log.h>
+#endif
 #ifndef INCLUDED_haxe_io_Bytes
 #include <haxe/io/Bytes.h>
 #endif
+#ifndef INCLUDED_haxe_iterators_ArrayIterator
+#include <haxe/iterators/ArrayIterator.h>
+#endif
+#ifndef INCLUDED_snikket_Config
+#include <snikket/Config.h>
+#endif
 #ifndef INCLUDED_snikket_persistence_SqliteDriver
 #include <snikket/persistence/SqliteDriver.h>
 #endif
@@ -31,6 +46,27 @@
 #ifndef INCLUDED_sys_db_Sqlite
 #include <sys/db/Sqlite.h>
 #endif
+#ifndef INCLUDED_sys_thread_Deque
+#include <sys/thread/Deque.h>
+#endif
+#ifndef INCLUDED_sys_thread_ElasticThreadPool
+#include <sys/thread/ElasticThreadPool.h>
+#endif
+#ifndef INCLUDED_sys_thread_EventLoop
+#include <sys/thread/EventLoop.h>
+#endif
+#ifndef INCLUDED_sys_thread_FixedThreadPool
+#include <sys/thread/FixedThreadPool.h>
+#endif
+#ifndef INCLUDED_sys_thread_IThreadPool
+#include <sys/thread/IThreadPool.h>
+#endif
+#ifndef INCLUDED_sys_thread__Thread_HaxeThread
+#include <sys/thread/_Thread/HaxeThread.h>
+#endif
+#ifndef INCLUDED_sys_thread__Thread_Thread_Impl_
+#include <sys/thread/_Thread/Thread_Impl_.h>
+#endif
 #ifndef INCLUDED_thenshim_Thenable
 #include <thenshim/Thenable.h>
 #endif
@@ -38,17 +74,70 @@
 #include <thenshim/_Promise/Promise_Impl_.h>
 #endif
 
-HX_DEFINE_STACK_FRAME(_hx_pos_5c401225cb14c98d_11_new,"snikket.persistence.SqliteDriver","new",0x358a23a6,"snikket.persistence.SqliteDriver.new","snikket/persistence/SqliteDriver.hx",11,0xaa839748)
-HX_LOCAL_STACK_FRAME(_hx_pos_5c401225cb14c98d_16_exec,"snikket.persistence.SqliteDriver","exec",0x9d707d8b,"snikket.persistence.SqliteDriver.exec","snikket/persistence/SqliteDriver.hx",16,0xaa839748)
-HX_LOCAL_STACK_FRAME(_hx_pos_5c401225cb14c98d_39_prepare,"snikket.persistence.SqliteDriver","prepare",0xd045ffcd,"snikket.persistence.SqliteDriver.prepare","snikket/persistence/SqliteDriver.hx",39,0xaa839748)
-HX_LOCAL_STACK_FRAME(_hx_pos_5c401225cb14c98d_38_prepare,"snikket.persistence.SqliteDriver","prepare",0xd045ffcd,"snikket.persistence.SqliteDriver.prepare","snikket/persistence/SqliteDriver.hx",38,0xaa839748)
+HX_DEFINE_STACK_FRAME(_hx_pos_5c401225cb14c98d_20_new,"snikket.persistence.SqliteDriver","new",0x358a23a6,"snikket.persistence.SqliteDriver.new","snikket/persistence/SqliteDriver.hx",20,0xaa839748)
+HX_DEFINE_STACK_FRAME(_hx_pos_5c401225cb14c98d_27_new,"snikket.persistence.SqliteDriver","new",0x358a23a6,"snikket.persistence.SqliteDriver.new","snikket/persistence/SqliteDriver.hx",27,0xaa839748)
+HX_DEFINE_STACK_FRAME(_hx_pos_5c401225cb14c98d_28_new,"snikket.persistence.SqliteDriver","new",0x358a23a6,"snikket.persistence.SqliteDriver.new","snikket/persistence/SqliteDriver.hx",28,0xaa839748)
+HX_DEFINE_STACK_FRAME(_hx_pos_5c401225cb14c98d_23_new,"snikket.persistence.SqliteDriver","new",0x358a23a6,"snikket.persistence.SqliteDriver.new","snikket/persistence/SqliteDriver.hx",23,0xaa839748)
+HX_DEFINE_STACK_FRAME(_hx_pos_5c401225cb14c98d_8_new,"snikket.persistence.SqliteDriver","new",0x358a23a6,"snikket.persistence.SqliteDriver.new","snikket/persistence/SqliteDriver.hx",8,0xaa839748)
+HX_LOCAL_STACK_FRAME(_hx_pos_5c401225cb14c98d_35_execute,"snikket.persistence.SqliteDriver","execute",0x6475787b,"snikket.persistence.SqliteDriver.execute","snikket/persistence/SqliteDriver.hx",35,0xaa839748)
+HX_LOCAL_STACK_FRAME(_hx_pos_5c401225cb14c98d_52_execute,"snikket.persistence.SqliteDriver","execute",0x6475787b,"snikket.persistence.SqliteDriver.execute","snikket/persistence/SqliteDriver.hx",52,0xaa839748)
+HX_LOCAL_STACK_FRAME(_hx_pos_5c401225cb14c98d_54_execute,"snikket.persistence.SqliteDriver","execute",0x6475787b,"snikket.persistence.SqliteDriver.execute","snikket/persistence/SqliteDriver.hx",54,0xaa839748)
+HX_LOCAL_STACK_FRAME(_hx_pos_5c401225cb14c98d_58_execute,"snikket.persistence.SqliteDriver","execute",0x6475787b,"snikket.persistence.SqliteDriver.execute","snikket/persistence/SqliteDriver.hx",58,0xaa839748)
+HX_LOCAL_STACK_FRAME(_hx_pos_5c401225cb14c98d_33_execute,"snikket.persistence.SqliteDriver","execute",0x6475787b,"snikket.persistence.SqliteDriver.execute","snikket/persistence/SqliteDriver.hx",33,0xaa839748)
+HX_LOCAL_STACK_FRAME(_hx_pos_5c401225cb14c98d_65_exec,"snikket.persistence.SqliteDriver","exec",0x9d707d8b,"snikket.persistence.SqliteDriver.exec","snikket/persistence/SqliteDriver.hx",65,0xaa839748)
+HX_LOCAL_STACK_FRAME(_hx_pos_5c401225cb14c98d_64_exec,"snikket.persistence.SqliteDriver","exec",0x9d707d8b,"snikket.persistence.SqliteDriver.exec","snikket/persistence/SqliteDriver.hx",64,0xaa839748)
+HX_LOCAL_STACK_FRAME(_hx_pos_5c401225cb14c98d_73_prepare,"snikket.persistence.SqliteDriver","prepare",0xd045ffcd,"snikket.persistence.SqliteDriver.prepare","snikket/persistence/SqliteDriver.hx",73,0xaa839748)
 namespace snikket{
 namespace persistence{
 
-void SqliteDriver_obj::__construct(::String dbfile){
-            	HX_STACKFRAME(&_hx_pos_5c401225cb14c98d_11_new)
-HXLINE(  12)		this->db = ::sys::db::Sqlite_obj::open(dbfile);
-HXLINE(  13)		::sys::db::Connection_obj::request(this->db,HX_("PRAGMA journal_mode=WAL",74,ce,b2,c7));
+void SqliteDriver_obj::__construct(::String dbfile, ::Dynamic migrate){
+            		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::persistence::SqliteDriver,_gthis) HXARGC(2)
+            		void _hx_run( ::Dynamic resolve, ::Dynamic reject){
+            			HX_GC_STACKFRAME(&_hx_pos_5c401225cb14c98d_20_new)
+HXLINE(  20)			_gthis->setReady = resolve;
+            		}
+            		HX_END_LOCAL_FUNC2((void))
+
+            		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_3, ::snikket::persistence::SqliteDriver,_gthis,::String,dbfile, ::Dynamic,migrate) HXARGC(0)
+            		void _hx_run(){
+            			HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_1, ::snikket::persistence::SqliteDriver,_gthis) HXARGC(1)
+            			::Dynamic _hx_run(::Array< ::String > sql){
+            				HX_GC_STACKFRAME(&_hx_pos_5c401225cb14c98d_27_new)
+HXLINE(  27)				return _gthis->execute(_gthis->writePool,sql,::cpp::VirtualArray_obj::__new(0));
+            			}
+            			HX_END_LOCAL_FUNC1(return)
+
+            			HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_2, ::snikket::persistence::SqliteDriver,_gthis) HXARGC(1)
+            			void _hx_run( ::Dynamic _){
+            				HX_GC_STACKFRAME(&_hx_pos_5c401225cb14c98d_28_new)
+HXLINE(  28)				_gthis->setReady(true);
+            			}
+            			HX_END_LOCAL_FUNC1((void))
+
+            			HX_GC_STACKFRAME(&_hx_pos_5c401225cb14c98d_23_new)
+HXLINE(  24)			::Dynamic db = ::sys::db::Sqlite_obj::open(dbfile);
+HXLINE(  25)			::sys::db::Connection_obj::request(db,HX_("PRAGMA journal_mode=WAL",74,ce,b2,c7));
+HXLINE(  26)			_gthis->dbs->push(db);
+HXLINE(  27)			::thenshim::_Promise::Promise_Impl__obj::then(migrate( ::Dynamic(new _hx_Closure_1(_gthis))), ::Dynamic(new _hx_Closure_2(_gthis)),null());
+            		}
+            		HX_END_LOCAL_FUNC0((void))
+
+            	HX_GC_STACKFRAME(&_hx_pos_5c401225cb14c98d_8_new)
+HXLINE(  10)		this->writePool =  ::sys::thread::FixedThreadPool_obj::__alloc( HX_CTX ,1);
+HXLINE(   9)		this->dbs =  ::sys::thread::Deque_obj::__alloc( HX_CTX );
+HXLINE(  17)		 ::snikket::persistence::SqliteDriver _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE(  18)		this->dbfile = dbfile;
+HXLINE(  19)		::Dynamic _hx_tmp;
+HXDLIN(  19)		if (::snikket::Config_obj::constrainedMemoryMode) {
+HXLINE(  19)			_hx_tmp = this->writePool;
+            		}
+            		else {
+HXLINE(  19)			_hx_tmp =  ::sys::thread::ElasticThreadPool_obj::__alloc( HX_CTX ,10,null());
+            		}
+HXDLIN(  19)		this->readPool = _hx_tmp;
+HXLINE(  20)		this->ready = ::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_0(_gthis)));
+HXLINE(  21)		this->mainLoop = ::sys::thread::_Thread::Thread_Impl__obj::get_events(::sys::thread::_Thread::HaxeThread_obj::current());
+HXLINE(  23)		::sys::thread::IThreadPool_obj::run(this->writePool, ::Dynamic(new _hx_Closure_3(_gthis,dbfile,migrate)));
             	}
 
 Dynamic SqliteDriver_obj::__CreateEmpty() { return new SqliteDriver_obj; }
@@ -58,7 +147,7 @@ void *SqliteDriver_obj::_hx_vtable = 0;
 Dynamic SqliteDriver_obj::__Create(::hx::DynamicArray inArgs)
 {
 	::hx::ObjectPtr< SqliteDriver_obj > _hx_result = new SqliteDriver_obj();
-	_hx_result->__construct(inArgs[0]);
+	_hx_result->__construct(inArgs[0],inArgs[1]);
 	return _hx_result;
 }
 
@@ -66,135 +155,209 @@ bool SqliteDriver_obj::_hx_isInstanceOf(int inClassId) {
 	return inClassId==(int)0x00000001 || inClassId==(int)0x0672539a;
 }
 
-::Dynamic SqliteDriver_obj::exec( ::Dynamic sql,::cpp::VirtualArray params){
-            	HX_STACKFRAME(&_hx_pos_5c401225cb14c98d_16_exec)
-HXLINE(  17)		::Dynamic result = null();
-HXLINE(  18)		::cpp::VirtualArray qs;
-HXDLIN(  18)		if (::Std_obj::isOfType(sql,::hx::ClassOf< ::String >())) {
-HXLINE(  18)			qs = ::cpp::VirtualArray_obj::__new(1)->init(0,sql);
-            		}
-            		else {
-HXLINE(  18)			qs = ::hx::TCast< ::cpp::VirtualArray >::cast(sql);
-            		}
-HXLINE(  23)		try {
-            			HX_STACK_CATCHABLE( ::Dynamic, 0);
-HXLINE(  24)			{
-HXLINE(  24)				int _g = 0;
-HXDLIN(  24)				while((_g < qs->get_length())){
-HXLINE(  24)					 ::Dynamic q = qs->__get(_g);
-HXDLIN(  24)					_g = (_g + 1);
-HXLINE(  25)					if (::hx::IsNull( result )) {
-HXLINE(  26)						::cpp::VirtualArray tmp = params;
-HXDLIN(  26)						::cpp::VirtualArray prepared;
-HXDLIN(  26)						if (::hx::IsNotNull( tmp )) {
-HXLINE(  26)							prepared = tmp;
+::Dynamic SqliteDriver_obj::execute(::Dynamic pool,::Array< ::String > qs,::cpp::VirtualArray params){
+            		HX_BEGIN_LOCAL_FUNC_S4(::hx::LocalFunc,_hx_Closure_4, ::snikket::persistence::SqliteDriver,_gthis,::Dynamic,pool,::Array< ::String >,qs,::cpp::VirtualArray,params) HXARGC(2)
+            		void _hx_run( ::Dynamic resolve, ::Dynamic reject){
+            			HX_BEGIN_LOCAL_FUNC_S5(::hx::LocalFunc,_hx_Closure_3, ::snikket::persistence::SqliteDriver,_gthis,::Array< ::String >,qs, ::Dynamic,resolve, ::Dynamic,reject,::cpp::VirtualArray,params) HXARGC(0)
+            			void _hx_run(){
+            				HX_STACKFRAME(&_hx_pos_5c401225cb14c98d_35_execute)
+HXLINE(  36)				::Dynamic db = _gthis->dbs->pop(false);
+HXLINE(  37)				try {
+            					HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0,::Array< ::Dynamic>,result) HXARGC(0)
+            					::Dynamic _hx_run(){
+            						HX_STACKFRAME(&_hx_pos_5c401225cb14c98d_52_execute)
+HXLINE(  52)						return result->__get(0);
+            					}
+            					HX_END_LOCAL_FUNC0(return)
+
+            					HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_1, ::Dynamic,resolve,::cpp::VirtualArray,arr) HXARGC(0)
+            					void _hx_run(){
+            						HX_GC_STACKFRAME(&_hx_pos_5c401225cb14c98d_54_execute)
+HXLINE(  54)						 ::Dynamic resolve1 = resolve;
+HXDLIN(  54)						resolve1( ::haxe::iterators::ArrayIterator_obj::__alloc( HX_CTX ,arr));
+            					}
+            					HX_END_LOCAL_FUNC0((void))
+
+            					HX_STACK_CATCHABLE( ::Dynamic, 0);
+HXLINE(  38)					if (::hx::IsNull( db )) {
+HXLINE(  39)						db = ::sys::db::Sqlite_obj::open(_gthis->dbfile);
+            					}
+HXLINE(  41)					::Array< ::Dynamic> result = ::Array_obj< ::Dynamic>::__new(1)->init(0,null());
+HXLINE(  42)					{
+HXLINE(  42)						int _g = 0;
+HXDLIN(  42)						while((_g < qs->length)){
+HXLINE(  42)							::String q = qs->__get(_g);
+HXDLIN(  42)							_g = (_g + 1);
+HXLINE(  43)							if (::hx::IsNull( result->__get(0) )) {
+HXLINE(  44)								::String prepared = _gthis->prepare(db,q,params);
+HXLINE(  45)								result[0] = ::sys::db::Connection_obj::request(db,prepared);
+            							}
+            							else {
+HXLINE(  47)								::sys::db::Connection_obj::request(db,q);
+            							}
             						}
-            						else {
-HXLINE(  26)							prepared = ::cpp::VirtualArray_obj::__new(0);
+            					}
+HXLINE(  52)					::cpp::VirtualArray arr = ::Lambda_obj::array( ::Dynamic(::hx::Anon_obj::Create(1)
+            						->setFixed(0,HX_("iterator",ee,49,9a,93), ::Dynamic(new _hx_Closure_0(result)))));
+HXLINE(  53)					_gthis->dbs->push(db);
+HXLINE(  54)					_gthis->mainLoop->run( ::Dynamic(new _hx_Closure_1(resolve,arr)));
+            				} catch( ::Dynamic _hx_e) {
+            					if (_hx_e.IsClass<  ::Dynamic >() ){
+            						HX_STACK_BEGIN_CATCH
+            						 ::Dynamic _g1 = _hx_e;
+HXLINE(  55)						 ::haxe::Exception e = ::haxe::Exception_obj::caught(_g1);
+HXDLIN(  55)						{
+            							HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_2, ::haxe::Exception,e, ::Dynamic,reject) HXARGC(0)
+            							void _hx_run(){
+            								HX_STACKFRAME(&_hx_pos_5c401225cb14c98d_58_execute)
+HXLINE(  58)								reject(e);
+            							}
+            							HX_END_LOCAL_FUNC0((void))
+
+HXLINE(  56)							::haxe::Log_obj::trace(HX_("SQLFAIL",cc,52,48,cf), ::Dynamic(::hx::Anon_obj::Create(5)
+            								->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.persistence.SqliteDriver",b4,18,c2,cb))
+            								->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(1)->init(0,e))
+            								->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("execute",35,0a,0d,cc))
+            								->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/persistence/SqliteDriver.hx",48,97,83,aa))
+            								->setFixed(4,HX_("lineNumber",dd,81,22,76),56)));
+HXLINE(  57)							_gthis->dbs->push(db);
+HXLINE(  58)							_gthis->mainLoop->run( ::Dynamic(new _hx_Closure_2(e,reject)));
             						}
-HXDLIN(  26)						::String prepared1 = this->prepare(( (::String)(q) ),prepared);
-HXLINE(  27)						result = ::sys::db::Connection_obj::request(this->db,prepared1);
             					}
             					else {
-HXLINE(  29)						::sys::db::Connection_obj::request(this->db,q);
+            						HX_STACK_DO_THROW(_hx_e);
             					}
             				}
             			}
-HXLINE(  32)			return ::thenshim::_Promise::Promise_Impl__obj::resolve(result);
-            		} catch( ::Dynamic _hx_e) {
-            			if (_hx_e.IsClass<  ::Dynamic >() ){
-            				HX_STACK_BEGIN_CATCH
-            				 ::Dynamic _g1 = _hx_e;
-HXLINE(  33)				 ::haxe::Exception e = ::haxe::Exception_obj::caught(_g1);
-HXLINE(  34)				return ::thenshim::_Promise::Promise_Impl__obj::reject(e);
+            			HX_END_LOCAL_FUNC0((void))
+
+            			HX_STACKFRAME(&_hx_pos_5c401225cb14c98d_35_execute)
+HXLINE(  35)			::sys::thread::IThreadPool_obj::run(pool, ::Dynamic(new _hx_Closure_3(_gthis,qs,resolve,reject,params)));
+            		}
+            		HX_END_LOCAL_FUNC2((void))
+
+            	HX_STACKFRAME(&_hx_pos_5c401225cb14c98d_33_execute)
+HXDLIN(  33)		 ::snikket::persistence::SqliteDriver _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE(  34)		return ::thenshim::_Promise::Promise_Impl__obj::_new( ::Dynamic(new _hx_Closure_4(_gthis,pool,qs,params)));
+            	}
+
+
+HX_DEFINE_DYNAMIC_FUNC3(SqliteDriver_obj,execute,return )
+
+::Dynamic SqliteDriver_obj::exec( ::Dynamic sql,::cpp::VirtualArray params){
+            		HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_0, ::snikket::persistence::SqliteDriver,_gthis, ::Dynamic,sql,::cpp::VirtualArray,params) HXARGC(1)
+            		::Dynamic _hx_run(bool _){
+            			HX_STACKFRAME(&_hx_pos_5c401225cb14c98d_65_exec)
+HXLINE(  66)			::cpp::VirtualArray qs;
+HXDLIN(  66)			if (::Std_obj::isOfType(sql,::hx::ClassOf< ::String >())) {
+HXLINE(  66)				qs = ::cpp::VirtualArray_obj::__new(1)->init(0,sql);
             			}
             			else {
-            				HX_STACK_DO_THROW(_hx_e);
+HXLINE(  66)				qs = ( (::cpp::VirtualArray)(sql) );
+            			}
+HXLINE(  67)			::Dynamic pool;
+HXDLIN(  67)			if (::StringTools_obj::startsWith(( (::String)(qs->__get(0)) ),HX_("SELECT",fc,c6,b5,1c))) {
+HXLINE(  67)				pool = _gthis->readPool;
             			}
+            			else {
+HXLINE(  67)				pool = _gthis->writePool;
+            			}
+HXLINE(  68)			::cpp::VirtualArray tmp = params;
+HXDLIN(  68)			::cpp::VirtualArray _hx_tmp;
+HXDLIN(  68)			if (::hx::IsNotNull( tmp )) {
+HXLINE(  68)				_hx_tmp = tmp;
+            			}
+            			else {
+HXLINE(  68)				_hx_tmp = ::cpp::VirtualArray_obj::__new(0);
+            			}
+HXDLIN(  68)			return _gthis->execute(pool,qs,_hx_tmp);
             		}
-HXLINE(  23)		return null();
+            		HX_END_LOCAL_FUNC1(return)
+
+            	HX_STACKFRAME(&_hx_pos_5c401225cb14c98d_64_exec)
+HXDLIN(  64)		 ::snikket::persistence::SqliteDriver _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE(  65)		return ::thenshim::_Promise::Promise_Impl__obj::then(this->ready, ::Dynamic(new _hx_Closure_0(_gthis,sql,params)),null());
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC2(SqliteDriver_obj,exec,return )
 
-::String SqliteDriver_obj::prepare(::String sql,::cpp::VirtualArray params){
-            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0, ::snikket::persistence::SqliteDriver,_gthis,::cpp::VirtualArray,params) HXARGC(1)
+::String SqliteDriver_obj::prepare(::Dynamic db,::String sql,::cpp::VirtualArray params){
+            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0,::cpp::VirtualArray,params,::Dynamic,db) HXARGC(1)
             		::String _hx_run( ::EReg f){
-            			HX_GC_STACKFRAME(&_hx_pos_5c401225cb14c98d_39_prepare)
-HXLINE(  40)			 ::Dynamic p = params->shift();
-HXLINE(  41)			 ::ValueType _g = ::Type_obj::_hx_typeof(p);
-HXDLIN(  41)			switch((int)(_g->_hx_getIndex())){
+            			HX_GC_STACKFRAME(&_hx_pos_5c401225cb14c98d_73_prepare)
+HXLINE(  74)			 ::Dynamic p = params->shift();
+HXLINE(  75)			 ::ValueType _g = ::Type_obj::_hx_typeof(p);
+HXDLIN(  75)			switch((int)(_g->_hx_getIndex())){
             				case (int)0: {
-HXLINE(  51)					return HX_("NULL",87,66,cf,33);
+HXLINE(  85)					return HX_("NULL",87,66,cf,33);
             				}
             				break;
             				case (int)1: {
-HXLINE(  49)					return ::Std_obj::string(p);
+HXLINE(  83)					return ::Std_obj::string(p);
             				}
             				break;
             				case (int)2: {
-HXLINE(  47)					return ::Std_obj::string(p);
+HXLINE(  81)					return ::Std_obj::string(p);
             				}
             				break;
             				case (int)3: {
-HXLINE(  45)					if (::hx::IsEq( p,true )) {
-HXLINE(  45)						return HX_("1",31,00,00,00);
+HXLINE(  79)					if (::hx::IsEq( p,true )) {
+HXLINE(  79)						return HX_("1",31,00,00,00);
             					}
             					else {
-HXLINE(  45)						return HX_("0",30,00,00,00);
+HXLINE(  79)						return HX_("0",30,00,00,00);
             					}
             				}
             				break;
             				case (int)6: {
-HXLINE(  55)					::hx::Class _hx_switch_0 = _g->_hx_getObject(0).StaticCast< ::hx::Class >();
+HXLINE(  89)					::hx::Class _hx_switch_0 = _g->_hx_getObject(0).StaticCast< ::hx::Class >();
             					if (  (_hx_switch_0==::hx::ArrayBase::__mClass) ){
-HXLINE(  53)						 ::haxe::io::Bytes bytes = ::haxe::io::Bytes_obj::ofData(( (::Array< unsigned char >)(p) ));
-HXLINE(  54)						return ((HX_("X'",cf,4c,00,00) + bytes->toHex()) + HX_("'",27,00,00,00));
-HXLINE(  52)						goto _hx_goto_3;
+HXLINE(  87)						 ::haxe::io::Bytes bytes = ::haxe::io::Bytes_obj::ofData(( (::Array< unsigned char >)(p) ));
+HXLINE(  88)						return ((HX_("X'",cf,4c,00,00) + bytes->toHex()) + HX_("'",27,00,00,00));
+HXLINE(  86)						goto _hx_goto_14;
             					}
             					if (  (_hx_switch_0==::hx::ClassOf< ::String >()) ){
-HXLINE(  43)						return ::sys::db::Connection_obj::quote(_gthis->db,p);
-HXDLIN(  43)						goto _hx_goto_3;
+HXLINE(  77)						return ::sys::db::Connection_obj::quote(db,p);
+HXDLIN(  77)						goto _hx_goto_14;
             					}
             					if (  (_hx_switch_0==::hx::ClassOf< ::haxe::io::Bytes >()) ){
-HXLINE(  56)						 ::haxe::io::Bytes bytes1 = ( ( ::haxe::io::Bytes)(p) );
-HXLINE(  57)						return ((HX_("X'",cf,4c,00,00) + bytes1->toHex()) + HX_("'",27,00,00,00));
-HXLINE(  55)						goto _hx_goto_3;
+HXLINE(  90)						 ::haxe::io::Bytes bytes1 = ( ( ::haxe::io::Bytes)(p) );
+HXLINE(  91)						return ((HX_("X'",cf,4c,00,00) + bytes1->toHex()) + HX_("'",27,00,00,00));
+HXLINE(  89)						goto _hx_goto_14;
             					}
             					/* default */{
-HXLINE(  59)						HX_STACK_DO_THROW((HX_("UKNONWN: ",54,2e,a9,30) + ::Std_obj::string(::Type_obj::_hx_typeof(p))));
+HXLINE(  93)						HX_STACK_DO_THROW((HX_("UKNONWN: ",54,2e,a9,30) + ::Std_obj::string(::Type_obj::_hx_typeof(p))));
             					}
-            					_hx_goto_3:;
+            					_hx_goto_14:;
             				}
             				break;
             				default:{
-HXLINE(  59)					HX_STACK_DO_THROW((HX_("UKNONWN: ",54,2e,a9,30) + ::Std_obj::string(::Type_obj::_hx_typeof(p))));
+HXLINE(  93)					HX_STACK_DO_THROW((HX_("UKNONWN: ",54,2e,a9,30) + ::Std_obj::string(::Type_obj::_hx_typeof(p))));
             				}
             			}
-HXLINE(  41)			return null();
+HXLINE(  75)			return null();
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            	HX_GC_STACKFRAME(&_hx_pos_5c401225cb14c98d_38_prepare)
-HXDLIN(  38)		 ::snikket::persistence::SqliteDriver _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE(  39)		return  ::EReg_obj::__alloc( HX_CTX ,HX_("\\?",63,50,00,00),HX_("gm",26,5a,00,00))->map(sql, ::Dynamic(new _hx_Closure_0(_gthis,params)));
+            	HX_GC_STACKFRAME(&_hx_pos_5c401225cb14c98d_73_prepare)
+HXDLIN(  73)		return  ::EReg_obj::__alloc( HX_CTX ,HX_("\\?",63,50,00,00),HX_("gm",26,5a,00,00))->map(sql, ::Dynamic(new _hx_Closure_0(params,db)));
             	}
 
 
-HX_DEFINE_DYNAMIC_FUNC2(SqliteDriver_obj,prepare,return )
+HX_DEFINE_DYNAMIC_FUNC3(SqliteDriver_obj,prepare,return )
 
 
-::hx::ObjectPtr< SqliteDriver_obj > SqliteDriver_obj::__new(::String dbfile) {
+::hx::ObjectPtr< SqliteDriver_obj > SqliteDriver_obj::__new(::String dbfile, ::Dynamic migrate) {
 	::hx::ObjectPtr< SqliteDriver_obj > __this = new SqliteDriver_obj();
-	__this->__construct(dbfile);
+	__this->__construct(dbfile,migrate);
 	return __this;
 }
 
-::hx::ObjectPtr< SqliteDriver_obj > SqliteDriver_obj::__alloc(::hx::Ctx *_hx_ctx,::String dbfile) {
+::hx::ObjectPtr< SqliteDriver_obj > SqliteDriver_obj::__alloc(::hx::Ctx *_hx_ctx,::String dbfile, ::Dynamic migrate) {
 	SqliteDriver_obj *__this = (SqliteDriver_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(SqliteDriver_obj), true, "snikket.persistence.SqliteDriver"));
 	*(void **)__this = SqliteDriver_obj::_hx_vtable;
-	__this->__construct(dbfile);
+	__this->__construct(dbfile,migrate);
 	return __this;
 }
 
@@ -205,26 +368,53 @@ SqliteDriver_obj::SqliteDriver_obj()
 void SqliteDriver_obj::__Mark(HX_MARK_PARAMS)
 {
 	HX_MARK_BEGIN_CLASS(SqliteDriver);
-	HX_MARK_MEMBER_NAME(db,"db");
+	HX_MARK_MEMBER_NAME(dbs,"dbs");
+	HX_MARK_MEMBER_NAME(writePool,"writePool");
+	HX_MARK_MEMBER_NAME(readPool,"readPool");
+	HX_MARK_MEMBER_NAME(dbfile,"dbfile");
+	HX_MARK_MEMBER_NAME(ready,"ready");
+	HX_MARK_MEMBER_NAME(setReady,"setReady");
+	HX_MARK_MEMBER_NAME(mainLoop,"mainLoop");
 	HX_MARK_END_CLASS();
 }
 
 void SqliteDriver_obj::__Visit(HX_VISIT_PARAMS)
 {
-	HX_VISIT_MEMBER_NAME(db,"db");
+	HX_VISIT_MEMBER_NAME(dbs,"dbs");
+	HX_VISIT_MEMBER_NAME(writePool,"writePool");
+	HX_VISIT_MEMBER_NAME(readPool,"readPool");
+	HX_VISIT_MEMBER_NAME(dbfile,"dbfile");
+	HX_VISIT_MEMBER_NAME(ready,"ready");
+	HX_VISIT_MEMBER_NAME(setReady,"setReady");
+	HX_VISIT_MEMBER_NAME(mainLoop,"mainLoop");
 }
 
 ::hx::Val SqliteDriver_obj::__Field(const ::String &inName,::hx::PropertyAccess inCallProp)
 {
 	switch(inName.length) {
-	case 2:
-		if (HX_FIELD_EQ(inName,"db") ) { return ::hx::Val( db ); }
+	case 3:
+		if (HX_FIELD_EQ(inName,"dbs") ) { return ::hx::Val( dbs ); }
 		break;
 	case 4:
 		if (HX_FIELD_EQ(inName,"exec") ) { return ::hx::Val( exec_dyn() ); }
 		break;
+	case 5:
+		if (HX_FIELD_EQ(inName,"ready") ) { return ::hx::Val( ready ); }
+		break;
+	case 6:
+		if (HX_FIELD_EQ(inName,"dbfile") ) { return ::hx::Val( dbfile ); }
+		break;
 	case 7:
+		if (HX_FIELD_EQ(inName,"execute") ) { return ::hx::Val( execute_dyn() ); }
 		if (HX_FIELD_EQ(inName,"prepare") ) { return ::hx::Val( prepare_dyn() ); }
+		break;
+	case 8:
+		if (HX_FIELD_EQ(inName,"readPool") ) { return ::hx::Val( readPool ); }
+		if (HX_FIELD_EQ(inName,"setReady") ) { return ::hx::Val( setReady ); }
+		if (HX_FIELD_EQ(inName,"mainLoop") ) { return ::hx::Val( mainLoop ); }
+		break;
+	case 9:
+		if (HX_FIELD_EQ(inName,"writePool") ) { return ::hx::Val( writePool ); }
 	}
 	return super::__Field(inName,inCallProp);
 }
@@ -232,28 +422,60 @@ void SqliteDriver_obj::__Visit(HX_VISIT_PARAMS)
 ::hx::Val SqliteDriver_obj::__SetField(const ::String &inName,const ::hx::Val &inValue,::hx::PropertyAccess inCallProp)
 {
 	switch(inName.length) {
-	case 2:
-		if (HX_FIELD_EQ(inName,"db") ) { db=inValue.Cast< ::Dynamic >(); return inValue; }
+	case 3:
+		if (HX_FIELD_EQ(inName,"dbs") ) { dbs=inValue.Cast<  ::sys::thread::Deque >(); return inValue; }
+		break;
+	case 5:
+		if (HX_FIELD_EQ(inName,"ready") ) { ready=inValue.Cast< ::Dynamic >(); return inValue; }
+		break;
+	case 6:
+		if (HX_FIELD_EQ(inName,"dbfile") ) { dbfile=inValue.Cast< ::String >(); return inValue; }
+		break;
+	case 8:
+		if (HX_FIELD_EQ(inName,"readPool") ) { readPool=inValue.Cast< ::Dynamic >(); return inValue; }
+		if (HX_FIELD_EQ(inName,"setReady") ) { setReady=inValue.Cast<  ::Dynamic >(); return inValue; }
+		if (HX_FIELD_EQ(inName,"mainLoop") ) { mainLoop=inValue.Cast<  ::sys::thread::EventLoop >(); return inValue; }
+		break;
+	case 9:
+		if (HX_FIELD_EQ(inName,"writePool") ) { writePool=inValue.Cast< ::Dynamic >(); return inValue; }
 	}
 	return super::__SetField(inName,inValue,inCallProp);
 }
 
 void SqliteDriver_obj::__GetFields(Array< ::String> &outFields)
 {
-	outFields->push(HX_("db",7e,57,00,00));
+	outFields->push(HX_("dbs",35,37,4c,00));
+	outFields->push(HX_("writePool",5b,75,10,53));
+	outFields->push(HX_("readPool",52,5b,54,72));
+	outFields->push(HX_("dbfile",fa,bc,b0,ac));
+	outFields->push(HX_("ready",63,a0,ba,e6));
+	outFields->push(HX_("mainLoop",3d,1b,3a,a0));
 	super::__GetFields(outFields);
 };
 
 #ifdef HXCPP_SCRIPTABLE
 static ::hx::StorageInfo SqliteDriver_obj_sMemberStorageInfo[] = {
-	{::hx::fsObject /* ::Dynamic */ ,(int)offsetof(SqliteDriver_obj,db),HX_("db",7e,57,00,00)},
+	{::hx::fsObject /*  ::sys::thread::Deque */ ,(int)offsetof(SqliteDriver_obj,dbs),HX_("dbs",35,37,4c,00)},
+	{::hx::fsObject /* ::Dynamic */ ,(int)offsetof(SqliteDriver_obj,writePool),HX_("writePool",5b,75,10,53)},
+	{::hx::fsObject /* ::Dynamic */ ,(int)offsetof(SqliteDriver_obj,readPool),HX_("readPool",52,5b,54,72)},
+	{::hx::fsString,(int)offsetof(SqliteDriver_obj,dbfile),HX_("dbfile",fa,bc,b0,ac)},
+	{::hx::fsObject /* ::Dynamic */ ,(int)offsetof(SqliteDriver_obj,ready),HX_("ready",63,a0,ba,e6)},
+	{::hx::fsObject /*  ::Dynamic */ ,(int)offsetof(SqliteDriver_obj,setReady),HX_("setReady",61,09,ef,f4)},
+	{::hx::fsObject /*  ::sys::thread::EventLoop */ ,(int)offsetof(SqliteDriver_obj,mainLoop),HX_("mainLoop",3d,1b,3a,a0)},
 	{ ::hx::fsUnknown, 0, null()}
 };
 static ::hx::StaticInfo *SqliteDriver_obj_sStaticStorageInfo = 0;
 #endif
 
 static ::String SqliteDriver_obj_sMemberFields[] = {
-	HX_("db",7e,57,00,00),
+	HX_("dbs",35,37,4c,00),
+	HX_("writePool",5b,75,10,53),
+	HX_("readPool",52,5b,54,72),
+	HX_("dbfile",fa,bc,b0,ac),
+	HX_("ready",63,a0,ba,e6),
+	HX_("setReady",61,09,ef,f4),
+	HX_("mainLoop",3d,1b,3a,a0),
+	HX_("execute",35,0a,0d,cc),
 	HX_("exec",91,f3,1d,43),
 	HX_("prepare",87,91,dd,37),
 	::String(null()) };
diff --git a/Sources/c_snikket/src/snikket/queries/DiscoInfoGet.cpp b/Sources/c_snikket/src/snikket/queries/DiscoInfoGet.cpp
index cc5783f..f46d3ea 100644
--- a/Sources/c_snikket/src/snikket/queries/DiscoInfoGet.cpp
+++ b/Sources/c_snikket/src/snikket/queries/DiscoInfoGet.cpp
@@ -118,7 +118,7 @@ HXDLIN(  50)						result1->__unsafe_set(i1,inValue3);
             					}
             				}
             			}
-HXLINE(  47)			this->result =  ::snikket::Caps_obj::__alloc( HX_CTX ,_hx_tmp,_hx_tmp1,result1);
+HXLINE(  47)			this->result =  ::snikket::Caps_obj::__alloc( HX_CTX ,_hx_tmp,_hx_tmp1,result1,null());
             		}
 HXLINE(  53)		return this->result;
             	}
diff --git a/Sources/c_snikket/src/snikket/streams/XmppStropheStream.cpp b/Sources/c_snikket/src/snikket/streams/XmppStropheStream.cpp
index bb288f3..4039f4e 100644
--- a/Sources/c_snikket/src/snikket/streams/XmppStropheStream.cpp
+++ b/Sources/c_snikket/src/snikket/streams/XmppStropheStream.cpp
@@ -12,15 +12,15 @@
 #ifndef INCLUDED_Reflect
 #include <Reflect.h>
 #endif
-#ifndef INCLUDED_haxe_Exception
-#include <haxe/Exception.h>
-#endif
 #ifndef INCLUDED_haxe_IMap
 #include <haxe/IMap.h>
 #endif
 #ifndef INCLUDED_haxe_Log
 #include <haxe/Log.h>
 #endif
+#ifndef INCLUDED_haxe_Timer
+#include <haxe/Timer.h>
+#endif
 #ifndef INCLUDED_haxe_ds_BalancedTree
 #include <haxe/ds/BalancedTree.h>
 #endif
@@ -57,91 +57,77 @@
 #ifndef INCLUDED_snikket_Stanza
 #include <snikket/Stanza.h>
 #endif
-#ifndef INCLUDED_snikket_TextNode
-#include <snikket/TextNode.h>
-#endif
 #ifndef INCLUDED_snikket__Stanza_NodeInterface
 #include <snikket/_Stanza/NodeInterface.h>
 #endif
 #ifndef INCLUDED_snikket_streams_XmppStropheStream
 #include <snikket/streams/XmppStropheStream.h>
 #endif
-#ifndef INCLUDED_sys_thread_EventLoop
-#include <sys/thread/EventLoop.h>
-#endif
-#ifndef INCLUDED_sys_thread__Thread_HaxeThread
-#include <sys/thread/_Thread/HaxeThread.h>
-#endif
-#ifndef INCLUDED_sys_thread__Thread_Thread_Impl_
-#include <sys/thread/_Thread/Thread_Impl_.h>
-#endif
 
-HX_DEFINE_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_221_new,"snikket.streams.XmppStropheStream","new",0x50539160,"snikket.streams.XmppStropheStream.new","snikket/streams/XmppStropheStream.hx",221,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_259_newId,"snikket.streams.XmppStropheStream","newId",0xb962e95b,"snikket.streams.XmppStropheStream.newId","snikket/streams/XmppStropheStream.hx",259,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_363_onIq,"snikket.streams.XmppStropheStream","onIq",0xf97b85e7,"snikket.streams.XmppStropheStream.onIq","snikket/streams/XmppStropheStream.hx",363,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_400_connect,"snikket.streams.XmppStropheStream","connect",0x26f47cea,"snikket.streams.XmppStropheStream.connect","snikket/streams/XmppStropheStream.hx",400,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_422_connect,"snikket.streams.XmppStropheStream","connect",0x26f47cea,"snikket.streams.XmppStropheStream.connect","snikket/streams/XmppStropheStream.hx",422,0x06c67012)
+HX_DEFINE_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_228_new,"snikket.streams.XmppStropheStream","new",0x50539160,"snikket.streams.XmppStropheStream.new","snikket/streams/XmppStropheStream.hx",228,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_262_newId,"snikket.streams.XmppStropheStream","newId",0xb962e95b,"snikket.streams.XmppStropheStream.newId","snikket/streams/XmppStropheStream.hx",262,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_350_onIq,"snikket.streams.XmppStropheStream","onIq",0xf97b85e7,"snikket.streams.XmppStropheStream.onIq","snikket/streams/XmppStropheStream.hx",350,0x06c67012)
 HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_393_connect,"snikket.streams.XmppStropheStream","connect",0x26f47cea,"snikket.streams.XmppStropheStream.connect","snikket/streams/XmppStropheStream.hx",393,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_432_disconnect,"snikket.streams.XmppStropheStream","disconnect",0xaf2ec35c,"snikket.streams.XmppStropheStream.disconnect","snikket/streams/XmppStropheStream.hx",432,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_472_convertFromStanza,"snikket.streams.XmppStropheStream","convertFromStanza",0x96c3f3d2,"snikket.streams.XmppStropheStream.convertFromStanza","snikket/streams/XmppStropheStream.hx",472,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_498_sendStanza,"snikket.streams.XmppStropheStream","sendStanza",0xed37e45d,"snikket.streams.XmppStropheStream.sendStanza","snikket/streams/XmppStropheStream.hx",498,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_505_finalize,"snikket.streams.XmppStropheStream","finalize",0x297ee49e,"snikket.streams.XmppStropheStream.finalize","snikket/streams/XmppStropheStream.hx",505,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_266_strophe_fast_token_handler,"snikket.streams.XmppStropheStream","strophe_fast_token_handler",0xfc0a9611,"snikket.streams.XmppStropheStream.strophe_fast_token_handler","snikket/streams/XmppStropheStream.hx",266,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_262_strophe_fast_token_handler,"snikket.streams.XmppStropheStream","strophe_fast_token_handler",0xfc0a9611,"snikket.streams.XmppStropheStream.strophe_fast_token_handler","snikket/streams/XmppStropheStream.hx",262,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_275_strophe_sm_handler,"snikket.streams.XmppStropheStream","strophe_sm_handler",0xb2b084d5,"snikket.streams.XmppStropheStream.strophe_sm_handler","snikket/streams/XmppStropheStream.hx",275,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_385_connect,"snikket.streams.XmppStropheStream","connect",0x26f47cea,"snikket.streams.XmppStropheStream.connect","snikket/streams/XmppStropheStream.hx",385,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_418_disconnect,"snikket.streams.XmppStropheStream","disconnect",0xaf2ec35c,"snikket.streams.XmppStropheStream.disconnect","snikket/streams/XmppStropheStream.hx",418,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_423_poll,"snikket.streams.XmppStropheStream","poll",0xfa259d3f,"snikket.streams.XmppStropheStream.poll","snikket/streams/XmppStropheStream.hx",423,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_421_poll,"snikket.streams.XmppStropheStream","poll",0xfa259d3f,"snikket.streams.XmppStropheStream.poll","snikket/streams/XmppStropheStream.hx",421,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_466_convertFromStanza,"snikket.streams.XmppStropheStream","convertFromStanza",0x96c3f3d2,"snikket.streams.XmppStropheStream.convertFromStanza","snikket/streams/XmppStropheStream.hx",466,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_492_sendStanza,"snikket.streams.XmppStropheStream","sendStanza",0xed37e45d,"snikket.streams.XmppStropheStream.sendStanza","snikket/streams/XmppStropheStream.hx",492,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_500_finalize,"snikket.streams.XmppStropheStream","finalize",0x297ee49e,"snikket.streams.XmppStropheStream.finalize","snikket/streams/XmppStropheStream.hx",500,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_265_strophe_fast_token_handler,"snikket.streams.XmppStropheStream","strophe_fast_token_handler",0xfc0a9611,"snikket.streams.XmppStropheStream.strophe_fast_token_handler","snikket/streams/XmppStropheStream.hx",265,0x06c67012)
 HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_271_strophe_sm_handler,"snikket.streams.XmppStropheStream","strophe_sm_handler",0xb2b084d5,"snikket.streams.XmppStropheStream.strophe_sm_handler","snikket/streams/XmppStropheStream.hx",271,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_284_strophe_sm_ack_handler,"snikket.streams.XmppStropheStream","strophe_sm_ack_handler",0x6c59a21f,"snikket.streams.XmppStropheStream.strophe_sm_ack_handler","snikket/streams/XmppStropheStream.hx",284,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_280_strophe_sm_ack_handler,"snikket.streams.XmppStropheStream","strophe_sm_ack_handler",0x6c59a21f,"snikket.streams.XmppStropheStream.strophe_sm_ack_handler","snikket/streams/XmppStropheStream.hx",280,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_293_strophe_sm_fail_handler,"snikket.streams.XmppStropheStream","strophe_sm_fail_handler",0x892bd43e,"snikket.streams.XmppStropheStream.strophe_sm_fail_handler","snikket/streams/XmppStropheStream.hx",293,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_289_strophe_sm_fail_handler,"snikket.streams.XmppStropheStream","strophe_sm_fail_handler",0x892bd43e,"snikket.streams.XmppStropheStream.strophe_sm_fail_handler","snikket/streams/XmppStropheStream.hx",289,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_298_strophe_certfail_handler,"snikket.streams.XmppStropheStream","strophe_certfail_handler",0x0748fefd,"snikket.streams.XmppStropheStream.strophe_certfail_handler","snikket/streams/XmppStropheStream.hx",298,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_316_strophe_stanza,"snikket.streams.XmppStropheStream","strophe_stanza",0xa2c712e5,"snikket.streams.XmppStropheStream.strophe_stanza","snikket/streams/XmppStropheStream.hx",316,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_325_strophe_stanza,"snikket.streams.XmppStropheStream","strophe_stanza",0xa2c712e5,"snikket.streams.XmppStropheStream.strophe_stanza","snikket/streams/XmppStropheStream.hx",325,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_368_strophe_connect,"snikket.streams.XmppStropheStream","strophe_connect",0xae6ed8fa,"snikket.streams.XmppStropheStream.strophe_connect","snikket/streams/XmppStropheStream.hx",368,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_366_strophe_connect,"snikket.streams.XmppStropheStream","strophe_connect",0xae6ed8fa,"snikket.streams.XmppStropheStream.strophe_connect","snikket/streams/XmppStropheStream.hx",366,0x06c67012)
-HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_442_convertToStanza,"snikket.streams.XmppStropheStream","convertToStanza",0x53baabe3,"snikket.streams.XmppStropheStream.convertToStanza","snikket/streams/XmppStropheStream.hx",442,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_277_strophe_sm_ack_handler,"snikket.streams.XmppStropheStream","strophe_sm_ack_handler",0x6c59a21f,"snikket.streams.XmppStropheStream.strophe_sm_ack_handler","snikket/streams/XmppStropheStream.hx",277,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_283_strophe_sm_fail_handler,"snikket.streams.XmppStropheStream","strophe_sm_fail_handler",0x892bd43e,"snikket.streams.XmppStropheStream.strophe_sm_fail_handler","snikket/streams/XmppStropheStream.hx",283,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_289_strophe_certfail_handler,"snikket.streams.XmppStropheStream","strophe_certfail_handler",0x0748fefd,"snikket.streams.XmppStropheStream.strophe_certfail_handler","snikket/streams/XmppStropheStream.hx",289,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_306_strophe_stanza,"snikket.streams.XmppStropheStream","strophe_stanza",0xa2c712e5,"snikket.streams.XmppStropheStream.strophe_stanza","snikket/streams/XmppStropheStream.hx",306,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_353_strophe_connect,"snikket.streams.XmppStropheStream","strophe_connect",0xae6ed8fa,"snikket.streams.XmppStropheStream.strophe_connect","snikket/streams/XmppStropheStream.hx",353,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_430_parseStanza,"snikket.streams.XmppStropheStream","parseStanza",0x685ccb88,"snikket.streams.XmppStropheStream.parseStanza","snikket/streams/XmppStropheStream.hx",430,0x06c67012)
+HX_LOCAL_STACK_FRAME(_hx_pos_c0c1f1a3af656a5a_438_convertToStanza,"snikket.streams.XmppStropheStream","convertToStanza",0x53baabe3,"snikket.streams.XmppStropheStream.convertToStanza","snikket/streams/XmppStropheStream.hx",438,0x06c67012)
+
+xmpp_log_t *logger = getenv("SNIKKET_XMPP_DEBUG") ? xmpp_get_default_logger(XMPP_LEVEL_DEBUG) : 0;
+xmpp_ctx_t* snikket::streams::XmppStropheStream_obj::ctx = xmpp_ctx_new(0,logger);
+
 namespace snikket{
 namespace streams{
 
 void XmppStropheStream_obj::__construct(){
-            	HX_GC_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_221_new)
-HXLINE( 227)		this->mainThread = ::sys::thread::_Thread::Thread_Impl__obj::get_events(::sys::thread::_Thread::HaxeThread_obj::current());
-HXLINE( 226)		this->ready = false;
-HXLINE( 225)		this->pending = ::Array_obj< ::Dynamic>::__new(0);
-HXLINE( 224)		 ::haxe::ds::EnumValueMap _g =  ::haxe::ds::EnumValueMap_obj::__alloc( HX_CTX );
-HXDLIN( 224)		_g->set(::snikket::IqRequestType_obj::Get_dyn(), ::haxe::ds::StringMap_obj::__alloc( HX_CTX ));
-HXDLIN( 224)		_g->set(::snikket::IqRequestType_obj::Set_dyn(), ::haxe::ds::StringMap_obj::__alloc( HX_CTX ));
-HXDLIN( 224)		this->iqHandlers = _g;
-HXLINE( 230)		super::__construct();
-HXLINE( 231)		xmpp_initialize();
-HXLINE( 232)		xmpp_log_t *logger = NULL;;
-HXLINE( 234)		logger = xmpp_get_default_logger(XMPP_LEVEL_DEBUG);;
-HXLINE( 236)		this->ctx = xmpp_ctx_new(null(),logger);
-HXLINE( 237)		this->conn = xmpp_conn_new(this->ctx);
-HXLINE( 241)		::cpp::Pointer< char > tmp = null();
-HXLINE( 242)		::cpp::Pointer< char > tmp1 = null();
-HXLINE( 243)		::cpp::Pointer< char > tmp2 = null();
-HXLINE( 239)		 xmpp_conn_t* _hx_tmp = this->conn;
-HXLINE( 240)		::cpp::Function< int  ( xmpp_conn_t*, xmpp_stanza_t*,void*) > _hx_tmp1 = ::cpp::Function< int ( xmpp_conn_t*, xmpp_stanza_t*,void*)>(::hx::AnyCast(&::snikket::streams::XmppStropheStream_obj::strophe_stanza ));
-HXLINE( 241)		::cpp::Pointer< char > tmp3 = tmp;
-HXLINE( 242)		::cpp::Pointer< char > tmp4 = tmp1;
-HXLINE( 243)		::cpp::Pointer< char > tmp5 = tmp2;
-HXLINE( 238)		xmpp_handler_add(_hx_tmp,_hx_tmp1,tmp3,tmp4,tmp5,(void*)this);
-HXLINE( 247)		 xmpp_conn_t* _hx_tmp2 = this->conn;
-HXLINE( 248)		::cpp::Function< void  ( xmpp_conn_t*,const char*,void*) > _hx_tmp3 = ::cpp::Function< void ( xmpp_conn_t*,const char*,void*)>(::hx::AnyCast(&::snikket::streams::XmppStropheStream_obj::strophe_fast_token_handler ));
-HXLINE( 246)		xmpp_conn_set_fast_token_handler(_hx_tmp2,_hx_tmp3,(void*)this);
-HXLINE( 251)		 xmpp_conn_t* _hx_tmp4 = this->conn;
-HXDLIN( 251)		xmpp_conn_set_certfail_handler(_hx_tmp4,::cpp::Function< int ( const xmpp_tlscert_t*,const char*)>(::hx::AnyCast(&::snikket::streams::XmppStropheStream_obj::strophe_certfail_handler )));
-HXLINE( 252)		 xmpp_conn_t* _hx_tmp5 = this->conn;
-HXDLIN( 252)		::cpp::Function< void  ( xmpp_conn_t*,void*,const unsigned char*,size_t) > _hx_tmp6 = ::cpp::Function< void ( xmpp_conn_t*,void*,const unsigned char*,size_t)>(::hx::AnyCast(&::snikket::streams::XmppStropheStream_obj::strophe_sm_handler ));
-HXDLIN( 252)		xmpp_conn_set_sm_callback(_hx_tmp5,_hx_tmp6,(void*)this);
-HXLINE( 253)		 xmpp_conn_t* _hx_tmp7 = this->conn;
-HXDLIN( 253)		::cpp::Function< void  ( xmpp_conn_t*,void*,const char*) > _hx_tmp8 = ::cpp::Function< void ( xmpp_conn_t*,void*,const char*)>(::hx::AnyCast(&::snikket::streams::XmppStropheStream_obj::strophe_sm_ack_handler ));
-HXDLIN( 253)		xmpp_conn_set_sm_ack_callback(_hx_tmp7,_hx_tmp8,(void*)this);
-HXLINE( 254)		 xmpp_conn_t* _hx_tmp9 = this->conn;
-HXDLIN( 254)		::cpp::Function< void  ( xmpp_conn_t*,void*,const char*) > _hx_tmp10 = ::cpp::Function< void ( xmpp_conn_t*,void*,const char*)>(::hx::AnyCast(&::snikket::streams::XmppStropheStream_obj::strophe_sm_fail_handler ));
-HXDLIN( 254)		xmpp_conn_set_sm_fail_callback(_hx_tmp9,_hx_tmp10,(void*)this);
-HXLINE( 255)		_hx_add_finalizable(::hx::ObjectPtr<OBJ_>(this),false);
+            	HX_GC_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_228_new)
+HXLINE( 235)		this->stanzaThisPoll = false;
+HXLINE( 234)		this->ready = false;
+HXLINE( 233)		this->pollTimer = null();
+HXLINE( 232)		this->pending = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE( 231)		 ::haxe::ds::EnumValueMap _g =  ::haxe::ds::EnumValueMap_obj::__alloc( HX_CTX );
+HXDLIN( 231)		_g->set(::snikket::IqRequestType_obj::Get_dyn(), ::haxe::ds::StringMap_obj::__alloc( HX_CTX ));
+HXDLIN( 231)		_g->set(::snikket::IqRequestType_obj::Set_dyn(), ::haxe::ds::StringMap_obj::__alloc( HX_CTX ));
+HXDLIN( 231)		this->iqHandlers = _g;
+HXLINE( 238)		super::__construct();
+HXLINE( 239)		xmpp_initialize();
+HXLINE( 240)		this->conn = xmpp_conn_new(::snikket::streams::XmppStropheStream_obj::ctx);
+HXLINE( 244)		::cpp::Pointer< char > tmp = null();
+HXLINE( 245)		::cpp::Pointer< char > tmp1 = null();
+HXLINE( 246)		::cpp::Pointer< char > tmp2 = null();
+HXLINE( 242)		 xmpp_conn_t* _hx_tmp = this->conn;
+HXLINE( 243)		::cpp::Function< int  ( xmpp_conn_t*, xmpp_stanza_t*,void*) > _hx_tmp1 = ::cpp::Function< int ( xmpp_conn_t*, xmpp_stanza_t*,void*)>(::hx::AnyCast(&::snikket::streams::XmppStropheStream_obj::strophe_stanza ));
+HXLINE( 244)		::cpp::Pointer< char > tmp3 = tmp;
+HXLINE( 245)		::cpp::Pointer< char > tmp4 = tmp1;
+HXLINE( 246)		::cpp::Pointer< char > tmp5 = tmp2;
+HXLINE( 241)		xmpp_handler_add(_hx_tmp,_hx_tmp1,tmp3,tmp4,tmp5,(void*)this);
+HXLINE( 250)		 xmpp_conn_t* _hx_tmp2 = this->conn;
+HXLINE( 251)		::cpp::Function< void  ( xmpp_conn_t*,const char*,void*) > _hx_tmp3 = ::cpp::Function< void ( xmpp_conn_t*,const char*,void*)>(::hx::AnyCast(&::snikket::streams::XmppStropheStream_obj::strophe_fast_token_handler ));
+HXLINE( 249)		xmpp_conn_set_fast_token_handler(_hx_tmp2,_hx_tmp3,(void*)this);
+HXLINE( 254)		 xmpp_conn_t* _hx_tmp4 = this->conn;
+HXDLIN( 254)		xmpp_conn_set_certfail_handler(_hx_tmp4,::cpp::Function< int ( const xmpp_tlscert_t*,const char*)>(::hx::AnyCast(&::snikket::streams::XmppStropheStream_obj::strophe_certfail_handler )));
+HXLINE( 255)		 xmpp_conn_t* _hx_tmp5 = this->conn;
+HXDLIN( 255)		::cpp::Function< void  ( xmpp_conn_t*,void*,const unsigned char*,size_t) > _hx_tmp6 = ::cpp::Function< void ( xmpp_conn_t*,void*,const unsigned char*,size_t)>(::hx::AnyCast(&::snikket::streams::XmppStropheStream_obj::strophe_sm_handler ));
+HXDLIN( 255)		xmpp_conn_set_sm_callback(_hx_tmp5,_hx_tmp6,(void*)this);
+HXLINE( 256)		 xmpp_conn_t* _hx_tmp7 = this->conn;
+HXDLIN( 256)		::cpp::Function< void  ( xmpp_conn_t*,void*,const char*) > _hx_tmp8 = ::cpp::Function< void ( xmpp_conn_t*,void*,const char*)>(::hx::AnyCast(&::snikket::streams::XmppStropheStream_obj::strophe_sm_ack_handler ));
+HXDLIN( 256)		xmpp_conn_set_sm_ack_callback(_hx_tmp7,_hx_tmp8,(void*)this);
+HXLINE( 257)		 xmpp_conn_t* _hx_tmp9 = this->conn;
+HXDLIN( 257)		::cpp::Function< void  ( xmpp_conn_t*,void*,const char*) > _hx_tmp10 = ::cpp::Function< void ( xmpp_conn_t*,void*,const char*)>(::hx::AnyCast(&::snikket::streams::XmppStropheStream_obj::strophe_sm_fail_handler ));
+HXDLIN( 257)		xmpp_conn_set_sm_fail_callback(_hx_tmp9,_hx_tmp10,(void*)this);
+HXLINE( 258)		_hx_add_finalizable(::hx::ObjectPtr<OBJ_>(this),false);
             	}
 
 Dynamic XmppStropheStream_obj::__CreateEmpty() { return new XmppStropheStream_obj; }
@@ -168,193 +154,185 @@ bool XmppStropheStream_obj::_hx_isInstanceOf(int inClassId) {
 }
 
 ::String XmppStropheStream_obj::newId(){
-            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_259_newId)
-HXDLIN( 259)		return ::snikket::ID_obj::_hx_long();
+            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_262_newId)
+HXDLIN( 262)		return ::snikket::ID_obj::_hx_long();
             	}
 
 
 void XmppStropheStream_obj::onIq( ::snikket::IqRequestType type,::String tag,::String xmlns, ::Dynamic handler){
-            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_363_onIq)
-HXDLIN( 363)		this->iqHandlers->get(type).StaticCast<  ::haxe::ds::StringMap >()->set((((HX_("{",7b,00,00,00) + xmlns) + HX_("}",7d,00,00,00)) + tag),handler);
+            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_350_onIq)
+HXDLIN( 350)		this->iqHandlers->get(type).StaticCast<  ::haxe::ds::StringMap >()->set((((HX_("{",7b,00,00,00) + xmlns) + HX_("}",7d,00,00,00)) + tag),handler);
             	}
 
 
 void XmppStropheStream_obj::connect(::String jid,::Array< unsigned char > sm){
             		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::streams::XmppStropheStream,_gthis) HXARGC(1)
             		 ::snikket::EventResult _hx_run( ::Dynamic event){
-            			HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_400_connect)
-HXLINE( 401)			 ::snikket::streams::XmppStropheStream o = _gthis;
-HXLINE( 402)			::String pass = ( (::String)(event->__Field(HX_("password",1b,23,d0,48),::hx::paccDynamic)) );
-HXLINE( 403)			if (::hx::IsNotNull( event->__Field(HX_("fastCount",93,fc,67,a5),::hx::paccDynamic) )) {
-HXLINE( 404)				::cpp::Pointer< char > tmp = cpp::Pointer_obj::fromPointer(pass.c_str());
-HXDLIN( 404)				xmpp_conn_set_fast(_gthis->conn,tmp,( (int)(event->__Field(HX_("fastCount",93,fc,67,a5),::hx::paccDynamic)) ));
+            			HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_393_connect)
+HXLINE( 394)			 ::snikket::streams::XmppStropheStream o = _gthis;
+HXLINE( 395)			::String pass = ( (::String)(event->__Field(HX_("password",1b,23,d0,48),::hx::paccDynamic)) );
+HXLINE( 396)			if (::hx::IsNotNull( event->__Field(HX_("fastCount",93,fc,67,a5),::hx::paccDynamic) )) {
+HXLINE( 397)				::cpp::Pointer< char > tmp = cpp::Pointer_obj::fromPointer(pass.c_str());
+HXDLIN( 397)				xmpp_conn_set_fast(_gthis->conn,tmp,( (int)(event->__Field(HX_("fastCount",93,fc,67,a5),::hx::paccDynamic)) ));
             			}
             			else {
-HXLINE( 406)				::cpp::Pointer< char > tmp1 = cpp::Pointer_obj::fromPointer(pass.c_str());
-HXDLIN( 406)				xmpp_conn_set_pass(_gthis->conn,tmp1);
-HXLINE( 407)				::cpp::Pointer< char > tmp2 = null();
-HXDLIN( 407)				xmpp_conn_set_fast(_gthis->conn,tmp2,-1);
+HXLINE( 399)				::cpp::Pointer< char > tmp1 = cpp::Pointer_obj::fromPointer(pass.c_str());
+HXDLIN( 399)				xmpp_conn_set_pass(_gthis->conn,tmp1);
+HXLINE( 400)				::cpp::Pointer< char > tmp2 = null();
+HXDLIN( 400)				xmpp_conn_set_fast(_gthis->conn,tmp2,-1);
             			}
-HXLINE( 409)			::cpp::Pointer< char > tmp3 = cpp::Pointer_obj::fromPointer(_gthis->clientId.c_str());
-HXDLIN( 409)			xmpp_conn_set_user_agent_id(_gthis->conn,tmp3);
-HXLINE( 412)			::cpp::Pointer< char > tmp4 = null();
-HXLINE( 411)			 xmpp_conn_t* _gthis1 = _gthis->conn;
-HXLINE( 414)			::cpp::Function< void  ( xmpp_conn_t*, xmpp_conn_event_t,int, xmpp_stream_error_t*,void*) > _hx_tmp = ::cpp::Function< void ( xmpp_conn_t*, xmpp_conn_event_t,int, xmpp_stream_error_t*,void*)>(::hx::AnyCast(&::snikket::streams::XmppStropheStream_obj::strophe_connect ));
-HXLINE( 410)			xmpp_connect_client(_gthis1,tmp4,( (unsigned short)(0) ),_hx_tmp,o.GetPtr());
-HXLINE( 418)			return ::snikket::EventResult_obj::EventHandled_dyn();
+HXLINE( 402)			::cpp::Pointer< char > tmp3 = cpp::Pointer_obj::fromPointer(_gthis->clientId.c_str());
+HXDLIN( 402)			xmpp_conn_set_user_agent_id(_gthis->conn,tmp3);
+HXLINE( 405)			::cpp::Pointer< char > tmp4 = null();
+HXLINE( 404)			 xmpp_conn_t* _gthis1 = _gthis->conn;
+HXLINE( 407)			::cpp::Function< void  ( xmpp_conn_t*, xmpp_conn_event_t,int, xmpp_stream_error_t*,int,void*) > _hx_tmp = ::cpp::Function< void ( xmpp_conn_t*, xmpp_conn_event_t,int, xmpp_stream_error_t*,int,void*)>(::hx::AnyCast(&::snikket::streams::XmppStropheStream_obj::strophe_connect ));
+HXLINE( 403)			xmpp_connect_client(_gthis1,tmp4,( (unsigned short)(0) ),_hx_tmp,o.GetPtr());
+HXLINE( 411)			return ::snikket::EventResult_obj::EventHandled_dyn();
             		}
             		HX_END_LOCAL_FUNC1(return)
 
-            		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_1, ::snikket::streams::XmppStropheStream,_gthis) HXARGC(0)
+            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_385_connect)
+HXDLIN( 385)		 ::snikket::streams::XmppStropheStream _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 386)		::haxe::Log_obj::trace(HX_("SM",9a,48,00,00), ::Dynamic(::hx::Anon_obj::Create(5)
+            			->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.streams.XmppStropheStream",6e,a1,9f,1c))
+            			->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(1)->init(0,sm))
+            			->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("connect",ea,3b,80,15))
+            			->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/streams/XmppStropheStream.hx",12,70,c6,06))
+            			->setFixed(4,HX_("lineNumber",dd,81,22,76),386)));
+HXLINE( 387)		::cpp::Pointer< char > tmp = cpp::Pointer_obj::fromPointer(jid.c_str());
+HXDLIN( 387)		xmpp_conn_set_jid(this->conn,tmp);
+HXLINE( 388)		if (::hx::IsNotNull( sm )) {
+HXLINE( 390)			const unsigned char* smPtr = (unsigned char*)sm->getBase();
+HXLINE( 391)			xmpp_conn_restore_sm_state(this->conn,smPtr,( (size_t)(sm->length) ));
+            		}
+HXLINE( 393)		this->on(HX_("auth/password",e2,5d,98,00), ::Dynamic(new _hx_Closure_0(_gthis)));
+HXLINE( 413)		this->trigger(HX_("auth/password-needed",80,f0,74,49), ::Dynamic(::hx::Anon_obj::Create(0)));
+HXLINE( 414)		this->poll(null());
+            	}
+
+
+void XmppStropheStream_obj::disconnect(){
+            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_418_disconnect)
+HXDLIN( 418)		xmpp_disconnect(this->conn);
+            	}
+
+
+void XmppStropheStream_obj::poll( ::Dynamic __o_timeout){
+            		HX_BEGIN_LOCAL_FUNC_S1(::hx::LocalFunc,_hx_Closure_0, ::snikket::streams::XmppStropheStream,_gthis) HXARGC(0)
             		void _hx_run(){
-            			HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_422_connect)
-HXLINE( 422)			try {
-            				HX_STACK_CATCHABLE( ::Dynamic, 0);
-HXLINE( 423)				__hxcpp_enter_gc_free_zone();
-HXLINE( 424)				xmpp_run(_gthis->ctx);
-            			} catch( ::Dynamic _hx_e) {
-            				if (_hx_e.IsClass<  ::Dynamic >() ){
-            					HX_STACK_BEGIN_CATCH
-            					 ::Dynamic _g = _hx_e;
-HXLINE( 425)					 ::haxe::Exception e = ::haxe::Exception_obj::caught(_g);
-HXLINE( 426)					::haxe::Log_obj::trace(HX_("strophe",8f,5b,ec,fc), ::Dynamic(::hx::Anon_obj::Create(5)
-            						->setFixed(0,HX_("className",a3,92,3d,dc),HX_("snikket.streams.XmppStropheStream",6e,a1,9f,1c))
-            						->setFixed(1,HX_("customParams",d7,51,18,ed),::cpp::VirtualArray_obj::__new(1)->init(0,e))
-            						->setFixed(2,HX_("methodName",cc,19,0f,12),HX_("connect",ea,3b,80,15))
-            						->setFixed(3,HX_("fileName",e7,5a,43,62),HX_("snikket/streams/XmppStropheStream.hx",12,70,c6,06))
-            						->setFixed(4,HX_("lineNumber",dd,81,22,76),426)));
-            				}
-            				else {
-            					HX_STACK_DO_THROW(_hx_e);
-            				}
+            			HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_423_poll)
+HXLINE( 424)			_gthis->stanzaThisPoll = false;
+HXLINE( 425)			xmpp_run_once(::snikket::streams::XmppStropheStream_obj::ctx,( (::cpp::UInt64)(5) ));
+HXLINE( 426)			 ::Dynamic _hx_tmp;
+HXDLIN( 426)			if (_gthis->stanzaThisPoll) {
+HXLINE( 426)				_hx_tmp = 5;
             			}
+            			else {
+HXLINE( 426)				_hx_tmp = 100;
+            			}
+HXDLIN( 426)			_gthis->poll(_hx_tmp);
             		}
             		HX_END_LOCAL_FUNC0((void))
 
-            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_393_connect)
-HXDLIN( 393)		 ::snikket::streams::XmppStropheStream _gthis = ::hx::ObjectPtr<OBJ_>(this);
-HXLINE( 394)		::cpp::Pointer< char > tmp = cpp::Pointer_obj::fromPointer(jid.c_str());
-HXDLIN( 394)		xmpp_conn_set_jid(this->conn,tmp);
-HXLINE( 395)		if (::hx::IsNotNull( sm )) {
-HXLINE( 397)			const unsigned char* smPtr = (unsigned char*)sm->getBase();
-HXLINE( 398)			xmpp_conn_restore_sm_state(this->conn,smPtr,( (size_t)(sm->length) ));
+            		 ::Dynamic timeout = __o_timeout;
+            		if (::hx::IsNull(__o_timeout)) timeout = 100;
+            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_421_poll)
+HXDLIN( 421)		 ::snikket::streams::XmppStropheStream _gthis = ::hx::ObjectPtr<OBJ_>(this);
+HXLINE( 422)		if (::hx::IsNotNull( this->pollTimer )) {
+HXLINE( 422)			this->pollTimer->stop();
             		}
-HXLINE( 400)		this->on(HX_("auth/password",e2,5d,98,00), ::Dynamic(new _hx_Closure_0(_gthis)));
-HXLINE( 420)		this->trigger(HX_("auth/password-needed",80,f0,74,49), ::Dynamic(::hx::Anon_obj::Create(0)));
-HXLINE( 421)		::sys::thread::_Thread::HaxeThread_obj::create( ::Dynamic(new _hx_Closure_1(_gthis)),false);
+HXLINE( 423)		this->pollTimer = ::haxe::Timer_obj::delay( ::Dynamic(new _hx_Closure_0(_gthis)),( (int)(timeout) ));
             	}
 
 
-void XmppStropheStream_obj::disconnect(){
-            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_432_disconnect)
-HXDLIN( 432)		xmpp_disconnect(this->conn);
-            	}
-
+HX_DEFINE_DYNAMIC_FUNC1(XmppStropheStream_obj,poll,(void))
 
  xmpp_stanza_t* XmppStropheStream_obj::convertFromStanza( ::snikket::Stanza el){
-            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_472_convertFromStanza)
-HXLINE( 473)		 xmpp_stanza_t* xml = xmpp_stanza_new(this->ctx);
-HXLINE( 474)		::cpp::Pointer< char > tmp = cpp::Pointer_obj::fromPointer(el->name.c_str());
-HXDLIN( 474)		xmpp_stanza_set_name(xml,tmp);
-HXLINE( 475)		{
-HXLINE( 475)			 ::Dynamic access = el->attr;
-HXDLIN( 475)			 ::Dynamic _g_access = access;
-HXDLIN( 475)			::Array< ::String > _g_keys = ::Reflect_obj::fields(access);
-HXDLIN( 475)			int _g_index = 0;
-HXDLIN( 475)			while((_g_index < _g_keys->length)){
-HXLINE( 475)				_g_index = (_g_index + 1);
-HXDLIN( 475)				::String key = _g_keys->__get((_g_index - 1));
-HXDLIN( 475)				::String attr_value = ( (::String)(::Reflect_obj::field(_g_access,key)) );
-HXDLIN( 475)				::String attr_key = key;
-HXLINE( 476)				::String key1 = attr_key;
-HXLINE( 477)				::String value = attr_value;
-HXLINE( 478)				if (::hx::IsNotNull( value )) {
-HXLINE( 479)					::cpp::Pointer< char > tmp1 = cpp::Pointer_obj::fromPointer(key1.c_str());
-HXDLIN( 479)					::cpp::Pointer< char > tmp2 = cpp::Pointer_obj::fromPointer(value.c_str());
-HXDLIN( 479)					xmpp_stanza_set_attribute(xml,tmp1,tmp2);
+            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_466_convertFromStanza)
+HXLINE( 467)		 xmpp_stanza_t* xml = xmpp_stanza_new(::snikket::streams::XmppStropheStream_obj::ctx);
+HXLINE( 468)		::cpp::Pointer< char > tmp = cpp::Pointer_obj::fromPointer(el->name.c_str());
+HXDLIN( 468)		xmpp_stanza_set_name(xml,tmp);
+HXLINE( 469)		{
+HXLINE( 469)			 ::Dynamic access = el->attr;
+HXDLIN( 469)			 ::Dynamic _g_access = access;
+HXDLIN( 469)			::Array< ::String > _g_keys = ::Reflect_obj::fields(access);
+HXDLIN( 469)			int _g_index = 0;
+HXDLIN( 469)			while((_g_index < _g_keys->length)){
+HXLINE( 469)				_g_index = (_g_index + 1);
+HXDLIN( 469)				::String key = _g_keys->__get((_g_index - 1));
+HXDLIN( 469)				::String attr_value = ( (::String)(::Reflect_obj::field(_g_access,key)) );
+HXDLIN( 469)				::String attr_key = key;
+HXLINE( 470)				::String key1 = attr_key;
+HXLINE( 471)				::String value = attr_value;
+HXLINE( 472)				if (::hx::IsNotNull( value )) {
+HXLINE( 473)					::cpp::Pointer< char > tmp1 = cpp::Pointer_obj::fromPointer(key1.c_str());
+HXDLIN( 473)					::cpp::Pointer< char > tmp2 = cpp::Pointer_obj::fromPointer(value.c_str());
+HXDLIN( 473)					xmpp_stanza_set_attribute(xml,tmp1,tmp2);
             				}
             			}
             		}
-HXLINE( 482)		if ((el->children->length > 0)) {
-HXLINE( 483)			int _g = 0;
-HXDLIN( 483)			::Array< ::Dynamic> _g1 = el->children;
-HXDLIN( 483)			while((_g < _g1->length)){
-HXLINE( 483)				 ::snikket::Node child = _g1->__get(_g).StaticCast<  ::snikket::Node >();
-HXDLIN( 483)				_g = (_g + 1);
-HXLINE( 484)				switch((int)(child->_hx_getIndex())){
+HXLINE( 476)		if ((el->children->length > 0)) {
+HXLINE( 477)			int _g = 0;
+HXDLIN( 477)			::Array< ::Dynamic> _g1 = el->children;
+HXDLIN( 477)			while((_g < _g1->length)){
+HXLINE( 477)				 ::snikket::Node child = _g1->__get(_g).StaticCast<  ::snikket::Node >();
+HXDLIN( 477)				_g = (_g + 1);
+HXLINE( 478)				switch((int)(child->_hx_getIndex())){
             					case (int)0: {
-HXLINE( 485)						 ::snikket::Stanza stanza = child->_hx_getObject(0).StaticCast<  ::snikket::Stanza >();
-HXLINE( 486)						xmpp_stanza_add_child_ex(xml,this->convertFromStanza(stanza),false);
+HXLINE( 479)						 ::snikket::Stanza stanza = child->_hx_getObject(0).StaticCast<  ::snikket::Stanza >();
+HXLINE( 480)						xmpp_stanza_add_child_ex(xml,this->convertFromStanza(stanza),false);
             					}
             					break;
             					case (int)1: {
-HXLINE( 487)						 ::snikket::TextNode text = child->_hx_getObject(0).StaticCast<  ::snikket::TextNode >();
-HXDLIN( 487)						{
-HXLINE( 488)							 xmpp_stanza_t* text_node = xmpp_stanza_new(this->ctx);
-HXLINE( 489)							::cpp::Pointer< char > tmp3 = cpp::Pointer_obj::fromPointer(text->content.c_str());
-HXDLIN( 489)							xmpp_stanza_set_text(text_node,tmp3);
-HXLINE( 490)							xmpp_stanza_add_child_ex(xml,text_node,false);
+HXLINE( 481)						::String text = child->_hx_getString(0);
+HXDLIN( 481)						{
+HXLINE( 482)							 xmpp_stanza_t* text_node = xmpp_stanza_new(::snikket::streams::XmppStropheStream_obj::ctx);
+HXLINE( 483)							::cpp::Pointer< char > tmp3 = cpp::Pointer_obj::fromPointer(text.c_str());
+HXDLIN( 483)							xmpp_stanza_set_text(text_node,tmp3);
+HXLINE( 484)							xmpp_stanza_add_child_ex(xml,text_node,false);
             						}
             					}
             					break;
             				}
             			}
             		}
-HXLINE( 494)		return xml;
+HXLINE( 488)		return xml;
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC1(XmppStropheStream_obj,convertFromStanza,return )
 
 void XmppStropheStream_obj::sendStanza( ::snikket::Stanza stanza){
-            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_498_sendStanza)
-HXDLIN( 498)		if (this->ready) {
-HXLINE( 499)			 xmpp_conn_t* _hx_tmp = this->conn;
-HXDLIN( 499)			xmpp_send(_hx_tmp,this->convertFromStanza(stanza));
+            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_492_sendStanza)
+HXDLIN( 492)		if (this->ready) {
+HXLINE( 493)			 xmpp_conn_t* _hx_tmp = this->conn;
+HXDLIN( 493)			xmpp_send(_hx_tmp,this->convertFromStanza(stanza));
             		}
             		else {
-HXLINE( 501)			this->pending->push(stanza);
+HXLINE( 495)			this->pending->push(stanza);
             		}
             	}
 
 
 void XmppStropheStream_obj::finalize(){
-            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_505_finalize)
-HXLINE( 506)		xmpp_stop(this->ctx);
-HXLINE( 507)		xmpp_conn_release(this->conn);
-HXLINE( 508)		xmpp_ctx_free(this->ctx);
+            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_500_finalize)
+HXDLIN( 500)		xmpp_conn_release(this->conn);
             	}
 
 
 HX_DEFINE_DYNAMIC_FUNC0(XmppStropheStream_obj,finalize,(void))
 
 void XmppStropheStream_obj::strophe_fast_token_handler( xmpp_conn_t* conn,const char* token,void* userdata){
-            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0, ::snikket::streams::XmppStropheStream,stream,::String,token1) HXARGC(0)
-            		void _hx_run(){
-            			HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_266_strophe_fast_token_handler)
-HXLINE( 266)			stream->trigger(HX_("fast-token",48,5f,c2,26), ::Dynamic(::hx::Anon_obj::Create(1)
-            				->setFixed(0,HX_("token",f9,82,2b,14),token1)));
-            		}
-            		HX_END_LOCAL_FUNC0((void))
-
-            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_262_strophe_fast_token_handler)
-HXLINE( 263)		 ::snikket::streams::XmppStropheStream stream = static_cast<hx::Object*>(userdata);
-HXLINE( 264)		::cpp::Pointer< char > inPtr = cpp::Pointer_obj::fromRaw(token);
-HXDLIN( 264)		::String token1 =  ::String(inPtr->ptr);
-HXLINE( 265)		stream->mainThread->run( ::Dynamic(new _hx_Closure_0(stream,token1)));
-HXLINE( 268)		__hxcpp_enter_gc_free_zone();
+            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_265_strophe_fast_token_handler)
+HXLINE( 266)		 ::snikket::streams::XmppStropheStream stream = static_cast<hx::Object*>(userdata);
+HXLINE( 267)		::cpp::Pointer< char > inPtr = cpp::Pointer_obj::fromRaw(token);
+HXDLIN( 267)		::String token1 =  ::String(inPtr->ptr);
+HXLINE( 268)		stream->trigger(HX_("fast-token",48,5f,c2,26), ::Dynamic(::hx::Anon_obj::Create(1)
+            			->setFixed(0,HX_("token",f9,82,2b,14),token1)));
             	}
 
 
 void XmppStropheStream_obj::strophe_sm_handler( xmpp_conn_t* conn,void* userdata,const unsigned char* sm_state,size_t sm_state_len){
-            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0, ::snikket::streams::XmppStropheStream,stream,::cpp::VirtualArray,bytes) HXARGC(0)
-            		void _hx_run(){
-            			HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_275_strophe_sm_handler)
-HXLINE( 275)			stream->trigger(HX_("sm/update",1e,16,63,46), ::Dynamic(::hx::Anon_obj::Create(1)
-            				->setFixed(0,HX_("sm",9a,64,00,00),bytes)));
-            		}
-            		HX_END_LOCAL_FUNC0((void))
-
             	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_271_strophe_sm_handler)
 HXLINE( 272)		 ::snikket::streams::XmppStropheStream stream = static_cast<hx::Object*>(userdata);
 HXLINE( 273)		::cpp::Pointer<  ::Dynamic > _this = cpp::Pointer_obj::fromRaw(sm_state)->reinterpret();
@@ -362,239 +340,218 @@ HXDLIN( 273)		::cpp::VirtualArray result = ::cpp::VirtualArray_obj::__new();
 HXDLIN( 273)		::cpp::Pointer<  ::Dynamic > tmp = _this;
 HXDLIN( 273)		result->setUnmanagedData(tmp,( (int)(sm_state_len) ));
 HXDLIN( 273)		::cpp::VirtualArray bytes = result->copy();
-HXLINE( 274)		stream->mainThread->run( ::Dynamic(new _hx_Closure_0(stream,bytes)));
-HXLINE( 277)		__hxcpp_enter_gc_free_zone();
+HXLINE( 274)		stream->trigger(HX_("sm/update",1e,16,63,46), ::Dynamic(::hx::Anon_obj::Create(1)
+            			->setFixed(0,HX_("sm",9a,64,00,00),bytes)));
             	}
 
 
 void XmppStropheStream_obj::strophe_sm_ack_handler( xmpp_conn_t* conn,void* userdata,const char* id){
-            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0, ::snikket::streams::XmppStropheStream,stream,::String,sid) HXARGC(0)
-            		void _hx_run(){
-            			HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_284_strophe_sm_ack_handler)
-HXLINE( 284)			stream->trigger(HX_("sm/ack",14,b2,12,dd), ::Dynamic(::hx::Anon_obj::Create(1)
-            				->setFixed(0,HX_("id",db,5b,00,00),sid)));
-            		}
-            		HX_END_LOCAL_FUNC0((void))
-
-            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_280_strophe_sm_ack_handler)
-HXLINE( 281)		 ::snikket::streams::XmppStropheStream stream = static_cast<hx::Object*>(userdata);
-HXLINE( 282)		::cpp::Pointer< char > inPtr = cpp::Pointer_obj::fromRaw(id);
-HXDLIN( 282)		::String sid =  ::String(inPtr->ptr);
-HXLINE( 283)		stream->mainThread->run( ::Dynamic(new _hx_Closure_0(stream,sid)));
-HXLINE( 286)		__hxcpp_enter_gc_free_zone();
+            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_277_strophe_sm_ack_handler)
+HXLINE( 278)		 ::snikket::streams::XmppStropheStream stream = static_cast<hx::Object*>(userdata);
+HXLINE( 279)		::cpp::Pointer< char > inPtr = cpp::Pointer_obj::fromRaw(id);
+HXDLIN( 279)		::String sid =  ::String(inPtr->ptr);
+HXLINE( 280)		stream->trigger(HX_("sm/ack",14,b2,12,dd), ::Dynamic(::hx::Anon_obj::Create(1)
+            			->setFixed(0,HX_("id",db,5b,00,00),sid)));
             	}
 
 
 void XmppStropheStream_obj::strophe_sm_fail_handler( xmpp_conn_t* conn,void* userdata,const char* id){
-            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0, ::snikket::streams::XmppStropheStream,stream,::String,sid) HXARGC(0)
-            		void _hx_run(){
-            			HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_293_strophe_sm_fail_handler)
-HXLINE( 293)			stream->trigger(HX_("sm/fail",b3,aa,95,96), ::Dynamic(::hx::Anon_obj::Create(1)
-            				->setFixed(0,HX_("id",db,5b,00,00),sid)));
-            		}
-            		HX_END_LOCAL_FUNC0((void))
-
-            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_289_strophe_sm_fail_handler)
-HXLINE( 290)		 ::snikket::streams::XmppStropheStream stream = static_cast<hx::Object*>(userdata);
-HXLINE( 291)		::cpp::Pointer< char > inPtr = cpp::Pointer_obj::fromRaw(id);
-HXDLIN( 291)		::String sid =  ::String(inPtr->ptr);
-HXLINE( 292)		stream->mainThread->run( ::Dynamic(new _hx_Closure_0(stream,sid)));
-HXLINE( 295)		__hxcpp_enter_gc_free_zone();
+            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_283_strophe_sm_fail_handler)
+HXLINE( 284)		 ::snikket::streams::XmppStropheStream stream = static_cast<hx::Object*>(userdata);
+HXLINE( 285)		::cpp::Pointer< char > inPtr = cpp::Pointer_obj::fromRaw(id);
+HXDLIN( 285)		::String sid =  ::String(inPtr->ptr);
+HXLINE( 286)		stream->trigger(HX_("sm/fail",b3,aa,95,96), ::Dynamic(::hx::Anon_obj::Create(1)
+            			->setFixed(0,HX_("id",db,5b,00,00),sid)));
             	}
 
 
 int XmppStropheStream_obj::strophe_certfail_handler( const xmpp_tlscert_t* cert,const char* err){
-            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_298_strophe_certfail_handler)
-HXLINE( 299)		 xmpp_conn_t* conn = xmpp_tlscert_get_conn(cert);
-HXLINE( 300)		::Array< ::String > dnsNames = ::Array_obj< ::String >::__new(0);
-HXLINE( 301)		::cpp::Pointer< char > dnsName = null();
-HXLINE( 302)		int dnsNameN = 0;
-HXLINE( 303)		while(true){
-HXLINE( 303)			dnsNameN = (dnsNameN + 1);
-HXDLIN( 303)			dnsName = xmpp_tlscert_get_dnsname(cert,( (size_t)((dnsNameN - 1)) ));
-HXDLIN( 303)			if (!(::hx::IsNotNull( dnsName ))) {
-HXLINE( 303)				goto _hx_goto_20;
+            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_289_strophe_certfail_handler)
+HXLINE( 290)		 xmpp_conn_t* conn = xmpp_tlscert_get_conn(cert);
+HXLINE( 291)		::Array< ::String > dnsNames = ::Array_obj< ::String >::__new(0);
+HXLINE( 292)		::cpp::Pointer< char > dnsName = null();
+HXLINE( 293)		int dnsNameN = 0;
+HXLINE( 294)		while(true){
+HXLINE( 294)			dnsNameN = (dnsNameN + 1);
+HXDLIN( 294)			dnsName = xmpp_tlscert_get_dnsname(cert,( (size_t)((dnsNameN - 1)) ));
+HXDLIN( 294)			if (!(::hx::IsNotNull( dnsName ))) {
+HXLINE( 294)				goto _hx_goto_17;
             			}
-HXLINE( 304)			dnsNames->push( ::String(dnsName->ptr));
+HXLINE( 295)			dnsNames->push( ::String(dnsName->ptr));
             		}
-            		_hx_goto_20:;
-HXLINE( 306)		__hxcpp_enter_gc_free_zone();
-HXLINE( 307)		return 1;
+            		_hx_goto_17:;
+HXLINE( 297)		return 1;
             	}
 
 
 int XmppStropheStream_obj::strophe_stanza( xmpp_conn_t* conn, xmpp_stanza_t* sstanza,void* userdata){
-            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_316_strophe_stanza)
-HXLINE( 317)		__hxcpp_exit_gc_free_zone();
-HXLINE( 318)		 ::snikket::streams::XmppStropheStream stream = static_cast<hx::Object*>(userdata);
-HXLINE( 319)		 ::snikket::Stanza stanza = ::snikket::streams::XmppStropheStream_obj::convertToStanza(sstanza,null());
-HXLINE( 321)		::String xmlns = ( (::String)(::Reflect_obj::field(stanza->attr,HX_("xmlns",dc,31,74,60))) );
-HXLINE( 322)		if ((xmlns == HX_("jabber:client",21,64,c5,e4))) {
-            			HX_BEGIN_LOCAL_FUNC_S3(::hx::LocalFunc,_hx_Closure_0,::String,name, ::snikket::streams::XmppStropheStream,stream, ::snikket::Stanza,stanza) HXARGC(0)
-            			void _hx_run(){
-            				HX_GC_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_325_strophe_stanza)
-HXLINE( 325)				if ((name == HX_("iq",e8,5b,00,00))) {
-HXLINE( 326)					::String type = ( (::String)(::Reflect_obj::field(stanza->attr,HX_("type",ba,f2,08,4d))) );
-HXLINE( 327)					bool _hx_tmp;
-HXDLIN( 327)					if ((type != HX_("result",dd,68,84,08))) {
-HXLINE( 327)						_hx_tmp = (type == HX_("error",c8,cb,29,73));
-            					}
-            					else {
-HXLINE( 327)						_hx_tmp = true;
-            					}
-HXDLIN( 327)					if (_hx_tmp) {
-HXLINE( 328)						stream->onStanza(stanza);
-            					}
-            					else {
-HXLINE( 331)						 ::snikket::Stanza child = stanza->getFirstChild();
-HXLINE( 332)						if (::hx::IsNotNull( child )) {
-HXLINE( 333)							 ::snikket::IqRequestType this1;
-HXDLIN( 333)							if ((type == HX_("get",96,80,4e,00))) {
-HXLINE( 333)								this1 = ::snikket::IqRequestType_obj::Get_dyn();
-            							}
-            							else {
-HXLINE( 333)								this1 = ::snikket::IqRequestType_obj::Set_dyn();
-            							}
-HXDLIN( 333)							::Dynamic this2 = stream->iqHandlers->get(this1).StaticCast<  ::haxe::ds::StringMap >();
-HXDLIN( 333)							::String key = ((HX_("{",7b,00,00,00) + ( (::String)(::Reflect_obj::field(child->attr,HX_("xmlns",dc,31,74,60))) )) + HX_("}",7d,00,00,00));
-HXDLIN( 333)							 ::Dynamic handler = ( ( ::haxe::ds::StringMap)(this2) )->get((key + child->name));
-HXLINE( 334)							if (::hx::IsNotNull( handler )) {
-HXLINE( 335)								::String reply = ( (::String)(::Reflect_obj::field(stanza->attr,HX_("to",7b,65,00,00))) );
-HXDLIN( 335)								::String reply1 = ( (::String)(::Reflect_obj::field(stanza->attr,HX_("from",6a,a5,c2,43))) );
-HXDLIN( 335)								 ::snikket::Stanza reply2 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("iq",e8,5b,00,00), ::Dynamic(::hx::Anon_obj::Create(4)
-            									->setFixed(0,HX_("id",db,5b,00,00),( (::String)(::Reflect_obj::field(stanza->attr,HX_("id",db,5b,00,00))) ))
-            									->setFixed(1,HX_("to",7b,65,00,00),reply1)
-            									->setFixed(2,HX_("from",6a,a5,c2,43),reply)
-            									->setFixed(3,HX_("type",ba,f2,08,4d),HX_("result",dd,68,84,08))));
-HXLINE( 336)								try {
-            									HX_STACK_CATCHABLE( ::Dynamic, 0);
-HXLINE( 337)									 ::snikket::IqResult _g = handler(stanza);
-HXDLIN( 337)									switch((int)(_g->_hx_getIndex())){
-            										case (int)0: {
-HXLINE( 338)											 ::snikket::Stanza el = _g->_hx_getObject(0).StaticCast<  ::snikket::Stanza >();
-HXDLIN( 338)											reply2->addChild(el);
-            										}
-            										break;
-            										case (int)1: {
-            										}
-            										break;
-            										case (int)2: {
-HXLINE( 341)											::Reflect_obj::setField(reply2->attr,HX_("result",dd,68,84,08),HX_("error",c8,cb,29,73));
-HXLINE( 342)											reply2->tag(HX_("error",c8,cb,29,73), ::Dynamic(::hx::Anon_obj::Create(1)
-            												->setFixed(0,HX_("type",ba,f2,08,4d),HX_("cancel",7a,ed,33,b8))))->tag(HX_("service-unavailable",f8,3c,11,1c), ::Dynamic(::hx::Anon_obj::Create(1)
-            												->setFixed(0,HX_("xmlns",dc,31,74,60),HX_("urn:ietf:params:xml:ns:xmpp-stanzas",27,f2,3d,30))));
-            										}
-            										break;
+            	HX_GC_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_306_strophe_stanza)
+HXLINE( 307)		 ::snikket::streams::XmppStropheStream stream = static_cast<hx::Object*>(userdata);
+HXLINE( 308)		stream->stanzaThisPoll = true;
+HXLINE( 309)		 ::snikket::Stanza stanza = ::snikket::streams::XmppStropheStream_obj::convertToStanza(sstanza,null());
+HXLINE( 311)		::String xmlns = ( (::String)(::Reflect_obj::field(stanza->attr,HX_("xmlns",dc,31,74,60))) );
+HXLINE( 312)		if ((xmlns == HX_("jabber:client",21,64,c5,e4))) {
+HXLINE( 313)			::String name = stanza->name;
+HXLINE( 314)			if ((name == HX_("iq",e8,5b,00,00))) {
+HXLINE( 315)				::String type = ( (::String)(::Reflect_obj::field(stanza->attr,HX_("type",ba,f2,08,4d))) );
+HXLINE( 316)				bool _hx_tmp;
+HXDLIN( 316)				if ((type != HX_("result",dd,68,84,08))) {
+HXLINE( 316)					_hx_tmp = (type == HX_("error",c8,cb,29,73));
+            				}
+            				else {
+HXLINE( 316)					_hx_tmp = true;
+            				}
+HXDLIN( 316)				if (_hx_tmp) {
+HXLINE( 317)					stream->onStanza(stanza);
+            				}
+            				else {
+HXLINE( 320)					 ::snikket::Stanza child = stanza->getFirstChild();
+HXLINE( 321)					if (::hx::IsNotNull( child )) {
+HXLINE( 322)						 ::snikket::IqRequestType this1;
+HXDLIN( 322)						if ((type == HX_("get",96,80,4e,00))) {
+HXLINE( 322)							this1 = ::snikket::IqRequestType_obj::Get_dyn();
+            						}
+            						else {
+HXLINE( 322)							this1 = ::snikket::IqRequestType_obj::Set_dyn();
+            						}
+HXDLIN( 322)						::Dynamic this2 = stream->iqHandlers->get(this1).StaticCast<  ::haxe::ds::StringMap >();
+HXDLIN( 322)						::String key = ((HX_("{",7b,00,00,00) + ( (::String)(::Reflect_obj::field(child->attr,HX_("xmlns",dc,31,74,60))) )) + HX_("}",7d,00,00,00));
+HXDLIN( 322)						 ::Dynamic handler = ( ( ::haxe::ds::StringMap)(this2) )->get((key + child->name));
+HXLINE( 323)						if (::hx::IsNotNull( handler )) {
+HXLINE( 324)							::String reply = ( (::String)(::Reflect_obj::field(stanza->attr,HX_("to",7b,65,00,00))) );
+HXDLIN( 324)							::String reply1 = ( (::String)(::Reflect_obj::field(stanza->attr,HX_("from",6a,a5,c2,43))) );
+HXDLIN( 324)							 ::snikket::Stanza reply2 =  ::snikket::Stanza_obj::__alloc( HX_CTX ,HX_("iq",e8,5b,00,00), ::Dynamic(::hx::Anon_obj::Create(4)
+            								->setFixed(0,HX_("id",db,5b,00,00),( (::String)(::Reflect_obj::field(stanza->attr,HX_("id",db,5b,00,00))) ))
+            								->setFixed(1,HX_("to",7b,65,00,00),reply1)
+            								->setFixed(2,HX_("from",6a,a5,c2,43),reply)
+            								->setFixed(3,HX_("type",ba,f2,08,4d),HX_("result",dd,68,84,08))));
+HXLINE( 325)							try {
+            								HX_STACK_CATCHABLE( ::Dynamic, 0);
+HXLINE( 326)								 ::snikket::IqResult _g = handler(stanza);
+HXDLIN( 326)								switch((int)(_g->_hx_getIndex())){
+            									case (int)0: {
+HXLINE( 327)										 ::snikket::Stanza el = _g->_hx_getObject(0).StaticCast<  ::snikket::Stanza >();
+HXDLIN( 327)										reply2->addChild(el);
             									}
-            								} catch( ::Dynamic _hx_e) {
-            									if (_hx_e.IsClass<  ::Dynamic >() ){
-            										HX_STACK_BEGIN_CATCH
-            										 ::Dynamic _g1 = _hx_e;
-HXLINE( 345)										::Reflect_obj::setField(reply2->attr,HX_("result",dd,68,84,08),HX_("error",c8,cb,29,73));
-HXLINE( 346)										reply2->tag(HX_("error",c8,cb,29,73), ::Dynamic(::hx::Anon_obj::Create(1)
-            											->setFixed(0,HX_("type",ba,f2,08,4d),HX_("cancel",7a,ed,33,b8))))->tag(HX_("internal-server-error",ce,6d,55,6c), ::Dynamic(::hx::Anon_obj::Create(1)
-            											->setFixed(0,HX_("xmlns",dc,31,74,60),HX_("urn:ietf:params:xml:ns:xmpp-stanzas",27,f2,3d,30))));
+            									break;
+            									case (int)1: {
             									}
-            									else {
-            										HX_STACK_DO_THROW(_hx_e);
+            									break;
+            									case (int)2: {
+HXLINE( 330)										::Reflect_obj::setField(reply2->attr,HX_("result",dd,68,84,08),HX_("error",c8,cb,29,73));
+HXLINE( 331)										reply2->tag(HX_("error",c8,cb,29,73), ::Dynamic(::hx::Anon_obj::Create(1)
+            											->setFixed(0,HX_("type",ba,f2,08,4d),HX_("cancel",7a,ed,33,b8))))->tag(HX_("service-unavailable",f8,3c,11,1c), ::Dynamic(::hx::Anon_obj::Create(1)
+            											->setFixed(0,HX_("xmlns",dc,31,74,60),HX_("urn:ietf:params:xml:ns:xmpp-stanzas",27,f2,3d,30))));
             									}
+            									break;
+            								}
+            							} catch( ::Dynamic _hx_e) {
+            								if (_hx_e.IsClass<  ::Dynamic >() ){
+            									HX_STACK_BEGIN_CATCH
+            									 ::Dynamic _g1 = _hx_e;
+HXLINE( 334)									::Reflect_obj::setField(reply2->attr,HX_("result",dd,68,84,08),HX_("error",c8,cb,29,73));
+HXLINE( 335)									reply2->tag(HX_("error",c8,cb,29,73), ::Dynamic(::hx::Anon_obj::Create(1)
+            										->setFixed(0,HX_("type",ba,f2,08,4d),HX_("cancel",7a,ed,33,b8))))->tag(HX_("internal-server-error",ce,6d,55,6c), ::Dynamic(::hx::Anon_obj::Create(1)
+            										->setFixed(0,HX_("xmlns",dc,31,74,60),HX_("urn:ietf:params:xml:ns:xmpp-stanzas",27,f2,3d,30))));
+            								}
+            								else {
+            									HX_STACK_DO_THROW(_hx_e);
             								}
-HXLINE( 348)								stream->sendStanza(reply2);
             							}
+HXLINE( 337)							stream->sendStanza(reply2);
             						}
             					}
             				}
-            				else {
-HXLINE( 353)					stream->onStanza(stanza);
-            				}
             			}
-            			HX_END_LOCAL_FUNC0((void))
-
-HXLINE( 323)			::String name = stanza->name;
-HXLINE( 324)			stream->mainThread->run( ::Dynamic(new _hx_Closure_0(name,stream,stanza)));
+            			else {
+HXLINE( 342)				stream->onStanza(stanza);
+            			}
             		}
-HXLINE( 358)		__hxcpp_enter_gc_free_zone();
-HXLINE( 359)		return 1;
+HXLINE( 346)		return 1;
             	}
 
 
-void XmppStropheStream_obj::strophe_connect( xmpp_conn_t* conn, xmpp_conn_event_t event,int error, xmpp_stream_error_t* stream_error,void* userdata){
-            		HX_BEGIN_LOCAL_FUNC_S2(::hx::LocalFunc,_hx_Closure_0, xmpp_conn_event_t,event, ::snikket::streams::XmppStropheStream,stream) HXARGC(0)
-            		void _hx_run(){
-            			HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_368_strophe_connect)
-HXLINE( 369)			 xmpp_conn_event_t event1 = event;
-HXDLIN( 369)			if (::hx::IsInstanceEq( event1,XMPP_CONN_CONNECT )) {
-HXLINE( 370)				stream->ready = true;
-HXLINE( 371)				while((stream->pending->length > 0)){
-HXLINE( 372)					 ::snikket::streams::XmppStropheStream stream1 = stream;
-HXDLIN( 372)					stream1->sendStanza(stream->pending->shift().StaticCast<  ::snikket::Stanza >());
-            				}
-HXLINE( 374)				stream->trigger(HX_("status/online",10,05,0e,d2), ::Dynamic(::hx::Anon_obj::Create(0)));
+void XmppStropheStream_obj::strophe_connect( xmpp_conn_t* conn, xmpp_conn_event_t event,int error, xmpp_stream_error_t* stream_error,int resumed,void* userdata){
+            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_353_strophe_connect)
+HXLINE( 354)		 ::snikket::streams::XmppStropheStream stream = static_cast<hx::Object*>(userdata);
+HXLINE( 355)		if (::hx::IsInstanceEq( event,XMPP_CONN_CONNECT )) {
+HXLINE( 356)			stream->ready = true;
+HXLINE( 357)			while((stream->pending->length > 0)){
+HXLINE( 358)				stream->sendStanza(stream->pending->shift().StaticCast<  ::snikket::Stanza >());
             			}
-HXLINE( 376)			 xmpp_conn_event_t event2 = event;
-HXDLIN( 376)			if (::hx::IsInstanceEq( event2,XMPP_CONN_DISCONNECT )) {
-HXLINE( 377)				if (!(stream->ready)) {
-HXLINE( 379)					stream->trigger(HX_("auth/fail",25,45,e9,d1), ::Dynamic(::hx::Anon_obj::Create(0)));
-            				}
-            				else {
-HXLINE( 381)					stream->ready = false;
-HXLINE( 382)					stream->trigger(HX_("status/offline",c6,eb,eb,54), ::Dynamic(::hx::Anon_obj::Create(0)));
-            				}
+HXLINE( 360)			stream->trigger(HX_("status/online",10,05,0e,d2), ::Dynamic(::hx::Anon_obj::Create(1)
+            				->setFixed(0,HX_("resumed",17,0e,58,6b),(resumed != 0))));
+            		}
+HXLINE( 362)		if (::hx::IsInstanceEq( event,XMPP_CONN_DISCONNECT )) {
+HXLINE( 363)			if (!(stream->ready)) {
+HXLINE( 365)				stream->trigger(HX_("auth/fail",25,45,e9,d1), ::Dynamic(::hx::Anon_obj::Create(0)));
             			}
-HXLINE( 385)			 xmpp_conn_event_t event3 = event;
-HXDLIN( 385)			if (::hx::IsInstanceEq( event3,XMPP_CONN_FAIL )) {
-HXLINE( 386)				stream->ready = false;
-HXLINE( 387)				stream->trigger(HX_("status/offline",c6,eb,eb,54), ::Dynamic(::hx::Anon_obj::Create(0)));
+            			else {
+HXLINE( 367)				stream->ready = false;
+HXLINE( 368)				stream->trigger(HX_("status/offline",c6,eb,eb,54), ::Dynamic(::hx::Anon_obj::Create(0)));
+HXLINE( 372)				::cpp::Pointer< char > tmp = null();
+HXLINE( 370)				xmpp_connect_client(conn,tmp,( (unsigned short)(0) ),::cpp::Function< void ( xmpp_conn_t*, xmpp_conn_event_t,int, xmpp_stream_error_t*,int,void*)>(::hx::AnyCast(&::snikket::streams::XmppStropheStream_obj::strophe_connect )),userdata);
             			}
             		}
-            		HX_END_LOCAL_FUNC0((void))
+HXLINE( 379)		if (::hx::IsInstanceEq( event,XMPP_CONN_FAIL )) {
+HXLINE( 380)			stream->ready = false;
+HXLINE( 381)			stream->trigger(HX_("status/offline",c6,eb,eb,54), ::Dynamic(::hx::Anon_obj::Create(0)));
+            		}
+            	}
+
 
-            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_366_strophe_connect)
-HXLINE( 367)		 ::snikket::streams::XmppStropheStream stream = static_cast<hx::Object*>(userdata);
-HXLINE( 368)		stream->mainThread->run( ::Dynamic(new _hx_Closure_0(event,stream)));
-HXLINE( 390)		__hxcpp_enter_gc_free_zone();
+ ::snikket::Stanza XmppStropheStream_obj::parseStanza(::String s){
+            	HX_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_430_parseStanza)
+HXLINE( 431)		::cpp::Pointer< char > tmp = cpp::Pointer_obj::fromPointer(s.c_str());
+HXDLIN( 431)		 xmpp_stanza_t* sstanza = xmpp_stanza_new_from_string(::snikket::streams::XmppStropheStream_obj::ctx,tmp);
+HXLINE( 432)		if (::hx::IsNull( sstanza )) {
+HXLINE( 432)			HX_STACK_DO_THROW((HX_("Failed to parse stanza: ",6a,ef,ec,9c) + s));
+            		}
+HXLINE( 433)		 ::snikket::Stanza stanza = ::snikket::streams::XmppStropheStream_obj::convertToStanza(sstanza,null());
+HXLINE( 434)		xmpp_stanza_release(sstanza);
+HXLINE( 435)		return stanza;
             	}
 
 
+STATIC_HX_DEFINE_DYNAMIC_FUNC1(XmppStropheStream_obj,parseStanza,return )
+
  ::snikket::Stanza XmppStropheStream_obj::convertToStanza( xmpp_stanza_t* el,void* dummy){
-            	HX_GC_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_442_convertToStanza)
-HXLINE( 443)		::cpp::Pointer< char > name = xmpp_stanza_get_name(el);
-HXLINE( 444)		int attrlen = xmpp_stanza_get_attribute_count(el);
-HXLINE( 445)		void* attrsraw = ::hx::InternalNew(((attrlen * 2) * sizeof(char*)),false);
-HXLINE( 446)		const char** attrsarray = static_cast<const char**>(attrsraw);
-HXLINE( 447)		::cpp::Pointer< const char* > attrsptr = ::cpp::Pointer_obj::fromRaw(attrsarray);
-HXLINE( 448)		xmpp_stanza_get_attributes(el,attrsarray,(attrlen * 2));
-HXLINE( 449)		 ::Dynamic attrs =  ::Dynamic(::hx::Anon_obj::Create(0));
-HXLINE( 450)		{
-HXLINE( 450)			int _g = 0;
-HXDLIN( 450)			int _g1 = attrlen;
-HXDLIN( 450)			while((_g < _g1)){
-HXLINE( 450)				_g = (_g + 1);
-HXDLIN( 450)				int i = (_g - 1);
-HXLINE( 451)				::cpp::Pointer< char > key = cpp::Pointer_obj::fromRaw(attrsptr->at((i * 2)));
-HXLINE( 452)				::cpp::Pointer< char > value = cpp::Pointer_obj::fromRaw(attrsptr->at(((i * 2) + 1)));
-HXLINE( 453)				{
-HXLINE( 453)					::String key1 =  ::String(key->ptr);
-HXDLIN( 453)					::String value1 =  ::String(value->ptr);
-HXDLIN( 453)					::Reflect_obj::setField(attrs,key1,value1);
+            	HX_GC_STACKFRAME(&_hx_pos_c0c1f1a3af656a5a_438_convertToStanza)
+HXLINE( 439)		::cpp::Pointer< char > name = xmpp_stanza_get_name(el);
+HXLINE( 440)		int attrlen = xmpp_stanza_get_attribute_count(el);
+HXLINE( 441)		void* attrsraw = ::hx::InternalNew(((attrlen * 2) * sizeof(char*)),false);
+HXLINE( 442)		const char** attrsarray = static_cast<const char**>(attrsraw);
+HXLINE( 443)		::cpp::Pointer< const char* > attrsptr = ::cpp::Pointer_obj::fromRaw(attrsarray);
+HXLINE( 444)		xmpp_stanza_get_attributes(el,attrsarray,(attrlen * 2));
+HXLINE( 445)		 ::Dynamic attrs =  ::Dynamic(::hx::Anon_obj::Create(0));
+HXLINE( 446)		{
+HXLINE( 446)			int _g = 0;
+HXDLIN( 446)			int _g1 = attrlen;
+HXDLIN( 446)			while((_g < _g1)){
+HXLINE( 446)				_g = (_g + 1);
+HXDLIN( 446)				int i = (_g - 1);
+HXLINE( 447)				::cpp::Pointer< char > key = cpp::Pointer_obj::fromRaw(attrsptr->at((i * 2)));
+HXLINE( 448)				::cpp::Pointer< char > value = cpp::Pointer_obj::fromRaw(attrsptr->at(((i * 2) + 1)));
+HXLINE( 449)				{
+HXLINE( 449)					::String key1 =  ::String(key->ptr);
+HXDLIN( 449)					::String value1 =  ::String(value->ptr);
+HXDLIN( 449)					::Reflect_obj::setField(attrs,key1,value1);
             				}
             			}
             		}
-HXLINE( 455)		 ::snikket::Stanza stanza =  ::snikket::Stanza_obj::__alloc( HX_CTX , ::String(name->ptr),attrs);
-HXLINE( 457)		 xmpp_stanza_t* child = xmpp_stanza_get_children(el);
-HXLINE( 458)		while(::hx::IsNotNull( child )){
-HXLINE( 459)			if (xmpp_stanza_is_text(child)) {
-HXLINE( 460)				const char* r = xmpp_stanza_get_text_ptr(child);
-HXLINE( 461)				::cpp::Pointer< char > inPtr = cpp::Pointer_obj::fromRaw(xmpp_stanza_get_text_ptr(child));
-HXDLIN( 461)				::String x =  ::String(inPtr->ptr);
-HXLINE( 462)				stanza->text(x);
+HXLINE( 451)		 ::snikket::Stanza stanza =  ::snikket::Stanza_obj::__alloc( HX_CTX , ::String(name->ptr),attrs);
+HXLINE( 453)		 xmpp_stanza_t* child = xmpp_stanza_get_children(el);
+HXLINE( 454)		while(::hx::IsNotNull( child )){
+HXLINE( 455)			if (xmpp_stanza_is_text(child)) {
+HXLINE( 456)				::cpp::Pointer< char > inPtr = cpp::Pointer_obj::fromRaw(xmpp_stanza_get_text_ptr(child));
+HXDLIN( 456)				stanza->text( ::String(inPtr->ptr));
             			}
             			else {
-HXLINE( 464)				stanza->addChild(::snikket::streams::XmppStropheStream_obj::convertToStanza(child,null()));
+HXLINE( 458)				stanza->addChild(::snikket::streams::XmppStropheStream_obj::convertToStanza(child,null()));
             			}
-HXLINE( 466)			child = xmpp_stanza_get_next(child);
+HXLINE( 460)			child = xmpp_stanza_get_next(child);
             		}
-HXLINE( 469)		return stanza;
+HXLINE( 463)		return stanza;
             	}
 
 
@@ -621,8 +578,9 @@ void XmppStropheStream_obj::__Mark(HX_MARK_PARAMS)
 	HX_MARK_BEGIN_CLASS(XmppStropheStream);
 	HX_MARK_MEMBER_NAME(iqHandlers,"iqHandlers");
 	HX_MARK_MEMBER_NAME(pending,"pending");
+	HX_MARK_MEMBER_NAME(pollTimer,"pollTimer");
 	HX_MARK_MEMBER_NAME(ready,"ready");
-	HX_MARK_MEMBER_NAME(mainThread,"mainThread");
+	HX_MARK_MEMBER_NAME(stanzaThisPoll,"stanzaThisPoll");
 	 ::snikket::GenericStream_obj::__Mark(HX_MARK_ARG);
 	HX_MARK_END_CLASS();
 }
@@ -631,8 +589,9 @@ void XmppStropheStream_obj::__Visit(HX_VISIT_PARAMS)
 {
 	HX_VISIT_MEMBER_NAME(iqHandlers,"iqHandlers");
 	HX_VISIT_MEMBER_NAME(pending,"pending");
+	HX_VISIT_MEMBER_NAME(pollTimer,"pollTimer");
 	HX_VISIT_MEMBER_NAME(ready,"ready");
-	HX_VISIT_MEMBER_NAME(mainThread,"mainThread");
+	HX_VISIT_MEMBER_NAME(stanzaThisPoll,"stanzaThisPoll");
 	 ::snikket::GenericStream_obj::__Visit(HX_VISIT_ARG);
 }
 
@@ -641,6 +600,7 @@ void XmppStropheStream_obj::__Visit(HX_VISIT_PARAMS)
 	switch(inName.length) {
 	case 4:
 		if (HX_FIELD_EQ(inName,"onIq") ) { return ::hx::Val( onIq_dyn() ); }
+		if (HX_FIELD_EQ(inName,"poll") ) { return ::hx::Val( poll_dyn() ); }
 		break;
 	case 5:
 		if (HX_FIELD_EQ(inName,"ready") ) { return ::hx::Val( ready ); }
@@ -653,18 +613,32 @@ void XmppStropheStream_obj::__Visit(HX_VISIT_PARAMS)
 	case 8:
 		if (HX_FIELD_EQ(inName,"finalize") ) { return ::hx::Val( finalize_dyn() ); }
 		break;
+	case 9:
+		if (HX_FIELD_EQ(inName,"pollTimer") ) { return ::hx::Val( pollTimer ); }
+		break;
 	case 10:
 		if (HX_FIELD_EQ(inName,"iqHandlers") ) { return ::hx::Val( iqHandlers ); }
-		if (HX_FIELD_EQ(inName,"mainThread") ) { return ::hx::Val( mainThread ); }
 		if (HX_FIELD_EQ(inName,"disconnect") ) { return ::hx::Val( disconnect_dyn() ); }
 		if (HX_FIELD_EQ(inName,"sendStanza") ) { return ::hx::Val( sendStanza_dyn() ); }
 		break;
+	case 14:
+		if (HX_FIELD_EQ(inName,"stanzaThisPoll") ) { return ::hx::Val( stanzaThisPoll ); }
+		break;
 	case 17:
 		if (HX_FIELD_EQ(inName,"convertFromStanza") ) { return ::hx::Val( convertFromStanza_dyn() ); }
 	}
 	return super::__Field(inName,inCallProp);
 }
 
+bool XmppStropheStream_obj::__GetStatic(const ::String &inName, Dynamic &outValue, ::hx::PropertyAccess inCallProp)
+{
+	switch(inName.length) {
+	case 11:
+		if (HX_FIELD_EQ(inName,"parseStanza") ) { outValue = parseStanza_dyn(); return true; }
+	}
+	return false;
+}
+
 ::hx::Val XmppStropheStream_obj::__SetField(const ::String &inName,const ::hx::Val &inValue,::hx::PropertyAccess inCallProp)
 {
 	switch(inName.length) {
@@ -674,9 +648,14 @@ void XmppStropheStream_obj::__Visit(HX_VISIT_PARAMS)
 	case 7:
 		if (HX_FIELD_EQ(inName,"pending") ) { pending=inValue.Cast< ::Array< ::Dynamic> >(); return inValue; }
 		break;
+	case 9:
+		if (HX_FIELD_EQ(inName,"pollTimer") ) { pollTimer=inValue.Cast<  ::haxe::Timer >(); return inValue; }
+		break;
 	case 10:
 		if (HX_FIELD_EQ(inName,"iqHandlers") ) { iqHandlers=inValue.Cast<  ::haxe::ds::EnumValueMap >(); return inValue; }
-		if (HX_FIELD_EQ(inName,"mainThread") ) { mainThread=inValue.Cast<  ::sys::thread::EventLoop >(); return inValue; }
+		break;
+	case 14:
+		if (HX_FIELD_EQ(inName,"stanzaThisPoll") ) { stanzaThisPoll=inValue.Cast< bool >(); return inValue; }
 	}
 	return super::__SetField(inName,inValue,inCallProp);
 }
@@ -685,8 +664,9 @@ void XmppStropheStream_obj::__GetFields(Array< ::String> &outFields)
 {
 	outFields->push(HX_("iqHandlers",71,61,f0,a9));
 	outFields->push(HX_("pending",57,98,ec,2b));
+	outFields->push(HX_("pollTimer",06,ad,79,73));
 	outFields->push(HX_("ready",63,a0,ba,e6));
-	outFields->push(HX_("mainThread",e3,97,65,e4));
+	outFields->push(HX_("stanzaThisPoll",d2,ce,2e,fa));
 	super::__GetFields(outFields);
 };
 
@@ -694,8 +674,9 @@ void XmppStropheStream_obj::__GetFields(Array< ::String> &outFields)
 static ::hx::StorageInfo XmppStropheStream_obj_sMemberStorageInfo[] = {
 	{::hx::fsObject /*  ::haxe::ds::EnumValueMap */ ,(int)offsetof(XmppStropheStream_obj,iqHandlers),HX_("iqHandlers",71,61,f0,a9)},
 	{::hx::fsObject /* ::Array< ::Dynamic> */ ,(int)offsetof(XmppStropheStream_obj,pending),HX_("pending",57,98,ec,2b)},
+	{::hx::fsObject /*  ::haxe::Timer */ ,(int)offsetof(XmppStropheStream_obj,pollTimer),HX_("pollTimer",06,ad,79,73)},
 	{::hx::fsBool,(int)offsetof(XmppStropheStream_obj,ready),HX_("ready",63,a0,ba,e6)},
-	{::hx::fsObject /*  ::sys::thread::EventLoop */ ,(int)offsetof(XmppStropheStream_obj,mainThread),HX_("mainThread",e3,97,65,e4)},
+	{::hx::fsBool,(int)offsetof(XmppStropheStream_obj,stanzaThisPoll),HX_("stanzaThisPoll",d2,ce,2e,fa)},
 	{ ::hx::fsUnknown, 0, null()}
 };
 static ::hx::StaticInfo *XmppStropheStream_obj_sStaticStorageInfo = 0;
@@ -704,12 +685,14 @@ static ::hx::StaticInfo *XmppStropheStream_obj_sStaticStorageInfo = 0;
 static ::String XmppStropheStream_obj_sMemberFields[] = {
 	HX_("iqHandlers",71,61,f0,a9),
 	HX_("pending",57,98,ec,2b),
+	HX_("pollTimer",06,ad,79,73),
 	HX_("ready",63,a0,ba,e6),
-	HX_("mainThread",e3,97,65,e4),
+	HX_("stanzaThisPoll",d2,ce,2e,fa),
 	HX_("newId",5b,e8,30,99),
 	HX_("onIq",e7,66,b2,49),
 	HX_("connect",ea,3b,80,15),
 	HX_("disconnect",5c,64,44,69),
+	HX_("poll",3f,7e,5c,4a),
 	HX_("convertFromStanza",d2,72,14,33),
 	HX_("sendStanza",5d,85,4d,a7),
 	HX_("finalize",9e,45,3a,f5),
@@ -717,6 +700,11 @@ static ::String XmppStropheStream_obj_sMemberFields[] = {
 
 ::hx::Class XmppStropheStream_obj::__mClass;
 
+static ::String XmppStropheStream_obj_sStaticFields[] = {
+	HX_("parseStanza",88,0a,34,81),
+	::String(null())
+};
+
 void XmppStropheStream_obj::__register()
 {
 	XmppStropheStream_obj _hx_dummy;
@@ -726,9 +714,9 @@ void XmppStropheStream_obj::__register()
 	__mClass->mSuper = &super::__SGetClass();
 	__mClass->mConstructEmpty = &__CreateEmpty;
 	__mClass->mConstructArgs = &__Create;
-	__mClass->mGetStaticField = &::hx::Class_obj::GetNoStaticField;
+	__mClass->mGetStaticField = &XmppStropheStream_obj::__GetStatic;
 	__mClass->mSetStaticField = &::hx::Class_obj::SetNoStaticField;
-	__mClass->mStatics = ::hx::Class_obj::dupFunctions(0 /* sStaticFields */);
+	__mClass->mStatics = ::hx::Class_obj::dupFunctions(XmppStropheStream_obj_sStaticFields);
 	__mClass->mMembers = ::hx::Class_obj::dupFunctions(XmppStropheStream_obj_sMemberFields);
 	__mClass->mCanCast = ::hx::TCanCast< XmppStropheStream_obj >;
 #ifdef HXCPP_SCRIPTABLE
diff --git a/Sources/c_snikket/src/sys/thread/Deque.cpp b/Sources/c_snikket/src/sys/thread/Deque.cpp
new file mode 100644
index 0000000..cc6a1e8
--- /dev/null
+++ b/Sources/c_snikket/src/sys/thread/Deque.cpp
@@ -0,0 +1,148 @@
+// Generated by Haxe 4.3.3
+#include <hxcpp.h>
+
+#ifndef INCLUDED_sys_thread_Deque
+#include <sys/thread/Deque.h>
+#endif
+
+HX_DEFINE_STACK_FRAME(_hx_pos_2beacc257f186a5f_30_new,"sys.thread.Deque","new",0xfb067acf,"sys.thread.Deque.new","/usr/local/lib/haxe/std/cpp/_std/sys/thread/Deque.hx",30,0x960d395f)
+HX_LOCAL_STACK_FRAME(_hx_pos_2beacc257f186a5f_34_add,"sys.thread.Deque","add",0xfafc9c90,"sys.thread.Deque.add","/usr/local/lib/haxe/std/cpp/_std/sys/thread/Deque.hx",34,0x960d395f)
+HX_LOCAL_STACK_FRAME(_hx_pos_2beacc257f186a5f_38_push,"sys.thread.Deque","push",0xac03888b,"sys.thread.Deque.push","/usr/local/lib/haxe/std/cpp/_std/sys/thread/Deque.hx",38,0x960d395f)
+HX_LOCAL_STACK_FRAME(_hx_pos_2beacc257f186a5f_42_pop,"sys.thread.Deque","pop",0xfb080800,"sys.thread.Deque.pop","/usr/local/lib/haxe/std/cpp/_std/sys/thread/Deque.hx",42,0x960d395f)
+namespace sys{
+namespace thread{
+
+void Deque_obj::__construct(){
+            	HX_STACKFRAME(&_hx_pos_2beacc257f186a5f_30_new)
+HXDLIN(  30)		this->q =  ::__hxcpp_deque_create();
+            	}
+
+Dynamic Deque_obj::__CreateEmpty() { return new Deque_obj; }
+
+void *Deque_obj::_hx_vtable = 0;
+
+Dynamic Deque_obj::__Create(::hx::DynamicArray inArgs)
+{
+	::hx::ObjectPtr< Deque_obj > _hx_result = new Deque_obj();
+	_hx_result->__construct();
+	return _hx_result;
+}
+
+bool Deque_obj::_hx_isInstanceOf(int inClassId) {
+	return inClassId==(int)0x00000001 || inClassId==(int)0x1b43d7ad;
+}
+
+void Deque_obj::add( ::Dynamic i){
+            	HX_STACKFRAME(&_hx_pos_2beacc257f186a5f_34_add)
+HXDLIN(  34)		 ::__hxcpp_deque_add(this->q,i);
+            	}
+
+
+HX_DEFINE_DYNAMIC_FUNC1(Deque_obj,add,(void))
+
+void Deque_obj::push( ::Dynamic i){
+            	HX_STACKFRAME(&_hx_pos_2beacc257f186a5f_38_push)
+HXDLIN(  38)		 ::__hxcpp_deque_push(this->q,i);
+            	}
+
+
+HX_DEFINE_DYNAMIC_FUNC1(Deque_obj,push,(void))
+
+ ::Dynamic Deque_obj::pop(bool block){
+            	HX_STACKFRAME(&_hx_pos_2beacc257f186a5f_42_pop)
+HXDLIN(  42)		return  ::__hxcpp_deque_pop(this->q,block);
+            	}
+
+
+HX_DEFINE_DYNAMIC_FUNC1(Deque_obj,pop,return )
+
+
+Deque_obj::Deque_obj()
+{
+}
+
+void Deque_obj::__Mark(HX_MARK_PARAMS)
+{
+	HX_MARK_BEGIN_CLASS(Deque);
+	HX_MARK_MEMBER_NAME(q,"q");
+	HX_MARK_END_CLASS();
+}
+
+void Deque_obj::__Visit(HX_VISIT_PARAMS)
+{
+	HX_VISIT_MEMBER_NAME(q,"q");
+}
+
+::hx::Val Deque_obj::__Field(const ::String &inName,::hx::PropertyAccess inCallProp)
+{
+	switch(inName.length) {
+	case 1:
+		if (HX_FIELD_EQ(inName,"q") ) { return ::hx::Val( q ); }
+		break;
+	case 3:
+		if (HX_FIELD_EQ(inName,"add") ) { return ::hx::Val( add_dyn() ); }
+		if (HX_FIELD_EQ(inName,"pop") ) { return ::hx::Val( pop_dyn() ); }
+		break;
+	case 4:
+		if (HX_FIELD_EQ(inName,"push") ) { return ::hx::Val( push_dyn() ); }
+	}
+	return super::__Field(inName,inCallProp);
+}
+
+::hx::Val Deque_obj::__SetField(const ::String &inName,const ::hx::Val &inValue,::hx::PropertyAccess inCallProp)
+{
+	switch(inName.length) {
+	case 1:
+		if (HX_FIELD_EQ(inName,"q") ) { q=inValue.Cast<  ::Dynamic >(); return inValue; }
+	}
+	return super::__SetField(inName,inValue,inCallProp);
+}
+
+void Deque_obj::__GetFields(Array< ::String> &outFields)
+{
+	outFields->push(HX_("q",71,00,00,00));
+	super::__GetFields(outFields);
+};
+
+#ifdef HXCPP_SCRIPTABLE
+static ::hx::StorageInfo Deque_obj_sMemberStorageInfo[] = {
+	{::hx::fsObject /*  ::Dynamic */ ,(int)offsetof(Deque_obj,q),HX_("q",71,00,00,00)},
+	{ ::hx::fsUnknown, 0, null()}
+};
+static ::hx::StaticInfo *Deque_obj_sStaticStorageInfo = 0;
+#endif
+
+static ::String Deque_obj_sMemberFields[] = {
+	HX_("q",71,00,00,00),
+	HX_("add",21,f2,49,00),
+	HX_("push",da,11,61,4a),
+	HX_("pop",91,5d,55,00),
+	::String(null()) };
+
+::hx::Class Deque_obj::__mClass;
+
+void Deque_obj::__register()
+{
+	Deque_obj _hx_dummy;
+	Deque_obj::_hx_vtable = *(void **)&_hx_dummy;
+	::hx::Static(__mClass) = new ::hx::Class_obj();
+	__mClass->mName = HX_("sys.thread.Deque",5d,67,c7,9a);
+	__mClass->mSuper = &super::__SGetClass();
+	__mClass->mConstructEmpty = &__CreateEmpty;
+	__mClass->mConstructArgs = &__Create;
+	__mClass->mGetStaticField = &::hx::Class_obj::GetNoStaticField;
+	__mClass->mSetStaticField = &::hx::Class_obj::SetNoStaticField;
+	__mClass->mStatics = ::hx::Class_obj::dupFunctions(0 /* sStaticFields */);
+	__mClass->mMembers = ::hx::Class_obj::dupFunctions(Deque_obj_sMemberFields);
+	__mClass->mCanCast = ::hx::TCanCast< Deque_obj >;
+#ifdef HXCPP_SCRIPTABLE
+	__mClass->mMemberStorageInfo = Deque_obj_sMemberStorageInfo;
+#endif
+#ifdef HXCPP_SCRIPTABLE
+	__mClass->mStaticStorageInfo = Deque_obj_sStaticStorageInfo;
+#endif
+	::hx::_hx_RegisterClass(__mClass->mName, __mClass);
+}
+
+} // end namespace sys
+} // end namespace thread
diff --git a/Sources/c_snikket/src/sys/thread/ElasticThreadPool.cpp b/Sources/c_snikket/src/sys/thread/ElasticThreadPool.cpp
new file mode 100644
index 0000000..35a30c0
--- /dev/null
+++ b/Sources/c_snikket/src/sys/thread/ElasticThreadPool.cpp
@@ -0,0 +1,278 @@
+// Generated by Haxe 4.3.3
+#include <hxcpp.h>
+
+#ifndef INCLUDED_haxe_Exception
+#include <haxe/Exception.h>
+#endif
+#ifndef INCLUDED_sys_thread_Deque
+#include <sys/thread/Deque.h>
+#endif
+#ifndef INCLUDED_sys_thread_ElasticThreadPool
+#include <sys/thread/ElasticThreadPool.h>
+#endif
+#ifndef INCLUDED_sys_thread_IThreadPool
+#include <sys/thread/IThreadPool.h>
+#endif
+#ifndef INCLUDED_sys_thread_Mutex
+#include <sys/thread/Mutex.h>
+#endif
+#ifndef INCLUDED_sys_thread_ThreadPoolException
+#include <sys/thread/ThreadPoolException.h>
+#endif
+#ifndef INCLUDED_sys_thread__ElasticThreadPool_Worker
+#include <sys/thread/_ElasticThreadPool/Worker.h>
+#endif
+
+HX_DEFINE_STACK_FRAME(_hx_pos_375541b599b12e89_38_new,"sys.thread.ElasticThreadPool","new",0x39cbceaa,"sys.thread.ElasticThreadPool.new","/usr/local/lib/haxe/std/sys/thread/ElasticThreadPool.hx",38,0xef69f909)
+HX_LOCAL_STACK_FRAME(_hx_pos_375541b599b12e89_71_run,"sys.thread.ElasticThreadPool","run",0x39cee595,"sys.thread.ElasticThreadPool.run","/usr/local/lib/haxe/std/sys/thread/ElasticThreadPool.hx",71,0xef69f909)
+namespace sys{
+namespace thread{
+
+void ElasticThreadPool_obj::__construct(int maxThreadsCount,::hx::Null< Float >  __o_threadTimeout){
+            		Float threadTimeout = __o_threadTimeout.Default(60);
+            	HX_GC_STACKFRAME(&_hx_pos_375541b599b12e89_38_new)
+HXLINE(  50)		this->mutex =  ::sys::thread::Mutex_obj::__alloc( HX_CTX );
+HXLINE(  49)		this->queue =  ::sys::thread::Deque_obj::__alloc( HX_CTX );
+HXLINE(  48)		this->pool = ::Array_obj< ::Dynamic>::__new(0);
+HXLINE(  45)		this->_isShutdown = false;
+HXLINE(  60)		if ((maxThreadsCount < 1)) {
+HXLINE(  61)			HX_STACK_DO_THROW( ::sys::thread::ThreadPoolException_obj::__alloc( HX_CTX ,HX_("ElasticThreadPool needs maxThreadsCount to be at least 1.",2b,c3,02,ca),null(),null()));
+            		}
+HXLINE(  62)		this->maxThreadsCount = maxThreadsCount;
+HXLINE(  63)		this->threadTimeout = threadTimeout;
+            	}
+
+Dynamic ElasticThreadPool_obj::__CreateEmpty() { return new ElasticThreadPool_obj; }
+
+void *ElasticThreadPool_obj::_hx_vtable = 0;
+
+Dynamic ElasticThreadPool_obj::__Create(::hx::DynamicArray inArgs)
+{
+	::hx::ObjectPtr< ElasticThreadPool_obj > _hx_result = new ElasticThreadPool_obj();
+	_hx_result->__construct(inArgs[0],inArgs[1]);
+	return _hx_result;
+}
+
+bool ElasticThreadPool_obj::_hx_isInstanceOf(int inClassId) {
+	return inClassId==(int)0x00000001 || inClassId==(int)0x4a20aa6c;
+}
+
+static ::sys::thread::IThreadPool_obj _hx_sys_thread_ElasticThreadPool__hx_sys_thread_IThreadPool= {
+	( void (::hx::Object::*)( ::Dynamic))&::sys::thread::ElasticThreadPool_obj::run,
+};
+
+void *ElasticThreadPool_obj::_hx_getInterface(int inHash) {
+	switch(inHash) {
+		case (int)0xf18bc1b8: return &_hx_sys_thread_ElasticThreadPool__hx_sys_thread_IThreadPool;
+	}
+	#ifdef HXCPP_SCRIPTABLE
+	return super::_hx_getInterface(inHash);
+	#else
+	return 0;
+	#endif
+}
+
+void ElasticThreadPool_obj::run( ::Dynamic task){
+            	HX_GC_STACKFRAME(&_hx_pos_375541b599b12e89_71_run)
+HXLINE(  72)		if (this->_isShutdown) {
+HXLINE(  73)			HX_STACK_DO_THROW( ::sys::thread::ThreadPoolException_obj::__alloc( HX_CTX ,HX_("Task is rejected. Thread pool is shut down.",3d,37,88,9f),null(),null()));
+            		}
+HXLINE(  74)		if (::hx::IsNull( task )) {
+HXLINE(  75)			HX_STACK_DO_THROW( ::sys::thread::ThreadPoolException_obj::__alloc( HX_CTX ,HX_("Task to run must not be null.",6f,48,35,6b),null(),null()));
+            		}
+HXLINE(  77)		this->mutex->acquire();
+HXLINE(  78)		bool submitted = false;
+HXLINE(  79)		 ::sys::thread::_ElasticThreadPool::Worker deadWorker = null();
+HXLINE(  80)		{
+HXLINE(  80)			int _g = 0;
+HXDLIN(  80)			::Array< ::Dynamic> _g1 = this->pool;
+HXDLIN(  80)			while((_g < _g1->length)){
+HXLINE(  80)				 ::sys::thread::_ElasticThreadPool::Worker worker = _g1->__get(_g).StaticCast<  ::sys::thread::_ElasticThreadPool::Worker >();
+HXDLIN(  80)				_g = (_g + 1);
+HXLINE(  81)				bool _hx_tmp;
+HXDLIN(  81)				if (::hx::IsNull( deadWorker )) {
+HXLINE(  81)					_hx_tmp = worker->dead;
+            				}
+            				else {
+HXLINE(  81)					_hx_tmp = false;
+            				}
+HXDLIN(  81)				if (_hx_tmp) {
+HXLINE(  82)					deadWorker = worker;
+            				}
+HXLINE(  84)				if (::hx::IsNull( worker->task )) {
+HXLINE(  85)					submitted = true;
+HXLINE(  86)					worker->wakeup(task);
+HXLINE(  87)					goto _hx_goto_1;
+            				}
+            			}
+            			_hx_goto_1:;
+            		}
+HXLINE(  90)		if (!(submitted)) {
+HXLINE(  91)			if (::hx::IsNotNull( deadWorker )) {
+HXLINE(  92)				deadWorker->wakeup(task);
+            			}
+            			else {
+HXLINE(  93)				if ((this->pool->length < this->maxThreadsCount)) {
+HXLINE(  94)					 ::sys::thread::_ElasticThreadPool::Worker worker1 =  ::sys::thread::_ElasticThreadPool::Worker_obj::__alloc( HX_CTX ,this->queue,this->threadTimeout);
+HXLINE(  95)					this->pool->push(worker1);
+HXLINE(  96)					worker1->wakeup(task);
+            				}
+            				else {
+HXLINE(  98)					this->queue->add(task);
+            				}
+            			}
+            		}
+HXLINE( 101)		this->mutex->release();
+            	}
+
+
+HX_DEFINE_DYNAMIC_FUNC1(ElasticThreadPool_obj,run,(void))
+
+
+::hx::ObjectPtr< ElasticThreadPool_obj > ElasticThreadPool_obj::__new(int maxThreadsCount,::hx::Null< Float >  __o_threadTimeout) {
+	::hx::ObjectPtr< ElasticThreadPool_obj > __this = new ElasticThreadPool_obj();
+	__this->__construct(maxThreadsCount,__o_threadTimeout);
+	return __this;
+}
+
+::hx::ObjectPtr< ElasticThreadPool_obj > ElasticThreadPool_obj::__alloc(::hx::Ctx *_hx_ctx,int maxThreadsCount,::hx::Null< Float >  __o_threadTimeout) {
+	ElasticThreadPool_obj *__this = (ElasticThreadPool_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(ElasticThreadPool_obj), true, "sys.thread.ElasticThreadPool"));
+	*(void **)__this = ElasticThreadPool_obj::_hx_vtable;
+	__this->__construct(maxThreadsCount,__o_threadTimeout);
+	return __this;
+}
+
+ElasticThreadPool_obj::ElasticThreadPool_obj()
+{
+}
+
+void ElasticThreadPool_obj::__Mark(HX_MARK_PARAMS)
+{
+	HX_MARK_BEGIN_CLASS(ElasticThreadPool);
+	HX_MARK_MEMBER_NAME(maxThreadsCount,"maxThreadsCount");
+	HX_MARK_MEMBER_NAME(_isShutdown,"_isShutdown");
+	HX_MARK_MEMBER_NAME(pool,"pool");
+	HX_MARK_MEMBER_NAME(queue,"queue");
+	HX_MARK_MEMBER_NAME(mutex,"mutex");
+	HX_MARK_MEMBER_NAME(threadTimeout,"threadTimeout");
+	HX_MARK_END_CLASS();
+}
+
+void ElasticThreadPool_obj::__Visit(HX_VISIT_PARAMS)
+{
+	HX_VISIT_MEMBER_NAME(maxThreadsCount,"maxThreadsCount");
+	HX_VISIT_MEMBER_NAME(_isShutdown,"_isShutdown");
+	HX_VISIT_MEMBER_NAME(pool,"pool");
+	HX_VISIT_MEMBER_NAME(queue,"queue");
+	HX_VISIT_MEMBER_NAME(mutex,"mutex");
+	HX_VISIT_MEMBER_NAME(threadTimeout,"threadTimeout");
+}
+
+::hx::Val ElasticThreadPool_obj::__Field(const ::String &inName,::hx::PropertyAccess inCallProp)
+{
+	switch(inName.length) {
+	case 3:
+		if (HX_FIELD_EQ(inName,"run") ) { return ::hx::Val( run_dyn() ); }
+		break;
+	case 4:
+		if (HX_FIELD_EQ(inName,"pool") ) { return ::hx::Val( pool ); }
+		break;
+	case 5:
+		if (HX_FIELD_EQ(inName,"queue") ) { return ::hx::Val( queue ); }
+		if (HX_FIELD_EQ(inName,"mutex") ) { return ::hx::Val( mutex ); }
+		break;
+	case 11:
+		if (HX_FIELD_EQ(inName,"_isShutdown") ) { return ::hx::Val( _isShutdown ); }
+		break;
+	case 13:
+		if (HX_FIELD_EQ(inName,"threadTimeout") ) { return ::hx::Val( threadTimeout ); }
+		break;
+	case 15:
+		if (HX_FIELD_EQ(inName,"maxThreadsCount") ) { return ::hx::Val( maxThreadsCount ); }
+	}
+	return super::__Field(inName,inCallProp);
+}
+
+::hx::Val ElasticThreadPool_obj::__SetField(const ::String &inName,const ::hx::Val &inValue,::hx::PropertyAccess inCallProp)
+{
+	switch(inName.length) {
+	case 4:
+		if (HX_FIELD_EQ(inName,"pool") ) { pool=inValue.Cast< ::Array< ::Dynamic> >(); return inValue; }
+		break;
+	case 5:
+		if (HX_FIELD_EQ(inName,"queue") ) { queue=inValue.Cast<  ::sys::thread::Deque >(); return inValue; }
+		if (HX_FIELD_EQ(inName,"mutex") ) { mutex=inValue.Cast<  ::sys::thread::Mutex >(); return inValue; }
+		break;
+	case 11:
+		if (HX_FIELD_EQ(inName,"_isShutdown") ) { _isShutdown=inValue.Cast< bool >(); return inValue; }
+		break;
+	case 13:
+		if (HX_FIELD_EQ(inName,"threadTimeout") ) { threadTimeout=inValue.Cast< Float >(); return inValue; }
+		break;
+	case 15:
+		if (HX_FIELD_EQ(inName,"maxThreadsCount") ) { maxThreadsCount=inValue.Cast< int >(); return inValue; }
+	}
+	return super::__SetField(inName,inValue,inCallProp);
+}
+
+void ElasticThreadPool_obj::__GetFields(Array< ::String> &outFields)
+{
+	outFields->push(HX_("maxThreadsCount",6a,9e,b8,6f));
+	outFields->push(HX_("_isShutdown",bf,db,44,b8));
+	outFields->push(HX_("pool",dc,80,5c,4a));
+	outFields->push(HX_("queue",91,8d,ea,5d));
+	outFields->push(HX_("mutex",7f,8f,5b,10));
+	outFields->push(HX_("threadTimeout",f7,14,e0,7c));
+	super::__GetFields(outFields);
+};
+
+#ifdef HXCPP_SCRIPTABLE
+static ::hx::StorageInfo ElasticThreadPool_obj_sMemberStorageInfo[] = {
+	{::hx::fsInt,(int)offsetof(ElasticThreadPool_obj,maxThreadsCount),HX_("maxThreadsCount",6a,9e,b8,6f)},
+	{::hx::fsBool,(int)offsetof(ElasticThreadPool_obj,_isShutdown),HX_("_isShutdown",bf,db,44,b8)},
+	{::hx::fsObject /* ::Array< ::Dynamic> */ ,(int)offsetof(ElasticThreadPool_obj,pool),HX_("pool",dc,80,5c,4a)},
+	{::hx::fsObject /*  ::sys::thread::Deque */ ,(int)offsetof(ElasticThreadPool_obj,queue),HX_("queue",91,8d,ea,5d)},
+	{::hx::fsObject /*  ::sys::thread::Mutex */ ,(int)offsetof(ElasticThreadPool_obj,mutex),HX_("mutex",7f,8f,5b,10)},
+	{::hx::fsFloat,(int)offsetof(ElasticThreadPool_obj,threadTimeout),HX_("threadTimeout",f7,14,e0,7c)},
+	{ ::hx::fsUnknown, 0, null()}
+};
+static ::hx::StaticInfo *ElasticThreadPool_obj_sStaticStorageInfo = 0;
+#endif
+
+static ::String ElasticThreadPool_obj_sMemberFields[] = {
+	HX_("maxThreadsCount",6a,9e,b8,6f),
+	HX_("_isShutdown",bf,db,44,b8),
+	HX_("pool",dc,80,5c,4a),
+	HX_("queue",91,8d,ea,5d),
+	HX_("mutex",7f,8f,5b,10),
+	HX_("threadTimeout",f7,14,e0,7c),
+	HX_("run",4b,e7,56,00),
+	::String(null()) };
+
+::hx::Class ElasticThreadPool_obj::__mClass;
+
+void ElasticThreadPool_obj::__register()
+{
+	ElasticThreadPool_obj _hx_dummy;
+	ElasticThreadPool_obj::_hx_vtable = *(void **)&_hx_dummy;
+	::hx::Static(__mClass) = new ::hx::Class_obj();
+	__mClass->mName = HX_("sys.thread.ElasticThreadPool",b8,f1,88,33);
+	__mClass->mSuper = &super::__SGetClass();
+	__mClass->mConstructEmpty = &__CreateEmpty;
+	__mClass->mConstructArgs = &__Create;
+	__mClass->mGetStaticField = &::hx::Class_obj::GetNoStaticField;
+	__mClass->mSetStaticField = &::hx::Class_obj::SetNoStaticField;
+	__mClass->mStatics = ::hx::Class_obj::dupFunctions(0 /* sStaticFields */);
+	__mClass->mMembers = ::hx::Class_obj::dupFunctions(ElasticThreadPool_obj_sMemberFields);
+	__mClass->mCanCast = ::hx::TCanCast< ElasticThreadPool_obj >;
+#ifdef HXCPP_SCRIPTABLE
+	__mClass->mMemberStorageInfo = ElasticThreadPool_obj_sMemberStorageInfo;
+#endif
+#ifdef HXCPP_SCRIPTABLE
+	__mClass->mStaticStorageInfo = ElasticThreadPool_obj_sStaticStorageInfo;
+#endif
+	::hx::_hx_RegisterClass(__mClass->mName, __mClass);
+}
+
+} // end namespace sys
+} // end namespace thread
diff --git a/Sources/c_snikket/src/sys/thread/FixedThreadPool.cpp b/Sources/c_snikket/src/sys/thread/FixedThreadPool.cpp
new file mode 100644
index 0000000..2455b78
--- /dev/null
+++ b/Sources/c_snikket/src/sys/thread/FixedThreadPool.cpp
@@ -0,0 +1,222 @@
+// Generated by Haxe 4.3.3
+#include <hxcpp.h>
+
+#ifndef INCLUDED_haxe_Exception
+#include <haxe/Exception.h>
+#endif
+#ifndef INCLUDED_sys_thread_Deque
+#include <sys/thread/Deque.h>
+#endif
+#ifndef INCLUDED_sys_thread_FixedThreadPool
+#include <sys/thread/FixedThreadPool.h>
+#endif
+#ifndef INCLUDED_sys_thread_IThreadPool
+#include <sys/thread/IThreadPool.h>
+#endif
+#ifndef INCLUDED_sys_thread_ThreadPoolException
+#include <sys/thread/ThreadPoolException.h>
+#endif
+#ifndef INCLUDED_sys_thread__FixedThreadPool_Worker
+#include <sys/thread/_FixedThreadPool/Worker.h>
+#endif
+
+HX_DEFINE_STACK_FRAME(_hx_pos_ae42d88601619f92_36_new,"sys.thread.FixedThreadPool","new",0xb5d48549,"sys.thread.FixedThreadPool.new","/usr/local/lib/haxe/std/sys/thread/FixedThreadPool.hx",36,0x6690e48a)
+HX_LOCAL_STACK_FRAME(_hx_pos_ae42d88601619f92_65_run,"sys.thread.FixedThreadPool","run",0xb5d79c34,"sys.thread.FixedThreadPool.run","/usr/local/lib/haxe/std/sys/thread/FixedThreadPool.hx",65,0x6690e48a)
+namespace sys{
+namespace thread{
+
+void FixedThreadPool_obj::__construct(int threadsCount){
+            	HX_GC_STACKFRAME(&_hx_pos_ae42d88601619f92_36_new)
+HXLINE(  48)		this->queue =  ::sys::thread::Deque_obj::__alloc( HX_CTX );
+HXLINE(  43)		this->_isShutdown = false;
+HXLINE(  54)		if ((threadsCount < 1)) {
+HXLINE(  55)			HX_STACK_DO_THROW( ::sys::thread::ThreadPoolException_obj::__alloc( HX_CTX ,HX_("FixedThreadPool needs threadsCount to be at least 1.",38,9d,3d,48),null(),null()));
+            		}
+HXLINE(  56)		this->threadsCount = threadsCount;
+HXLINE(  57)		::Array< ::Dynamic> _g = ::Array_obj< ::Dynamic>::__new(0);
+HXDLIN(  57)		{
+HXLINE(  57)			int _g1 = 0;
+HXDLIN(  57)			int _g2 = threadsCount;
+HXDLIN(  57)			while((_g1 < _g2)){
+HXLINE(  57)				_g1 = (_g1 + 1);
+HXDLIN(  57)				int i = (_g1 - 1);
+HXDLIN(  57)				_g->push( ::sys::thread::_FixedThreadPool::Worker_obj::__alloc( HX_CTX ,this->queue));
+            			}
+            		}
+HXDLIN(  57)		this->pool = _g;
+            	}
+
+Dynamic FixedThreadPool_obj::__CreateEmpty() { return new FixedThreadPool_obj; }
+
+void *FixedThreadPool_obj::_hx_vtable = 0;
+
+Dynamic FixedThreadPool_obj::__Create(::hx::DynamicArray inArgs)
+{
+	::hx::ObjectPtr< FixedThreadPool_obj > _hx_result = new FixedThreadPool_obj();
+	_hx_result->__construct(inArgs[0]);
+	return _hx_result;
+}
+
+bool FixedThreadPool_obj::_hx_isInstanceOf(int inClassId) {
+	return inClassId==(int)0x00000001 || inClassId==(int)0x654fb1c3;
+}
+
+static ::sys::thread::IThreadPool_obj _hx_sys_thread_FixedThreadPool__hx_sys_thread_IThreadPool= {
+	( void (::hx::Object::*)( ::Dynamic))&::sys::thread::FixedThreadPool_obj::run,
+};
+
+void *FixedThreadPool_obj::_hx_getInterface(int inHash) {
+	switch(inHash) {
+		case (int)0xf18bc1b8: return &_hx_sys_thread_FixedThreadPool__hx_sys_thread_IThreadPool;
+	}
+	#ifdef HXCPP_SCRIPTABLE
+	return super::_hx_getInterface(inHash);
+	#else
+	return 0;
+	#endif
+}
+
+void FixedThreadPool_obj::run( ::Dynamic task){
+            	HX_GC_STACKFRAME(&_hx_pos_ae42d88601619f92_65_run)
+HXLINE(  66)		if (this->_isShutdown) {
+HXLINE(  67)			HX_STACK_DO_THROW( ::sys::thread::ThreadPoolException_obj::__alloc( HX_CTX ,HX_("Task is rejected. Thread pool is shut down.",3d,37,88,9f),null(),null()));
+            		}
+HXLINE(  68)		if (::hx::IsNull( task )) {
+HXLINE(  69)			HX_STACK_DO_THROW( ::sys::thread::ThreadPoolException_obj::__alloc( HX_CTX ,HX_("Task to run must not be null.",6f,48,35,6b),null(),null()));
+            		}
+HXLINE(  70)		this->queue->add(task);
+            	}
+
+
+HX_DEFINE_DYNAMIC_FUNC1(FixedThreadPool_obj,run,(void))
+
+
+::hx::ObjectPtr< FixedThreadPool_obj > FixedThreadPool_obj::__new(int threadsCount) {
+	::hx::ObjectPtr< FixedThreadPool_obj > __this = new FixedThreadPool_obj();
+	__this->__construct(threadsCount);
+	return __this;
+}
+
+::hx::ObjectPtr< FixedThreadPool_obj > FixedThreadPool_obj::__alloc(::hx::Ctx *_hx_ctx,int threadsCount) {
+	FixedThreadPool_obj *__this = (FixedThreadPool_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(FixedThreadPool_obj), true, "sys.thread.FixedThreadPool"));
+	*(void **)__this = FixedThreadPool_obj::_hx_vtable;
+	__this->__construct(threadsCount);
+	return __this;
+}
+
+FixedThreadPool_obj::FixedThreadPool_obj()
+{
+}
+
+void FixedThreadPool_obj::__Mark(HX_MARK_PARAMS)
+{
+	HX_MARK_BEGIN_CLASS(FixedThreadPool);
+	HX_MARK_MEMBER_NAME(threadsCount,"threadsCount");
+	HX_MARK_MEMBER_NAME(_isShutdown,"_isShutdown");
+	HX_MARK_MEMBER_NAME(pool,"pool");
+	HX_MARK_MEMBER_NAME(queue,"queue");
+	HX_MARK_END_CLASS();
+}
+
+void FixedThreadPool_obj::__Visit(HX_VISIT_PARAMS)
+{
+	HX_VISIT_MEMBER_NAME(threadsCount,"threadsCount");
+	HX_VISIT_MEMBER_NAME(_isShutdown,"_isShutdown");
+	HX_VISIT_MEMBER_NAME(pool,"pool");
+	HX_VISIT_MEMBER_NAME(queue,"queue");
+}
+
+::hx::Val FixedThreadPool_obj::__Field(const ::String &inName,::hx::PropertyAccess inCallProp)
+{
+	switch(inName.length) {
+	case 3:
+		if (HX_FIELD_EQ(inName,"run") ) { return ::hx::Val( run_dyn() ); }
+		break;
+	case 4:
+		if (HX_FIELD_EQ(inName,"pool") ) { return ::hx::Val( pool ); }
+		break;
+	case 5:
+		if (HX_FIELD_EQ(inName,"queue") ) { return ::hx::Val( queue ); }
+		break;
+	case 11:
+		if (HX_FIELD_EQ(inName,"_isShutdown") ) { return ::hx::Val( _isShutdown ); }
+		break;
+	case 12:
+		if (HX_FIELD_EQ(inName,"threadsCount") ) { return ::hx::Val( threadsCount ); }
+	}
+	return super::__Field(inName,inCallProp);
+}
+
+::hx::Val FixedThreadPool_obj::__SetField(const ::String &inName,const ::hx::Val &inValue,::hx::PropertyAccess inCallProp)
+{
+	switch(inName.length) {
+	case 4:
+		if (HX_FIELD_EQ(inName,"pool") ) { pool=inValue.Cast< ::Array< ::Dynamic> >(); return inValue; }
+		break;
+	case 5:
+		if (HX_FIELD_EQ(inName,"queue") ) { queue=inValue.Cast<  ::sys::thread::Deque >(); return inValue; }
+		break;
+	case 11:
+		if (HX_FIELD_EQ(inName,"_isShutdown") ) { _isShutdown=inValue.Cast< bool >(); return inValue; }
+		break;
+	case 12:
+		if (HX_FIELD_EQ(inName,"threadsCount") ) { threadsCount=inValue.Cast< int >(); return inValue; }
+	}
+	return super::__SetField(inName,inValue,inCallProp);
+}
+
+void FixedThreadPool_obj::__GetFields(Array< ::String> &outFields)
+{
+	outFields->push(HX_("threadsCount",a6,e1,9b,c2));
+	outFields->push(HX_("_isShutdown",bf,db,44,b8));
+	outFields->push(HX_("pool",dc,80,5c,4a));
+	outFields->push(HX_("queue",91,8d,ea,5d));
+	super::__GetFields(outFields);
+};
+
+#ifdef HXCPP_SCRIPTABLE
+static ::hx::StorageInfo FixedThreadPool_obj_sMemberStorageInfo[] = {
+	{::hx::fsInt,(int)offsetof(FixedThreadPool_obj,threadsCount),HX_("threadsCount",a6,e1,9b,c2)},
+	{::hx::fsBool,(int)offsetof(FixedThreadPool_obj,_isShutdown),HX_("_isShutdown",bf,db,44,b8)},
+	{::hx::fsObject /* ::Array< ::Dynamic> */ ,(int)offsetof(FixedThreadPool_obj,pool),HX_("pool",dc,80,5c,4a)},
+	{::hx::fsObject /*  ::sys::thread::Deque */ ,(int)offsetof(FixedThreadPool_obj,queue),HX_("queue",91,8d,ea,5d)},
+	{ ::hx::fsUnknown, 0, null()}
+};
+static ::hx::StaticInfo *FixedThreadPool_obj_sStaticStorageInfo = 0;
+#endif
+
+static ::String FixedThreadPool_obj_sMemberFields[] = {
+	HX_("threadsCount",a6,e1,9b,c2),
+	HX_("_isShutdown",bf,db,44,b8),
+	HX_("pool",dc,80,5c,4a),
+	HX_("queue",91,8d,ea,5d),
+	HX_("run",4b,e7,56,00),
+	::String(null()) };
+
+::hx::Class FixedThreadPool_obj::__mClass;
+
+void FixedThreadPool_obj::__register()
+{
+	FixedThreadPool_obj _hx_dummy;
+	FixedThreadPool_obj::_hx_vtable = *(void **)&_hx_dummy;
+	::hx::Static(__mClass) = new ::hx::Class_obj();
+	__mClass->mName = HX_("sys.thread.FixedThreadPool",d7,2c,6c,84);
+	__mClass->mSuper = &super::__SGetClass();
+	__mClass->mConstructEmpty = &__CreateEmpty;
+	__mClass->mConstructArgs = &__Create;
+	__mClass->mGetStaticField = &::hx::Class_obj::GetNoStaticField;
+	__mClass->mSetStaticField = &::hx::Class_obj::SetNoStaticField;
+	__mClass->mStatics = ::hx::Class_obj::dupFunctions(0 /* sStaticFields */);
+	__mClass->mMembers = ::hx::Class_obj::dupFunctions(FixedThreadPool_obj_sMemberFields);
+	__mClass->mCanCast = ::hx::TCanCast< FixedThreadPool_obj >;
+#ifdef HXCPP_SCRIPTABLE
+	__mClass->mMemberStorageInfo = FixedThreadPool_obj_sMemberStorageInfo;
+#endif
+#ifdef HXCPP_SCRIPTABLE
+	__mClass->mStaticStorageInfo = FixedThreadPool_obj_sStaticStorageInfo;
+#endif
+	::hx::_hx_RegisterClass(__mClass->mName, __mClass);
+}
+
+} // end namespace sys
+} // end namespace thread
diff --git a/Sources/c_snikket/src/sys/thread/IThreadPool.cpp b/Sources/c_snikket/src/sys/thread/IThreadPool.cpp
new file mode 100644
index 0000000..714258f
--- /dev/null
+++ b/Sources/c_snikket/src/sys/thread/IThreadPool.cpp
@@ -0,0 +1,29 @@
+// Generated by Haxe 4.3.3
+#include <hxcpp.h>
+
+#ifndef INCLUDED_sys_thread_IThreadPool
+#include <sys/thread/IThreadPool.h>
+#endif
+
+namespace sys{
+namespace thread{
+
+
+static ::String IThreadPool_obj_sMemberFields[] = {
+	HX_("run",4b,e7,56,00),
+	::String(null()) };
+
+::hx::Class IThreadPool_obj::__mClass;
+
+void IThreadPool_obj::__register()
+{
+	::hx::Static(__mClass) = new ::hx::Class_obj();
+	__mClass->mName = HX_("sys.thread.IThreadPool",8c,95,52,e3);
+	__mClass->mSuper = &super::__SGetClass();
+	__mClass->mMembers = ::hx::Class_obj::dupFunctions(IThreadPool_obj_sMemberFields);
+	__mClass->mCanCast = ::hx::TIsInterface< (int)0xf18bc1b8 >;
+	::hx::_hx_RegisterClass(__mClass->mName, __mClass);
+}
+
+} // end namespace sys
+} // end namespace thread
diff --git a/Sources/c_snikket/src/sys/thread/NextEventTime.cpp b/Sources/c_snikket/src/sys/thread/NextEventTime.cpp
new file mode 100644
index 0000000..d4494e6
--- /dev/null
+++ b/Sources/c_snikket/src/sys/thread/NextEventTime.cpp
@@ -0,0 +1,102 @@
+// Generated by Haxe 4.3.3
+#include <hxcpp.h>
+
+#ifndef INCLUDED_sys_thread_NextEventTime
+#include <sys/thread/NextEventTime.h>
+#endif
+namespace sys{
+namespace thread{
+
+::sys::thread::NextEventTime NextEventTime_obj::AnyTime( ::Dynamic time)
+{
+	return ::hx::CreateEnum< NextEventTime_obj >(HX_("AnyTime",f9,00,87,6d),2,1)->_hx_init(0,time);
+}
+
+::sys::thread::NextEventTime NextEventTime_obj::At(Float time)
+{
+	return ::hx::CreateEnum< NextEventTime_obj >(HX_("At",13,39,00,00),3,1)->_hx_init(0,time);
+}
+
+::sys::thread::NextEventTime NextEventTime_obj::Never;
+
+::sys::thread::NextEventTime NextEventTime_obj::Now;
+
+bool NextEventTime_obj::__GetStatic(const ::String &inName, ::Dynamic &outValue, ::hx::PropertyAccess inCallProp)
+{
+	if (inName==HX_("AnyTime",f9,00,87,6d)) { outValue = NextEventTime_obj::AnyTime_dyn(); return true; }
+	if (inName==HX_("At",13,39,00,00)) { outValue = NextEventTime_obj::At_dyn(); return true; }
+	if (inName==HX_("Never",6c,ae,5d,2c)) { outValue = NextEventTime_obj::Never; return true; }
+	if (inName==HX_("Now",f6,90,3b,00)) { outValue = NextEventTime_obj::Now; return true; }
+	return super::__GetStatic(inName, outValue, inCallProp);
+}
+
+HX_DEFINE_CREATE_ENUM(NextEventTime_obj)
+
+int NextEventTime_obj::__FindIndex(::String inName)
+{
+	if (inName==HX_("AnyTime",f9,00,87,6d)) return 2;
+	if (inName==HX_("At",13,39,00,00)) return 3;
+	if (inName==HX_("Never",6c,ae,5d,2c)) return 1;
+	if (inName==HX_("Now",f6,90,3b,00)) return 0;
+	return super::__FindIndex(inName);
+}
+
+STATIC_HX_DEFINE_DYNAMIC_FUNC1(NextEventTime_obj,AnyTime,return)
+
+STATIC_HX_DEFINE_DYNAMIC_FUNC1(NextEventTime_obj,At,return)
+
+int NextEventTime_obj::__FindArgCount(::String inName)
+{
+	if (inName==HX_("AnyTime",f9,00,87,6d)) return 1;
+	if (inName==HX_("At",13,39,00,00)) return 1;
+	if (inName==HX_("Never",6c,ae,5d,2c)) return 0;
+	if (inName==HX_("Now",f6,90,3b,00)) return 0;
+	return super::__FindArgCount(inName);
+}
+
+::hx::Val NextEventTime_obj::__Field(const ::String &inName,::hx::PropertyAccess inCallProp)
+{
+	if (inName==HX_("AnyTime",f9,00,87,6d)) return AnyTime_dyn();
+	if (inName==HX_("At",13,39,00,00)) return At_dyn();
+	if (inName==HX_("Never",6c,ae,5d,2c)) return Never;
+	if (inName==HX_("Now",f6,90,3b,00)) return Now;
+	return super::__Field(inName,inCallProp);
+}
+
+static ::String NextEventTime_obj_sStaticFields[] = {
+	HX_("Now",f6,90,3b,00),
+	HX_("Never",6c,ae,5d,2c),
+	HX_("AnyTime",f9,00,87,6d),
+	HX_("At",13,39,00,00),
+	::String(null())
+};
+
+::hx::Class NextEventTime_obj::__mClass;
+
+Dynamic __Create_NextEventTime_obj() { return new NextEventTime_obj; }
+
+void NextEventTime_obj::__register()
+{
+
+::hx::Static(__mClass) = ::hx::_hx_RegisterClass(HX_("sys.thread.NextEventTime",11,32,a7,e0), ::hx::TCanCast< NextEventTime_obj >,NextEventTime_obj_sStaticFields,0,
+	&__Create_NextEventTime_obj, &__Create,
+	&super::__SGetClass(), &CreateNextEventTime_obj, 0
+#ifdef HXCPP_VISIT_ALLOCS
+    , 0
+#endif
+#ifdef HXCPP_SCRIPTABLE
+    , 0
+#endif
+);
+	__mClass->mGetStaticField = &NextEventTime_obj::__GetStatic;
+}
+
+void NextEventTime_obj::__boot()
+{
+Never = ::hx::CreateConstEnum< NextEventTime_obj >(HX_("Never",6c,ae,5d,2c),1);
+Now = ::hx::CreateConstEnum< NextEventTime_obj >(HX_("Now",f6,90,3b,00),0);
+}
+
+
+} // end namespace sys
+} // end namespace thread
diff --git a/Sources/c_snikket/src/sys/thread/ThreadPoolException.cpp b/Sources/c_snikket/src/sys/thread/ThreadPoolException.cpp
new file mode 100644
index 0000000..09b4ce8
--- /dev/null
+++ b/Sources/c_snikket/src/sys/thread/ThreadPoolException.cpp
@@ -0,0 +1,75 @@
+// Generated by Haxe 4.3.3
+#include <hxcpp.h>
+
+#ifndef INCLUDED_haxe_Exception
+#include <haxe/Exception.h>
+#endif
+#ifndef INCLUDED_sys_thread_ThreadPoolException
+#include <sys/thread/ThreadPoolException.h>
+#endif
+
+HX_DEFINE_STACK_FRAME(_hx_pos_198c3f4b2c534790_5_new,"sys.thread.ThreadPoolException","new",0x173dc298,"sys.thread.ThreadPoolException.new","/usr/local/lib/haxe/std/sys/thread/ThreadPoolException.hx",5,0xbaece39b)
+namespace sys{
+namespace thread{
+
+void ThreadPoolException_obj::__construct(::String message, ::haxe::Exception previous, ::Dynamic native){
+            	HX_STACKFRAME(&_hx_pos_198c3f4b2c534790_5_new)
+HXDLIN(   5)		super::__construct(message,previous,native);
+            	}
+
+Dynamic ThreadPoolException_obj::__CreateEmpty() { return new ThreadPoolException_obj; }
+
+void *ThreadPoolException_obj::_hx_vtable = 0;
+
+Dynamic ThreadPoolException_obj::__Create(::hx::DynamicArray inArgs)
+{
+	::hx::ObjectPtr< ThreadPoolException_obj > _hx_result = new ThreadPoolException_obj();
+	_hx_result->__construct(inArgs[0],inArgs[1],inArgs[2]);
+	return _hx_result;
+}
+
+bool ThreadPoolException_obj::_hx_isInstanceOf(int inClassId) {
+	if (inClassId<=(int)0x15d515be) {
+		return inClassId==(int)0x00000001 || inClassId==(int)0x15d515be;
+	} else {
+		return inClassId==(int)0x677ddc49;
+	}
+}
+
+
+ThreadPoolException_obj::ThreadPoolException_obj()
+{
+}
+
+#ifdef HXCPP_SCRIPTABLE
+static ::hx::StorageInfo *ThreadPoolException_obj_sMemberStorageInfo = 0;
+static ::hx::StaticInfo *ThreadPoolException_obj_sStaticStorageInfo = 0;
+#endif
+
+::hx::Class ThreadPoolException_obj::__mClass;
+
+void ThreadPoolException_obj::__register()
+{
+	ThreadPoolException_obj _hx_dummy;
+	ThreadPoolException_obj::_hx_vtable = *(void **)&_hx_dummy;
+	::hx::Static(__mClass) = new ::hx::Class_obj();
+	__mClass->mName = HX_("sys.thread.ThreadPoolException",a6,d6,da,2e);
+	__mClass->mSuper = &super::__SGetClass();
+	__mClass->mConstructEmpty = &__CreateEmpty;
+	__mClass->mConstructArgs = &__Create;
+	__mClass->mGetStaticField = &::hx::Class_obj::GetNoStaticField;
+	__mClass->mSetStaticField = &::hx::Class_obj::SetNoStaticField;
+	__mClass->mStatics = ::hx::Class_obj::dupFunctions(0 /* sStaticFields */);
+	__mClass->mMembers = ::hx::Class_obj::dupFunctions(0 /* sMemberFields */);
+	__mClass->mCanCast = ::hx::TCanCast< ThreadPoolException_obj >;
+#ifdef HXCPP_SCRIPTABLE
+	__mClass->mMemberStorageInfo = ThreadPoolException_obj_sMemberStorageInfo;
+#endif
+#ifdef HXCPP_SCRIPTABLE
+	__mClass->mStaticStorageInfo = ThreadPoolException_obj_sStaticStorageInfo;
+#endif
+	::hx::_hx_RegisterClass(__mClass->mName, __mClass);
+}
+
+} // end namespace sys
+} // end namespace thread
diff --git a/Sources/c_snikket/src/sys/thread/_ElasticThreadPool/Worker.cpp b/Sources/c_snikket/src/sys/thread/_ElasticThreadPool/Worker.cpp
new file mode 100644
index 0000000..7dbfc1f
--- /dev/null
+++ b/Sources/c_snikket/src/sys/thread/_ElasticThreadPool/Worker.cpp
@@ -0,0 +1,300 @@
+// Generated by Haxe 4.3.3
+#include <hxcpp.h>
+
+#ifndef INCLUDED_haxe_Exception
+#include <haxe/Exception.h>
+#endif
+#ifndef INCLUDED_sys_thread_Deque
+#include <sys/thread/Deque.h>
+#endif
+#ifndef INCLUDED_sys_thread_Lock
+#include <sys/thread/Lock.h>
+#endif
+#ifndef INCLUDED_sys_thread_Mutex
+#include <sys/thread/Mutex.h>
+#endif
+#ifndef INCLUDED_sys_thread__ElasticThreadPool_Worker
+#include <sys/thread/_ElasticThreadPool/Worker.h>
+#endif
+#ifndef INCLUDED_sys_thread__Thread_HaxeThread
+#include <sys/thread/_Thread/HaxeThread.h>
+#endif
+
+HX_DEFINE_STACK_FRAME(_hx_pos_612e84ac54a20b79_130_new,"sys.thread._ElasticThreadPool.Worker","new",0x0979567f,"sys.thread._ElasticThreadPool.Worker.new","/usr/local/lib/haxe/std/sys/thread/ElasticThreadPool.hx",130,0xef69f909)
+HX_LOCAL_STACK_FRAME(_hx_pos_612e84ac54a20b79_147_wakeup,"sys.thread._ElasticThreadPool.Worker","wakeup",0xd86ceac0,"sys.thread._ElasticThreadPool.Worker.wakeup","/usr/local/lib/haxe/std/sys/thread/ElasticThreadPool.hx",147,0xef69f909)
+HX_LOCAL_STACK_FRAME(_hx_pos_612e84ac54a20b79_161_start,"sys.thread._ElasticThreadPool.Worker","start",0x46360041,"sys.thread._ElasticThreadPool.Worker.start","/usr/local/lib/haxe/std/sys/thread/ElasticThreadPool.hx",161,0xef69f909)
+HX_LOCAL_STACK_FRAME(_hx_pos_612e84ac54a20b79_167_loop,"sys.thread._ElasticThreadPool.Worker","loop",0x3f677b65,"sys.thread._ElasticThreadPool.Worker.loop","/usr/local/lib/haxe/std/sys/thread/ElasticThreadPool.hx",167,0xef69f909)
+namespace sys{
+namespace thread{
+namespace _ElasticThreadPool{
+
+void Worker_obj::__construct( ::sys::thread::Deque queue,Float timeout){
+            	HX_GC_STACKFRAME(&_hx_pos_612e84ac54a20b79_130_new)
+HXLINE( 139)		this->isShutdown = false;
+HXLINE( 135)		this->waiter =  ::sys::thread::Lock_obj::__alloc( HX_CTX );
+HXLINE( 134)		this->deathMutex =  ::sys::thread::Mutex_obj::__alloc( HX_CTX );
+HXLINE( 132)		this->dead = false;
+HXLINE( 142)		this->queue = queue;
+HXLINE( 143)		this->timeout = timeout;
+HXLINE( 144)		this->start();
+            	}
+
+Dynamic Worker_obj::__CreateEmpty() { return new Worker_obj; }
+
+void *Worker_obj::_hx_vtable = 0;
+
+Dynamic Worker_obj::__Create(::hx::DynamicArray inArgs)
+{
+	::hx::ObjectPtr< Worker_obj > _hx_result = new Worker_obj();
+	_hx_result->__construct(inArgs[0],inArgs[1]);
+	return _hx_result;
+}
+
+bool Worker_obj::_hx_isInstanceOf(int inClassId) {
+	return inClassId==(int)0x00000001 || inClassId==(int)0x4ed34e2d;
+}
+
+void Worker_obj::wakeup( ::Dynamic task){
+            	HX_STACKFRAME(&_hx_pos_612e84ac54a20b79_147_wakeup)
+HXLINE( 148)		this->deathMutex->acquire();
+HXLINE( 149)		if (this->dead) {
+HXLINE( 150)			this->start();
+            		}
+HXLINE( 151)		this->task = task;
+HXLINE( 152)		this->waiter->release();
+HXLINE( 153)		this->deathMutex->release();
+            	}
+
+
+HX_DEFINE_DYNAMIC_FUNC1(Worker_obj,wakeup,(void))
+
+void Worker_obj::start(){
+            	HX_STACKFRAME(&_hx_pos_612e84ac54a20b79_161_start)
+HXLINE( 162)		this->dead = false;
+HXLINE( 163)		this->thread = ::sys::thread::_Thread::HaxeThread_obj::create(this->loop_dyn(),false);
+            	}
+
+
+HX_DEFINE_DYNAMIC_FUNC0(Worker_obj,start,(void))
+
+void Worker_obj::loop(){
+            	HX_STACKFRAME(&_hx_pos_612e84ac54a20b79_167_loop)
+HXDLIN( 167)		try {
+            			HX_STACK_CATCHABLE( ::Dynamic, 0);
+HXLINE( 168)			while(this->waiter->wait(this->timeout)){
+HXLINE( 169)				 ::Dynamic _g = this->task;
+HXLINE( 170)				if (::hx::IsNull( _g )) {
+HXLINE( 171)					if (this->isShutdown) {
+HXLINE( 172)						goto _hx_goto_3;
+            					}
+            				}
+            				else {
+HXLINE( 173)					 ::Dynamic fn = _g;
+HXDLIN( 173)					{
+HXLINE( 174)						fn();
+HXLINE( 176)						while(true){
+HXLINE( 177)							 ::Dynamic _g1 = this->queue->pop(false);
+HXLINE( 178)							if (::hx::IsNull( _g1 )) {
+HXLINE( 178)								goto _hx_goto_4;
+            							}
+            							else {
+HXLINE( 179)								 ::Dynamic fn1 = _g1;
+HXDLIN( 179)								fn1();
+            							}
+            						}
+            						_hx_goto_4:;
+HXLINE( 182)						this->task = null();
+            					}
+            				}
+            			}
+            			_hx_goto_3:;
+HXLINE( 185)			this->deathMutex->acquire();
+HXLINE( 187)			if (::hx::IsNotNull( this->task )) {
+HXLINE( 188)				this->start();
+            			}
+            			else {
+HXLINE( 190)				this->dead = true;
+            			}
+HXLINE( 191)			this->deathMutex->release();
+            		} catch( ::Dynamic _hx_e) {
+            			if (_hx_e.IsClass<  ::Dynamic >() ){
+            				HX_STACK_BEGIN_CATCH
+            				 ::Dynamic _g2 = _hx_e;
+HXLINE( 192)				 ::haxe::Exception e = ::haxe::Exception_obj::caught(_g2);
+HXLINE( 193)				this->task = null();
+HXLINE( 194)				this->start();
+HXLINE( 195)				HX_STACK_DO_THROW(e);
+            			}
+            			else {
+            				HX_STACK_DO_THROW(_hx_e);
+            			}
+            		}
+            	}
+
+
+HX_DEFINE_DYNAMIC_FUNC0(Worker_obj,loop,(void))
+
+
+::hx::ObjectPtr< Worker_obj > Worker_obj::__new( ::sys::thread::Deque queue,Float timeout) {
+	::hx::ObjectPtr< Worker_obj > __this = new Worker_obj();
+	__this->__construct(queue,timeout);
+	return __this;
+}
+
+::hx::ObjectPtr< Worker_obj > Worker_obj::__alloc(::hx::Ctx *_hx_ctx, ::sys::thread::Deque queue,Float timeout) {
+	Worker_obj *__this = (Worker_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Worker_obj), true, "sys.thread._ElasticThreadPool.Worker"));
+	*(void **)__this = Worker_obj::_hx_vtable;
+	__this->__construct(queue,timeout);
+	return __this;
+}
+
+Worker_obj::Worker_obj()
+{
+}
+
+void Worker_obj::__Mark(HX_MARK_PARAMS)
+{
+	HX_MARK_BEGIN_CLASS(Worker);
+	HX_MARK_MEMBER_NAME(task,"task");
+	HX_MARK_MEMBER_NAME(dead,"dead");
+	HX_MARK_MEMBER_NAME(deathMutex,"deathMutex");
+	HX_MARK_MEMBER_NAME(waiter,"waiter");
+	HX_MARK_MEMBER_NAME(queue,"queue");
+	HX_MARK_MEMBER_NAME(timeout,"timeout");
+	HX_MARK_MEMBER_NAME(thread,"thread");
+	HX_MARK_MEMBER_NAME(isShutdown,"isShutdown");
+	HX_MARK_END_CLASS();
+}
+
+void Worker_obj::__Visit(HX_VISIT_PARAMS)
+{
+	HX_VISIT_MEMBER_NAME(task,"task");
+	HX_VISIT_MEMBER_NAME(dead,"dead");
+	HX_VISIT_MEMBER_NAME(deathMutex,"deathMutex");
+	HX_VISIT_MEMBER_NAME(waiter,"waiter");
+	HX_VISIT_MEMBER_NAME(queue,"queue");
+	HX_VISIT_MEMBER_NAME(timeout,"timeout");
+	HX_VISIT_MEMBER_NAME(thread,"thread");
+	HX_VISIT_MEMBER_NAME(isShutdown,"isShutdown");
+}
+
+::hx::Val Worker_obj::__Field(const ::String &inName,::hx::PropertyAccess inCallProp)
+{
+	switch(inName.length) {
+	case 4:
+		if (HX_FIELD_EQ(inName,"task") ) { return ::hx::Val( task ); }
+		if (HX_FIELD_EQ(inName,"dead") ) { return ::hx::Val( dead ); }
+		if (HX_FIELD_EQ(inName,"loop") ) { return ::hx::Val( loop_dyn() ); }
+		break;
+	case 5:
+		if (HX_FIELD_EQ(inName,"queue") ) { return ::hx::Val( queue ); }
+		if (HX_FIELD_EQ(inName,"start") ) { return ::hx::Val( start_dyn() ); }
+		break;
+	case 6:
+		if (HX_FIELD_EQ(inName,"waiter") ) { return ::hx::Val( waiter ); }
+		if (HX_FIELD_EQ(inName,"thread") ) { return ::hx::Val( thread ); }
+		if (HX_FIELD_EQ(inName,"wakeup") ) { return ::hx::Val( wakeup_dyn() ); }
+		break;
+	case 7:
+		if (HX_FIELD_EQ(inName,"timeout") ) { return ::hx::Val( timeout ); }
+		break;
+	case 10:
+		if (HX_FIELD_EQ(inName,"deathMutex") ) { return ::hx::Val( deathMutex ); }
+		if (HX_FIELD_EQ(inName,"isShutdown") ) { return ::hx::Val( isShutdown ); }
+	}
+	return super::__Field(inName,inCallProp);
+}
+
+::hx::Val Worker_obj::__SetField(const ::String &inName,const ::hx::Val &inValue,::hx::PropertyAccess inCallProp)
+{
+	switch(inName.length) {
+	case 4:
+		if (HX_FIELD_EQ(inName,"task") ) { task=inValue.Cast<  ::Dynamic >(); return inValue; }
+		if (HX_FIELD_EQ(inName,"dead") ) { dead=inValue.Cast< bool >(); return inValue; }
+		break;
+	case 5:
+		if (HX_FIELD_EQ(inName,"queue") ) { queue=inValue.Cast<  ::sys::thread::Deque >(); return inValue; }
+		break;
+	case 6:
+		if (HX_FIELD_EQ(inName,"waiter") ) { waiter=inValue.Cast<  ::sys::thread::Lock >(); return inValue; }
+		if (HX_FIELD_EQ(inName,"thread") ) { thread=inValue.Cast<  ::sys::thread::_Thread::HaxeThread >(); return inValue; }
+		break;
+	case 7:
+		if (HX_FIELD_EQ(inName,"timeout") ) { timeout=inValue.Cast< Float >(); return inValue; }
+		break;
+	case 10:
+		if (HX_FIELD_EQ(inName,"deathMutex") ) { deathMutex=inValue.Cast<  ::sys::thread::Mutex >(); return inValue; }
+		if (HX_FIELD_EQ(inName,"isShutdown") ) { isShutdown=inValue.Cast< bool >(); return inValue; }
+	}
+	return super::__SetField(inName,inValue,inCallProp);
+}
+
+void Worker_obj::__GetFields(Array< ::String> &outFields)
+{
+	outFields->push(HX_("dead",a4,4e,66,42));
+	outFields->push(HX_("deathMutex",ab,d3,d2,12));
+	outFields->push(HX_("waiter",22,fa,15,b4));
+	outFields->push(HX_("queue",91,8d,ea,5d));
+	outFields->push(HX_("timeout",a1,1a,f7,d8));
+	outFields->push(HX_("thread",ca,7a,b9,8e));
+	outFields->push(HX_("isShutdown",a0,0e,bb,e5));
+	super::__GetFields(outFields);
+};
+
+#ifdef HXCPP_SCRIPTABLE
+static ::hx::StorageInfo Worker_obj_sMemberStorageInfo[] = {
+	{::hx::fsObject /*  ::Dynamic */ ,(int)offsetof(Worker_obj,task),HX_("task",45,bf,f6,4c)},
+	{::hx::fsBool,(int)offsetof(Worker_obj,dead),HX_("dead",a4,4e,66,42)},
+	{::hx::fsObject /*  ::sys::thread::Mutex */ ,(int)offsetof(Worker_obj,deathMutex),HX_("deathMutex",ab,d3,d2,12)},
+	{::hx::fsObject /*  ::sys::thread::Lock */ ,(int)offsetof(Worker_obj,waiter),HX_("waiter",22,fa,15,b4)},
+	{::hx::fsObject /*  ::sys::thread::Deque */ ,(int)offsetof(Worker_obj,queue),HX_("queue",91,8d,ea,5d)},
+	{::hx::fsFloat,(int)offsetof(Worker_obj,timeout),HX_("timeout",a1,1a,f7,d8)},
+	{::hx::fsObject /*  ::sys::thread::_Thread::HaxeThread */ ,(int)offsetof(Worker_obj,thread),HX_("thread",ca,7a,b9,8e)},
+	{::hx::fsBool,(int)offsetof(Worker_obj,isShutdown),HX_("isShutdown",a0,0e,bb,e5)},
+	{ ::hx::fsUnknown, 0, null()}
+};
+static ::hx::StaticInfo *Worker_obj_sStaticStorageInfo = 0;
+#endif
+
+static ::String Worker_obj_sMemberFields[] = {
+	HX_("task",45,bf,f6,4c),
+	HX_("dead",a4,4e,66,42),
+	HX_("deathMutex",ab,d3,d2,12),
+	HX_("waiter",22,fa,15,b4),
+	HX_("queue",91,8d,ea,5d),
+	HX_("timeout",a1,1a,f7,d8),
+	HX_("thread",ca,7a,b9,8e),
+	HX_("isShutdown",a0,0e,bb,e5),
+	HX_("wakeup",7f,13,5d,b5),
+	HX_("start",62,74,0b,84),
+	HX_("loop",64,a6,b7,47),
+	::String(null()) };
+
+::hx::Class Worker_obj::__mClass;
+
+void Worker_obj::__register()
+{
+	Worker_obj _hx_dummy;
+	Worker_obj::_hx_vtable = *(void **)&_hx_dummy;
+	::hx::Static(__mClass) = new ::hx::Class_obj();
+	__mClass->mName = HX_("sys.thread._ElasticThreadPool.Worker",0d,ab,56,06);
+	__mClass->mSuper = &super::__SGetClass();
+	__mClass->mConstructEmpty = &__CreateEmpty;
+	__mClass->mConstructArgs = &__Create;
+	__mClass->mGetStaticField = &::hx::Class_obj::GetNoStaticField;
+	__mClass->mSetStaticField = &::hx::Class_obj::SetNoStaticField;
+	__mClass->mStatics = ::hx::Class_obj::dupFunctions(0 /* sStaticFields */);
+	__mClass->mMembers = ::hx::Class_obj::dupFunctions(Worker_obj_sMemberFields);
+	__mClass->mCanCast = ::hx::TCanCast< Worker_obj >;
+#ifdef HXCPP_SCRIPTABLE
+	__mClass->mMemberStorageInfo = Worker_obj_sMemberStorageInfo;
+#endif
+#ifdef HXCPP_SCRIPTABLE
+	__mClass->mStaticStorageInfo = Worker_obj_sStaticStorageInfo;
+#endif
+	::hx::_hx_RegisterClass(__mClass->mName, __mClass);
+}
+
+} // end namespace sys
+} // end namespace thread
+} // end namespace _ElasticThreadPool
diff --git a/Sources/c_snikket/src/sys/thread/_FixedThreadPool/ShutdownException.cpp b/Sources/c_snikket/src/sys/thread/_FixedThreadPool/ShutdownException.cpp
new file mode 100644
index 0000000..88796c2
--- /dev/null
+++ b/Sources/c_snikket/src/sys/thread/_FixedThreadPool/ShutdownException.cpp
@@ -0,0 +1,77 @@
+// Generated by Haxe 4.3.3
+#include <hxcpp.h>
+
+#ifndef INCLUDED_haxe_Exception
+#include <haxe/Exception.h>
+#endif
+#ifndef INCLUDED_sys_thread__FixedThreadPool_ShutdownException
+#include <sys/thread/_FixedThreadPool/ShutdownException.h>
+#endif
+
+HX_DEFINE_STACK_FRAME(_hx_pos_3d4aac51d93fb9ec_93_new,"sys.thread._FixedThreadPool.ShutdownException","new",0x9e4c333b,"sys.thread._FixedThreadPool.ShutdownException.new","/usr/local/lib/haxe/std/sys/thread/FixedThreadPool.hx",93,0x6690e48a)
+namespace sys{
+namespace thread{
+namespace _FixedThreadPool{
+
+void ShutdownException_obj::__construct(::String message, ::haxe::Exception previous, ::Dynamic native){
+            	HX_STACKFRAME(&_hx_pos_3d4aac51d93fb9ec_93_new)
+HXDLIN(  93)		super::__construct(message,previous,native);
+            	}
+
+Dynamic ShutdownException_obj::__CreateEmpty() { return new ShutdownException_obj; }
+
+void *ShutdownException_obj::_hx_vtable = 0;
+
+Dynamic ShutdownException_obj::__Create(::hx::DynamicArray inArgs)
+{
+	::hx::ObjectPtr< ShutdownException_obj > _hx_result = new ShutdownException_obj();
+	_hx_result->__construct(inArgs[0],inArgs[1],inArgs[2]);
+	return _hx_result;
+}
+
+bool ShutdownException_obj::_hx_isInstanceOf(int inClassId) {
+	if (inClassId<=(int)0x677ddc49) {
+		return inClassId==(int)0x00000001 || inClassId==(int)0x677ddc49;
+	} else {
+		return inClassId==(int)0x74de5cef;
+	}
+}
+
+
+ShutdownException_obj::ShutdownException_obj()
+{
+}
+
+#ifdef HXCPP_SCRIPTABLE
+static ::hx::StorageInfo *ShutdownException_obj_sMemberStorageInfo = 0;
+static ::hx::StaticInfo *ShutdownException_obj_sStaticStorageInfo = 0;
+#endif
+
+::hx::Class ShutdownException_obj::__mClass;
+
+void ShutdownException_obj::__register()
+{
+	ShutdownException_obj _hx_dummy;
+	ShutdownException_obj::_hx_vtable = *(void **)&_hx_dummy;
+	::hx::Static(__mClass) = new ::hx::Class_obj();
+	__mClass->mName = HX_("sys.thread._FixedThreadPool.ShutdownException",c9,79,55,79);
+	__mClass->mSuper = &super::__SGetClass();
+	__mClass->mConstructEmpty = &__CreateEmpty;
+	__mClass->mConstructArgs = &__Create;
+	__mClass->mGetStaticField = &::hx::Class_obj::GetNoStaticField;
+	__mClass->mSetStaticField = &::hx::Class_obj::SetNoStaticField;
+	__mClass->mStatics = ::hx::Class_obj::dupFunctions(0 /* sStaticFields */);
+	__mClass->mMembers = ::hx::Class_obj::dupFunctions(0 /* sMemberFields */);
+	__mClass->mCanCast = ::hx::TCanCast< ShutdownException_obj >;
+#ifdef HXCPP_SCRIPTABLE
+	__mClass->mMemberStorageInfo = ShutdownException_obj_sMemberStorageInfo;
+#endif
+#ifdef HXCPP_SCRIPTABLE
+	__mClass->mStaticStorageInfo = ShutdownException_obj_sStaticStorageInfo;
+#endif
+	::hx::_hx_RegisterClass(__mClass->mName, __mClass);
+}
+
+} // end namespace sys
+} // end namespace thread
+} // end namespace _FixedThreadPool
diff --git a/Sources/c_snikket/src/sys/thread/_FixedThreadPool/Worker.cpp b/Sources/c_snikket/src/sys/thread/_FixedThreadPool/Worker.cpp
new file mode 100644
index 0000000..ad7d1a2
--- /dev/null
+++ b/Sources/c_snikket/src/sys/thread/_FixedThreadPool/Worker.cpp
@@ -0,0 +1,185 @@
+// Generated by Haxe 4.3.3
+#include <hxcpp.h>
+
+#ifndef INCLUDED_haxe_Exception
+#include <haxe/Exception.h>
+#endif
+#ifndef INCLUDED_sys_thread_Deque
+#include <sys/thread/Deque.h>
+#endif
+#ifndef INCLUDED_sys_thread__FixedThreadPool_ShutdownException
+#include <sys/thread/_FixedThreadPool/ShutdownException.h>
+#endif
+#ifndef INCLUDED_sys_thread__FixedThreadPool_Worker
+#include <sys/thread/_FixedThreadPool/Worker.h>
+#endif
+#ifndef INCLUDED_sys_thread__Thread_HaxeThread
+#include <sys/thread/_Thread/HaxeThread.h>
+#endif
+
+HX_DEFINE_STACK_FRAME(_hx_pos_c14e958bfffbc46a_99_new,"sys.thread._FixedThreadPool.Worker","new",0x5ad56180,"sys.thread._FixedThreadPool.Worker.new","/usr/local/lib/haxe/std/sys/thread/FixedThreadPool.hx",99,0x6690e48a)
+HX_LOCAL_STACK_FRAME(_hx_pos_c14e958bfffbc46a_105_loop,"sys.thread._FixedThreadPool.Worker","loop",0x1e951144,"sys.thread._FixedThreadPool.Worker.loop","/usr/local/lib/haxe/std/sys/thread/FixedThreadPool.hx",105,0x6690e48a)
+namespace sys{
+namespace thread{
+namespace _FixedThreadPool{
+
+void Worker_obj::__construct( ::sys::thread::Deque queue){
+            	HX_STACKFRAME(&_hx_pos_c14e958bfffbc46a_99_new)
+HXLINE( 100)		this->queue = queue;
+HXLINE( 101)		this->thread = ::sys::thread::_Thread::HaxeThread_obj::create(this->loop_dyn(),false);
+            	}
+
+Dynamic Worker_obj::__CreateEmpty() { return new Worker_obj; }
+
+void *Worker_obj::_hx_vtable = 0;
+
+Dynamic Worker_obj::__Create(::hx::DynamicArray inArgs)
+{
+	::hx::ObjectPtr< Worker_obj > _hx_result = new Worker_obj();
+	_hx_result->__construct(inArgs[0]);
+	return _hx_result;
+}
+
+bool Worker_obj::_hx_isInstanceOf(int inClassId) {
+	return inClassId==(int)0x00000001 || inClassId==(int)0x56d87870;
+}
+
+void Worker_obj::loop(){
+            	HX_STACKFRAME(&_hx_pos_c14e958bfffbc46a_105_loop)
+HXDLIN( 105)		try {
+            			HX_STACK_CATCHABLE( ::sys::thread::_FixedThreadPool::ShutdownException, 0);
+            			HX_STACK_CATCHABLE( ::Dynamic, 1);
+HXLINE( 106)			while(true){
+HXLINE( 107)				 ::Dynamic task = this->queue->pop(true);
+HXLINE( 108)				task();
+            			}
+            		} catch( ::Dynamic _hx_e) {
+            			if (_hx_e.IsClass<  ::sys::thread::_FixedThreadPool::ShutdownException >() ){
+            				HX_STACK_BEGIN_CATCH
+            				 ::sys::thread::_FixedThreadPool::ShutdownException _ = _hx_e;
+            			}
+            			else if (_hx_e.IsClass<  ::Dynamic >() ){
+            				HX_STACK_BEGIN_CATCH
+            				 ::Dynamic _g = _hx_e;
+HXLINE( 111)				 ::haxe::Exception e = ::haxe::Exception_obj::caught(_g);
+HXLINE( 112)				this->thread = ::sys::thread::_Thread::HaxeThread_obj::create(this->loop_dyn(),false);
+HXLINE( 113)				HX_STACK_DO_THROW(e);
+            			}
+            			else {
+            				HX_STACK_DO_THROW(_hx_e);
+            			}
+            		}
+            	}
+
+
+HX_DEFINE_DYNAMIC_FUNC0(Worker_obj,loop,(void))
+
+
+::hx::ObjectPtr< Worker_obj > Worker_obj::__new( ::sys::thread::Deque queue) {
+	::hx::ObjectPtr< Worker_obj > __this = new Worker_obj();
+	__this->__construct(queue);
+	return __this;
+}
+
+::hx::ObjectPtr< Worker_obj > Worker_obj::__alloc(::hx::Ctx *_hx_ctx, ::sys::thread::Deque queue) {
+	Worker_obj *__this = (Worker_obj*)(::hx::Ctx::alloc(_hx_ctx, sizeof(Worker_obj), true, "sys.thread._FixedThreadPool.Worker"));
+	*(void **)__this = Worker_obj::_hx_vtable;
+	__this->__construct(queue);
+	return __this;
+}
+
+Worker_obj::Worker_obj()
+{
+}
+
+void Worker_obj::__Mark(HX_MARK_PARAMS)
+{
+	HX_MARK_BEGIN_CLASS(Worker);
+	HX_MARK_MEMBER_NAME(thread,"thread");
+	HX_MARK_MEMBER_NAME(queue,"queue");
+	HX_MARK_END_CLASS();
+}
+
+void Worker_obj::__Visit(HX_VISIT_PARAMS)
+{
+	HX_VISIT_MEMBER_NAME(thread,"thread");
+	HX_VISIT_MEMBER_NAME(queue,"queue");
+}
+
+::hx::Val Worker_obj::__Field(const ::String &inName,::hx::PropertyAccess inCallProp)
+{
+	switch(inName.length) {
+	case 4:
+		if (HX_FIELD_EQ(inName,"loop") ) { return ::hx::Val( loop_dyn() ); }
+		break;
+	case 5:
+		if (HX_FIELD_EQ(inName,"queue") ) { return ::hx::Val( queue ); }
+		break;
+	case 6:
+		if (HX_FIELD_EQ(inName,"thread") ) { return ::hx::Val( thread ); }
+	}
+	return super::__Field(inName,inCallProp);
+}
+
+::hx::Val Worker_obj::__SetField(const ::String &inName,const ::hx::Val &inValue,::hx::PropertyAccess inCallProp)
+{
+	switch(inName.length) {
+	case 5:
+		if (HX_FIELD_EQ(inName,"queue") ) { queue=inValue.Cast<  ::sys::thread::Deque >(); return inValue; }
+		break;
+	case 6:
+		if (HX_FIELD_EQ(inName,"thread") ) { thread=inValue.Cast<  ::sys::thread::_Thread::HaxeThread >(); return inValue; }
+	}
+	return super::__SetField(inName,inValue,inCallProp);
+}
+
+void Worker_obj::__GetFields(Array< ::String> &outFields)
+{
+	outFields->push(HX_("thread",ca,7a,b9,8e));
+	outFields->push(HX_("queue",91,8d,ea,5d));
+	super::__GetFields(outFields);
+};
+
+#ifdef HXCPP_SCRIPTABLE
+static ::hx::StorageInfo Worker_obj_sMemberStorageInfo[] = {
+	{::hx::fsObject /*  ::sys::thread::_Thread::HaxeThread */ ,(int)offsetof(Worker_obj,thread),HX_("thread",ca,7a,b9,8e)},
+	{::hx::fsObject /*  ::sys::thread::Deque */ ,(int)offsetof(Worker_obj,queue),HX_("queue",91,8d,ea,5d)},
+	{ ::hx::fsUnknown, 0, null()}
+};
+static ::hx::StaticInfo *Worker_obj_sStaticStorageInfo = 0;
+#endif
+
+static ::String Worker_obj_sMemberFields[] = {
+	HX_("thread",ca,7a,b9,8e),
+	HX_("queue",91,8d,ea,5d),
+	HX_("loop",64,a6,b7,47),
+	::String(null()) };
+
+::hx::Class Worker_obj::__mClass;
+
+void Worker_obj::__register()
+{
+	Worker_obj _hx_dummy;
+	Worker_obj::_hx_vtable = *(void **)&_hx_dummy;
+	::hx::Static(__mClass) = new ::hx::Class_obj();
+	__mClass->mName = HX_("sys.thread._FixedThreadPool.Worker",8e,e1,ae,e1);
+	__mClass->mSuper = &super::__SGetClass();
+	__mClass->mConstructEmpty = &__CreateEmpty;
+	__mClass->mConstructArgs = &__Create;
+	__mClass->mGetStaticField = &::hx::Class_obj::GetNoStaticField;
+	__mClass->mSetStaticField = &::hx::Class_obj::SetNoStaticField;
+	__mClass->mStatics = ::hx::Class_obj::dupFunctions(0 /* sStaticFields */);
+	__mClass->mMembers = ::hx::Class_obj::dupFunctions(Worker_obj_sMemberFields);
+	__mClass->mCanCast = ::hx::TCanCast< Worker_obj >;
+#ifdef HXCPP_SCRIPTABLE
+	__mClass->mMemberStorageInfo = Worker_obj_sMemberStorageInfo;
+#endif
+#ifdef HXCPP_SCRIPTABLE
+	__mClass->mStaticStorageInfo = Worker_obj_sStaticStorageInfo;
+#endif
+	::hx::_hx_RegisterClass(__mClass->mName, __mClass);
+}
+
+} // end namespace sys
+} // end namespace thread
+} // end namespace _FixedThreadPool
diff --git a/Sources/strophe/libstrophe b/Sources/strophe/libstrophe
index 2d6b179..51be03d 160000
--- a/Sources/strophe/libstrophe
+++ b/Sources/strophe/libstrophe
@@ -1 +1 @@
-Subproject commit 2d6b179774d3e9f13beaa644feb8b01c12bba9a7
+Subproject commit 51be03d58266ba23d099ba4a76354fae2751e3a1