diff --git a/bindings/php5/wrapper_source.py b/bindings/php5/wrapper_source.py
index ab2d2715..27ee7f48 100644
--- a/bindings/php5/wrapper_source.py
+++ b/bindings/php5/wrapper_source.py
@@ -442,7 +442,7 @@ static function_entry lasso_functions[] = {'''
         for m in self.functions_list:
             print >> self.fd, '    PHP_FE(%s, NULL)' % m
         print >> self.fd, '''\
-    {NULL, NULL, NULL}
+    {NULL, NULL, NULL, 0, 0}
 };
 '''
 
diff --git a/bindings/python/wrapper_top.c b/bindings/python/wrapper_top.c
index cb704aaa..c703b927 100644
--- a/bindings/python/wrapper_top.c
+++ b/bindings/python/wrapper_top.c
@@ -437,7 +437,7 @@ PyGObjectPtr_repr(PyGObjectPtr *obj)
 
 static PyMemberDef PyGObjectPtr_members[] = {
 	{"typename", T_OBJECT, offsetof(PyGObjectPtr, typename), 0, "typename"},
-	{NULL}
+	{NULL, 0, 0, 0, NULL}
 };
 
 static PyObject*
@@ -453,7 +453,7 @@ PyGObjectPtr_get_refcount(PyGObjectPtr *self, G_GNUC_UNUSED void *closure)
 static PyGetSetDef PyGObjectPtr_getseters[] = {
 	{"refcount", (getter)PyGObjectPtr_get_refcount, NULL,
 		"reference count of intern GObject*", NULL},
-	{NULL}  /* Sentinel */
+	{NULL, NULL, NULL, NULL, NULL}  /* Sentinel */
 };
 
 
@@ -466,7 +466,7 @@ static PyTypeObject PyGObjectPtrType = {
 	(destructor)PyGObjectPtr_dealloc, /* tp_dealloc */
 	0,       /*tp_print*/
 	0,                      /*tp_getattr*/
-	0,       /*tp_setattr*/
+	.tp_setattr = 0,       /*tp_setattr*/
 	0,       /*tp_compare*/
 	(reprfunc)PyGObjectPtr_repr,       /*tp_repr*/
 	0,       /*tp_as_number*/
@@ -489,6 +489,8 @@ static PyTypeObject PyGObjectPtrType = {
 	0,       /* tp_methods */
 	PyGObjectPtr_members,   /* tp_members */
 	PyGObjectPtr_getseters, /* tp_getset */
+	NULL,
+	NULL
 };
 
 static void
diff --git a/configure.ac b/configure.ac
index 883708a8..81955458 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,7 +84,7 @@ dnl Check for programs
 dnl
 AC_PROG_CC
 CFLAGS=""
-AM_CFLAGS="-Wall -Wextra -Werror -Wno-missing-field-initializers"
+AM_CFLAGS="-Wall -Wextra -Werror"
 AC_HEADER_STDC
 LT_AC_PROG_RC
 AC_EXEEXT
diff --git a/lasso/id-ff/defederation.c b/lasso/id-ff/defederation.c
index f6556829..740a92d9 100644
--- a/lasso/id-ff/defederation.c
+++ b/lasso/id-ff/defederation.c
@@ -244,7 +244,7 @@ lasso_defederation_init_notification(LassoDefederation *defederation, gchar *rem
 		if (profile->msg_relayState) {
 			message(G_LOG_LEVEL_WARNING,
 					"RelayState was defined but can't be used "\
-					"in SOAP Federation Termination Notification");
+					"in SOAP Federation Termination Notification", NULL);
 		}
 
 	} else { /* LASSO_HTTP_METHOD_REDIRECT */
@@ -452,6 +452,7 @@ lasso_defederation_get_type()
 			sizeof(LassoDefederation),
 			0,
 			NULL,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_PROFILE,
diff --git a/lasso/id-ff/federation.c b/lasso/id-ff/federation.c
index 2ca96afc..97dd119b 100644
--- a/lasso/id-ff/federation.c
+++ b/lasso/id-ff/federation.c
@@ -158,12 +158,12 @@ lasso_federation_verify_name_identifier(LassoFederation *federation,
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "LocalNameIdentifier", SNIPPET_NODE_IN_CHILD,
-		G_STRUCT_OFFSET(LassoFederation, local_nameIdentifier) },
+		G_STRUCT_OFFSET(LassoFederation, local_nameIdentifier), NULL, NULL, NULL},
 	{ "RemoteNameIdentifier", SNIPPET_NODE_IN_CHILD,
-		G_STRUCT_OFFSET(LassoFederation, remote_nameIdentifier) },
+		G_STRUCT_OFFSET(LassoFederation, remote_nameIdentifier), NULL, NULL, NULL},
 	{ "RemoteProviderID", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoFederation, remote_providerID) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoFederation, remote_providerID), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -257,6 +257,7 @@ lasso_federation_get_type()
 			sizeof(LassoFederation),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/id-ff/identity.c b/lasso/id-ff/identity.c
index 855399f3..12edf48e 100644
--- a/lasso/id-ff/identity.c
+++ b/lasso/id-ff/identity.c
@@ -483,6 +483,7 @@ lasso_identity_get_type()
 			sizeof(LassoIdentity),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/id-ff/lecp.c b/lasso/id-ff/lecp.c
index 502e3d4d..ed604d92 100644
--- a/lasso/id-ff/lecp.c
+++ b/lasso/id-ff/lecp.c
@@ -458,6 +458,7 @@ lasso_lecp_get_type()
 			sizeof(LassoLecp),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_LOGIN,
diff --git a/lasso/id-ff/login.c b/lasso/id-ff/login.c
index 7d30d6b7..b6188fa2 100644
--- a/lasso/id-ff/login.c
+++ b/lasso/id-ff/login.c
@@ -1969,10 +1969,10 @@ lasso_login_set_resourceId(G_GNUC_UNUSED LassoLogin *login, G_GNUC_UNUSED const
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "AssertionArtifact", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLogin, assertionArtifact) },
-	{ "NameIDPolicy", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLogin, nameIDPolicy) },
-	{ "Assertion", SNIPPET_NODE_IN_CHILD, G_STRUCT_OFFSET(LassoLogin, assertion) },
-	{ NULL, 0, 0}
+	{ "AssertionArtifact", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLogin, assertionArtifact), NULL, NULL, NULL},
+	{ "NameIDPolicy", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLogin, nameIDPolicy), NULL, NULL, NULL},
+	{ "Assertion", SNIPPET_NODE_IN_CHILD, G_STRUCT_OFFSET(LassoLogin, assertion), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -2117,6 +2117,7 @@ lasso_login_get_type()
 			sizeof(LassoLogin),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_PROFILE,
diff --git a/lasso/id-ff/logout.c b/lasso/id-ff/logout.c
index 4a76c1a9..e2b85df6 100644
--- a/lasso/id-ff/logout.c
+++ b/lasso/id-ff/logout.c
@@ -968,18 +968,18 @@ lasso_logout_validate_request(LassoLogout *logout)
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "InitialRequest", SNIPPET_NODE_IN_CHILD, G_STRUCT_OFFSET(LassoLogout, initial_request) },
+	{ "InitialRequest", SNIPPET_NODE_IN_CHILD, G_STRUCT_OFFSET(LassoLogout, initial_request), NULL, NULL, NULL},
 	{ "InitialResponse", SNIPPET_NODE_IN_CHILD,
-		G_STRUCT_OFFSET(LassoLogout, initial_response) },
+		G_STRUCT_OFFSET(LassoLogout, initial_response), NULL, NULL, NULL},
 	{ "InitialRemoteProviderID", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoLogout, initial_remote_providerID) },
+		G_STRUCT_OFFSET(LassoLogout, initial_remote_providerID), NULL, NULL, NULL},
 	{ "InitialHttpRequestMethod", SNIPPET_CONTENT | SNIPPET_INTEGER,
-		G_STRUCT_OFFSET(LassoLogout, initial_http_request_method) },
+		G_STRUCT_OFFSET(LassoLogout, initial_http_request_method), NULL, NULL, NULL},
 	/* "ProviderIdIndex" must not be dumped (since apps assume to get
 	 * it back to 0 after a restore from dump) (maybe this behaviour should
 	 * be fixed)
 	 */
-	{ NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -1105,6 +1105,7 @@ lasso_logout_get_type()
 			sizeof(LassoLogout),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_PROFILE,
diff --git a/lasso/id-ff/name_identifier_mapping.c b/lasso/id-ff/name_identifier_mapping.c
index 7fa1b49e..c7db9df9 100644
--- a/lasso/id-ff/name_identifier_mapping.c
+++ b/lasso/id-ff/name_identifier_mapping.c
@@ -549,6 +549,7 @@ lasso_name_identifier_mapping_get_type()
 			sizeof(LassoNameIdentifierMapping),
 			0,
 			NULL,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_PROFILE,
diff --git a/lasso/id-ff/name_registration.c b/lasso/id-ff/name_registration.c
index f2329c13..1859a3a6 100644
--- a/lasso/id-ff/name_registration.c
+++ b/lasso/id-ff/name_registration.c
@@ -646,8 +646,8 @@ lasso_name_registration_validate_request(LassoNameRegistration *name_registratio
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "OldNameIdentifier", SNIPPET_NODE_IN_CHILD,
-		G_STRUCT_OFFSET(LassoNameRegistration, oldNameIdentifier) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoNameRegistration, oldNameIdentifier), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -708,6 +708,7 @@ lasso_name_registration_get_type()
 			sizeof(LassoNameRegistration),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_PROFILE,
diff --git a/lasso/id-ff/profile.c b/lasso/id-ff/profile.c
index 23ee3c50..59967233 100644
--- a/lasso/id-ff/profile.c
+++ b/lasso/id-ff/profile.c
@@ -421,17 +421,17 @@ lasso_profile_set_artifact_message(LassoProfile *profile, char *message)
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Request", SNIPPET_NODE_IN_CHILD, G_STRUCT_OFFSET(LassoProfile, request) },
-	{ "Response", SNIPPET_NODE_IN_CHILD, G_STRUCT_OFFSET(LassoProfile, response) },
+	{ "Request", SNIPPET_NODE_IN_CHILD, G_STRUCT_OFFSET(LassoProfile, request), NULL, NULL, NULL},
+	{ "Response", SNIPPET_NODE_IN_CHILD, G_STRUCT_OFFSET(LassoProfile, response), NULL, NULL, NULL},
 	{ "NameIdentifier", SNIPPET_NODE_IN_CHILD,
-		G_STRUCT_OFFSET(LassoProfile, nameIdentifier) },
-	{ "RemoteProviderID", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoProfile, remote_providerID) },
-	{ "MsgUrl", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoProfile, msg_url) },
-	{ "MsgBody", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoProfile, msg_body) },
-	{ "MsgRelayState", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoProfile, msg_relayState) },
+		G_STRUCT_OFFSET(LassoProfile, nameIdentifier), NULL, NULL, NULL},
+	{ "RemoteProviderID", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoProfile, remote_providerID), NULL, NULL, NULL},
+	{ "MsgUrl", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoProfile, msg_url), NULL, NULL, NULL},
+	{ "MsgBody", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoProfile, msg_body), NULL, NULL, NULL},
+	{ "MsgRelayState", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoProfile, msg_relayState), NULL, NULL, NULL},
 	{ "HttpRequestMethod", SNIPPET_CONTENT | SNIPPET_INTEGER,
-		G_STRUCT_OFFSET(LassoProfile, http_request_method) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoProfile, http_request_method), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -595,6 +595,7 @@ lasso_profile_get_type()
 			sizeof(LassoProfile),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/id-ff/profile.h b/lasso/id-ff/profile.h
index 55b838b7..758af182 100644
--- a/lasso/id-ff/profile.h
+++ b/lasso/id-ff/profile.h
@@ -84,7 +84,7 @@ typedef enum {
 	LASSO_REQUEST_TYPE_NAME_ID_MANAGEMENT = 12,
 	LASSO_REQUEST_TYPE_IDWSF2_DISCO_SVCMD_REGISTER = 13,
 	LASSO_REQUEST_TYPE_IDWSF2_DISCO_SVCMD_ASSOCIATION_ADD = 14,
-	LASSO_REQUEST_TYPE_IDWSF2_DISCO_QUERY = 15,
+	LASSO_REQUEST_TYPE_IDWSF2_DISCO_QUERY = 15
 } LassoRequestType;
 
 
diff --git a/lasso/id-ff/provider.c b/lasso/id-ff/provider.c
index 1f2b472e..6b58512e 100644
--- a/lasso/id-ff/provider.c
+++ b/lasso/id-ff/provider.c
@@ -361,11 +361,11 @@ lasso_provider_get_organization(LassoProvider *provider)
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "PublicKeyFilePath", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoProvider, public_key) },
-	{ "CaCertChainFilePath", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoProvider, ca_cert_chain) },
-	{ "MetadataFilePath", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoProvider, metadata_filename) },
-	{ "ProviderID", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoProvider, ProviderID) },
-	{ NULL, 0, 0}
+	{ "PublicKeyFilePath", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoProvider, public_key), NULL, NULL, NULL},
+	{ "CaCertChainFilePath", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoProvider, ca_cert_chain), NULL, NULL, NULL},
+	{ "MetadataFilePath", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoProvider, metadata_filename), NULL, NULL, NULL},
+	{ "ProviderID", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoProvider, ProviderID), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -668,6 +668,7 @@ lasso_provider_get_type()
 			sizeof(LassoProvider),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/id-ff/provider.h b/lasso/id-ff/provider.h
index 0dde1a8b..be991c8c 100644
--- a/lasso/id-ff/provider.h
+++ b/lasso/id-ff/provider.h
@@ -143,7 +143,7 @@ typedef enum {
 typedef enum {
 	LASSO_ENCRYPTION_MODE_NONE,
 	LASSO_ENCRYPTION_MODE_NAMEID,
-	LASSO_ENCRYPTION_MODE_ASSERTION,
+	LASSO_ENCRYPTION_MODE_ASSERTION
 } LassoEncryptionMode;
 
 
diff --git a/lasso/id-ff/providerprivate.h b/lasso/id-ff/providerprivate.h
index 9babacb3..00cceb91 100644
--- a/lasso/id-ff/providerprivate.h
+++ b/lasso/id-ff/providerprivate.h
@@ -38,7 +38,7 @@ extern "C" {
  **/
 typedef enum {
 	LASSO_PUBLIC_KEY_SIGNING,
-	LASSO_PUBLIC_KEY_ENCRYPTION,
+	LASSO_PUBLIC_KEY_ENCRYPTION
 } LassoPublicKeyType;
 
 
diff --git a/lasso/id-ff/server.c b/lasso/id-ff/server.c
index 4965461e..f7649e44 100644
--- a/lasso/id-ff/server.c
+++ b/lasso/id-ff/server.c
@@ -340,11 +340,11 @@ exit:
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "PrivateKeyFilePath", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoServer, private_key) },
+	{ "PrivateKeyFilePath", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoServer, private_key), NULL, NULL, NULL},
 	{ "PrivateKeyPassword", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoServer, private_key_password) },
-	{ "CertificateFilePath", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoServer, certificate) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoServer, private_key_password), NULL, NULL, NULL},
+	{ "CertificateFilePath", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoServer, certificate), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -720,6 +720,7 @@ lasso_server_get_type()
 			sizeof(LassoServer),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_PROVIDER,
diff --git a/lasso/id-ff/session.c b/lasso/id-ff/session.c
index 1428a685..da9974cb 100644
--- a/lasso/id-ff/session.c
+++ b/lasso/id-ff/session.c
@@ -811,6 +811,7 @@ lasso_session_get_type()
 			sizeof(LassoSession),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/id-wsf-2.0/data_service.c b/lasso/id-wsf-2.0/data_service.c
index 96daa67f..734ba5ff 100644
--- a/lasso/id-wsf-2.0/data_service.c
+++ b/lasso/id-wsf-2.0/data_service.c
@@ -963,6 +963,7 @@ lasso_idwsf2_data_service_get_type()
 			sizeof(LassoIdWsf2DataService),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PROFILE,
diff --git a/lasso/id-wsf-2.0/discovery.c b/lasso/id-wsf-2.0/discovery.c
index 7cc3ceec..a6579bc8 100644
--- a/lasso/id-wsf-2.0/discovery.c
+++ b/lasso/id-wsf-2.0/discovery.c
@@ -841,6 +841,7 @@ lasso_idwsf2_discovery_get_type()
 			sizeof(LassoIdWsf2Discovery),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PROFILE,
diff --git a/lasso/id-wsf-2.0/profile.c b/lasso/id-wsf-2.0/profile.c
index 23e34bd3..1c9164bd 100644
--- a/lasso/id-wsf-2.0/profile.c
+++ b/lasso/id-wsf-2.0/profile.c
@@ -295,6 +295,7 @@ lasso_idwsf2_profile_get_type()
 			sizeof(LassoIdWsf2Profile),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_PROFILE,
diff --git a/lasso/id-wsf/authentication.c b/lasso/id-wsf/authentication.c
index ca7c59de..56e824b1 100644
--- a/lasso/id-wsf/authentication.c
+++ b/lasso/id-wsf/authentication.c
@@ -728,6 +728,7 @@ lasso_authentication_get_type()
 			sizeof(LassoAuthentication),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_WSF_PROFILE,
diff --git a/lasso/id-wsf/data_service.c b/lasso/id-wsf/data_service.c
index ba3ef677..974f0f00 100644
--- a/lasso/id-wsf/data_service.c
+++ b/lasso/id-wsf/data_service.c
@@ -998,6 +998,7 @@ lasso_data_service_get_type()
 			sizeof(LassoDataService),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_WSF_PROFILE,
diff --git a/lasso/id-wsf/discovery.c b/lasso/id-wsf/discovery.c
index 5c35fa5f..3b958dc9 100644
--- a/lasso/id-wsf/discovery.c
+++ b/lasso/id-wsf/discovery.c
@@ -1345,6 +1345,7 @@ lasso_discovery_get_type()
 			sizeof(LassoDiscovery),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_WSF_PROFILE,
diff --git a/lasso/id-wsf/interaction_profile_service.c b/lasso/id-wsf/interaction_profile_service.c
index 2e4b76f0..4aac7e9f 100644
--- a/lasso/id-wsf/interaction_profile_service.c
+++ b/lasso/id-wsf/interaction_profile_service.c
@@ -108,6 +108,7 @@ lasso_interaction_profile_service_get_type()
 			sizeof(LassoInteractionProfileService),
 			0,
 			NULL,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_WSF_PROFILE,
diff --git a/lasso/id-wsf/personal_profile_service.c b/lasso/id-wsf/personal_profile_service.c
index 07291b72..e45bc4cd 100644
--- a/lasso/id-wsf/personal_profile_service.c
+++ b/lasso/id-wsf/personal_profile_service.c
@@ -97,6 +97,7 @@ lasso_personal_profile_service_get_type()
 			sizeof(LassoPersonalProfileService),
 			0,
 			NULL,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_DATA_SERVICE,
diff --git a/lasso/id-wsf/wsf_profile.c b/lasso/id-wsf/wsf_profile.c
index dc1ea141..ddc9ca29 100644
--- a/lasso/id-wsf/wsf_profile.c
+++ b/lasso/id-wsf/wsf_profile.c
@@ -66,18 +66,18 @@
 static gint lasso_wsf_profile_add_saml_signature(LassoWsfProfile *wsf_profile, xmlDoc *doc);
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Server", SNIPPET_NODE_IN_CHILD, G_STRUCT_OFFSET(LassoWsfProfile, server) },
-	{ "Request", SNIPPET_NODE_IN_CHILD, G_STRUCT_OFFSET(LassoWsfProfile, request) },
-	{ "Response", SNIPPET_NODE_IN_CHILD, G_STRUCT_OFFSET(LassoWsfProfile, response) },
+	{ "Server", SNIPPET_NODE_IN_CHILD, G_STRUCT_OFFSET(LassoWsfProfile, server), NULL, NULL, NULL},
+	{ "Request", SNIPPET_NODE_IN_CHILD, G_STRUCT_OFFSET(LassoWsfProfile, request), NULL, NULL, NULL},
+	{ "Response", SNIPPET_NODE_IN_CHILD, G_STRUCT_OFFSET(LassoWsfProfile, response), NULL, NULL, NULL},
 	{ "SOAP-Request", SNIPPET_NODE_IN_CHILD,
-		G_STRUCT_OFFSET(LassoWsfProfile, soap_envelope_request) },
+		G_STRUCT_OFFSET(LassoWsfProfile, soap_envelope_request), NULL, NULL, NULL},
 	{ "SOAP-Response", SNIPPET_NODE_IN_CHILD,
-		G_STRUCT_OFFSET(LassoWsfProfile, soap_envelope_response) },
-	{ "MsgUrl", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoWsfProfile, msg_url) },
-	{ "MsgBody", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoWsfProfile, msg_body) },
-	{ "Identity", SNIPPET_NODE_IN_CHILD, G_STRUCT_OFFSET(LassoWsfProfile, identity) },
-	{ "Session", SNIPPET_NODE_IN_CHILD, G_STRUCT_OFFSET(LassoWsfProfile, session) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoWsfProfile, soap_envelope_response), NULL, NULL, NULL},
+	{ "MsgUrl", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoWsfProfile, msg_url), NULL, NULL, NULL},
+	{ "MsgBody", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoWsfProfile, msg_body), NULL, NULL, NULL},
+	{ "Identity", SNIPPET_NODE_IN_CHILD, G_STRUCT_OFFSET(LassoWsfProfile, identity), NULL, NULL, NULL},
+	{ "Session", SNIPPET_NODE_IN_CHILD, G_STRUCT_OFFSET(LassoWsfProfile, session), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*
@@ -964,6 +964,7 @@ lasso_wsf_profile_get_type()
 			sizeof(LassoWsfProfile),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/saml-2.0/assertion_query.c b/lasso/saml-2.0/assertion_query.c
index 1af107d2..d7f22c75 100644
--- a/lasso/saml-2.0/assertion_query.c
+++ b/lasso/saml-2.0/assertion_query.c
@@ -487,7 +487,7 @@ lasso_assertion_query_process_response_msg(
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -573,6 +573,7 @@ lasso_assertion_query_get_type()
 			sizeof(LassoAssertionQuery),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_PROFILE,
diff --git a/lasso/saml-2.0/ecp.c b/lasso/saml-2.0/ecp.c
index 1d343f8b..bb9cbf4d 100644
--- a/lasso/saml-2.0/ecp.c
+++ b/lasso/saml-2.0/ecp.c
@@ -299,6 +299,7 @@ lasso_ecp_get_type()
 			sizeof(LassoEcp),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_PROFILE,
diff --git a/lasso/saml-2.0/name_id_management.c b/lasso/saml-2.0/name_id_management.c
index 4158f835..371441c6 100644
--- a/lasso/saml-2.0/name_id_management.c
+++ b/lasso/saml-2.0/name_id_management.c
@@ -668,7 +668,7 @@ lasso_name_id_management_process_response_msg(
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -745,6 +745,7 @@ lasso_name_id_management_get_type()
 			sizeof(LassoNameIdManagement),
 			0,
 			NULL,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_PROFILE,
diff --git a/lasso/xml/disco_authenticate_requester.c b/lasso/xml/disco_authenticate_requester.c
index f527f502..d99801a9 100644
--- a/lasso/xml/disco_authenticate_requester.c
+++ b/lasso/xml/disco_authenticate_requester.c
@@ -46,8 +46,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "descriptionIDRefs",SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoDiscoAuthenticateRequester, descriptionIDRefs) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoDiscoAuthenticateRequester, descriptionIDRefs), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -87,6 +87,7 @@ lasso_disco_authenticate_requester_get_type()
 			sizeof(LassoDiscoAuthenticateRequester),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/disco_authenticate_session_context.c b/lasso/xml/disco_authenticate_session_context.c
index 95b3d2dd..d1197968 100644
--- a/lasso/xml/disco_authenticate_session_context.c
+++ b/lasso/xml/disco_authenticate_session_context.c
@@ -46,8 +46,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "descriptionIDRefs",SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoDiscoAuthenticateSessionContext, descriptionIDRefs) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoDiscoAuthenticateSessionContext, descriptionIDRefs), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -87,6 +87,7 @@ lasso_disco_authenticate_session_context_get_type()
 			sizeof(LassoDiscoAuthenticateSessionContext),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/disco_authorize_requester.c b/lasso/xml/disco_authorize_requester.c
index d895dda1..4f4a3e67 100644
--- a/lasso/xml/disco_authorize_requester.c
+++ b/lasso/xml/disco_authorize_requester.c
@@ -46,8 +46,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "descriptionIDRefs",SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoDiscoAuthorizeRequester, descriptionIDRefs) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoDiscoAuthorizeRequester, descriptionIDRefs), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -87,6 +87,7 @@ lasso_disco_authorize_requester_get_type()
 			sizeof(LassoDiscoAuthorizeRequester),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/disco_credentials.c b/lasso/xml/disco_credentials.c
index c9e1695b..251ca002 100644
--- a/lasso/xml/disco_credentials.c
+++ b/lasso/xml/disco_credentials.c
@@ -48,8 +48,8 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "", SNIPPET_LIST_XMLNODES, G_STRUCT_OFFSET(LassoDiscoCredentials, any) },
-	{ NULL, 0, 0}
+	{ "", SNIPPET_LIST_XMLNODES, G_STRUCT_OFFSET(LassoDiscoCredentials, any), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -89,6 +89,7 @@ lasso_disco_credentials_get_type()
 			sizeof(LassoDiscoCredentials),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/disco_description.c b/lasso/xml/disco_description.c
index ecaf1b3a..8dd99904 100644
--- a/lasso/xml/disco_description.c
+++ b/lasso/xml/disco_description.c
@@ -68,16 +68,16 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "SecurityMechID", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoDiscoDescription, SecurityMechID) },
+		G_STRUCT_OFFSET(LassoDiscoDescription, SecurityMechID), NULL, NULL, NULL},
 	{ "CredentialRef", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoDiscoDescription, CredentialRef) },
-	{ "WsdlURI", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoDiscoDescription, WsdlURI) },
+		G_STRUCT_OFFSET(LassoDiscoDescription, CredentialRef), NULL, NULL, NULL},
+	{ "WsdlURI", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoDiscoDescription, WsdlURI), NULL, NULL, NULL},
 	{ "ServiceNameRef", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoDiscoDescription, ServiceNameRef) },
-	{ "Endpoint", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoDiscoDescription, Endpoint) },
-	{ "SoapAction", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoDiscoDescription, SoapAction) },
-	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDiscoDescription, id) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoDiscoDescription, ServiceNameRef), NULL, NULL, NULL},
+	{ "Endpoint", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoDiscoDescription, Endpoint), NULL, NULL, NULL},
+	{ "SoapAction", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoDiscoDescription, SoapAction), NULL, NULL, NULL},
+	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDiscoDescription, id), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -126,6 +126,7 @@ lasso_disco_description_get_type()
 			sizeof(LassoDiscoDescription),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/disco_encrypt_resource_id.c b/lasso/xml/disco_encrypt_resource_id.c
index 08bb9f39..91b6bb7d 100644
--- a/lasso/xml/disco_encrypt_resource_id.c
+++ b/lasso/xml/disco_encrypt_resource_id.c
@@ -46,8 +46,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "descriptionIDRefs",SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoDiscoEncryptResourceID, descriptionIDRefs) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoDiscoEncryptResourceID, descriptionIDRefs), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -87,6 +87,7 @@ lasso_disco_encrypt_resource_id_get_type()
 			sizeof(LassoDiscoEncryptResourceID),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/disco_encrypted_resource_id.c b/lasso/xml/disco_encrypted_resource_id.c
index 16ed0608..f5791027 100644
--- a/lasso/xml/disco_encrypted_resource_id.c
+++ b/lasso/xml/disco_encrypted_resource_id.c
@@ -49,12 +49,12 @@
 static struct XmlSnippet schema_snippets[] = {
 #if 0
 	{ "EncryptedData", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoDiscoEncryptedResourceID, EncryptedData) },
+		G_STRUCT_OFFSET(LassoDiscoEncryptedResourceID, EncryptedData), NULL, NULL, NULL},
 	{ "EncryptedKey", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoDiscoEncryptedResourceID, EncryptedKey) },
+		G_STRUCT_OFFSET(LassoDiscoEncryptedResourceID, EncryptedKey), NULL, NULL, NULL},
 #endif
-	{ "", SNIPPET_LIST_XMLNODES, G_STRUCT_OFFSET(LassoDiscoEncryptedResourceID, any) },
-	{ NULL, 0, 0}
+	{ "", SNIPPET_LIST_XMLNODES, G_STRUCT_OFFSET(LassoDiscoEncryptedResourceID, any), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -98,6 +98,7 @@ lasso_disco_encrypted_resource_id_get_type()
 			sizeof(LassoDiscoEncryptedResourceID),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/disco_generate_bearer_token.c b/lasso/xml/disco_generate_bearer_token.c
index feb575f7..037b65e0 100644
--- a/lasso/xml/disco_generate_bearer_token.c
+++ b/lasso/xml/disco_generate_bearer_token.c
@@ -46,8 +46,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "descriptionIDRefs",SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoDiscoGenerateBearerToken, descriptionIDRefs) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoDiscoGenerateBearerToken, descriptionIDRefs), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -87,6 +87,7 @@ lasso_disco_generate_bearer_token_get_type()
 			sizeof(LassoDiscoGenerateBearerToken),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/disco_insert_entry.c b/lasso/xml/disco_insert_entry.c
index 1fd40739..44b9abb8 100644
--- a/lasso/xml/disco_insert_entry.c
+++ b/lasso/xml/disco_insert_entry.c
@@ -47,9 +47,9 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "ResourceOffering", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoDiscoInsertEntry, ResourceOffering) },
-	{ "", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoDiscoInsertEntry, any) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoDiscoInsertEntry, ResourceOffering), NULL, NULL, NULL},
+	{ "", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoDiscoInsertEntry, any), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -90,6 +90,7 @@ lasso_disco_insert_entry_get_type()
 			sizeof(LassoDiscoInsertEntry),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/disco_modify.c b/lasso/xml/disco_modify.c
index b90f2145..e064d176 100644
--- a/lasso/xml/disco_modify.c
+++ b/lasso/xml/disco_modify.c
@@ -58,13 +58,13 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "ResourceID", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDiscoModify, ResourceID) },
+	{ "ResourceID", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDiscoModify, ResourceID), NULL, NULL, NULL},
 	{ "EncryptedResourceID", SNIPPET_NODE, \
-		G_STRUCT_OFFSET(LassoDiscoModify, EncryptedResourceID) },
-	{ "InsertEntry", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoDiscoModify, InsertEntry) },
-	{ "RemoveEntry", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoDiscoModify, RemoveEntry) },
-	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDiscoModify, id) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoDiscoModify, EncryptedResourceID), NULL, NULL, NULL},
+	{ "InsertEntry", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoDiscoModify, InsertEntry), NULL, NULL, NULL},
+	{ "RemoveEntry", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoDiscoModify, RemoveEntry), NULL, NULL, NULL},
+	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDiscoModify, id), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -108,6 +108,7 @@ lasso_disco_modify_get_type()
 			sizeof(LassoDiscoModify),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/disco_modify_response.c b/lasso/xml/disco_modify_response.c
index 47024b41..6156f8eb 100644
--- a/lasso/xml/disco_modify_response.c
+++ b/lasso/xml/disco_modify_response.c
@@ -63,11 +63,11 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDiscoModifyResponse, Status) },
-	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDiscoModifyResponse, id) },
+	{ "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDiscoModifyResponse, Status), NULL, NULL, NULL},
+	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDiscoModifyResponse, id), NULL, NULL, NULL},
 	{ "newEntryIDs", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoDiscoModifyResponse, newEntryIDs) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoDiscoModifyResponse, newEntryIDs), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -138,6 +138,7 @@ lasso_disco_modify_response_get_type()
 			sizeof(LassoDiscoModifyResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/disco_options.c b/lasso/xml/disco_options.c
index 92c23526..9af9db51 100644
--- a/lasso/xml/disco_options.c
+++ b/lasso/xml/disco_options.c
@@ -46,8 +46,8 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Option", SNIPPET_LIST_CONTENT, G_STRUCT_OFFSET(LassoDiscoOptions, Option) },
-	{ NULL, 0, 0}
+	{ "Option", SNIPPET_LIST_CONTENT, G_STRUCT_OFFSET(LassoDiscoOptions, Option), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -87,6 +87,7 @@ lasso_disco_options_get_type()
 			sizeof(LassoDiscoOptions),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/disco_query.c b/lasso/xml/disco_query.c
index ab5139be..5760aa0d 100644
--- a/lasso/xml/disco_query.c
+++ b/lasso/xml/disco_query.c
@@ -64,13 +64,13 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "ResourceID", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDiscoQuery, ResourceID) },
+	{ "ResourceID", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDiscoQuery, ResourceID), NULL, NULL, NULL},
 	{ "EncryptedResourceID",
-		SNIPPET_NODE, G_STRUCT_OFFSET(LassoDiscoQuery, EncryptedResourceID) },
+		SNIPPET_NODE, G_STRUCT_OFFSET(LassoDiscoQuery, EncryptedResourceID), NULL, NULL, NULL},
 	{ "RequestedServiceType", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoDiscoQuery, RequestedServiceType) },
-	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDiscoQuery, id) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoDiscoQuery, RequestedServiceType), NULL, NULL, NULL},
+	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDiscoQuery, id), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -113,6 +113,7 @@ lasso_disco_query_get_type()
 			sizeof(LassoDiscoQuery),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/disco_query_response.c b/lasso/xml/disco_query_response.c
index 74dc9ca6..9e19c8bf 100644
--- a/lasso/xml/disco_query_response.c
+++ b/lasso/xml/disco_query_response.c
@@ -56,14 +56,14 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Status", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoDiscoQueryResponse, Status) },
+		G_STRUCT_OFFSET(LassoDiscoQueryResponse, Status), NULL, NULL, NULL},
 	{ "ResourceOffering", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoDiscoQueryResponse, ResourceOffering) },
+		G_STRUCT_OFFSET(LassoDiscoQueryResponse, ResourceOffering), NULL, NULL, NULL},
 	{ "Credentials", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoDiscoQueryResponse, Credentials) },
+		G_STRUCT_OFFSET(LassoDiscoQueryResponse, Credentials), NULL, NULL, NULL},
 	{ "id", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoDiscoQueryResponse, id) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoDiscoQueryResponse, id), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -137,6 +137,7 @@ lasso_disco_query_response_get_type()
 			sizeof(LassoDiscoQueryResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/disco_remove_entry.c b/lasso/xml/disco_remove_entry.c
index fece252d..ffba312b 100644
--- a/lasso/xml/disco_remove_entry.c
+++ b/lasso/xml/disco_remove_entry.c
@@ -49,8 +49,8 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "entryID", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDiscoRemoveEntry, entryID) },
-	{ NULL, 0, 0}
+	{ "entryID", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDiscoRemoveEntry, entryID), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -90,6 +90,7 @@ lasso_disco_remove_entry_get_type()
 			sizeof(LassoDiscoRemoveEntry),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/disco_requested_service_type.c b/lasso/xml/disco_requested_service_type.c
index 66aad1c0..8acf8b12 100644
--- a/lasso/xml/disco_requested_service_type.c
+++ b/lasso/xml/disco_requested_service_type.c
@@ -51,10 +51,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "ServiceType", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoDiscoRequestedServiceType, ServiceType) },
+		G_STRUCT_OFFSET(LassoDiscoRequestedServiceType, ServiceType), NULL, NULL, NULL},
 	{ "Options", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoDiscoRequestedServiceType, Options) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoDiscoRequestedServiceType, Options), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -95,6 +95,7 @@ lasso_disco_requested_service_type_get_type()
 			sizeof(LassoDiscoRequestedServiceType),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/disco_resource_id.c b/lasso/xml/disco_resource_id.c
index 77a098af..4210a2c7 100644
--- a/lasso/xml/disco_resource_id.c
+++ b/lasso/xml/disco_resource_id.c
@@ -48,9 +48,9 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDiscoResourceID, id) },
-	{ "", SNIPPET_TEXT_CHILD, G_STRUCT_OFFSET(LassoDiscoResourceID, content) },
-	{ NULL, 0, 0}
+	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDiscoResourceID, id), NULL, NULL, NULL},
+	{ "", SNIPPET_TEXT_CHILD, G_STRUCT_OFFSET(LassoDiscoResourceID, content), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -91,6 +91,7 @@ lasso_disco_resource_id_get_type()
 			sizeof(LassoDiscoResourceID),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/disco_resource_offering.c b/lasso/xml/disco_resource_offering.c
index 742aeed2..5fab35be 100644
--- a/lasso/xml/disco_resource_offering.c
+++ b/lasso/xml/disco_resource_offering.c
@@ -57,18 +57,18 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "ResourceID", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoDiscoResourceOffering, ResourceID) },
+		G_STRUCT_OFFSET(LassoDiscoResourceOffering, ResourceID), NULL, NULL, NULL},
 	{ "EncryptedResourceID", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoDiscoResourceOffering, EncryptedResourceID) },
+		G_STRUCT_OFFSET(LassoDiscoResourceOffering, EncryptedResourceID), NULL, NULL, NULL},
 	{ "ServiceInstance", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoDiscoResourceOffering, ServiceInstance) },
+		G_STRUCT_OFFSET(LassoDiscoResourceOffering, ServiceInstance), NULL, NULL, NULL},
 	{ "Options", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoDiscoResourceOffering, Options) },
+		G_STRUCT_OFFSET(LassoDiscoResourceOffering, Options), NULL, NULL, NULL},
 	{ "Abstract", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoDiscoResourceOffering, Abstract) },
+		G_STRUCT_OFFSET(LassoDiscoResourceOffering, Abstract), NULL, NULL, NULL},
 	{ "entryID", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoDiscoResourceOffering, entryID) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoDiscoResourceOffering, entryID), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -113,6 +113,7 @@ lasso_disco_resource_offering_get_type()
 			sizeof(LassoDiscoResourceOffering),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/disco_send_single_logout.c b/lasso/xml/disco_send_single_logout.c
index a82f4f0b..2ef3e232 100644
--- a/lasso/xml/disco_send_single_logout.c
+++ b/lasso/xml/disco_send_single_logout.c
@@ -46,8 +46,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "descriptionIDRefs",SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoDiscoSendSingleLogout, descriptionIDRefs) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoDiscoSendSingleLogout, descriptionIDRefs), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -87,6 +87,7 @@ lasso_disco_send_single_logout_get_type()
 			sizeof(LassoDiscoSendSingleLogout),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/disco_service_instance.c b/lasso/xml/disco_service_instance.c
index 261480a2..b9922e01 100644
--- a/lasso/xml/disco_service_instance.c
+++ b/lasso/xml/disco_service_instance.c
@@ -50,12 +50,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "ServiceType", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoDiscoServiceInstance, ServiceType) },
+		G_STRUCT_OFFSET(LassoDiscoServiceInstance, ServiceType), NULL, NULL, NULL},
 	{ "ProviderID",  SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoDiscoServiceInstance, ProviderID) },
+		G_STRUCT_OFFSET(LassoDiscoServiceInstance, ProviderID), NULL, NULL, NULL},
 	{ "Description", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoDiscoServiceInstance, Description) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoDiscoServiceInstance, Description), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -97,6 +97,7 @@ lasso_disco_service_instance_get_type()
 			sizeof(LassoDiscoServiceInstance),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/ds_key_info.c b/lasso/xml/ds_key_info.c
index dfdf9ea9..325d840c 100644
--- a/lasso/xml/ds_key_info.c
+++ b/lasso/xml/ds_key_info.c
@@ -33,8 +33,8 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "KeyValue", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDsKeyInfo, KeyValue) },
-	{ NULL, 0, 0}
+	{ "KeyValue", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDsKeyInfo, KeyValue), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -74,6 +74,7 @@ lasso_ds_key_info_get_type()
 			sizeof(LassoDsKeyInfo),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/ds_key_value.c b/lasso/xml/ds_key_value.c
index cf9fbb74..5d54be7a 100644
--- a/lasso/xml/ds_key_value.c
+++ b/lasso/xml/ds_key_value.c
@@ -33,8 +33,8 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "RSAKeyValue", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDsKeyValue, RSAKeyValue) },
-	{ NULL, 0, 0}
+	{ "RSAKeyValue", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDsKeyValue, RSAKeyValue), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -74,6 +74,7 @@ lasso_ds_key_value_get_type()
 			sizeof(LassoDsKeyValue),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/ds_rsa_key_value.c b/lasso/xml/ds_rsa_key_value.c
index 9417bab5..51b2221b 100644
--- a/lasso/xml/ds_rsa_key_value.c
+++ b/lasso/xml/ds_rsa_key_value.c
@@ -33,9 +33,9 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Modulus", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoDsRsaKeyValue, Modulus) },
-	{ "Exponent", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoDsRsaKeyValue, Exponent) },
-	{ NULL, 0, 0}
+	{ "Modulus", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoDsRsaKeyValue, Modulus), NULL, NULL, NULL},
+	{ "Exponent", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoDsRsaKeyValue, Exponent), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -76,6 +76,7 @@ lasso_ds_rsa_key_value_get_type()
 			sizeof(LassoDsRsaKeyValue),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/dst_data.c b/lasso/xml/dst_data.c
index d1c5bb39..9ecf2913 100644
--- a/lasso/xml/dst_data.c
+++ b/lasso/xml/dst_data.c
@@ -59,10 +59,10 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "", SNIPPET_LIST_XMLNODES, G_STRUCT_OFFSET(LassoDstData, any) },
-	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstData, id) },
-	{ "itemIDRef", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstData, itemIDRef) },
-	{ NULL, 0, 0}
+	{ "", SNIPPET_LIST_XMLNODES, G_STRUCT_OFFSET(LassoDstData, any), NULL, NULL, NULL},
+	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstData, id), NULL, NULL, NULL},
+	{ "itemIDRef", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstData, itemIDRef), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 
@@ -105,6 +105,7 @@ lasso_dst_data_get_type()
 			sizeof(LassoDstData),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/dst_modification.c b/lasso/xml/dst_modification.c
index 0e53a170..2d960d02 100644
--- a/lasso/xml/dst_modification.c
+++ b/lasso/xml/dst_modification.c
@@ -57,14 +57,14 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Select", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoDstModification, Select) },
-	{ "NewData", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDstModification, NewData) },
-	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstModification, id) },
+	{ "Select", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoDstModification, Select), NULL, NULL, NULL},
+	{ "NewData", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDstModification, NewData), NULL, NULL, NULL},
+	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstModification, id), NULL, NULL, NULL},
 	{ "notChangedSince", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstModification,
-								notChangedSince) },
+			notChangedSince), NULL, NULL, NULL },
 	{ "overrideAllowed", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstModification,
-								overrideAllowed) },
-	{NULL, 0, 0}
+			overrideAllowed), NULL, NULL, NULL },
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -111,6 +111,7 @@ lasso_dst_modification_get_type()
 			sizeof(LassoDstModification),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/dst_modify.c b/lasso/xml/dst_modify.c
index a5160105..d37d6ce5 100644
--- a/lasso/xml/dst_modify.c
+++ b/lasso/xml/dst_modify.c
@@ -66,15 +66,15 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "ResourceID", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDstModify, ResourceID) },
+	{ "ResourceID", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDstModify, ResourceID), NULL, NULL, NULL},
 	{ "EncryptedResourceID", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDstModify,
-			EncryptedResourceID) },
+			EncryptedResourceID), NULL, NULL, NULL },
 	{ "Modification", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoDstModify,
-			Modification) },
-	{ "Extension", SNIPPET_EXTENSION, G_STRUCT_OFFSET(LassoDstModify, Extension) },
-	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstModify, id) },
-	{ "itemID", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstModify, itemID) },
-	{NULL, 0, 0}
+			Modification), NULL, NULL, NULL },
+	{ "Extension", SNIPPET_EXTENSION, G_STRUCT_OFFSET(LassoDstModify, Extension), NULL, NULL, NULL},
+	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstModify, id), NULL, NULL, NULL},
+	{ "itemID", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstModify, itemID), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -168,6 +168,7 @@ lasso_dst_modify_get_type()
 			sizeof(LassoDstModify),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/dst_modify_response.c b/lasso/xml/dst_modify_response.c
index 52d7186f..8653224f 100644
--- a/lasso/xml/dst_modify_response.c
+++ b/lasso/xml/dst_modify_response.c
@@ -50,12 +50,12 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDstModifyResponse, Status) },
-	{ "Extension", SNIPPET_EXTENSION, G_STRUCT_OFFSET(LassoDstModifyResponse, Extension) },
-	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstModifyResponse, id) },
-	{ "itemIDRef", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstModifyResponse, itemIDRef) },
-	{ "timeStamp", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstModifyResponse, timeStamp) },
-	{NULL, 0, 0}
+	{ "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDstModifyResponse, Status), NULL, NULL, NULL},
+	{ "Extension", SNIPPET_EXTENSION, G_STRUCT_OFFSET(LassoDstModifyResponse, Extension), NULL, NULL, NULL},
+	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstModifyResponse, id), NULL, NULL, NULL},
+	{ "itemIDRef", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstModifyResponse, itemIDRef), NULL, NULL, NULL},
+	{ "timeStamp", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstModifyResponse, timeStamp), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -146,6 +146,7 @@ lasso_dst_modify_response_get_type()
 			sizeof(LassoDstModifyResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/dst_new_data.c b/lasso/xml/dst_new_data.c
index 60963528..4513ceed 100644
--- a/lasso/xml/dst_new_data.c
+++ b/lasso/xml/dst_new_data.c
@@ -47,8 +47,8 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "", SNIPPET_LIST_XMLNODES, G_STRUCT_OFFSET(LassoDstNewData, any) },
-	{NULL, 0, 0}
+	{ "", SNIPPET_LIST_XMLNODES, G_STRUCT_OFFSET(LassoDstNewData, any), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -90,6 +90,7 @@ lasso_dst_new_data_get_type()
 			sizeof(LassoDstNewData),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/dst_query.c b/lasso/xml/dst_query.c
index 91658051..e2deb177 100644
--- a/lasso/xml/dst_query.c
+++ b/lasso/xml/dst_query.c
@@ -58,14 +58,14 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "ResourceID", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDstQuery, ResourceID) },
+	{ "ResourceID", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDstQuery, ResourceID), NULL, NULL, NULL},
 	{ "EncryptedResourceID", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDstQuery,
-			EncryptedResourceID) },
-	{ "QueryItem", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoDstQuery, QueryItem) },
-	{ "Extension", SNIPPET_EXTENSION, G_STRUCT_OFFSET(LassoDstQuery, Extension) },
-	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstQuery, id) },
-	{ "itemID", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstQuery, itemID) },
-	{NULL, 0, 0}
+			EncryptedResourceID), NULL, NULL, NULL },
+	{ "QueryItem", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoDstQuery, QueryItem), NULL, NULL, NULL},
+	{ "Extension", SNIPPET_EXTENSION, G_STRUCT_OFFSET(LassoDstQuery, Extension), NULL, NULL, NULL},
+	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstQuery, id), NULL, NULL, NULL},
+	{ "itemID", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstQuery, itemID), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -164,6 +164,7 @@ lasso_dst_query_get_type()
 			sizeof(LassoDstQuery),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/dst_query_item.c b/lasso/xml/dst_query_item.c
index a5976e11..d9e5271c 100644
--- a/lasso/xml/dst_query_item.c
+++ b/lasso/xml/dst_query_item.c
@@ -63,13 +63,13 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Select", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoDstQueryItem, Select) },
-	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstQueryItem, id) },
+	{ "Select", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoDstQueryItem, Select), NULL, NULL, NULL},
+	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstQueryItem, id), NULL, NULL, NULL},
 	{ "includeCommonAttributes", SNIPPET_ATTRIBUTE | SNIPPET_BOOLEAN, \
-		G_STRUCT_OFFSET(LassoDstQueryItem, includeCommonAttributes) },
-	{ "itemID", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstQueryItem, itemID) },
-	{ "changedSince", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstQueryItem, changedSince) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoDstQueryItem, includeCommonAttributes), NULL, NULL, NULL},
+	{ "itemID", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstQueryItem, itemID), NULL, NULL, NULL},
+	{ "changedSince", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstQueryItem, changedSince), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -116,6 +116,7 @@ lasso_dst_query_item_get_type()
 			sizeof(LassoDstQueryItem),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/dst_query_response.c b/lasso/xml/dst_query_response.c
index 10652a9e..4ff20a7f 100644
--- a/lasso/xml/dst_query_response.c
+++ b/lasso/xml/dst_query_response.c
@@ -61,15 +61,15 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDstQueryResponse, Status) },
-	{ "Data", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoDstQueryResponse, Data) },
-	{ "Extension", SNIPPET_EXTENSION, G_STRUCT_OFFSET(LassoDstQueryResponse, Extension) },
-	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstQueryResponse, id) },
+	{ "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoDstQueryResponse, Status), NULL, NULL, NULL},
+	{ "Data", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoDstQueryResponse, Data), NULL, NULL, NULL},
+	{ "Extension", SNIPPET_EXTENSION, G_STRUCT_OFFSET(LassoDstQueryResponse, Extension), NULL, NULL, NULL},
+	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoDstQueryResponse, id), NULL, NULL, NULL},
 	{ "itemIDRef", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoDstQueryResponse, itemIDRef) },
+		G_STRUCT_OFFSET(LassoDstQueryResponse, itemIDRef), NULL, NULL, NULL},
 	{ "timeStamp", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoDstQueryResponse, timeStamp) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoDstQueryResponse, timeStamp), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -169,6 +169,7 @@ lasso_dst_query_response_get_type()
 			sizeof(LassoDstQueryResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/disco_abstract.c b/lasso/xml/id-wsf-2.0/disco_abstract.c
index b0b0f33a..58e34f31 100644
--- a/lasso/xml/id-wsf-2.0/disco_abstract.c
+++ b/lasso/xml/id-wsf-2.0/disco_abstract.c
@@ -43,8 +43,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "content", SNIPPET_TEXT_CHILD,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoAbstract, content) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoAbstract, content), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -88,6 +88,7 @@ lasso_idwsf2_disco_abstract_get_type()
 			sizeof(LassoIdWsf2DiscoAbstract),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/disco_endpoint_context.c b/lasso/xml/id-wsf-2.0/disco_endpoint_context.c
index ff6caae1..9fb2badd 100644
--- a/lasso/xml/id-wsf-2.0/disco_endpoint_context.c
+++ b/lasso/xml/id-wsf-2.0/disco_endpoint_context.c
@@ -52,14 +52,14 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Address", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoEndpointContext, Address) },
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoEndpointContext, Address), NULL, NULL, NULL},
 	{ "Framework", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoEndpointContext, Framework) },
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoEndpointContext, Framework), NULL, NULL, NULL},
 	{ "SecurityMechID", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoEndpointContext, SecurityMechID) },
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoEndpointContext, SecurityMechID), NULL, NULL, NULL},
 	{ "Action", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoEndpointContext, Action) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoEndpointContext, Action), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -106,6 +106,7 @@ lasso_idwsf2_disco_endpoint_context_get_type()
 			sizeof(LassoIdWsf2DiscoEndpointContext),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/disco_keys.c b/lasso/xml/id-wsf-2.0/disco_keys.c
index 083b890c..36befd06 100644
--- a/lasso/xml/id-wsf-2.0/disco_keys.c
+++ b/lasso/xml/id-wsf-2.0/disco_keys.c
@@ -49,8 +49,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "KeyDescriptor", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoKeys, KeyDescriptor) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoKeys, KeyDescriptor), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -94,6 +94,7 @@ lasso_idwsf2_disco_keys_get_type()
 			sizeof(LassoIdWsf2DiscoKeys),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/disco_options.c b/lasso/xml/id-wsf-2.0/disco_options.c
index 91d06ef1..fc9dde73 100644
--- a/lasso/xml/id-wsf-2.0/disco_options.c
+++ b/lasso/xml/id-wsf-2.0/disco_options.c
@@ -47,8 +47,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Option", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoOptions, Option) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoOptions, Option), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -92,6 +92,7 @@ lasso_idwsf2_disco_options_get_type()
 			sizeof(LassoIdWsf2DiscoOptions),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/disco_provider_id.c b/lasso/xml/id-wsf-2.0/disco_provider_id.c
index 916b9082..93119454 100644
--- a/lasso/xml/id-wsf-2.0/disco_provider_id.c
+++ b/lasso/xml/id-wsf-2.0/disco_provider_id.c
@@ -43,8 +43,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "content", SNIPPET_TEXT_CHILD,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoProviderID, content) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoProviderID, content), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -88,6 +88,7 @@ lasso_idwsf2_disco_provider_id_get_type()
 			sizeof(LassoIdWsf2DiscoProviderID),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/disco_query.c b/lasso/xml/id-wsf-2.0/disco_query.c
index ce1b31d3..4ac1c1b3 100644
--- a/lasso/xml/id-wsf-2.0/disco_query.c
+++ b/lasso/xml/id-wsf-2.0/disco_query.c
@@ -53,10 +53,10 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "RequestedService", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoQuery, RequestedService),
-		"LassoIdWsf2DiscoRequestedService" },
+		"LassoIdWsf2DiscoRequestedService", NULL, NULL },
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoQuery, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoQuery, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -102,6 +102,7 @@ lasso_idwsf2_disco_query_get_type()
 			sizeof(LassoIdWsf2DiscoQuery),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/disco_query_response.c b/lasso/xml/id-wsf-2.0/disco_query_response.c
index 4c547c99..0221299e 100644
--- a/lasso/xml/id-wsf-2.0/disco_query_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_query_response.c
@@ -53,13 +53,13 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "Status", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoQueryResponse, Status),
-		"LassoIdWsf2UtilStatus" },
+		"LassoIdWsf2UtilStatus", NULL, NULL },
 	{ "EndpointReference", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoQueryResponse, EndpointReference),
-		"LassoWsAddrEndpointReference" },
+		"LassoWsAddrEndpointReference", NULL, NULL },
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoQueryResponse, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoQueryResponse, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -106,6 +106,7 @@ lasso_idwsf2_disco_query_response_get_type()
 			sizeof(LassoIdWsf2DiscoQueryResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/disco_requested_service.c b/lasso/xml/id-wsf-2.0/disco_requested_service.c
index 3be26a73..a0338f5d 100644
--- a/lasso/xml/id-wsf-2.0/disco_requested_service.c
+++ b/lasso/xml/id-wsf-2.0/disco_requested_service.c
@@ -67,25 +67,25 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "ServiceType", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoRequestedService, ServiceType) },
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoRequestedService, ServiceType), NULL, NULL, NULL},
 	{ "ProviderID", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoRequestedService, ProviderID) },
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoRequestedService, ProviderID), NULL, NULL, NULL},
 	{ "Options", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoRequestedService, Options),
-		"LassoIdWsf2DiscoOptions" },
+		"LassoIdWsf2DiscoOptions", NULL, NULL },
 	{ "SecurityMechID", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoRequestedService, SecurityMechID) },
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoRequestedService, SecurityMechID), NULL, NULL, NULL},
 	{ "Framework", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoRequestedService, Framework) },
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoRequestedService, Framework), NULL, NULL, NULL},
 	{ "Action", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoRequestedService, Action) },
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoRequestedService, Action), NULL, NULL, NULL},
 	{ "", SNIPPET_NODE | SNIPPET_ANY | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoRequestedService, any) },
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoRequestedService, any), NULL, NULL, NULL},
 	{ "reqID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoRequestedService, reqID) },
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoRequestedService, reqID), NULL, NULL, NULL},
 	{ "resultsType", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoRequestedService, resultsType) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoRequestedService, resultsType), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -137,6 +137,7 @@ lasso_idwsf2_disco_requested_service_get_type()
 			sizeof(LassoIdWsf2DiscoRequestedService),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/disco_security_context.c b/lasso/xml/id-wsf-2.0/disco_security_context.c
index 3c5441f2..339e7bda 100644
--- a/lasso/xml/id-wsf-2.0/disco_security_context.c
+++ b/lasso/xml/id-wsf-2.0/disco_security_context.c
@@ -55,10 +55,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "SecurityMechID", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoSecurityContext, SecurityMechID) },
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSecurityContext, SecurityMechID), NULL, NULL, NULL},
 	{ "Token", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoSecurityContext, Token) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSecurityContext, Token), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -103,6 +103,7 @@ lasso_idwsf2_disco_security_context_get_type()
 			sizeof(LassoIdWsf2DiscoSecurityContext),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/disco_service_context.c b/lasso/xml/id-wsf-2.0/disco_service_context.c
index 266fe4d4..52174346 100644
--- a/lasso/xml/id-wsf-2.0/disco_service_context.c
+++ b/lasso/xml/id-wsf-2.0/disco_service_context.c
@@ -50,14 +50,14 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "ServiceType", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoServiceContext, ServiceType) },
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoServiceContext, ServiceType), NULL, NULL, NULL},
 	{ "Options", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoServiceContext, Options),
-		"LassoIdWsf2DiscoOptions" },
+		"LassoIdWsf2DiscoOptions", NULL, NULL },
 	{ "EndpointContext", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoServiceContext, EndpointContext),
-		"LassoIdWsf2DiscoEndpointContext" },
-	{NULL, 0, 0}
+		"LassoIdWsf2DiscoEndpointContext", NULL, NULL },
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -103,6 +103,7 @@ lasso_idwsf2_disco_service_context_get_type()
 			sizeof(LassoIdWsf2DiscoServiceContext),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/disco_service_type.c b/lasso/xml/id-wsf-2.0/disco_service_type.c
index 6746b1de..8af9eea7 100644
--- a/lasso/xml/id-wsf-2.0/disco_service_type.c
+++ b/lasso/xml/id-wsf-2.0/disco_service_type.c
@@ -43,8 +43,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "content", SNIPPET_TEXT_CHILD,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoServiceType, content) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoServiceType, content), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -88,6 +88,7 @@ lasso_idwsf2_disco_service_type_get_type()
 			sizeof(LassoIdWsf2DiscoServiceType),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.c b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.c
index 3cbaee46..facb705c 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.c
@@ -48,10 +48,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "SvcMDID", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationAdd, SvcMDID) },
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationAdd, SvcMDID), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationAdd, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationAdd, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -97,6 +97,7 @@ lasso_idwsf2_disco_svc_md_association_add_get_type()
 			sizeof(LassoIdWsf2DiscoSvcMDAssociationAdd),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.c
index 3e06f228..7a00a0df 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.c
@@ -49,10 +49,10 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "Status", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationAddResponse, Status),
-		"LassoIdWsf2UtilStatus" },
+		"LassoIdWsf2UtilStatus", NULL, NULL },
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationAddResponse, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationAddResponse, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -98,6 +98,7 @@ lasso_idwsf2_disco_svc_md_association_add_response_get_type()
 			sizeof(LassoIdWsf2DiscoSvcMDAssociationAddResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.c b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.c
index 5ce7b4ec..cae3d676 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.c
@@ -48,10 +48,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "SvcMDID", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationDelete, SvcMDID) },
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationDelete, SvcMDID), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationDelete, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationDelete, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -97,6 +97,7 @@ lasso_idwsf2_disco_svc_md_association_delete_get_type()
 			sizeof(LassoIdWsf2DiscoSvcMDAssociationDelete),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.c
index 8fff7a93..2da50e54 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.c
@@ -49,10 +49,10 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "Status", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationDeleteResponse, Status),
-		"LassoIdWsf2UtilStatus" },
+		"LassoIdWsf2UtilStatus", NULL, NULL },
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationDeleteResponse, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationDeleteResponse, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -98,6 +98,7 @@ lasso_idwsf2_disco_svc_md_association_delete_response_get_type()
 			sizeof(LassoIdWsf2DiscoSvcMDAssociationDeleteResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.c b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.c
index 137d9666..022170ab 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.c
@@ -48,10 +48,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "SvcMDID", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationQuery, SvcMDID) },
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationQuery, SvcMDID), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationQuery, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationQuery, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -97,6 +97,7 @@ lasso_idwsf2_disco_svc_md_association_query_get_type()
 			sizeof(LassoIdWsf2DiscoSvcMDAssociationQuery),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.c
index 073969f4..6e829de1 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.c
@@ -50,12 +50,12 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "Status", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationQueryResponse, Status),
-		"LassoIdWsf2UtilStatus" },
+		"LassoIdWsf2UtilStatus", NULL, NULL },
 	{ "SvcMDID", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationQueryResponse, SvcMDID) },
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationQueryResponse, SvcMDID), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationQueryResponse, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationQueryResponse, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -102,6 +102,7 @@ lasso_idwsf2_disco_svc_md_association_query_response_get_type()
 			sizeof(LassoIdWsf2DiscoSvcMDAssociationQueryResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_delete.c b/lasso/xml/id-wsf-2.0/disco_svc_md_delete.c
index f59f3434..6e6c58b6 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_delete.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_delete.c
@@ -48,10 +48,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "SvcMDID", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDDelete, SvcMDID) },
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDDelete, SvcMDID), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDDelete, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDDelete, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -97,6 +97,7 @@ lasso_idwsf2_disco_svc_md_delete_get_type()
 			sizeof(LassoIdWsf2DiscoSvcMDDelete),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.c
index 0b0d9f1a..9897dd7d 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.c
@@ -49,10 +49,10 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "Status", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDDeleteResponse, Status),
-		"LassoIdWsf2UtilStatus" },
+		"LassoIdWsf2UtilStatus", NULL, NULL },
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDDeleteResponse, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDDeleteResponse, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -98,6 +98,7 @@ lasso_idwsf2_disco_svc_md_delete_response_get_type()
 			sizeof(LassoIdWsf2DiscoSvcMDDeleteResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_query.c b/lasso/xml/id-wsf-2.0/disco_svc_md_query.c
index 1f3f7c36..463a59be 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_query.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_query.c
@@ -50,10 +50,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "SvcMDID", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDQuery, SvcMDID) },
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDQuery, SvcMDID), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDQuery, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDQuery, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -99,6 +99,7 @@ lasso_idwsf2_disco_svc_md_query_get_type()
 			sizeof(LassoIdWsf2DiscoSvcMDQuery),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.c
index a5c1028a..c686e60f 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.c
@@ -50,13 +50,13 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "Status", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDQueryResponse, Status),
-		"LassoIdWsf2UtilStatus" },
+		"LassoIdWsf2UtilStatus", NULL, NULL },
 	{ "SvcMD", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDQueryResponse, SvcMD),
-		"LassoIdWsf2DiscoSvcMetadata" },
+		"LassoIdWsf2DiscoSvcMetadata", NULL, NULL },
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDQueryResponse, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDQueryResponse, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -103,6 +103,7 @@ lasso_idwsf2_disco_svc_md_query_response_get_type()
 			sizeof(LassoIdWsf2DiscoSvcMDQueryResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_register.c b/lasso/xml/id-wsf-2.0/disco_svc_md_register.c
index 006cfa3d..dd5f60ee 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_register.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_register.c
@@ -50,10 +50,10 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "SvcMD", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDRegister, SvcMD),
-		"LassoIdWsf2DiscoSvcMetadata" },
+		"LassoIdWsf2DiscoSvcMetadata", NULL, NULL },
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDRegister, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDRegister, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -99,6 +99,7 @@ lasso_idwsf2_disco_svc_md_register_get_type()
 			sizeof(LassoIdWsf2DiscoSvcMDRegister),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.c
index 0426387e..0a98bb0c 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.c
@@ -53,15 +53,15 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "Status", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDRegisterResponse, Status),
-		"LassoIdWsf2UtilStatus" },
+		"LassoIdWsf2UtilStatus", NULL, NULL },
 	{ "SvcMDID", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDRegisterResponse, SvcMDID) },
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDRegisterResponse, SvcMDID), NULL, NULL, NULL},
 	{ "Keys", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDRegisterResponse, Keys),
-		"LassoIdWsf2DiscoKeys" },
+		"LassoIdWsf2DiscoKeys", NULL, NULL },
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDRegisterResponse, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDRegisterResponse, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -109,6 +109,7 @@ lasso_idwsf2_disco_svc_md_register_response_get_type()
 			sizeof(LassoIdWsf2DiscoSvcMDRegisterResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_replace.c b/lasso/xml/id-wsf-2.0/disco_svc_md_replace.c
index c389e95f..c3bff403 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_replace.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_replace.c
@@ -49,10 +49,10 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "SvcMD", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDReplace, SvcMD),
-		"LassoIdWsf2DiscoSvcMetadata" },
+		"LassoIdWsf2DiscoSvcMetadata", NULL, NULL },
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDReplace, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDReplace, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -98,6 +98,7 @@ lasso_idwsf2_disco_svc_md_replace_get_type()
 			sizeof(LassoIdWsf2DiscoSvcMDReplace),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.c
index f92c2174..c3875495 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.c
@@ -49,10 +49,10 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "Status", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDReplaceResponse, Status),
-		"LassoIdWsf2UtilStatus" },
+		"LassoIdWsf2UtilStatus", NULL, NULL },
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDReplaceResponse, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDReplaceResponse, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -98,6 +98,7 @@ lasso_idwsf2_disco_svc_md_replace_response_get_type()
 			sizeof(LassoIdWsf2DiscoSvcMDReplaceResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_metadata.c b/lasso/xml/id-wsf-2.0/disco_svc_metadata.c
index 9185bff5..c026e324 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_metadata.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_metadata.c
@@ -52,15 +52,15 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Abstract", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMetadata, Abstract) },
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMetadata, Abstract), NULL, NULL, NULL},
 	{ "ProviderID", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMetadata, ProviderID) },
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMetadata, ProviderID), NULL, NULL, NULL},
 	{ "ServiceContext", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMetadata, ServiceContext),
-		"LassoIdWsf2DiscoServiceContext" },
+		"LassoIdWsf2DiscoServiceContext", NULL, NULL },
 	{ "svcMDID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMetadata, svcMDID) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMetadata, svcMDID), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -107,6 +107,7 @@ lasso_idwsf2_disco_svc_metadata_get_type()
 			sizeof(LassoIdWsf2DiscoSvcMetadata),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/dst_data_response_base.c b/lasso/xml/id-wsf-2.0/dst_data_response_base.c
index 97cbd87f..a600618a 100644
--- a/lasso/xml/id-wsf-2.0/dst_data_response_base.c
+++ b/lasso/xml/id-wsf-2.0/dst_data_response_base.c
@@ -49,8 +49,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "timeStamp", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2DstDataResponseBase, timeStamp) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DstDataResponseBase, timeStamp), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -94,6 +94,7 @@ lasso_idwsf2_dst_data_response_base_get_type()
 			sizeof(LassoIdWsf2DstDataResponseBase),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_UTIL_RESPONSE,
diff --git a/lasso/xml/id-wsf-2.0/dst_delete_item_base.c b/lasso/xml/id-wsf-2.0/dst_delete_item_base.c
index e494d8fe..ef4db528 100644
--- a/lasso/xml/id-wsf-2.0/dst_delete_item_base.c
+++ b/lasso/xml/id-wsf-2.0/dst_delete_item_base.c
@@ -48,16 +48,16 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "notChangedSince", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2DstDeleteItemBase, notChangedSince) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstDeleteItemBase, notChangedSince), NULL, NULL, NULL},
 	{ "id", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2DstDeleteItemBase, id) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstDeleteItemBase, id), NULL, NULL, NULL},
 	{ "itemID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2DstDeleteItemBase, itemID) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstDeleteItemBase, itemID), NULL, NULL, NULL},
 	{ "objectType", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2DstDeleteItemBase, objectType) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstDeleteItemBase, objectType), NULL, NULL, NULL},
 	{ "predefined", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2DstDeleteItemBase, predefined) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DstDeleteItemBase, predefined), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -105,6 +105,7 @@ lasso_idwsf2_dst_delete_item_base_get_type()
 			sizeof(LassoIdWsf2DstDeleteItemBase),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/dst_delete_response.c b/lasso/xml/id-wsf-2.0/dst_delete_response.c
index b50d7ebd..21ac90a9 100644
--- a/lasso/xml/id-wsf-2.0/dst_delete_response.c
+++ b/lasso/xml/id-wsf-2.0/dst_delete_response.c
@@ -46,7 +46,7 @@
 
 
 static struct XmlSnippet schema_snippets[] = {
-	{NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -84,6 +84,7 @@ lasso_idwsf2_dst_delete_response_get_type()
 			sizeof(LassoIdWsf2DstDeleteResponse),
 			0,
 			NULL,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_UTIL_RESPONSE,
diff --git a/lasso/xml/id-wsf-2.0/dst_request.c b/lasso/xml/id-wsf-2.0/dst_request.c
index 8f931c97..f3f17d92 100644
--- a/lasso/xml/id-wsf-2.0/dst_request.c
+++ b/lasso/xml/id-wsf-2.0/dst_request.c
@@ -50,12 +50,12 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "Extension", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2DstRequest, Extension),
-		"LassoIdWsf2Utilextension" },
+		"LassoIdWsf2Utilextension", NULL, NULL },
 	{ "itemID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRequest, itemID) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstRequest, itemID), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRequest, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DstRequest, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -102,6 +102,7 @@ lasso_idwsf2_dst_request_get_type()
 			sizeof(LassoIdWsf2DstRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/dst_result_query_base.c b/lasso/xml/id-wsf-2.0/dst_result_query_base.c
index 6bfbcae7..660eb40d 100644
--- a/lasso/xml/id-wsf-2.0/dst_result_query_base.c
+++ b/lasso/xml/id-wsf-2.0/dst_result_query_base.c
@@ -54,22 +54,22 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "ChangeFormat", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2DstResultQueryBase, ChangeFormat) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstResultQueryBase, ChangeFormat), NULL, NULL, NULL},
 	{ "itemIDRef", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2DstResultQueryBase, itemIDRef) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstResultQueryBase, itemIDRef), NULL, NULL, NULL},
 	{ "contingency", SNIPPET_ATTRIBUTE | SNIPPET_BOOLEAN | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2DstResultQueryBase, contingency) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstResultQueryBase, contingency), NULL, NULL, NULL},
 	{ "includeCommonAttributes", SNIPPET_ATTRIBUTE | SNIPPET_BOOLEAN | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2DstResultQueryBase, includeCommonAttributes) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstResultQueryBase, includeCommonAttributes), NULL, NULL, NULL},
 	{ "changedSince", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2DstResultQueryBase, changedSince) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstResultQueryBase, changedSince), NULL, NULL, NULL},
 	{ "itemID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2DstResultQueryBase, itemID) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstResultQueryBase, itemID), NULL, NULL, NULL},
 	{ "objectType", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2DstResultQueryBase, objectType) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstResultQueryBase, objectType), NULL, NULL, NULL},
 	{ "predefined", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2DstResultQueryBase, predefined) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DstResultQueryBase, predefined), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -120,6 +120,7 @@ lasso_idwsf2_dst_result_query_base_get_type()
 			sizeof(LassoIdWsf2DstResultQueryBase),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/dst_test_item_base.c b/lasso/xml/id-wsf-2.0/dst_test_item_base.c
index 65c38d88..b35c4dda 100644
--- a/lasso/xml/id-wsf-2.0/dst_test_item_base.c
+++ b/lasso/xml/id-wsf-2.0/dst_test_item_base.c
@@ -47,14 +47,14 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "id", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2DstTestItemBase, id) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstTestItemBase, id), NULL, NULL, NULL},
 	{ "itemID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2DstTestItemBase, itemID) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstTestItemBase, itemID), NULL, NULL, NULL},
 	{ "objectType", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2DstTestItemBase, objectType) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstTestItemBase, objectType), NULL, NULL, NULL},
 	{ "predefined", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2DstTestItemBase, predefined) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DstTestItemBase, predefined), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -101,6 +101,7 @@ lasso_idwsf2_dst_test_item_base_get_type()
 			sizeof(LassoIdWsf2DstTestItemBase),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/dstref_app_data.c b/lasso/xml/id-wsf-2.0/dstref_app_data.c
index 403727a7..05946ee5 100644
--- a/lasso/xml/id-wsf-2.0/dstref_app_data.c
+++ b/lasso/xml/id-wsf-2.0/dstref_app_data.c
@@ -47,8 +47,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "", SNIPPET_LIST_XMLNODES,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRefAppData, any) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefAppData, any), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -92,6 +92,7 @@ lasso_idwsf2_dstref_app_data_get_type()
 			sizeof(LassoIdWsf2DstRefAppData),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/dstref_create.c b/lasso/xml/id-wsf-2.0/dstref_create.c
index bc5ac219..2bd7cedd 100644
--- a/lasso/xml/id-wsf-2.0/dstref_create.c
+++ b/lasso/xml/id-wsf-2.0/dstref_create.c
@@ -53,11 +53,11 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "CreateItem", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2DstRefCreate, CreateItem),
-		"LassoIdWsf2DstRefCreateItem" },
+		"LassoIdWsf2DstRefCreateItem", NULL, NULL },
 	{ "ResultQuery", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2DstRefCreate, ResultQuery),
-		"LassoIdWsf2DstRefResultQuery" },
-	{NULL, 0, 0}
+		"LassoIdWsf2DstRefResultQuery", NULL, NULL },
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -102,6 +102,7 @@ lasso_idwsf2_dstref_create_get_type()
 			sizeof(LassoIdWsf2DstRefCreate),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_REQUEST,
diff --git a/lasso/xml/id-wsf-2.0/dstref_create_item.c b/lasso/xml/id-wsf-2.0/dstref_create_item.c
index a7e88457..70967e23 100644
--- a/lasso/xml/id-wsf-2.0/dstref_create_item.c
+++ b/lasso/xml/id-wsf-2.0/dstref_create_item.c
@@ -49,14 +49,14 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "NewData", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoIdWsf2DstRefCreateItem, NewData),
-		"LassoIdWsf2DstRefAppData" },
+		"LassoIdWsf2DstRefAppData", NULL, NULL },
 	{ "objectType", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRefCreateItem, objectType) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefCreateItem, objectType), NULL, NULL, NULL},
 	{ "id", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRefCreateItem, id) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefCreateItem, id), NULL, NULL, NULL},
 	{ "itemID", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRefCreateItem, itemID) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefCreateItem, itemID), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -103,6 +103,7 @@ lasso_idwsf2_dstref_create_item_get_type()
 			sizeof(LassoIdWsf2DstRefCreateItem),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/dstref_create_response.c b/lasso/xml/id-wsf-2.0/dstref_create_response.c
index 55a1f8df..efba1b3e 100644
--- a/lasso/xml/id-wsf-2.0/dstref_create_response.c
+++ b/lasso/xml/id-wsf-2.0/dstref_create_response.c
@@ -46,7 +46,7 @@
 
 
 static struct XmlSnippet schema_snippets[] = {
-	{NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -83,7 +83,7 @@ lasso_idwsf2_dstref_create_response_get_type()
 			NULL,
 			sizeof(LassoIdWsf2DstRefCreateResponse),
 			0,
-			NULL,
+			NULL, NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DSTREF_DATA_RESPONSE,
diff --git a/lasso/xml/id-wsf-2.0/dstref_data.c b/lasso/xml/id-wsf-2.0/dstref_data.c
index c4910757..43f7c02b 100644
--- a/lasso/xml/id-wsf-2.0/dstref_data.c
+++ b/lasso/xml/id-wsf-2.0/dstref_data.c
@@ -49,12 +49,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "remaining", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRefData, remaining) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefData, remaining), NULL, NULL, NULL},
 	{ "nextOffset", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL_NEG,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRefData, nextOffset) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefData, nextOffset), NULL, NULL, NULL},
 	{ "setID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRefData, setID) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefData, setID), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -100,6 +100,7 @@ lasso_idwsf2_dstref_data_get_type()
 			sizeof(LassoIdWsf2DstRefData),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DSTREF_ITEM_DATA,
diff --git a/lasso/xml/id-wsf-2.0/dstref_data_response.c b/lasso/xml/id-wsf-2.0/dstref_data_response.c
index bca7596c..ebde13ea 100644
--- a/lasso/xml/id-wsf-2.0/dstref_data_response.c
+++ b/lasso/xml/id-wsf-2.0/dstref_data_response.c
@@ -52,8 +52,8 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "ItemData", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2DstRefDataResponse, ItemData),
-		"LassoIdWsf2DstRefItemData" },
-	{NULL, 0, 0}
+		"LassoIdWsf2DstRefItemData", NULL, NULL },
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -97,6 +97,7 @@ lasso_idwsf2_dstref_data_response_get_type()
 			sizeof(LassoIdWsf2DstRefDataResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_DATA_RESPONSE_BASE,
diff --git a/lasso/xml/id-wsf-2.0/dstref_delete.c b/lasso/xml/id-wsf-2.0/dstref_delete.c
index bf74b3c8..281bc094 100644
--- a/lasso/xml/id-wsf-2.0/dstref_delete.c
+++ b/lasso/xml/id-wsf-2.0/dstref_delete.c
@@ -52,8 +52,8 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "DeleteItem", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2DstRefDelete, DeleteItem),
-		"LassoIdWsf2DstRefDeleteItem" },
-	{NULL, 0, 0}
+		"LassoIdWsf2DstRefDeleteItem", NULL, NULL },
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -97,6 +97,7 @@ lasso_idwsf2_dstref_delete_get_type()
 			sizeof(LassoIdWsf2DstRefDelete),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_REQUEST,
diff --git a/lasso/xml/id-wsf-2.0/dstref_delete_item.c b/lasso/xml/id-wsf-2.0/dstref_delete_item.c
index d33a97cd..84852172 100644
--- a/lasso/xml/id-wsf-2.0/dstref_delete_item.c
+++ b/lasso/xml/id-wsf-2.0/dstref_delete_item.c
@@ -51,8 +51,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Select", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRefDeleteItem, Select) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefDeleteItem, Select), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_idwsf2_dstref_delete_item_get_type()
 			sizeof(LassoIdWsf2DstRefDeleteItem),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_DELETE_ITEM_BASE,
diff --git a/lasso/xml/id-wsf-2.0/dstref_delete_response.c b/lasso/xml/id-wsf-2.0/dstref_delete_response.c
index 63776c1f..6fb8bfa6 100644
--- a/lasso/xml/id-wsf-2.0/dstref_delete_response.c
+++ b/lasso/xml/id-wsf-2.0/dstref_delete_response.c
@@ -46,7 +46,7 @@
 
 
 static struct XmlSnippet schema_snippets[] = {
-	{NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -84,6 +84,7 @@ lasso_idwsf2_dstref_delete_response_get_type()
 			sizeof(LassoIdWsf2DstRefDeleteResponse),
 			0,
 			NULL,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_UTIL_RESPONSE,
diff --git a/lasso/xml/id-wsf-2.0/dstref_item_data.c b/lasso/xml/id-wsf-2.0/dstref_item_data.c
index 5371fd80..5f00e031 100644
--- a/lasso/xml/id-wsf-2.0/dstref_item_data.c
+++ b/lasso/xml/id-wsf-2.0/dstref_item_data.c
@@ -49,12 +49,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "itemIDRef", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRefItemData, itemIDRef) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefItemData, itemIDRef), NULL, NULL, NULL},
 	{ "notSorted", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRefItemData, notSorted) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefItemData, notSorted), NULL, NULL, NULL},
 	{ "changeFormat", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRefItemData, changeFormat) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefItemData, changeFormat), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -100,6 +100,7 @@ lasso_idwsf2_dstref_item_data_get_type()
 			sizeof(LassoIdWsf2DstRefItemData),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DSTREF_APP_DATA,
diff --git a/lasso/xml/id-wsf-2.0/dstref_modify.c b/lasso/xml/id-wsf-2.0/dstref_modify.c
index b8f4a1f9..ba058b73 100644
--- a/lasso/xml/id-wsf-2.0/dstref_modify.c
+++ b/lasso/xml/id-wsf-2.0/dstref_modify.c
@@ -53,11 +53,11 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "ModifyItem", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2DstRefModify, ModifyItem),
-		"LassoIdWsf2DstRefModifyItem" },
+		"LassoIdWsf2DstRefModifyItem", NULL, NULL },
 	{ "ResultQuery", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2DstRefModify, ResultQuery),
-		"LassoIdWsf2DstRefResultQuery" },
-	{NULL, 0, 0}
+		"LassoIdWsf2DstRefResultQuery", NULL, NULL },
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -139,6 +139,7 @@ lasso_idwsf2_dstref_modify_get_type()
 			sizeof(LassoIdWsf2DstRefModify),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_REQUEST,
diff --git a/lasso/xml/id-wsf-2.0/dstref_modify_item.c b/lasso/xml/id-wsf-2.0/dstref_modify_item.c
index 96506d97..07eeb20b 100644
--- a/lasso/xml/id-wsf-2.0/dstref_modify_item.c
+++ b/lasso/xml/id-wsf-2.0/dstref_modify_item.c
@@ -49,19 +49,19 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Select", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRefModifyItem, Select) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefModifyItem, Select), NULL, NULL, NULL},
 	{ "NewData", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoIdWsf2DstRefModifyItem, NewData),
-		"LassoIdWsf2DstRefAppData" },
+		"LassoIdWsf2DstRefAppData", NULL, NULL },
 	{ "notChangedSince", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRefModifyItem, notChangedSince) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefModifyItem, notChangedSince), NULL, NULL, NULL},
 	{ "overrideAllowed", SNIPPET_ATTRIBUTE | SNIPPET_BOOLEAN | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRefModifyItem, overrideAllowed) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefModifyItem, overrideAllowed), NULL, NULL, NULL},
 	{ "id", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRefModifyItem, id) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefModifyItem, id), NULL, NULL, NULL},
 	{ "itemID", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRefModifyItem, itemID) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefModifyItem, itemID), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -110,6 +110,7 @@ lasso_idwsf2_dstref_modify_item_get_type()
 			sizeof(LassoIdWsf2DstRefModifyItem),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/dstref_modify_response.c b/lasso/xml/id-wsf-2.0/dstref_modify_response.c
index 5a526e8d..88ab6e7e 100644
--- a/lasso/xml/id-wsf-2.0/dstref_modify_response.c
+++ b/lasso/xml/id-wsf-2.0/dstref_modify_response.c
@@ -46,7 +46,7 @@
 
 
 static struct XmlSnippet schema_snippets[] = {
-	{NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -128,6 +128,7 @@ lasso_idwsf2_dstref_modify_response_get_type()
 			sizeof(LassoIdWsf2DstRefModifyResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DSTREF_DATA_RESPONSE,
diff --git a/lasso/xml/id-wsf-2.0/dstref_query.c b/lasso/xml/id-wsf-2.0/dstref_query.c
index 7a48b712..794f5f9f 100644
--- a/lasso/xml/id-wsf-2.0/dstref_query.c
+++ b/lasso/xml/id-wsf-2.0/dstref_query.c
@@ -53,11 +53,11 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "TestItem", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2DstRefQuery, TestItem),
-		"LassoIdWsf2DstRefTestItem" },
+		"LassoIdWsf2DstRefTestItem", NULL, NULL },
 	{ "QueryItem", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2DstRefQuery, QueryItem),
-		"LassoIdWsf2DstRefQueryItem" },
-	{NULL, 0, 0}
+		"LassoIdWsf2DstRefQueryItem", NULL, NULL },
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -141,6 +141,7 @@ lasso_idwsf2_dstref_query_get_type()
 			sizeof(LassoIdWsf2DstRefQuery),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_REQUEST,
diff --git a/lasso/xml/id-wsf-2.0/dstref_query_item.c b/lasso/xml/id-wsf-2.0/dstref_query_item.c
index 7aed99a5..e2ea722e 100644
--- a/lasso/xml/id-wsf-2.0/dstref_query_item.c
+++ b/lasso/xml/id-wsf-2.0/dstref_query_item.c
@@ -49,14 +49,14 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "count", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL_NEG,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRefQueryItem, count) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefQueryItem, count), NULL, NULL, NULL},
 	{ "offset", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL_NEG,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRefQueryItem, offset) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefQueryItem, offset), NULL, NULL, NULL},
 	{ "setID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRefQueryItem, setID) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefQueryItem, setID), NULL, NULL, NULL},
 	{ "setReq", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRefQueryItem, setReq) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefQueryItem, setReq), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -103,6 +103,7 @@ lasso_idwsf2_dstref_query_item_get_type()
 			sizeof(LassoIdWsf2DstRefQueryItem),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DSTREF_RESULT_QUERY,
diff --git a/lasso/xml/id-wsf-2.0/dstref_query_response.c b/lasso/xml/id-wsf-2.0/dstref_query_response.c
index 440de316..8ae33681 100644
--- a/lasso/xml/id-wsf-2.0/dstref_query_response.c
+++ b/lasso/xml/id-wsf-2.0/dstref_query_response.c
@@ -52,11 +52,11 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "TestResult", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRefQueryResponse, TestResult) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefQueryResponse, TestResult), NULL, NULL, NULL},
 	{ "Data", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2DstRefQueryResponse, Data),
-		"LassoIdWsf2DstRefData" },
-	{NULL, 0, 0}
+		"LassoIdWsf2DstRefData", NULL, NULL },
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -140,6 +140,7 @@ lasso_idwsf2_dstref_query_response_get_type()
 			sizeof(LassoIdWsf2DstRefQueryResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_DATA_RESPONSE_BASE,
diff --git a/lasso/xml/id-wsf-2.0/dstref_result_query.c b/lasso/xml/id-wsf-2.0/dstref_result_query.c
index 0ccee386..ea9d898e 100644
--- a/lasso/xml/id-wsf-2.0/dstref_result_query.c
+++ b/lasso/xml/id-wsf-2.0/dstref_result_query.c
@@ -52,10 +52,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Select", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRefResultQuery, Select) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefResultQuery, Select), NULL, NULL, NULL},
 	{ "Sort", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRefResultQuery, Sort) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefResultQuery, Sort), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -100,6 +100,7 @@ lasso_idwsf2_dstref_result_query_get_type()
 			sizeof(LassoIdWsf2DstRefResultQuery),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_RESULT_QUERY_BASE,
diff --git a/lasso/xml/id-wsf-2.0/dstref_test_item.c b/lasso/xml/id-wsf-2.0/dstref_test_item.c
index e8a38cff..1b3ece44 100644
--- a/lasso/xml/id-wsf-2.0/dstref_test_item.c
+++ b/lasso/xml/id-wsf-2.0/dstref_test_item.c
@@ -51,8 +51,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "TestOp", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRefTestItem, TestOp) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefTestItem, TestOp), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_idwsf2_dstref_test_item_get_type()
 			sizeof(LassoIdWsf2DstRefTestItem),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_TEST_ITEM_BASE,
diff --git a/lasso/xml/id-wsf-2.0/ims_identity_mapping_request.c b/lasso/xml/id-wsf-2.0/ims_identity_mapping_request.c
index 1500b7f3..a5c71f98 100644
--- a/lasso/xml/id-wsf-2.0/ims_identity_mapping_request.c
+++ b/lasso/xml/id-wsf-2.0/ims_identity_mapping_request.c
@@ -48,10 +48,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "MappingInput", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2ImsIdentityMappingRequest, MappingInput) },
+		G_STRUCT_OFFSET(LassoIdWsf2ImsIdentityMappingRequest, MappingInput), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2ImsIdentityMappingRequest, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2ImsIdentityMappingRequest, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -97,6 +97,7 @@ lasso_idwsf2_ims_identity_mapping_request_get_type()
 			sizeof(LassoIdWsf2ImsIdentityMappingRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.c b/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.c
index 35f27b01..bed7de7e 100644
--- a/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.c
+++ b/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.c
@@ -50,12 +50,12 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "Status", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoIdWsf2ImsIdentityMappingResponse, Status),
-		"LassoIdWsf2UtilStatus" },
+		"LassoIdWsf2UtilStatus", NULL, NULL },
 	{ "MappingOutput", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2ImsIdentityMappingResponse, MappingOutput) },
+		G_STRUCT_OFFSET(LassoIdWsf2ImsIdentityMappingResponse, MappingOutput), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2ImsIdentityMappingResponse, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2ImsIdentityMappingResponse, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -102,6 +102,7 @@ lasso_idwsf2_ims_identity_mapping_response_get_type()
 			sizeof(LassoIdWsf2ImsIdentityMappingResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/ims_mapping_input.c b/lasso/xml/id-wsf-2.0/ims_mapping_input.c
index 95271822..70ea1137 100644
--- a/lasso/xml/id-wsf-2.0/ims_mapping_input.c
+++ b/lasso/xml/id-wsf-2.0/ims_mapping_input.c
@@ -49,12 +49,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "TokenPolicy", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2ImsMappingInput, TokenPolicy) },
+		G_STRUCT_OFFSET(LassoIdWsf2ImsMappingInput, TokenPolicy), NULL, NULL, NULL},
 	{ "Token", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2ImsMappingInput, Token) },
+		G_STRUCT_OFFSET(LassoIdWsf2ImsMappingInput, Token), NULL, NULL, NULL},
 	{ "reqID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2ImsMappingInput, reqID) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2ImsMappingInput, reqID), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -100,6 +100,7 @@ lasso_idwsf2_ims_mapping_input_get_type()
 			sizeof(LassoIdWsf2ImsMappingInput),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/ims_mapping_output.c b/lasso/xml/id-wsf-2.0/ims_mapping_output.c
index 5889c877..515d9263 100644
--- a/lasso/xml/id-wsf-2.0/ims_mapping_output.c
+++ b/lasso/xml/id-wsf-2.0/ims_mapping_output.c
@@ -48,10 +48,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Token", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2ImsMappingOutput, Token) },
+		G_STRUCT_OFFSET(LassoIdWsf2ImsMappingOutput, Token), NULL, NULL, NULL},
 	{ "reqRef", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2ImsMappingOutput, reqRef) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2ImsMappingOutput, reqRef), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_idwsf2_ims_mapping_output_get_type()
 			sizeof(LassoIdWsf2ImsMappingOutput),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/is_help.c b/lasso/xml/id-wsf-2.0/is_help.c
index ceb4135f..7a988f12 100644
--- a/lasso/xml/id-wsf-2.0/is_help.c
+++ b/lasso/xml/id-wsf-2.0/is_help.c
@@ -47,12 +47,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "label", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2IsHelp, label) },
+		G_STRUCT_OFFSET(LassoIdWsf2IsHelp, label), NULL, NULL, NULL},
 	{ "link", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2IsHelp, link) },
+		G_STRUCT_OFFSET(LassoIdWsf2IsHelp, link), NULL, NULL, NULL},
 	{ "moreLink", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2IsHelp, moreLink) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2IsHelp, moreLink), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -98,6 +98,7 @@ lasso_idwsf2_is_help_get_type()
 			sizeof(LassoIdWsf2IsHelp),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/is_inquiry.c b/lasso/xml/id-wsf-2.0/is_inquiry.c
index 7dce86ec..9553a716 100644
--- a/lasso/xml/id-wsf-2.0/is_inquiry.c
+++ b/lasso/xml/id-wsf-2.0/is_inquiry.c
@@ -55,18 +55,18 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Help", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2IsInquiry, Help) },
+		G_STRUCT_OFFSET(LassoIdWsf2IsInquiry, Help), NULL, NULL, NULL},
 	{ "Select", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2IsInquiry, Select) },
+		G_STRUCT_OFFSET(LassoIdWsf2IsInquiry, Select), NULL, NULL, NULL},
 	{ "Confirm", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2IsInquiry, Confirm) },
+		G_STRUCT_OFFSET(LassoIdWsf2IsInquiry, Confirm), NULL, NULL, NULL},
 	{ "Text", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2IsInquiry, Text) },
+		G_STRUCT_OFFSET(LassoIdWsf2IsInquiry, Text), NULL, NULL, NULL},
 	{ "id", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2IsInquiry, id) },
+		G_STRUCT_OFFSET(LassoIdWsf2IsInquiry, id), NULL, NULL, NULL},
 	{ "title", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2IsInquiry, title) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2IsInquiry, title), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -115,6 +115,7 @@ lasso_idwsf2_is_inquiry_get_type()
 			sizeof(LassoIdWsf2IsInquiry),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/is_inquiry_element.c b/lasso/xml/id-wsf-2.0/is_inquiry_element.c
index 07656c83..b984f4bb 100644
--- a/lasso/xml/id-wsf-2.0/is_inquiry_element.c
+++ b/lasso/xml/id-wsf-2.0/is_inquiry_element.c
@@ -51,16 +51,16 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Help", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2IsInquiryElement, Help) },
+		G_STRUCT_OFFSET(LassoIdWsf2IsInquiryElement, Help), NULL, NULL, NULL},
 	{ "Hint", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2IsInquiryElement, Hint) },
+		G_STRUCT_OFFSET(LassoIdWsf2IsInquiryElement, Hint), NULL, NULL, NULL},
 	{ "Label", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2IsInquiryElement, Label) },
+		G_STRUCT_OFFSET(LassoIdWsf2IsInquiryElement, Label), NULL, NULL, NULL},
 	{ "Value", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2IsInquiryElement, Value) },
+		G_STRUCT_OFFSET(LassoIdWsf2IsInquiryElement, Value), NULL, NULL, NULL},
 	{ "name", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2IsInquiryElement, name) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2IsInquiryElement, name), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -108,6 +108,7 @@ lasso_idwsf2_is_inquiry_element_get_type()
 			sizeof(LassoIdWsf2IsInquiryElement),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/is_interaction_request.c b/lasso/xml/id-wsf-2.0/is_interaction_request.c
index 4333d243..395acd18 100644
--- a/lasso/xml/id-wsf-2.0/is_interaction_request.c
+++ b/lasso/xml/id-wsf-2.0/is_interaction_request.c
@@ -52,18 +52,18 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Inquiry", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionRequest, Inquiry) },
+		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionRequest, Inquiry), NULL, NULL, NULL},
 	{ "KeyInfo", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionRequest, KeyInfo) },
+		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionRequest, KeyInfo), NULL, NULL, NULL},
 	{ "id", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionRequest, id) },
+		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionRequest, id), NULL, NULL, NULL},
 	{ "language", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionRequest, language) },
+		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionRequest, language), NULL, NULL, NULL},
 	{ "maxInteractTime", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionRequest, maxInteractTime) },
+		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionRequest, maxInteractTime), NULL, NULL, NULL},
 	{ "signed", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionRequest, signed_) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionRequest, signed_), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -112,6 +112,7 @@ lasso_idwsf2_is_interaction_request_get_type()
 			sizeof(LassoIdWsf2IsInteractionRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/is_interaction_response.c b/lasso/xml/id-wsf-2.0/is_interaction_response.c
index 27db3f4c..dab93b8b 100644
--- a/lasso/xml/id-wsf-2.0/is_interaction_response.c
+++ b/lasso/xml/id-wsf-2.0/is_interaction_response.c
@@ -53,12 +53,12 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "Status", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionResponse, Status),
-		"LassoIdWsf2UtilStatus" },
+		"LassoIdWsf2UtilStatus", NULL, NULL },
 	{ "InteractionStatement", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionResponse, InteractionStatement) },
+		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionResponse, InteractionStatement), NULL, NULL, NULL},
 	{ "Parameter", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionResponse, Parameter) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionResponse, Parameter), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -104,6 +104,7 @@ lasso_idwsf2_is_interaction_response_get_type()
 			sizeof(LassoIdWsf2IsInteractionResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/is_interaction_statement.c b/lasso/xml/id-wsf-2.0/is_interaction_statement.c
index a0da24bb..3e8f867f 100644
--- a/lasso/xml/id-wsf-2.0/is_interaction_statement.c
+++ b/lasso/xml/id-wsf-2.0/is_interaction_statement.c
@@ -52,20 +52,20 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Inquiry", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionStatement, Inquiry) },
-	{ "Signature", SNIPPET_SIGNATURE  },
+		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionStatement, Inquiry), NULL, NULL, NULL},
+	{ "Signature", SNIPPET_SIGNATURE, 0, NULL, NULL, NULL  },
 
 	/* hidden fields; used in lasso dumps */
 	{ "SignType", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_LASSO_DUMP,
-		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionStatement, sign_type) },
+		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionStatement, sign_type), NULL, NULL, NULL},
 	{ "SignMethod", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_LASSO_DUMP,
-		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionStatement, sign_method) },
+		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionStatement, sign_method), NULL, NULL, NULL},
 	{ "PrivateKeyFile", SNIPPET_CONTENT | SNIPPET_LASSO_DUMP,
-		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionStatement, private_key_file) },
+		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionStatement, private_key_file), NULL, NULL, NULL},
 	{ "CertificateFile", SNIPPET_CONTENT | SNIPPET_LASSO_DUMP,
-		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionStatement, certificate_file) },
+		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionStatement, certificate_file), NULL, NULL, NULL},
 
-	{NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -115,6 +115,7 @@ lasso_idwsf2_is_interaction_statement_get_type()
 			sizeof(LassoIdWsf2IsInteractionStatement),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/is_item.c b/lasso/xml/id-wsf-2.0/is_item.c
index 13760f68..e8e648b6 100644
--- a/lasso/xml/id-wsf-2.0/is_item.c
+++ b/lasso/xml/id-wsf-2.0/is_item.c
@@ -51,12 +51,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Hint", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2IsItem, Hint) },
+		G_STRUCT_OFFSET(LassoIdWsf2IsItem, Hint), NULL, NULL, NULL},
 	{ "label", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2IsItem, label) },
+		G_STRUCT_OFFSET(LassoIdWsf2IsItem, label), NULL, NULL, NULL},
 	{ "value", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2IsItem, value) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2IsItem, value), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -102,6 +102,7 @@ lasso_idwsf2_is_item_get_type()
 			sizeof(LassoIdWsf2IsItem),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/is_parameter.c b/lasso/xml/id-wsf-2.0/is_parameter.c
index 7f95522e..c7065222 100644
--- a/lasso/xml/id-wsf-2.0/is_parameter.c
+++ b/lasso/xml/id-wsf-2.0/is_parameter.c
@@ -46,10 +46,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "name", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2IsParameter, name) },
+		G_STRUCT_OFFSET(LassoIdWsf2IsParameter, name), NULL, NULL, NULL},
 	{ "value", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2IsParameter, value) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2IsParameter, value), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -94,6 +94,7 @@ lasso_idwsf2_is_parameter_get_type()
 			sizeof(LassoIdWsf2IsParameter),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/is_select.c b/lasso/xml/id-wsf-2.0/is_select.c
index 19c02ec6..6e36b7be 100644
--- a/lasso/xml/id-wsf-2.0/is_select.c
+++ b/lasso/xml/id-wsf-2.0/is_select.c
@@ -54,8 +54,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Item", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2IsSelect, Item) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2IsSelect, Item), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -99,6 +99,7 @@ lasso_idwsf2_is_select_get_type()
 			sizeof(LassoIdWsf2IsSelect),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_IS_INQUIRY_ELEMENT,
diff --git a/lasso/xml/id-wsf-2.0/is_text.c b/lasso/xml/id-wsf-2.0/is_text.c
index e4e1786c..df1fafd0 100644
--- a/lasso/xml/id-wsf-2.0/is_text.c
+++ b/lasso/xml/id-wsf-2.0/is_text.c
@@ -51,12 +51,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "minChars", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2IsText, minChars) },
+		G_STRUCT_OFFSET(LassoIdWsf2IsText, minChars), NULL, NULL, NULL},
 	{ "maxChars", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2IsText, maxChars) },
+		G_STRUCT_OFFSET(LassoIdWsf2IsText, maxChars), NULL, NULL, NULL},
 	{ "format", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2IsText, format) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2IsText, format), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -102,6 +102,7 @@ lasso_idwsf2_is_text_get_type()
 			sizeof(LassoIdWsf2IsText),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_IS_INQUIRY_ELEMENT,
diff --git a/lasso/xml/id-wsf-2.0/ps_add_collection_request.c b/lasso/xml/id-wsf-2.0/ps_add_collection_request.c
index d736aa41..dd5632b8 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_collection_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_add_collection_request.c
@@ -52,10 +52,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Object", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsAddCollectionRequest, Object) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddCollectionRequest, Object), NULL, NULL, NULL},
 	{ "Subscription", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsAddCollectionRequest, Subscription) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddCollectionRequest, Subscription), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -100,6 +100,7 @@ lasso_idwsf2_ps_add_collection_request_get_type()
 			sizeof(LassoIdWsf2PsAddCollectionRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
diff --git a/lasso/xml/id-wsf-2.0/ps_add_collection_response.c b/lasso/xml/id-wsf-2.0/ps_add_collection_response.c
index 4e3df4d3..09de4351 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_collection_response.c
+++ b/lasso/xml/id-wsf-2.0/ps_add_collection_response.c
@@ -51,8 +51,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Object", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsAddCollectionResponse, Object) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddCollectionResponse, Object), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_idwsf2_ps_add_collection_response_get_type()
 			sizeof(LassoIdWsf2PsAddCollectionResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_RESPONSE_ABSTRACT,
diff --git a/lasso/xml/id-wsf-2.0/ps_add_entity_request.c b/lasso/xml/id-wsf-2.0/ps_add_entity_request.c
index ccc35b77..085a49c5 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_entity_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_add_entity_request.c
@@ -55,16 +55,16 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Object", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsAddEntityRequest, Object) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddEntityRequest, Object), NULL, NULL, NULL},
 	{ "PStoSPRedirectURL", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsAddEntityRequest, PStoSPRedirectURL) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddEntityRequest, PStoSPRedirectURL), NULL, NULL, NULL},
 	{ "CreatePSObject", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2PsAddEntityRequest, CreatePSObject) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddEntityRequest, CreatePSObject), NULL, NULL, NULL},
 	{ "Subscription", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsAddEntityRequest, Subscription) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddEntityRequest, Subscription), NULL, NULL, NULL},
 	{ "TokenPolicy", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsAddEntityRequest, TokenPolicy) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddEntityRequest, TokenPolicy), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -112,6 +112,7 @@ lasso_idwsf2_ps_add_entity_request_get_type()
 			sizeof(LassoIdWsf2PsAddEntityRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
diff --git a/lasso/xml/id-wsf-2.0/ps_add_entity_response.c b/lasso/xml/id-wsf-2.0/ps_add_entity_response.c
index 2ad1f34e..77936301 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_entity_response.c
+++ b/lasso/xml/id-wsf-2.0/ps_add_entity_response.c
@@ -53,12 +53,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Object", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsAddEntityResponse, Object) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddEntityResponse, Object), NULL, NULL, NULL},
 	{ "SPtoPSRedirectURL", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsAddEntityResponse, SPtoPSRedirectURL) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddEntityResponse, SPtoPSRedirectURL), NULL, NULL, NULL},
 	{ "QueryString", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsAddEntityResponse, QueryString) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddEntityResponse, QueryString), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -104,6 +104,7 @@ lasso_idwsf2_ps_add_entity_response_get_type()
 			sizeof(LassoIdWsf2PsAddEntityResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_RESPONSE_ABSTRACT,
diff --git a/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.c b/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.c
index 04bb6d4e..abae9fda 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.c
@@ -55,16 +55,16 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Object", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityRequest, Object) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityRequest, Object), NULL, NULL, NULL},
 	{ "Token", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityRequest, Token) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityRequest, Token), NULL, NULL, NULL},
 	{ "CreatePSObject", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityRequest, CreatePSObject) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityRequest, CreatePSObject), NULL, NULL, NULL},
 	{ "Subscription", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityRequest, Subscription) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityRequest, Subscription), NULL, NULL, NULL},
 	{ "TokenPolicy", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityRequest, TokenPolicy) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityRequest, TokenPolicy), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -112,6 +112,7 @@ lasso_idwsf2_ps_add_known_entity_request_get_type()
 			sizeof(LassoIdWsf2PsAddKnownEntityRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
diff --git a/lasso/xml/id-wsf-2.0/ps_add_known_entity_response.c b/lasso/xml/id-wsf-2.0/ps_add_known_entity_response.c
index 0534ddb2..28333fab 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_known_entity_response.c
+++ b/lasso/xml/id-wsf-2.0/ps_add_known_entity_response.c
@@ -53,12 +53,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Object", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityResponse, Object) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityResponse, Object), NULL, NULL, NULL},
 	{ "SPtoPSRedirectURL", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityResponse, SPtoPSRedirectURL) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityResponse, SPtoPSRedirectURL), NULL, NULL, NULL},
 	{ "QueryString", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityResponse, QueryString) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityResponse, QueryString), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -104,6 +104,7 @@ lasso_idwsf2_ps_add_known_entity_response_get_type()
 			sizeof(LassoIdWsf2PsAddKnownEntityResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_RESPONSE_ABSTRACT,
diff --git a/lasso/xml/id-wsf-2.0/ps_add_to_collection_request.c b/lasso/xml/id-wsf-2.0/ps_add_to_collection_request.c
index 7bb3fe10..589c9d8a 100644
--- a/lasso/xml/id-wsf-2.0/ps_add_to_collection_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_add_to_collection_request.c
@@ -53,12 +53,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "TargetObjectID", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsAddToCollectionRequest, TargetObjectID) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddToCollectionRequest, TargetObjectID), NULL, NULL, NULL},
 	{ "ObjectID", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2PsAddToCollectionRequest, ObjectID) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddToCollectionRequest, ObjectID), NULL, NULL, NULL},
 	{ "Subscription", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsAddToCollectionRequest, Subscription) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddToCollectionRequest, Subscription), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -104,6 +104,7 @@ lasso_idwsf2_ps_add_to_collection_request_get_type()
 			sizeof(LassoIdWsf2PsAddToCollectionRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
diff --git a/lasso/xml/id-wsf-2.0/ps_get_object_info_request.c b/lasso/xml/id-wsf-2.0/ps_get_object_info_request.c
index a470da17..c49d2e55 100644
--- a/lasso/xml/id-wsf-2.0/ps_get_object_info_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_get_object_info_request.c
@@ -52,10 +52,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "TargetObjectID", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsGetObjectInfoRequest, TargetObjectID) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsGetObjectInfoRequest, TargetObjectID), NULL, NULL, NULL},
 	{ "Subscription", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsGetObjectInfoRequest, Subscription) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsGetObjectInfoRequest, Subscription), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -100,6 +100,7 @@ lasso_idwsf2_ps_get_object_info_request_get_type()
 			sizeof(LassoIdWsf2PsGetObjectInfoRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
diff --git a/lasso/xml/id-wsf-2.0/ps_get_object_info_response.c b/lasso/xml/id-wsf-2.0/ps_get_object_info_response.c
index 010be09d..1f30fa0d 100644
--- a/lasso/xml/id-wsf-2.0/ps_get_object_info_response.c
+++ b/lasso/xml/id-wsf-2.0/ps_get_object_info_response.c
@@ -51,8 +51,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Object", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsGetObjectInfoResponse, Object) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsGetObjectInfoResponse, Object), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_idwsf2_ps_get_object_info_response_get_type()
 			sizeof(LassoIdWsf2PsGetObjectInfoResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_RESPONSE_ABSTRACT,
diff --git a/lasso/xml/id-wsf-2.0/ps_item_data.c b/lasso/xml/id-wsf-2.0/ps_item_data.c
index fcded391..20e694da 100644
--- a/lasso/xml/id-wsf-2.0/ps_item_data.c
+++ b/lasso/xml/id-wsf-2.0/ps_item_data.c
@@ -47,8 +47,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Object", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsItemData, Object) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsItemData, Object), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -92,6 +92,7 @@ lasso_idwsf2_ps_item_data_get_type()
 			sizeof(LassoIdWsf2PsItemData),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/ps_list_members_request.c b/lasso/xml/id-wsf-2.0/ps_list_members_request.c
index 063a7556..891afd50 100644
--- a/lasso/xml/id-wsf-2.0/ps_list_members_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_list_members_request.c
@@ -55,16 +55,16 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "TargetObjectID", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsListMembersRequest, TargetObjectID) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsListMembersRequest, TargetObjectID), NULL, NULL, NULL},
 	{ "Subscription", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsListMembersRequest, Subscription) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsListMembersRequest, Subscription), NULL, NULL, NULL},
 	{ "Structured", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2PsListMembersRequest, Structured) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsListMembersRequest, Structured), NULL, NULL, NULL},
 	{ "Count", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL_NEG,
-		G_STRUCT_OFFSET(LassoIdWsf2PsListMembersRequest, Count) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsListMembersRequest, Count), NULL, NULL, NULL},
 	{ "Offset", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL_NEG,
-		G_STRUCT_OFFSET(LassoIdWsf2PsListMembersRequest, Offset) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsListMembersRequest, Offset), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -112,6 +112,7 @@ lasso_idwsf2_ps_list_members_request_get_type()
 			sizeof(LassoIdWsf2PsListMembersRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
diff --git a/lasso/xml/id-wsf-2.0/ps_list_members_response.c b/lasso/xml/id-wsf-2.0/ps_list_members_response.c
index 4f68b5f2..06f8f01e 100644
--- a/lasso/xml/id-wsf-2.0/ps_list_members_response.c
+++ b/lasso/xml/id-wsf-2.0/ps_list_members_response.c
@@ -51,8 +51,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Object", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2PsListMembersResponse, Object) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsListMembersResponse, Object), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_idwsf2_ps_list_members_response_get_type()
 			sizeof(LassoIdWsf2PsListMembersResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_RESPONSE_ABSTRACT,
diff --git a/lasso/xml/id-wsf-2.0/ps_notification.c b/lasso/xml/id-wsf-2.0/ps_notification.c
index 1f2fb233..8d79ad94 100644
--- a/lasso/xml/id-wsf-2.0/ps_notification.c
+++ b/lasso/xml/id-wsf-2.0/ps_notification.c
@@ -51,8 +51,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "ItemData", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2PsNotification, ItemData) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsNotification, ItemData), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_idwsf2_ps_notification_get_type()
 			sizeof(LassoIdWsf2PsNotification),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_SUBS_NOTIFICATION,
diff --git a/lasso/xml/id-wsf-2.0/ps_notify.c b/lasso/xml/id-wsf-2.0/ps_notify.c
index 9d448d84..fa84cba5 100644
--- a/lasso/xml/id-wsf-2.0/ps_notify.c
+++ b/lasso/xml/id-wsf-2.0/ps_notify.c
@@ -52,10 +52,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Notification", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2PsNotify, Notification) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsNotify, Notification), NULL, NULL, NULL},
 	{ "timeStamp", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2PsNotify, timeStamp) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsNotify, timeStamp), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -100,6 +100,7 @@ lasso_idwsf2_ps_notify_get_type()
 			sizeof(LassoIdWsf2PsNotify),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
diff --git a/lasso/xml/id-wsf-2.0/ps_object.c b/lasso/xml/id-wsf-2.0/ps_object.c
index 95b5ea21..8b3b0c65 100644
--- a/lasso/xml/id-wsf-2.0/ps_object.c
+++ b/lasso/xml/id-wsf-2.0/ps_object.c
@@ -55,22 +55,22 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "ObjectID", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsObject, ObjectID) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsObject, ObjectID), NULL, NULL, NULL},
 	{ "DisplayName", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2PsObject, DisplayName) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsObject, DisplayName), NULL, NULL, NULL},
 	{ "Tag", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsObject, Tag) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsObject, Tag), NULL, NULL, NULL},
 	{ "Object", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2PsObject, Object) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsObject, Object), NULL, NULL, NULL},
 	{ "ObjectRef", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2PsObject, ObjectRef) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsObject, ObjectRef), NULL, NULL, NULL},
 	{ "NodeType", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsObject, NodeType) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsObject, NodeType), NULL, NULL, NULL},
 	{ "CreatedDateTime", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2PsObject, CreatedDateTime) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsObject, CreatedDateTime), NULL, NULL, NULL},
 	{ "ModifiedDateTime", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2PsObject, ModifiedDateTime) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsObject, ModifiedDateTime), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -121,6 +121,7 @@ lasso_idwsf2_ps_object_get_type()
 			sizeof(LassoIdWsf2PsObject),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/ps_query_objects_request.c b/lasso/xml/id-wsf-2.0/ps_query_objects_request.c
index 61460105..d5e9e8f0 100644
--- a/lasso/xml/id-wsf-2.0/ps_query_objects_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_query_objects_request.c
@@ -54,14 +54,14 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Filter", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2PsQueryObjectsRequest, Filter) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsQueryObjectsRequest, Filter), NULL, NULL, NULL},
 	{ "Subscription", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsQueryObjectsRequest, Subscription) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsQueryObjectsRequest, Subscription), NULL, NULL, NULL},
 	{ "Count", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL_NEG,
-		G_STRUCT_OFFSET(LassoIdWsf2PsQueryObjectsRequest, Count) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsQueryObjectsRequest, Count), NULL, NULL, NULL},
 	{ "Offset", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL_NEG,
-		G_STRUCT_OFFSET(LassoIdWsf2PsQueryObjectsRequest, Offset) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsQueryObjectsRequest, Offset), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -108,6 +108,7 @@ lasso_idwsf2_ps_query_objects_request_get_type()
 			sizeof(LassoIdWsf2PsQueryObjectsRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
diff --git a/lasso/xml/id-wsf-2.0/ps_query_objects_response.c b/lasso/xml/id-wsf-2.0/ps_query_objects_response.c
index ce07a05c..7087257c 100644
--- a/lasso/xml/id-wsf-2.0/ps_query_objects_response.c
+++ b/lasso/xml/id-wsf-2.0/ps_query_objects_response.c
@@ -51,8 +51,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Object", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2PsQueryObjectsResponse, Object) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsQueryObjectsResponse, Object), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_idwsf2_ps_query_objects_response_get_type()
 			sizeof(LassoIdWsf2PsQueryObjectsResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_RESPONSE_ABSTRACT,
diff --git a/lasso/xml/id-wsf-2.0/ps_remove_collection_request.c b/lasso/xml/id-wsf-2.0/ps_remove_collection_request.c
index ea47ad8a..f91cc33d 100644
--- a/lasso/xml/id-wsf-2.0/ps_remove_collection_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_remove_collection_request.c
@@ -51,8 +51,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "TargetObjectID", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2PsRemoveCollectionRequest, TargetObjectID) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsRemoveCollectionRequest, TargetObjectID), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_idwsf2_ps_remove_collection_request_get_type()
 			sizeof(LassoIdWsf2PsRemoveCollectionRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
diff --git a/lasso/xml/id-wsf-2.0/ps_remove_entity_request.c b/lasso/xml/id-wsf-2.0/ps_remove_entity_request.c
index 754712b1..03ad9d4c 100644
--- a/lasso/xml/id-wsf-2.0/ps_remove_entity_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_remove_entity_request.c
@@ -51,8 +51,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "TargetObjectID", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2PsRemoveEntityRequest, TargetObjectID) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsRemoveEntityRequest, TargetObjectID), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_idwsf2_ps_remove_entity_request_get_type()
 			sizeof(LassoIdWsf2PsRemoveEntityRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
diff --git a/lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.c b/lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.c
index 4a30105b..a768a012 100644
--- a/lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.c
@@ -53,12 +53,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "TargetObjectID", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsRemoveFromCollectionRequest, TargetObjectID) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsRemoveFromCollectionRequest, TargetObjectID), NULL, NULL, NULL},
 	{ "ObjectID", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2PsRemoveFromCollectionRequest, ObjectID) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsRemoveFromCollectionRequest, ObjectID), NULL, NULL, NULL},
 	{ "Subscription", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsRemoveFromCollectionRequest, Subscription) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsRemoveFromCollectionRequest, Subscription), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -104,6 +104,7 @@ lasso_idwsf2_ps_remove_from_collection_request_get_type()
 			sizeof(LassoIdWsf2PsRemoveFromCollectionRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
diff --git a/lasso/xml/id-wsf-2.0/ps_request_abstract.c b/lasso/xml/id-wsf-2.0/ps_request_abstract.c
index bbc058d2..11eb0480 100644
--- a/lasso/xml/id-wsf-2.0/ps_request_abstract.c
+++ b/lasso/xml/id-wsf-2.0/ps_request_abstract.c
@@ -45,8 +45,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2PsRequestAbstract, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsRequestAbstract, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -91,6 +91,7 @@ lasso_idwsf2_ps_request_abstract_get_type()
 			sizeof(LassoIdWsf2PsRequestAbstract),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.c b/lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.c
index 9c1dbbea..a16e794a 100644
--- a/lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.c
@@ -51,8 +51,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "ResolveInput", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2PsResolveIdentifierRequest, ResolveInput) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsResolveIdentifierRequest, ResolveInput), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_idwsf2_ps_resolve_identifier_request_get_type()
 			sizeof(LassoIdWsf2PsResolveIdentifierRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
diff --git a/lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.c b/lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.c
index c9cc1597..f4e254e6 100644
--- a/lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.c
+++ b/lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.c
@@ -51,8 +51,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "ResolveOutput", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2PsResolveIdentifierResponse, ResolveOutput) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsResolveIdentifierResponse, ResolveOutput), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_idwsf2_ps_resolve_identifier_response_get_type()
 			sizeof(LassoIdWsf2PsResolveIdentifierResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_RESPONSE_ABSTRACT,
diff --git a/lasso/xml/id-wsf-2.0/ps_resolve_input.c b/lasso/xml/id-wsf-2.0/ps_resolve_input.c
index e05f2a86..fce6bbf0 100644
--- a/lasso/xml/id-wsf-2.0/ps_resolve_input.c
+++ b/lasso/xml/id-wsf-2.0/ps_resolve_input.c
@@ -51,8 +51,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "TargetObjectID", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsResolveInput, TargetObjectID) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsResolveInput, TargetObjectID), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_idwsf2_ps_resolve_input_get_type()
 			sizeof(LassoIdWsf2PsResolveInput),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_IMS_MAPPING_INPUT,
diff --git a/lasso/xml/id-wsf-2.0/ps_response_abstract.c b/lasso/xml/id-wsf-2.0/ps_response_abstract.c
index 62efd3d3..1c0f7dd9 100644
--- a/lasso/xml/id-wsf-2.0/ps_response_abstract.c
+++ b/lasso/xml/id-wsf-2.0/ps_response_abstract.c
@@ -49,10 +49,10 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "Status", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoIdWsf2PsResponseAbstract, Status),
-		"LassoIdWsf2UtilStatus" },
+		"LassoIdWsf2UtilStatus", NULL, NULL },
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2PsResponseAbstract, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsResponseAbstract, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -98,6 +98,7 @@ lasso_idwsf2_ps_response_abstract_get_type()
 			sizeof(LassoIdWsf2PsResponseAbstract),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/ps_set_object_info_request.c b/lasso/xml/id-wsf-2.0/ps_set_object_info_request.c
index 23c3bcce..f2e57d2a 100644
--- a/lasso/xml/id-wsf-2.0/ps_set_object_info_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_set_object_info_request.c
@@ -52,10 +52,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Object", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2PsSetObjectInfoRequest, Object) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsSetObjectInfoRequest, Object), NULL, NULL, NULL},
 	{ "Subscription", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsSetObjectInfoRequest, Subscription) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsSetObjectInfoRequest, Subscription), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -100,6 +100,7 @@ lasso_idwsf2_ps_set_object_info_request_get_type()
 			sizeof(LassoIdWsf2PsSetObjectInfoRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
diff --git a/lasso/xml/id-wsf-2.0/ps_test_membership_request.c b/lasso/xml/id-wsf-2.0/ps_test_membership_request.c
index a60951ba..e24c585e 100644
--- a/lasso/xml/id-wsf-2.0/ps_test_membership_request.c
+++ b/lasso/xml/id-wsf-2.0/ps_test_membership_request.c
@@ -53,12 +53,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "TargetObjectID", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsTestMembershipRequest, TargetObjectID) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsTestMembershipRequest, TargetObjectID), NULL, NULL, NULL},
 	{ "Token", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsTestMembershipRequest, Token) },
+		G_STRUCT_OFFSET(LassoIdWsf2PsTestMembershipRequest, Token), NULL, NULL, NULL},
 	{ "Subscription", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsTestMembershipRequest, Subscription) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsTestMembershipRequest, Subscription), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -104,6 +104,7 @@ lasso_idwsf2_ps_test_membership_request_get_type()
 			sizeof(LassoIdWsf2PsTestMembershipRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
diff --git a/lasso/xml/id-wsf-2.0/ps_test_membership_response.c b/lasso/xml/id-wsf-2.0/ps_test_membership_response.c
index eea86e20..b97b5f96 100644
--- a/lasso/xml/id-wsf-2.0/ps_test_membership_response.c
+++ b/lasso/xml/id-wsf-2.0/ps_test_membership_response.c
@@ -51,8 +51,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Result", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2PsTestMembershipResponse, Result) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2PsTestMembershipResponse, Result), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_idwsf2_ps_test_membership_response_get_type()
 			sizeof(LassoIdWsf2PsTestMembershipResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_RESPONSE_ABSTRACT,
diff --git a/lasso/xml/id-wsf-2.0/sb2_consent.c b/lasso/xml/id-wsf-2.0/sb2_consent.c
index 2db5ab51..78e762c2 100644
--- a/lasso/xml/id-wsf-2.0/sb2_consent.c
+++ b/lasso/xml/id-wsf-2.0/sb2_consent.c
@@ -47,12 +47,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "uri", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2Sb2Consent, uri) },
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2Consent, uri), NULL, NULL, NULL},
 	{ "timestamp", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2Sb2Consent, timestamp) },
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2Consent, timestamp), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2Sb2Consent, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2Consent, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -99,6 +99,7 @@ lasso_idwsf2_sb2_consent_get_type()
 			sizeof(LassoIdWsf2Sb2Consent),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/sb2_credentials_context.c b/lasso/xml/id-wsf-2.0/sb2_credentials_context.c
index 18dd313d..7a9df32b 100644
--- a/lasso/xml/id-wsf-2.0/sb2_credentials_context.c
+++ b/lasso/xml/id-wsf-2.0/sb2_credentials_context.c
@@ -50,12 +50,12 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "RequestedAuthnContext", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoIdWsf2Sb2CredentialsContext, RequestedAuthnContext),
-		"LassoSamlp2RequestedAuthnContext" },
+		"LassoSamlp2RequestedAuthnContext", NULL, NULL },
 	{ "SecurityMechID", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoIdWsf2Sb2CredentialsContext, SecurityMechID) },
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2CredentialsContext, SecurityMechID), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2Sb2CredentialsContext, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2CredentialsContext, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -102,6 +102,7 @@ lasso_idwsf2_sb2_credentials_context_get_type()
 			sizeof(LassoIdWsf2Sb2CredentialsContext),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/sb2_endpoint_update.c b/lasso/xml/id-wsf-2.0/sb2_endpoint_update.c
index 06a85eaa..10fd0c2b 100644
--- a/lasso/xml/id-wsf-2.0/sb2_endpoint_update.c
+++ b/lasso/xml/id-wsf-2.0/sb2_endpoint_update.c
@@ -49,8 +49,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "updateType", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2Sb2EndpointUpdate, updateType) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2EndpointUpdate, updateType), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -94,6 +94,7 @@ lasso_idwsf2_sb2_endpoint_update_get_type()
 			sizeof(LassoIdWsf2Sb2EndpointUpdate),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_WSA_ENDPOINT_REFERENCE,
diff --git a/lasso/xml/id-wsf-2.0/sb2_redirect_request.c b/lasso/xml/id-wsf-2.0/sb2_redirect_request.c
index 768a7808..4057a47e 100644
--- a/lasso/xml/id-wsf-2.0/sb2_redirect_request.c
+++ b/lasso/xml/id-wsf-2.0/sb2_redirect_request.c
@@ -45,8 +45,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "redirectURL", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2Sb2RedirectRequest, redirectURL) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2RedirectRequest, redirectURL), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -90,6 +90,7 @@ lasso_idwsf2_sb2_redirect_request_get_type()
 			sizeof(LassoIdWsf2Sb2RedirectRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/sb2_sender.c b/lasso/xml/id-wsf-2.0/sb2_sender.c
index 95f3e181..d51931fd 100644
--- a/lasso/xml/id-wsf-2.0/sb2_sender.c
+++ b/lasso/xml/id-wsf-2.0/sb2_sender.c
@@ -47,12 +47,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "providerID", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2Sb2Sender, providerID) },
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2Sender, providerID), NULL, NULL, NULL},
 	{ "affiliationID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2Sb2Sender, affiliationID) },
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2Sender, affiliationID), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2Sb2Sender, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2Sender, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -99,6 +99,7 @@ lasso_idwsf2_sb2_sender_get_type()
 			sizeof(LassoIdWsf2Sb2Sender),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/sb2_target_identity.c b/lasso/xml/id-wsf-2.0/sb2_target_identity.c
index 8c9a84c9..68f2d7bf 100644
--- a/lasso/xml/id-wsf-2.0/sb2_target_identity.c
+++ b/lasso/xml/id-wsf-2.0/sb2_target_identity.c
@@ -48,8 +48,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2Sb2TargetIdentity, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2TargetIdentity, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -94,6 +94,7 @@ lasso_idwsf2_sb2_target_identity_get_type()
 			sizeof(LassoIdWsf2Sb2TargetIdentity),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/sb2_timeout.c b/lasso/xml/id-wsf-2.0/sb2_timeout.c
index 5862275c..065f5ebb 100644
--- a/lasso/xml/id-wsf-2.0/sb2_timeout.c
+++ b/lasso/xml/id-wsf-2.0/sb2_timeout.c
@@ -46,10 +46,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "maxProcessingTime", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER,
-		G_STRUCT_OFFSET(LassoIdWsf2Sb2Timeout, maxProcessingTime) },
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2Timeout, maxProcessingTime), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2Sb2Timeout, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2Timeout, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -95,6 +95,7 @@ lasso_idwsf2_sb2_timeout_get_type()
 			sizeof(LassoIdWsf2Sb2Timeout),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/sb2_usage_directive.c b/lasso/xml/id-wsf-2.0/sb2_usage_directive.c
index 927a5baa..a1d1bb2f 100644
--- a/lasso/xml/id-wsf-2.0/sb2_usage_directive.c
+++ b/lasso/xml/id-wsf-2.0/sb2_usage_directive.c
@@ -50,10 +50,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "ref", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2Sb2UsageDirective, ref) },
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2UsageDirective, ref), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2Sb2UsageDirective, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2UsageDirective, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -99,6 +99,7 @@ lasso_idwsf2_sb2_usage_directive_get_type()
 			sizeof(LassoIdWsf2Sb2UsageDirective),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/sb2_user_interaction_header.c b/lasso/xml/id-wsf-2.0/sb2_user_interaction_header.c
index a548a1e1..ea559021 100644
--- a/lasso/xml/id-wsf-2.0/sb2_user_interaction_header.c
+++ b/lasso/xml/id-wsf-2.0/sb2_user_interaction_header.c
@@ -54,18 +54,18 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "InteractionService", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2Sb2UserInteractionHeader, InteractionService) },
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2UserInteractionHeader, InteractionService), NULL, NULL, NULL},
 	{ "interact", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2Sb2UserInteractionHeader, interact) },
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2UserInteractionHeader, interact), NULL, NULL, NULL},
 	{ "language", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2Sb2UserInteractionHeader, language) },
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2UserInteractionHeader, language), NULL, NULL, NULL},
 	{ "redirect", SNIPPET_ATTRIBUTE | SNIPPET_BOOLEAN | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2Sb2UserInteractionHeader, redirect) },
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2UserInteractionHeader, redirect), NULL, NULL, NULL},
 	{ "maxInteractTime", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2Sb2UserInteractionHeader, maxInteractTime) },
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2UserInteractionHeader, maxInteractTime), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2Sb2UserInteractionHeader, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2UserInteractionHeader, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -115,6 +115,7 @@ lasso_idwsf2_sb2_user_interaction_header_get_type()
 			sizeof(LassoIdWsf2Sb2UserInteractionHeader),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/sbf_framework.c b/lasso/xml/id-wsf-2.0/sbf_framework.c
index 4b90d902..1cb12020 100644
--- a/lasso/xml/id-wsf-2.0/sbf_framework.c
+++ b/lasso/xml/id-wsf-2.0/sbf_framework.c
@@ -49,10 +49,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "version", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2SbfFramework, version) },
+		G_STRUCT_OFFSET(LassoIdWsf2SbfFramework, version), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2SbfFramework, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2SbfFramework, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -97,6 +97,7 @@ lasso_idwsf2_sbf_framework_get_type()
 			sizeof(LassoIdWsf2SbfFramework),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/sec_token.c b/lasso/xml/id-wsf-2.0/sec_token.c
index b07748d7..c26bdf36 100644
--- a/lasso/xml/id-wsf-2.0/sec_token.c
+++ b/lasso/xml/id-wsf-2.0/sec_token.c
@@ -51,14 +51,14 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "", SNIPPET_NODE | SNIPPET_ANY | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2SecToken, any) },
+		G_STRUCT_OFFSET(LassoIdWsf2SecToken, any), NULL, NULL, NULL},
 	{ "id", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2SecToken, id) },
+		G_STRUCT_OFFSET(LassoIdWsf2SecToken, id), NULL, NULL, NULL},
 	{ "ref", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2SecToken, ref) },
+		G_STRUCT_OFFSET(LassoIdWsf2SecToken, ref), NULL, NULL, NULL},
 	{ "usage", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2SecToken, usage) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2SecToken, usage), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -105,6 +105,7 @@ lasso_idwsf2_sec_token_get_type()
 			sizeof(LassoIdWsf2SecToken),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/sec_token_policy.c b/lasso/xml/id-wsf-2.0/sec_token_policy.c
index 5d7ec8bf..ca15cb74 100644
--- a/lasso/xml/id-wsf-2.0/sec_token_policy.c
+++ b/lasso/xml/id-wsf-2.0/sec_token_policy.c
@@ -52,18 +52,18 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "", SNIPPET_NODE | SNIPPET_ANY | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2SecTokenPolicy, any) },
+		G_STRUCT_OFFSET(LassoIdWsf2SecTokenPolicy, any), NULL, NULL, NULL},
 	{ "validUntil", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2SecTokenPolicy, validUntil) },
+		G_STRUCT_OFFSET(LassoIdWsf2SecTokenPolicy, validUntil), NULL, NULL, NULL},
 	{ "issueTo", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2SecTokenPolicy, issueTo) },
+		G_STRUCT_OFFSET(LassoIdWsf2SecTokenPolicy, issueTo), NULL, NULL, NULL},
 	{ "type", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2SecTokenPolicy, type) },
+		G_STRUCT_OFFSET(LassoIdWsf2SecTokenPolicy, type), NULL, NULL, NULL},
 	{ "wantDSEPR", SNIPPET_ATTRIBUTE | SNIPPET_BOOLEAN | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2SecTokenPolicy, wantDSEPR) },
+		G_STRUCT_OFFSET(LassoIdWsf2SecTokenPolicy, wantDSEPR), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2SecTokenPolicy, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2SecTokenPolicy, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -113,6 +113,7 @@ lasso_idwsf2_sec_token_policy_get_type()
 			sizeof(LassoIdWsf2SecTokenPolicy),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/sec_transited_provider_path.c b/lasso/xml/id-wsf-2.0/sec_transited_provider_path.c
index 6df5c609..2e8bc455 100644
--- a/lasso/xml/id-wsf-2.0/sec_transited_provider_path.c
+++ b/lasso/xml/id-wsf-2.0/sec_transited_provider_path.c
@@ -48,8 +48,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "TransitedProvider", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2SecTransitedProviderPath, TransitedProvider) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2SecTransitedProviderPath, TransitedProvider), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -93,6 +93,7 @@ lasso_idwsf2_sec_transited_provider_path_get_type()
 			sizeof(LassoIdWsf2SecTransitedProviderPath),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/subs_notification.c b/lasso/xml/id-wsf-2.0/subs_notification.c
index d9ac1644..077c2225 100644
--- a/lasso/xml/id-wsf-2.0/subs_notification.c
+++ b/lasso/xml/id-wsf-2.0/subs_notification.c
@@ -52,16 +52,16 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "TestResult", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2SubsNotification, TestResult),
-		"LassoIdWsf2UtilTestResult" },
+		"LassoIdWsf2UtilTestResult", NULL, NULL },
 	{ "id", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsNotification, id) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsNotification, id), NULL, NULL, NULL},
 	{ "subscriptionID", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsNotification, subscriptionID) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsNotification, subscriptionID), NULL, NULL, NULL},
 	{ "expires", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsNotification, expires) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsNotification, expires), NULL, NULL, NULL},
 	{ "endReason", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsNotification, endReason) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2SubsNotification, endReason), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -109,6 +109,7 @@ lasso_idwsf2_subs_notification_get_type()
 			sizeof(LassoIdWsf2SubsNotification),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/subs_notify_response.c b/lasso/xml/id-wsf-2.0/subs_notify_response.c
index 014d12aa..b1264b8e 100644
--- a/lasso/xml/id-wsf-2.0/subs_notify_response.c
+++ b/lasso/xml/id-wsf-2.0/subs_notify_response.c
@@ -46,7 +46,7 @@
 
 
 static struct XmlSnippet schema_snippets[] = {
-	{NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -84,6 +84,7 @@ lasso_idwsf2_subs_notify_response_get_type()
 			sizeof(LassoIdWsf2SubsNotifyResponse),
 			0,
 			NULL,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_UTIL_RESPONSE,
diff --git a/lasso/xml/id-wsf-2.0/subs_ref_item.c b/lasso/xml/id-wsf-2.0/subs_ref_item.c
index d3d9b5a7..cff0b255 100644
--- a/lasso/xml/id-wsf-2.0/subs_ref_item.c
+++ b/lasso/xml/id-wsf-2.0/subs_ref_item.c
@@ -46,10 +46,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "subscriptionID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefItem, subscriptionID) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefItem, subscriptionID), NULL, NULL, NULL},
 	{ "itemIDRef", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefItem, itemIDRef) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefItem, itemIDRef), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -94,6 +94,7 @@ lasso_idwsf2_subs_ref_item_get_type()
 			sizeof(LassoIdWsf2SubsRefItem),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/subs_subscription.c b/lasso/xml/id-wsf-2.0/subs_subscription.c
index 257bdbee..d8d59b86 100644
--- a/lasso/xml/id-wsf-2.0/subs_subscription.c
+++ b/lasso/xml/id-wsf-2.0/subs_subscription.c
@@ -63,25 +63,25 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "RefItem", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, RefItem) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, RefItem), NULL, NULL, NULL},
 	{ "Extension", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, Extension),
-		"LassoIdWsf2Utilextension" },
+		"LassoIdWsf2Utilextension", NULL, NULL },
 	{ "subscriptionID", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, subscriptionID) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, subscriptionID), NULL, NULL, NULL},
 	{ "notifyToRef", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, notifyToRef) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, notifyToRef), NULL, NULL, NULL},
 	{ "adminNotifyToRef", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, adminNotifyToRef) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, adminNotifyToRef), NULL, NULL, NULL},
 	{ "starts", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, starts) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, starts), NULL, NULL, NULL},
 	{ "expires", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, expires) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, expires), NULL, NULL, NULL},
 	{ "id", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, id) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, id), NULL, NULL, NULL},
 	{ "includeData", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, includeData) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, includeData), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -133,6 +133,7 @@ lasso_idwsf2_subs_subscription_get_type()
 			sizeof(LassoIdWsf2SubsSubscription),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/subsref_app_data.c b/lasso/xml/id-wsf-2.0/subsref_app_data.c
index 63c0651c..bdb512ca 100644
--- a/lasso/xml/id-wsf-2.0/subsref_app_data.c
+++ b/lasso/xml/id-wsf-2.0/subsref_app_data.c
@@ -37,10 +37,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "", SNIPPET_LIST_XMLNODES,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefAppData, any) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefAppData, any), NULL, NULL, NULL},
 	{ "Subscription", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefAppData, Subscription) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefAppData, Subscription), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -85,6 +85,7 @@ lasso_idwsf2_subsref_app_data_get_type()
 			sizeof(LassoIdWsf2SubsRefAppData),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/subsref_create.c b/lasso/xml/id-wsf-2.0/subsref_create.c
index 23601fa3..c5989279 100644
--- a/lasso/xml/id-wsf-2.0/subsref_create.c
+++ b/lasso/xml/id-wsf-2.0/subsref_create.c
@@ -53,12 +53,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Subscription", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefCreate, Subscription) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefCreate, Subscription), NULL, NULL, NULL},
 	{ "CreateItem", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefCreate, CreateItem) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefCreate, CreateItem), NULL, NULL, NULL},
 	{ "ResultQuery", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefCreate, ResultQuery) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefCreate, ResultQuery), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -104,6 +104,7 @@ lasso_idwsf2_subsref_create_get_type()
 			sizeof(LassoIdWsf2SubsRefCreate),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_REQUEST,
diff --git a/lasso/xml/id-wsf-2.0/subsref_create_item.c b/lasso/xml/id-wsf-2.0/subsref_create_item.c
index 8f8010b2..72746093 100644
--- a/lasso/xml/id-wsf-2.0/subsref_create_item.c
+++ b/lasso/xml/id-wsf-2.0/subsref_create_item.c
@@ -48,14 +48,14 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "NewData", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefCreateItem, NewData) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefCreateItem, NewData), NULL, NULL, NULL},
 	{ "objectType", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefCreateItem, objectType) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefCreateItem, objectType), NULL, NULL, NULL},
 	{ "id", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefCreateItem, id) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefCreateItem, id), NULL, NULL, NULL},
 	{ "itemID", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefCreateItem, itemID) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefCreateItem, itemID), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -102,6 +102,7 @@ lasso_idwsf2_subsref_create_item_get_type()
 			sizeof(LassoIdWsf2SubsRefCreateItem),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/subsref_create_response.c b/lasso/xml/id-wsf-2.0/subsref_create_response.c
index ac571620..1ac0247a 100644
--- a/lasso/xml/id-wsf-2.0/subsref_create_response.c
+++ b/lasso/xml/id-wsf-2.0/subsref_create_response.c
@@ -46,7 +46,7 @@
 
 
 static struct XmlSnippet schema_snippets[] = {
-	{NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -84,6 +84,7 @@ lasso_idwsf2_subsref_create_response_get_type()
 			sizeof(LassoIdWsf2SubsRefCreateResponse),
 			0,
 			NULL,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_SUBSREF_DATA_RESPONSE,
diff --git a/lasso/xml/id-wsf-2.0/subsref_data.c b/lasso/xml/id-wsf-2.0/subsref_data.c
index 0d2c42b3..472fab69 100644
--- a/lasso/xml/id-wsf-2.0/subsref_data.c
+++ b/lasso/xml/id-wsf-2.0/subsref_data.c
@@ -49,12 +49,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "remaining", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefData, remaining) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefData, remaining), NULL, NULL, NULL},
 	{ "nextOffset", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL_NEG,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefData, nextOffset) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefData, nextOffset), NULL, NULL, NULL},
 	{ "setID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefData, setID) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefData, setID), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -100,6 +100,7 @@ lasso_idwsf2_subsref_data_get_type()
 			sizeof(LassoIdWsf2SubsRefData),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_SUBSREF_ITEM_DATA,
diff --git a/lasso/xml/id-wsf-2.0/subsref_data_response.c b/lasso/xml/id-wsf-2.0/subsref_data_response.c
index 2df8b934..6397c76b 100644
--- a/lasso/xml/id-wsf-2.0/subsref_data_response.c
+++ b/lasso/xml/id-wsf-2.0/subsref_data_response.c
@@ -51,8 +51,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "ItemData", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefDataResponse, ItemData) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefDataResponse, ItemData), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_idwsf2_subsref_data_response_get_type()
 			sizeof(LassoIdWsf2SubsRefDataResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_DATA_RESPONSE_BASE,
diff --git a/lasso/xml/id-wsf-2.0/subsref_delete.c b/lasso/xml/id-wsf-2.0/subsref_delete.c
index 1ddd9787..92de3598 100644
--- a/lasso/xml/id-wsf-2.0/subsref_delete.c
+++ b/lasso/xml/id-wsf-2.0/subsref_delete.c
@@ -51,8 +51,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "DeleteItem", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefDelete, DeleteItem) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefDelete, DeleteItem), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_idwsf2_subsref_delete_get_type()
 			sizeof(LassoIdWsf2SubsRefDelete),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_REQUEST,
diff --git a/lasso/xml/id-wsf-2.0/subsref_delete_item.c b/lasso/xml/id-wsf-2.0/subsref_delete_item.c
index cb27da9b..285517af 100644
--- a/lasso/xml/id-wsf-2.0/subsref_delete_item.c
+++ b/lasso/xml/id-wsf-2.0/subsref_delete_item.c
@@ -51,8 +51,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Select", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefDeleteItem, Select) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefDeleteItem, Select), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_idwsf2_subsref_delete_item_get_type()
 			sizeof(LassoIdWsf2SubsRefDeleteItem),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_DELETE_ITEM_BASE,
diff --git a/lasso/xml/id-wsf-2.0/subsref_delete_response.c b/lasso/xml/id-wsf-2.0/subsref_delete_response.c
index 6fff1d3c..6d3d37bc 100644
--- a/lasso/xml/id-wsf-2.0/subsref_delete_response.c
+++ b/lasso/xml/id-wsf-2.0/subsref_delete_response.c
@@ -46,7 +46,7 @@
 
 
 static struct XmlSnippet schema_snippets[] = {
-	{NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -84,6 +84,7 @@ lasso_idwsf2_subsref_delete_response_get_type()
 			sizeof(LassoIdWsf2SubsRefDeleteResponse),
 			0,
 			NULL,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_UTIL_RESPONSE,
diff --git a/lasso/xml/id-wsf-2.0/subsref_item_data.c b/lasso/xml/id-wsf-2.0/subsref_item_data.c
index 9ae73c50..acf6700f 100644
--- a/lasso/xml/id-wsf-2.0/subsref_item_data.c
+++ b/lasso/xml/id-wsf-2.0/subsref_item_data.c
@@ -49,12 +49,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "itemIDRef", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefItemData, itemIDRef) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefItemData, itemIDRef), NULL, NULL, NULL},
 	{ "notSorted", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefItemData, notSorted) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefItemData, notSorted), NULL, NULL, NULL},
 	{ "changeFormat", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefItemData, changeFormat) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefItemData, changeFormat), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -100,6 +100,7 @@ lasso_idwsf2_subsref_item_data_get_type()
 			sizeof(LassoIdWsf2SubsRefItemData),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_SUBSREF_APP_DATA,
diff --git a/lasso/xml/id-wsf-2.0/subsref_modify.c b/lasso/xml/id-wsf-2.0/subsref_modify.c
index 67450a1e..847c84b3 100644
--- a/lasso/xml/id-wsf-2.0/subsref_modify.c
+++ b/lasso/xml/id-wsf-2.0/subsref_modify.c
@@ -53,12 +53,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Subscription", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefModify, Subscription) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefModify, Subscription), NULL, NULL, NULL},
 	{ "ModifyItem", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefModify, ModifyItem) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefModify, ModifyItem), NULL, NULL, NULL},
 	{ "ResultQuery", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefModify, ResultQuery) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefModify, ResultQuery), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -104,6 +104,7 @@ lasso_idwsf2_subsref_modify_get_type()
 			sizeof(LassoIdWsf2SubsRefModify),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_REQUEST,
diff --git a/lasso/xml/id-wsf-2.0/subsref_modify_item.c b/lasso/xml/id-wsf-2.0/subsref_modify_item.c
index 260ce289..6da90b69 100644
--- a/lasso/xml/id-wsf-2.0/subsref_modify_item.c
+++ b/lasso/xml/id-wsf-2.0/subsref_modify_item.c
@@ -49,18 +49,18 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Select", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefModifyItem, Select) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefModifyItem, Select), NULL, NULL, NULL},
 	{ "NewData", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefModifyItem, NewData) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefModifyItem, NewData), NULL, NULL, NULL},
 	{ "notChangedSince", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefModifyItem, notChangedSince) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefModifyItem, notChangedSince), NULL, NULL, NULL},
 	{ "overrideAllowed", SNIPPET_ATTRIBUTE | SNIPPET_BOOLEAN | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefModifyItem, overrideAllowed) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefModifyItem, overrideAllowed), NULL, NULL, NULL},
 	{ "id", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefModifyItem, id) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefModifyItem, id), NULL, NULL, NULL},
 	{ "itemID", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefModifyItem, itemID) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefModifyItem, itemID), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -109,6 +109,7 @@ lasso_idwsf2_subsref_modify_item_get_type()
 			sizeof(LassoIdWsf2SubsRefModifyItem),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/subsref_modify_response.c b/lasso/xml/id-wsf-2.0/subsref_modify_response.c
index e83e0d2e..c8ebb6df 100644
--- a/lasso/xml/id-wsf-2.0/subsref_modify_response.c
+++ b/lasso/xml/id-wsf-2.0/subsref_modify_response.c
@@ -46,7 +46,7 @@
 
 
 static struct XmlSnippet schema_snippets[] = {
-	{NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -84,6 +84,7 @@ lasso_idwsf2_subsref_modify_response_get_type()
 			sizeof(LassoIdWsf2SubsRefModifyResponse),
 			0,
 			NULL,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_SUBSREF_DATA_RESPONSE,
diff --git a/lasso/xml/id-wsf-2.0/subsref_notification.c b/lasso/xml/id-wsf-2.0/subsref_notification.c
index 8fbd5dfd..0848c3b3 100644
--- a/lasso/xml/id-wsf-2.0/subsref_notification.c
+++ b/lasso/xml/id-wsf-2.0/subsref_notification.c
@@ -51,8 +51,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "ItemData", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefNotification, ItemData) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefNotification, ItemData), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_idwsf2_subsref_notification_get_type()
 			sizeof(LassoIdWsf2SubsRefNotification),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_SUBS_NOTIFICATION,
diff --git a/lasso/xml/id-wsf-2.0/subsref_notify.c b/lasso/xml/id-wsf-2.0/subsref_notify.c
index 22bbd5ce..f378a1eb 100644
--- a/lasso/xml/id-wsf-2.0/subsref_notify.c
+++ b/lasso/xml/id-wsf-2.0/subsref_notify.c
@@ -52,10 +52,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Notification", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefNotify, Notification) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefNotify, Notification), NULL, NULL, NULL},
 	{ "timeStamp", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefNotify, timeStamp) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefNotify, timeStamp), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -100,6 +100,7 @@ lasso_idwsf2_subsref_notify_get_type()
 			sizeof(LassoIdWsf2SubsRefNotify),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_REQUEST,
diff --git a/lasso/xml/id-wsf-2.0/subsref_notify_response.c b/lasso/xml/id-wsf-2.0/subsref_notify_response.c
index 9fcbcc50..01e6c859 100644
--- a/lasso/xml/id-wsf-2.0/subsref_notify_response.c
+++ b/lasso/xml/id-wsf-2.0/subsref_notify_response.c
@@ -46,7 +46,7 @@
 
 
 static struct XmlSnippet schema_snippets[] = {
-	{NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -84,6 +84,7 @@ lasso_idwsf2_subsref_notify_response_get_type()
 			sizeof(LassoIdWsf2SubsRefNotifyResponse),
 			0,
 			NULL,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_SUBS_NOTIFY_RESPONSE,
diff --git a/lasso/xml/id-wsf-2.0/subsref_query.c b/lasso/xml/id-wsf-2.0/subsref_query.c
index 29fc6538..56182798 100644
--- a/lasso/xml/id-wsf-2.0/subsref_query.c
+++ b/lasso/xml/id-wsf-2.0/subsref_query.c
@@ -53,12 +53,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "TestItem", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefQuery, TestItem) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefQuery, TestItem), NULL, NULL, NULL},
 	{ "QueryItem", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefQuery, QueryItem) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefQuery, QueryItem), NULL, NULL, NULL},
 	{ "Subscription", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefQuery, Subscription) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefQuery, Subscription), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -104,6 +104,7 @@ lasso_idwsf2_subsref_query_get_type()
 			sizeof(LassoIdWsf2SubsRefQuery),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_REQUEST,
diff --git a/lasso/xml/id-wsf-2.0/subsref_query_item.c b/lasso/xml/id-wsf-2.0/subsref_query_item.c
index e9f49c2b..33b15292 100644
--- a/lasso/xml/id-wsf-2.0/subsref_query_item.c
+++ b/lasso/xml/id-wsf-2.0/subsref_query_item.c
@@ -49,14 +49,14 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "count", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL_NEG,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefQueryItem, count) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefQueryItem, count), NULL, NULL, NULL},
 	{ "offset", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL_NEG,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefQueryItem, offset) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefQueryItem, offset), NULL, NULL, NULL},
 	{ "setID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefQueryItem, setID) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefQueryItem, setID), NULL, NULL, NULL},
 	{ "setReq", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefQueryItem, setReq) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefQueryItem, setReq), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -103,6 +103,7 @@ lasso_idwsf2_subsref_query_item_get_type()
 			sizeof(LassoIdWsf2SubsRefQueryItem),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_SUBSREF_RESULT_QUERY,
diff --git a/lasso/xml/id-wsf-2.0/subsref_query_response.c b/lasso/xml/id-wsf-2.0/subsref_query_response.c
index 6fce8e41..34123bd8 100644
--- a/lasso/xml/id-wsf-2.0/subsref_query_response.c
+++ b/lasso/xml/id-wsf-2.0/subsref_query_response.c
@@ -53,10 +53,10 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "TestResult", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2SubsRefQueryResponse, TestResult),
-		"LassoIdWsf2UtilTestResult" },
+		"LassoIdWsf2UtilTestResult", NULL, NULL },
 	{ "Data", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefQueryResponse, Data) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefQueryResponse, Data), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -101,6 +101,7 @@ lasso_idwsf2_subsref_query_response_get_type()
 			sizeof(LassoIdWsf2SubsRefQueryResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_DATA_RESPONSE_BASE,
diff --git a/lasso/xml/id-wsf-2.0/subsref_result_query.c b/lasso/xml/id-wsf-2.0/subsref_result_query.c
index 8e627645..874debe2 100644
--- a/lasso/xml/id-wsf-2.0/subsref_result_query.c
+++ b/lasso/xml/id-wsf-2.0/subsref_result_query.c
@@ -52,10 +52,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Select", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefResultQuery, Select) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefResultQuery, Select), NULL, NULL, NULL},
 	{ "Sort", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefResultQuery, Sort) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefResultQuery, Sort), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -100,6 +100,7 @@ lasso_idwsf2_subsref_result_query_get_type()
 			sizeof(LassoIdWsf2SubsRefResultQuery),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_RESULT_QUERY_BASE,
diff --git a/lasso/xml/id-wsf-2.0/subsref_subscription.c b/lasso/xml/id-wsf-2.0/subsref_subscription.c
index 3784745d..3b42edba 100644
--- a/lasso/xml/id-wsf-2.0/subsref_subscription.c
+++ b/lasso/xml/id-wsf-2.0/subsref_subscription.c
@@ -54,12 +54,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "ResultQuery", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefSubscription, ResultQuery) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefSubscription, ResultQuery), NULL, NULL, NULL},
 	{ "Aggregation", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefSubscription, Aggregation) },
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefSubscription, Aggregation), NULL, NULL, NULL},
 	{ "Trigger", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefSubscription, Trigger) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefSubscription, Trigger), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -105,6 +105,7 @@ lasso_idwsf2_subsref_subscription_get_type()
 			sizeof(LassoIdWsf2SubsRefSubscription),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_SUBS_SUBSCRIPTION,
diff --git a/lasso/xml/id-wsf-2.0/subsref_test_item.c b/lasso/xml/id-wsf-2.0/subsref_test_item.c
index 2d6620f3..f77da7e1 100644
--- a/lasso/xml/id-wsf-2.0/subsref_test_item.c
+++ b/lasso/xml/id-wsf-2.0/subsref_test_item.c
@@ -51,8 +51,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "TestOp", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2SubsRefTestItem, TestOp) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefTestItem, TestOp), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_idwsf2_subsref_test_item_get_type()
 			sizeof(LassoIdWsf2SubsRefTestItem),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_TEST_ITEM_BASE,
diff --git a/lasso/xml/id-wsf-2.0/util_empty.c b/lasso/xml/id-wsf-2.0/util_empty.c
index 706e94d3..d2edbacb 100644
--- a/lasso/xml/id-wsf-2.0/util_empty.c
+++ b/lasso/xml/id-wsf-2.0/util_empty.c
@@ -49,7 +49,7 @@
 
 
 static struct XmlSnippet schema_snippets[] = {
-	{NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -87,6 +87,7 @@ lasso_idwsf2_util_empty_get_type()
 			sizeof(LassoIdWsf2UtilEmpty),
 			0,
 			NULL,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/util_extension.c b/lasso/xml/id-wsf-2.0/util_extension.c
index a1dc46a8..17e7606f 100644
--- a/lasso/xml/id-wsf-2.0/util_extension.c
+++ b/lasso/xml/id-wsf-2.0/util_extension.c
@@ -51,7 +51,7 @@
 
 
 static struct XmlSnippet schema_snippets[] = {
-	{NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -89,6 +89,7 @@ lasso_idwsf2_util_extension_get_type()
 			sizeof(LassoIdWsf2Utilextension),
 			0,
 			NULL,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/util_response.c b/lasso/xml/id-wsf-2.0/util_response.c
index f7b92dff..253f1f74 100644
--- a/lasso/xml/id-wsf-2.0/util_response.c
+++ b/lasso/xml/id-wsf-2.0/util_response.c
@@ -51,15 +51,15 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "Status", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoIdWsf2UtilResponse, Status),
-		"LassoIdWsf2UtilStatus" },
+		"LassoIdWsf2UtilStatus", NULL, NULL },
 	{ "Extension", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2UtilResponse, Extension),
-		"LassoIdWsf2Utilextension" },
+		"LassoIdWsf2Utilextension", NULL, NULL },
 	{ "itemIDRef", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2UtilResponse, itemIDRef) },
+		G_STRUCT_OFFSET(LassoIdWsf2UtilResponse, itemIDRef), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoIdWsf2UtilResponse, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2UtilResponse, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -107,6 +107,7 @@ lasso_idwsf2_util_response_get_type()
 			sizeof(LassoIdWsf2UtilResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/id-wsf-2.0/util_status.c b/lasso/xml/id-wsf-2.0/util_status.c
index 63f66dd1..bf181759 100644
--- a/lasso/xml/id-wsf-2.0/util_status.c
+++ b/lasso/xml/id-wsf-2.0/util_status.c
@@ -56,14 +56,14 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "Status", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2UtilStatus, Status),
-		"LassoIdWsf2UtilStatus" },
+		"LassoIdWsf2UtilStatus", NULL, NULL },
 	{ "code", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2UtilStatus, code) },
+		G_STRUCT_OFFSET(LassoIdWsf2UtilStatus, code), NULL, NULL, NULL},
 	{ "ref", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2UtilStatus, ref) },
+		G_STRUCT_OFFSET(LassoIdWsf2UtilStatus, ref), NULL, NULL, NULL},
 	{ "comment", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIdWsf2UtilStatus, comment) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2UtilStatus, comment), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -110,6 +110,7 @@ lasso_idwsf2_util_status_get_type()
 			sizeof(LassoIdWsf2UtilStatus),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/is_help.c b/lasso/xml/is_help.c
index 36b2e073..80375cc9 100644
--- a/lasso/xml/is_help.c
+++ b/lasso/xml/is_help.c
@@ -46,10 +46,10 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "label", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsHelp, label) },
-	{ "link", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsHelp, link) },
-	{ "moreLink", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsHelp, moreLink) },
-	{ NULL, 0, 0}
+	{ "label", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsHelp, label), NULL, NULL, NULL},
+	{ "link", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsHelp, link), NULL, NULL, NULL},
+	{ "moreLink", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsHelp, moreLink), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -91,6 +91,7 @@ lasso_is_help_get_type()
 			sizeof(LassoIsHelp),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/is_inquiry.c b/lasso/xml/is_inquiry.c
index ffc10d3f..2f3d6753 100644
--- a/lasso/xml/is_inquiry.c
+++ b/lasso/xml/is_inquiry.c
@@ -54,13 +54,13 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Help", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIsInquiry, Help) },
-	{ "Select", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoIsInquiry, Select) },
-	{ "Confirm", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoIsInquiry, Confirm) },
-	{ "Text", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoIsInquiry, Text) },
-	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsInquiry, id) },
-	{ "title", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsInquiry, title) },
-	{ NULL, 0, 0}
+	{ "Help", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIsInquiry, Help), NULL, NULL, NULL},
+	{ "Select", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoIsInquiry, Select), NULL, NULL, NULL},
+	{ "Confirm", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoIsInquiry, Confirm), NULL, NULL, NULL},
+	{ "Text", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoIsInquiry, Text), NULL, NULL, NULL},
+	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsInquiry, id), NULL, NULL, NULL},
+	{ "title", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsInquiry, title), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -105,6 +105,7 @@ lasso_is_inquiry_get_type()
 			sizeof(LassoIsInquiry),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/is_inquiry_element.c b/lasso/xml/is_inquiry_element.c
index b14c1f30..017c740c 100644
--- a/lasso/xml/is_inquiry_element.c
+++ b/lasso/xml/is_inquiry_element.c
@@ -49,12 +49,12 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Help", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIsInquiryElement, Help) },
-	{ "Hint", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoIsInquiryElement, Hint) },
-	{ "Label", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoIsInquiryElement, Label) },
-	{ "Value", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoIsInquiryElement, Value) },
-	{ "name", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsInquiryElement, name) },
-	{ NULL, 0, 0}
+	{ "Help", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIsInquiryElement, Help), NULL, NULL, NULL},
+	{ "Hint", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoIsInquiryElement, Hint), NULL, NULL, NULL},
+	{ "Label", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoIsInquiryElement, Label), NULL, NULL, NULL},
+	{ "Value", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoIsInquiryElement, Value), NULL, NULL, NULL},
+	{ "name", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsInquiryElement, name), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -98,6 +98,7 @@ lasso_is_inquiry_element_get_type()
 			sizeof(LassoIsInquiryElement),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/is_interaction_request.c b/lasso/xml/is_interaction_request.c
index 20ed09b3..92ebec81 100644
--- a/lasso/xml/is_interaction_request.c
+++ b/lasso/xml/is_interaction_request.c
@@ -53,20 +53,20 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "ResourceID", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIsInteractionRequest, ResourceID) },
+		G_STRUCT_OFFSET(LassoIsInteractionRequest, ResourceID), NULL, NULL, NULL},
 	{ "EncryptedResourceID", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIsInteractionRequest, EncryptedResourceID) },
+		G_STRUCT_OFFSET(LassoIsInteractionRequest, EncryptedResourceID), NULL, NULL, NULL},
 	{ "Inquiry", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIsInteractionRequest, Inquiry) },
+		G_STRUCT_OFFSET(LassoIsInteractionRequest, Inquiry), NULL, NULL, NULL},
 	/* TODO : KeyInfo */
 	{ "id", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIsInteractionRequest, id) },
+		G_STRUCT_OFFSET(LassoIsInteractionRequest, id), NULL, NULL, NULL},
 	{ "language", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIsInteractionRequest, language) },
+		G_STRUCT_OFFSET(LassoIsInteractionRequest, language), NULL, NULL, NULL},
 	{ "maxInteractTime", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoIsInteractionRequest, maxInteractTime) },
+		G_STRUCT_OFFSET(LassoIsInteractionRequest, maxInteractTime), NULL, NULL, NULL},
 	/* TODO : signed */
-	{ NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -113,6 +113,7 @@ lasso_is_interaction_request_get_type()
 			sizeof(LassoIsInteractionRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/is_interaction_response.c b/lasso/xml/is_interaction_response.c
index 8d53a436..f4f28f8a 100644
--- a/lasso/xml/is_interaction_response.c
+++ b/lasso/xml/is_interaction_response.c
@@ -52,12 +52,12 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIsInteractionResponse, Status) },
+	{ "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIsInteractionResponse, Status), NULL, NULL, NULL},
 	{ "InteractionStatement", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoIsInteractionResponse,
-			InteractionStatement) },
+			InteractionStatement), NULL, NULL, NULL },
 	{ "Parameter", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoIsInteractionResponse,
-			Parameter) },
-	{ NULL, 0, 0}
+			Parameter), NULL, NULL, NULL },
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -99,6 +99,7 @@ lasso_is_interaction_response_get_type()
 			sizeof(LassoIsInteractionResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/is_interaction_statement.c b/lasso/xml/is_interaction_statement.c
index efca3c36..3fd45b9a 100644
--- a/lasso/xml/is_interaction_statement.c
+++ b/lasso/xml/is_interaction_statement.c
@@ -47,9 +47,9 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Inquiry", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIsInteractionStatement, Inquiry) },
+	{ "Inquiry", SNIPPET_NODE, G_STRUCT_OFFSET(LassoIsInteractionStatement, Inquiry), NULL, NULL, NULL},
 	/* TODO : Signature */
-	{ NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -89,6 +89,7 @@ lasso_is_interaction_statement_get_type()
 			sizeof(LassoIsInteractionStatement),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/is_item.c b/lasso/xml/is_item.c
index 5d458547..6b5a6221 100644
--- a/lasso/xml/is_item.c
+++ b/lasso/xml/is_item.c
@@ -51,10 +51,10 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Hint", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoIsItem, Hint) },
-	{ "label", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsItem, label) },
-	{ "value", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsItem, value) },
-	{ NULL, 0, 0}
+	{ "Hint", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoIsItem, Hint), NULL, NULL, NULL},
+	{ "label", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsItem, label), NULL, NULL, NULL},
+	{ "value", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsItem, value), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -96,6 +96,7 @@ lasso_is_item_get_type()
 			sizeof(LassoIsItem),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/is_parameter.c b/lasso/xml/is_parameter.c
index ddc51b68..b5b0a207 100644
--- a/lasso/xml/is_parameter.c
+++ b/lasso/xml/is_parameter.c
@@ -45,9 +45,9 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "name", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsParameter, name) },
-	{ "value", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsParameter, value) },
-	{ NULL, 0, 0}
+	{ "name", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsParameter, name), NULL, NULL, NULL},
+	{ "value", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsParameter, value), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -88,6 +88,7 @@ lasso_is_parameter_get_type()
 			sizeof(LassoIsParameter),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/is_redirect_request.c b/lasso/xml/is_redirect_request.c
index 131aeca6..e8e44506 100644
--- a/lasso/xml/is_redirect_request.c
+++ b/lasso/xml/is_redirect_request.c
@@ -45,8 +45,8 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "redirectURL", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsRedirectRequest, redirectURL) },
-	{ NULL, 0, 0}
+	{ "redirectURL", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsRedirectRequest, redirectURL), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -86,6 +86,7 @@ lasso_is_redirect_request_get_type()
 			sizeof(LassoIsRedirectRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/is_select.c b/lasso/xml/is_select.c
index 8343e81f..a7ae36f6 100644
--- a/lasso/xml/is_select.c
+++ b/lasso/xml/is_select.c
@@ -51,10 +51,10 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Item", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoIsSelect, Item) },
+	{ "Item", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoIsSelect, Item), NULL, NULL, NULL},
 	{ "multiple", SNIPPET_ATTRIBUTE | SNIPPET_BOOLEAN,
-		G_STRUCT_OFFSET(LassoIsSelect, multiple) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIsSelect, multiple), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -95,6 +95,7 @@ lasso_is_select_get_type()
 			sizeof(LassoIsSelect),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/is_text.c b/lasso/xml/is_text.c
index 2367dd2c..50de2ba0 100644
--- a/lasso/xml/is_text.c
+++ b/lasso/xml/is_text.c
@@ -51,10 +51,10 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "minChars", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsText, minChars) },
-	{ "maxChars", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsText, maxChars) },
-	{ "format", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsText, format) },
-	{ NULL, 0, 0}
+	{ "minChars", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsText, minChars), NULL, NULL, NULL},
+	{ "maxChars", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsText, maxChars), NULL, NULL, NULL},
+	{ "format", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsText, format), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -96,6 +96,7 @@ lasso_is_text_get_type()
 			sizeof(LassoIsText),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/is_user_interaction.c b/lasso/xml/is_user_interaction.c
index 0ad58f42..764c4d78 100644
--- a/lasso/xml/is_user_interaction.c
+++ b/lasso/xml/is_user_interaction.c
@@ -54,15 +54,15 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "InteractionService", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIsUserInteraction, InteractionService) },
-	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsUserInteraction, id) },
-	{ "interact", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsUserInteraction, interact) },
-	{ "language", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsUserInteraction, language) },
+		G_STRUCT_OFFSET(LassoIsUserInteraction, InteractionService), NULL, NULL, NULL},
+	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsUserInteraction, id), NULL, NULL, NULL},
+	{ "interact", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsUserInteraction, interact), NULL, NULL, NULL},
+	{ "language", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoIsUserInteraction, language), NULL, NULL, NULL},
 	{ "redirect", SNIPPET_ATTRIBUTE | SNIPPET_BOOLEAN,
-		G_STRUCT_OFFSET(LassoIsUserInteraction, redirect) },
+		G_STRUCT_OFFSET(LassoIsUserInteraction, redirect), NULL, NULL, NULL},
 	{ "maxInteractTime", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIsUserInteraction, maxInteractTime) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIsUserInteraction, maxInteractTime), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -107,6 +107,7 @@ lasso_is_user_interaction_get_type()
 			sizeof(LassoIsUserInteraction),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/lib_assertion.c b/lasso/xml/lib_assertion.c
index fa3b92d6..013dbe66 100644
--- a/lasso/xml/lib_assertion.c
+++ b/lasso/xml/lib_assertion.c
@@ -62,8 +62,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "InResponseTo", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoLibAssertion, InResponseTo) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoLibAssertion, InResponseTo), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -103,6 +103,7 @@ lasso_lib_assertion_get_type()
 			sizeof(LassoLibAssertion),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAML_ASSERTION,
diff --git a/lasso/xml/lib_authentication_statement.c b/lasso/xml/lib_authentication_statement.c
index 044c4bb0..77ffc6e5 100644
--- a/lasso/xml/lib_authentication_statement.c
+++ b/lasso/xml/lib_authentication_statement.c
@@ -54,12 +54,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "AuthnContext", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoLibAuthenticationStatement, AuthnContext) },
+		G_STRUCT_OFFSET(LassoLibAuthenticationStatement, AuthnContext), NULL, NULL, NULL},
 	{ "ReauthenticateOnOrAfter", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoLibAuthenticationStatement, ReauthenticateOnOrAfter) },
+		G_STRUCT_OFFSET(LassoLibAuthenticationStatement, ReauthenticateOnOrAfter), NULL, NULL, NULL},
 	{ "SessionIndex", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoLibAuthenticationStatement, SessionIndex) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoLibAuthenticationStatement, SessionIndex), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -101,6 +101,7 @@ lasso_lib_authentication_statement_get_type()
 			sizeof(LassoLibAuthenticationStatement),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAML_AUTHENTICATION_STATEMENT,
diff --git a/lasso/xml/lib_authn_context.c b/lasso/xml/lib_authn_context.c
index a9a4bfff..dfd74def 100644
--- a/lasso/xml/lib_authn_context.c
+++ b/lasso/xml/lib_authn_context.c
@@ -51,10 +51,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "AuthnContextClassRef", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoLibAuthnContext, AuthnContextClassRef) },
+		G_STRUCT_OFFSET(LassoLibAuthnContext, AuthnContextClassRef), NULL, NULL, NULL},
 	{ "AuthnContextStatementRef", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoLibAuthnContext, AuthnContextStatementRef) },
-	{ NULL, 0, 0 }
+		G_STRUCT_OFFSET(LassoLibAuthnContext, AuthnContextStatementRef), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -95,6 +95,7 @@ lasso_lib_authn_context_get_type()
 			sizeof(LassoLibAuthnContext),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/lib_authn_request.c b/lasso/xml/lib_authn_request.c
index 3d111f88..6e9dc10e 100644
--- a/lasso/xml/lib_authn_request.c
+++ b/lasso/xml/lib_authn_request.c
@@ -89,24 +89,24 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Extension", SNIPPET_EXTENSION, G_STRUCT_OFFSET(LassoLibAuthnRequest, Extension) },
-	{ "ProviderID", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibAuthnRequest, ProviderID) },
-	{ "AffiliationID", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibAuthnRequest, AffiliationID) },
-	{ "NameIDPolicy", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibAuthnRequest, NameIDPolicy) },
+	{ "Extension", SNIPPET_EXTENSION, G_STRUCT_OFFSET(LassoLibAuthnRequest, Extension), NULL, NULL, NULL},
+	{ "ProviderID", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibAuthnRequest, ProviderID), NULL, NULL, NULL},
+	{ "AffiliationID", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibAuthnRequest, AffiliationID), NULL, NULL, NULL},
+	{ "NameIDPolicy", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibAuthnRequest, NameIDPolicy), NULL, NULL, NULL},
 	{ "ForceAuthn", SNIPPET_CONTENT | SNIPPET_BOOLEAN,
-		G_STRUCT_OFFSET(LassoLibAuthnRequest, ForceAuthn) },
+		G_STRUCT_OFFSET(LassoLibAuthnRequest, ForceAuthn), NULL, NULL, NULL},
 	{ "IsPassive", SNIPPET_CONTENT | SNIPPET_BOOLEAN,
-		G_STRUCT_OFFSET(LassoLibAuthnRequest, IsPassive) },
+		G_STRUCT_OFFSET(LassoLibAuthnRequest, IsPassive), NULL, NULL, NULL},
 	{ "ProtocolProfile", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoLibAuthnRequest, ProtocolProfile) },
+		G_STRUCT_OFFSET(LassoLibAuthnRequest, ProtocolProfile), NULL, NULL, NULL},
 	{ "AssertionConsumerServiceID", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoLibAuthnRequest, AssertionConsumerServiceID) },
+		G_STRUCT_OFFSET(LassoLibAuthnRequest, AssertionConsumerServiceID), NULL, NULL, NULL},
 	{ "RequestAuthnContext", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoLibAuthnRequest, RequestAuthnContext) },
-	{ "RelayState", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibAuthnRequest, RelayState) },
-	{ "Scoping", SNIPPET_NODE, G_STRUCT_OFFSET(LassoLibAuthnRequest, Scoping) },
-	{ "consent", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoLibAuthnRequest, consent) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoLibAuthnRequest, RequestAuthnContext), NULL, NULL, NULL},
+	{ "RelayState", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibAuthnRequest, RelayState), NULL, NULL, NULL},
+	{ "Scoping", SNIPPET_NODE, G_STRUCT_OFFSET(LassoLibAuthnRequest, Scoping), NULL, NULL, NULL},
+	{ "consent", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoLibAuthnRequest, consent), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static struct QuerySnippet query_snippets[] = {
@@ -214,6 +214,7 @@ lasso_lib_authn_request_get_type()
 			sizeof(LassoLibAuthnRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAMLP_REQUEST_ABSTRACT,
diff --git a/lasso/xml/lib_authn_request_envelope.c b/lasso/xml/lib_authn_request_envelope.c
index 9d829c9b..7509f6a0 100644
--- a/lasso/xml/lib_authn_request_envelope.c
+++ b/lasso/xml/lib_authn_request_envelope.c
@@ -72,20 +72,20 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Extension", SNIPPET_EXTENSION,
-		G_STRUCT_OFFSET(LassoLibAuthnRequestEnvelope, Extension) },
+		G_STRUCT_OFFSET(LassoLibAuthnRequestEnvelope, Extension), NULL, NULL, NULL},
 	{ "AuthnRequest", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoLibAuthnRequestEnvelope, AuthnRequest) },
+		G_STRUCT_OFFSET(LassoLibAuthnRequestEnvelope, AuthnRequest), NULL, NULL, NULL},
 	{ "ProviderID", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoLibAuthnRequestEnvelope, ProviderID) },
+		G_STRUCT_OFFSET(LassoLibAuthnRequestEnvelope, ProviderID), NULL, NULL, NULL},
 	{ "ProviderName", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoLibAuthnRequestEnvelope, ProviderName) },
+		G_STRUCT_OFFSET(LassoLibAuthnRequestEnvelope, ProviderName), NULL, NULL, NULL},
 	{ "AssertionConsumerServiceURL", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoLibAuthnRequestEnvelope, AssertionConsumerServiceURL) },
+		G_STRUCT_OFFSET(LassoLibAuthnRequestEnvelope, AssertionConsumerServiceURL), NULL, NULL, NULL},
 	{ "IDPList", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoLibAuthnRequestEnvelope, IDPList) },
+		G_STRUCT_OFFSET(LassoLibAuthnRequestEnvelope, IDPList), NULL, NULL, NULL},
 	{ "IsPassive", SNIPPET_CONTENT | SNIPPET_BOOLEAN,
-		G_STRUCT_OFFSET(LassoLibAuthnRequestEnvelope, IsPassive) },
-	{ NULL, 0, 0 }
+		G_STRUCT_OFFSET(LassoLibAuthnRequestEnvelope, IsPassive), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -131,6 +131,7 @@ lasso_lib_authn_request_envelope_get_type()
 			sizeof(LassoLibAuthnRequestEnvelope),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/lib_authn_response.c b/lasso/xml/lib_authn_response.c
index 172069ce..77bf29ff 100644
--- a/lasso/xml/lib_authn_response.c
+++ b/lasso/xml/lib_authn_response.c
@@ -55,11 +55,11 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Extension", SNIPPET_EXTENSION, G_STRUCT_OFFSET(LassoLibAuthnResponse, Extension) },
-	{ "ProviderID", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibAuthnResponse, ProviderID) },
-	{ "RelayState", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibAuthnResponse, RelayState) },
-	{ "consent", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoLibAuthnResponse, consent) },
-	{ NULL, 0, 0 }
+	{ "Extension", SNIPPET_EXTENSION, G_STRUCT_OFFSET(LassoLibAuthnResponse, Extension), NULL, NULL, NULL},
+	{ "ProviderID", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibAuthnResponse, ProviderID), NULL, NULL, NULL},
+	{ "RelayState", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibAuthnResponse, RelayState), NULL, NULL, NULL},
+	{ "consent", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoLibAuthnResponse, consent), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -102,6 +102,7 @@ lasso_lib_authn_response_get_type()
 			sizeof(LassoLibAuthnResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		authn_response_type = g_type_register_static(LASSO_TYPE_SAMLP_RESPONSE,
diff --git a/lasso/xml/lib_authn_response_envelope.c b/lasso/xml/lib_authn_response_envelope.c
index c56596d7..7e30f2d1 100644
--- a/lasso/xml/lib_authn_response_envelope.c
+++ b/lasso/xml/lib_authn_response_envelope.c
@@ -37,10 +37,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "AuthnResponse", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoLibAuthnResponseEnvelope, AuthnResponse) },
+		G_STRUCT_OFFSET(LassoLibAuthnResponseEnvelope, AuthnResponse), NULL, NULL, NULL},
 	{ "AssertionConsumerServiceURL", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoLibAuthnResponseEnvelope, AssertionConsumerServiceURL) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoLibAuthnResponseEnvelope, AssertionConsumerServiceURL), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -82,6 +82,7 @@ lasso_lib_authn_response_envelope_get_type()
 			sizeof(LassoLibAuthnResponseEnvelope),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/lib_federation_termination_notification.c b/lasso/xml/lib_federation_termination_notification.c
index afb45939..8c5660b5 100644
--- a/lasso/xml/lib_federation_termination_notification.c
+++ b/lasso/xml/lib_federation_termination_notification.c
@@ -57,14 +57,14 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Extension", SNIPPET_EXTENSION,
-		G_STRUCT_OFFSET(LassoLibFederationTerminationNotification, Extension) },
+		G_STRUCT_OFFSET(LassoLibFederationTerminationNotification, Extension), NULL, NULL, NULL},
 	{ "ProviderID", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoLibFederationTerminationNotification, ProviderID) },
+		G_STRUCT_OFFSET(LassoLibFederationTerminationNotification, ProviderID), NULL, NULL, NULL},
 	{ "NameIdentifier", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoLibFederationTerminationNotification, NameIdentifier) },
+		G_STRUCT_OFFSET(LassoLibFederationTerminationNotification, NameIdentifier), NULL, NULL, NULL},
 	{ "consent", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoLibFederationTerminationNotification, consent) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoLibFederationTerminationNotification, consent), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static struct QuerySnippet query_snippets[] = {
@@ -184,6 +184,7 @@ lasso_lib_federation_termination_notification_get_type()
 			sizeof(LassoLibFederationTerminationNotification),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAMLP_REQUEST_ABSTRACT,
diff --git a/lasso/xml/lib_idp_entries.c b/lasso/xml/lib_idp_entries.c
index c4189b50..7b6f31bd 100644
--- a/lasso/xml/lib_idp_entries.c
+++ b/lasso/xml/lib_idp_entries.c
@@ -47,8 +47,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "IDPEntry", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoLibIDPEntries, IDPEntry) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoLibIDPEntries, IDPEntry), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -88,6 +88,7 @@ lasso_lib_idp_entries_get_type()
 			sizeof(LassoLibIDPEntries),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/lib_idp_entry.c b/lasso/xml/lib_idp_entry.c
index 1ff507aa..e0890b35 100644
--- a/lasso/xml/lib_idp_entry.c
+++ b/lasso/xml/lib_idp_entry.c
@@ -48,10 +48,10 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "ProviderID", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibIDPEntry, ProviderID) },
-	{ "ProviderName", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibIDPEntry, ProviderName) },
-	{ "Loc", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibIDPEntry, Loc) },
-	{ NULL, 0, 0}
+	{ "ProviderID", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibIDPEntry, ProviderID), NULL, NULL, NULL},
+	{ "ProviderName", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibIDPEntry, ProviderName), NULL, NULL, NULL},
+	{ "Loc", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibIDPEntry, Loc), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -93,6 +93,7 @@ lasso_lib_idp_entry_get_type()
 			sizeof(LassoLibIDPEntry),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/lib_idp_list.c b/lasso/xml/lib_idp_list.c
index 9b86f01c..2f0b4f20 100644
--- a/lasso/xml/lib_idp_list.c
+++ b/lasso/xml/lib_idp_list.c
@@ -48,9 +48,9 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "IDPEntries", SNIPPET_NODE, G_STRUCT_OFFSET(LassoLibIDPList, IDPEntries) },
-	{ "GetComplete", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibIDPList, GetComplete) },
-	{ NULL, 0, 0}
+	{ "IDPEntries", SNIPPET_NODE, G_STRUCT_OFFSET(LassoLibIDPList, IDPEntries), NULL, NULL, NULL},
+	{ "GetComplete", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibIDPList, GetComplete), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -91,6 +91,7 @@ lasso_lib_idp_list_get_type()
 			sizeof(LassoLibIDPList),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/lib_logout_request.c b/lasso/xml/lib_logout_request.c
index 1c4d4d7e..f4ea6239 100644
--- a/lasso/xml/lib_logout_request.c
+++ b/lasso/xml/lib_logout_request.c
@@ -59,15 +59,15 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Extension", SNIPPET_EXTENSION, G_STRUCT_OFFSET(LassoLibLogoutRequest, Extension) },
-	{ "ProviderID", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibLogoutRequest, ProviderID) },
-	{ "NameIdentifier", SNIPPET_NODE, G_STRUCT_OFFSET(LassoLibLogoutRequest, NameIdentifier) },
-	{ "SessionIndex", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibLogoutRequest, SessionIndex) },
-	{ "RelayState", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibLogoutRequest, RelayState) },
-	{ "consent", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoLibLogoutRequest, consent) },
+	{ "Extension", SNIPPET_EXTENSION, G_STRUCT_OFFSET(LassoLibLogoutRequest, Extension), NULL, NULL, NULL},
+	{ "ProviderID", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibLogoutRequest, ProviderID), NULL, NULL, NULL},
+	{ "NameIdentifier", SNIPPET_NODE, G_STRUCT_OFFSET(LassoLibLogoutRequest, NameIdentifier), NULL, NULL, NULL},
+	{ "SessionIndex", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibLogoutRequest, SessionIndex), NULL, NULL, NULL},
+	{ "RelayState", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibLogoutRequest, RelayState), NULL, NULL, NULL},
+	{ "consent", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoLibLogoutRequest, consent), NULL, NULL, NULL},
 	{ "NotOnOrAfter", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoLibLogoutRequest, NotOnOrAfter) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoLibLogoutRequest, NotOnOrAfter), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static struct QuerySnippet query_snippets[] = {
@@ -159,6 +159,7 @@ lasso_lib_logout_request_get_type()
 			sizeof(LassoLibLogoutRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAMLP_REQUEST_ABSTRACT,
diff --git a/lasso/xml/lib_logout_response.c b/lasso/xml/lib_logout_response.c
index 67fd40f7..9a12f9b0 100644
--- a/lasso/xml/lib_logout_response.c
+++ b/lasso/xml/lib_logout_response.c
@@ -68,6 +68,7 @@ lasso_lib_logout_response_get_type()
 			sizeof(LassoLibLogoutResponse),
 			0,
 			NULL,
+			NULL,
 		};
 
 		logout_response_type = g_type_register_static(LASSO_TYPE_LIB_STATUS_RESPONSE,
diff --git a/lasso/xml/lib_name_identifier_mapping_request.c b/lasso/xml/lib_name_identifier_mapping_request.c
index 1fc89ac8..78e6eec4 100644
--- a/lasso/xml/lib_name_identifier_mapping_request.c
+++ b/lasso/xml/lib_name_identifier_mapping_request.c
@@ -56,16 +56,16 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Extension", SNIPPET_EXTENSION,
-		G_STRUCT_OFFSET(LassoLibNameIdentifierMappingRequest, Extension) },
+		G_STRUCT_OFFSET(LassoLibNameIdentifierMappingRequest, Extension), NULL, NULL, NULL},
 	{ "ProviderID", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoLibNameIdentifierMappingRequest, ProviderID) },
+		G_STRUCT_OFFSET(LassoLibNameIdentifierMappingRequest, ProviderID), NULL, NULL, NULL},
 	{ "NameIdentifier", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoLibNameIdentifierMappingRequest, NameIdentifier) },
+		G_STRUCT_OFFSET(LassoLibNameIdentifierMappingRequest, NameIdentifier), NULL, NULL, NULL},
 	{ "TargetNamespace", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoLibNameIdentifierMappingRequest, TargetNamespace) },
+		G_STRUCT_OFFSET(LassoLibNameIdentifierMappingRequest, TargetNamespace), NULL, NULL, NULL},
 	{ "consent", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoLibNameIdentifierMappingRequest, consent) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoLibNameIdentifierMappingRequest, consent), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -109,6 +109,7 @@ lasso_lib_name_identifier_mapping_request_get_type()
 			sizeof(LassoLibNameIdentifierMappingRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAMLP_REQUEST_ABSTRACT,
diff --git a/lasso/xml/lib_name_identifier_mapping_response.c b/lasso/xml/lib_name_identifier_mapping_response.c
index 63f9ade2..dd9dcd60 100644
--- a/lasso/xml/lib_name_identifier_mapping_response.c
+++ b/lasso/xml/lib_name_identifier_mapping_response.c
@@ -53,14 +53,14 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Extension", SNIPPET_EXTENSION,
-		G_STRUCT_OFFSET(LassoLibNameIdentifierMappingResponse, Extension) },
+		G_STRUCT_OFFSET(LassoLibNameIdentifierMappingResponse, Extension), NULL, NULL, NULL},
 	{ "ProviderID", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoLibNameIdentifierMappingResponse, ProviderID) },
+		G_STRUCT_OFFSET(LassoLibNameIdentifierMappingResponse, ProviderID), NULL, NULL, NULL},
 	{ "Status", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoLibNameIdentifierMappingResponse, Status) },
+		G_STRUCT_OFFSET(LassoLibNameIdentifierMappingResponse, Status), NULL, NULL, NULL},
 	{ "NameIdentifier", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoLibNameIdentifierMappingResponse, NameIdentifier) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoLibNameIdentifierMappingResponse, NameIdentifier), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -103,6 +103,7 @@ lasso_lib_name_identifier_mapping_response_get_type()
 			sizeof(LassoLibNameIdentifierMappingResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		name_identifier_mapping_response_type = g_type_register_static
diff --git a/lasso/xml/lib_register_name_identifier_request.c b/lasso/xml/lib_register_name_identifier_request.c
index c1f96718..bc4deff0 100644
--- a/lasso/xml/lib_register_name_identifier_request.c
+++ b/lasso/xml/lib_register_name_identifier_request.c
@@ -62,18 +62,18 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Extension", SNIPPET_EXTENSION,
-		G_STRUCT_OFFSET(LassoLibRegisterNameIdentifierRequest, Extension) },
+		G_STRUCT_OFFSET(LassoLibRegisterNameIdentifierRequest, Extension), NULL, NULL, NULL},
 	{ "ProviderID", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoLibRegisterNameIdentifierRequest, ProviderID) },
+		G_STRUCT_OFFSET(LassoLibRegisterNameIdentifierRequest, ProviderID), NULL, NULL, NULL},
 	{ "IDPProvidedNameIdentifier", SNIPPET_NAME_IDENTIFIER,
-		G_STRUCT_OFFSET(LassoLibRegisterNameIdentifierRequest, IDPProvidedNameIdentifier)},
+		G_STRUCT_OFFSET(LassoLibRegisterNameIdentifierRequest, IDPProvidedNameIdentifier), NULL, NULL, NULL},
 	{ "SPProvidedNameIdentifier", SNIPPET_NAME_IDENTIFIER,
-		G_STRUCT_OFFSET(LassoLibRegisterNameIdentifierRequest, SPProvidedNameIdentifier) },
+		G_STRUCT_OFFSET(LassoLibRegisterNameIdentifierRequest, SPProvidedNameIdentifier), NULL, NULL, NULL},
 	{ "OldProvidedNameIdentifier", SNIPPET_NAME_IDENTIFIER,
-		G_STRUCT_OFFSET(LassoLibRegisterNameIdentifierRequest, OldProvidedNameIdentifier)},
+		G_STRUCT_OFFSET(LassoLibRegisterNameIdentifierRequest, OldProvidedNameIdentifier), NULL, NULL, NULL},
 	{ "RelayState", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoLibRegisterNameIdentifierRequest, RelayState) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoLibRegisterNameIdentifierRequest, RelayState), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static struct QuerySnippet query_snippets[] = {
@@ -184,6 +184,7 @@ lasso_lib_register_name_identifier_request_get_type()
 			sizeof(LassoLibRegisterNameIdentifierRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAMLP_REQUEST_ABSTRACT,
diff --git a/lasso/xml/lib_register_name_identifier_response.c b/lasso/xml/lib_register_name_identifier_response.c
index 98357c76..40bb9a49 100644
--- a/lasso/xml/lib_register_name_identifier_response.c
+++ b/lasso/xml/lib_register_name_identifier_response.c
@@ -69,6 +69,7 @@ lasso_lib_register_name_identifier_response_get_type()
 			sizeof(LassoLibRegisterNameIdentifierResponse),
 			0,
 			NULL,
+			NULL,
 		};
 
 		register_name_identifier_response_type = g_type_register_static(
diff --git a/lasso/xml/lib_request_authn_context.c b/lasso/xml/lib_request_authn_context.c
index 1307b717..3b08456f 100644
--- a/lasso/xml/lib_request_authn_context.c
+++ b/lasso/xml/lib_request_authn_context.c
@@ -55,12 +55,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "AuthnContextClassRef", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoLibRequestAuthnContext, AuthnContextClassRef) },
+		G_STRUCT_OFFSET(LassoLibRequestAuthnContext, AuthnContextClassRef), NULL, NULL, NULL},
 	{ "AuthnContextStatementRef", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoLibRequestAuthnContext, AuthnContextStatementRef) },
+		G_STRUCT_OFFSET(LassoLibRequestAuthnContext, AuthnContextStatementRef), NULL, NULL, NULL},
 	{ "AuthnContextComparison", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoLibRequestAuthnContext, AuthnContextComparison) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoLibRequestAuthnContext, AuthnContextComparison), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -102,6 +102,7 @@ lasso_lib_request_authn_context_get_type()
 			sizeof(LassoLibRequestAuthnContext),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/lib_scoping.c b/lasso/xml/lib_scoping.c
index c4435600..5760c375 100644
--- a/lasso/xml/lib_scoping.c
+++ b/lasso/xml/lib_scoping.c
@@ -47,9 +47,9 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "ProxyCount", SNIPPET_CONTENT | SNIPPET_INTEGER | SNIPPET_OPTIONAL_NEG,
-		G_STRUCT_OFFSET(LassoLibScoping, ProxyCount) },
-	{ "IDPList", SNIPPET_NODE, G_STRUCT_OFFSET(LassoLibScoping, IDPList) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoLibScoping, ProxyCount), NULL, NULL, NULL},
+	{ "IDPList", SNIPPET_NODE, G_STRUCT_OFFSET(LassoLibScoping, IDPList), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -90,6 +90,7 @@ lasso_lib_scoping_get_type()
 			sizeof(LassoLibScoping),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/lib_status_response.c b/lasso/xml/lib_status_response.c
index 19eea62c..1cc37b7f 100644
--- a/lasso/xml/lib_status_response.c
+++ b/lasso/xml/lib_status_response.c
@@ -56,11 +56,11 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Extension", SNIPPET_EXTENSION,
-		G_STRUCT_OFFSET(LassoLibStatusResponse, Extension) },
-	{ "ProviderID", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibStatusResponse, ProviderID) },
-	{ "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoLibStatusResponse, Status) },
-	{ "RelayState", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibStatusResponse, RelayState) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoLibStatusResponse, Extension), NULL, NULL, NULL},
+	{ "ProviderID", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibStatusResponse, ProviderID), NULL, NULL, NULL},
+	{ "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoLibStatusResponse, Status), NULL, NULL, NULL},
+	{ "RelayState", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoLibStatusResponse, RelayState), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static struct QuerySnippet query_snippets[] = {
@@ -153,6 +153,7 @@ lasso_lib_status_response_get_type()
 			sizeof(LassoLibStatusResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		status_response_type = g_type_register_static(LASSO_TYPE_SAMLP_RESPONSE_ABSTRACT,
diff --git a/lasso/xml/lib_subject.c b/lasso/xml/lib_subject.c
index 35776450..52c566a6 100644
--- a/lasso/xml/lib_subject.c
+++ b/lasso/xml/lib_subject.c
@@ -50,8 +50,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "IDPProvidedNameIdentifier", SNIPPET_NAME_IDENTIFIER,
-		G_STRUCT_OFFSET(LassoLibSubject, IDPProvidedNameIdentifier) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoLibSubject, IDPProvidedNameIdentifier), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -91,6 +91,7 @@ lasso_lib_subject_get_type()
 			sizeof(LassoLibSubject),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAML_SUBJECT,
diff --git a/lasso/xml/misc_text_node.c b/lasso/xml/misc_text_node.c
index b96b083f..0f213a11 100644
--- a/lasso/xml/misc_text_node.c
+++ b/lasso/xml/misc_text_node.c
@@ -31,8 +31,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "content", SNIPPET_TEXT_CHILD,
-		G_STRUCT_OFFSET(LassoMiscTextNode, content) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoMiscTextNode, content), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -152,6 +152,7 @@ lasso_misc_text_node_get_type()
 			sizeof(LassoMiscTextNode),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/private.h b/lasso/xml/private.h
index 5fc6c92b..858632f5 100644
--- a/lasso/xml/private.h
+++ b/lasso/xml/private.h
@@ -54,7 +54,7 @@ typedef enum {
 	SNIPPET_OPTIONAL = 1 << 23, /* optional, ignored if 0 */
 	SNIPPET_OPTIONAL_NEG = 1 << 24, /* optional, ignored if -1 */
 	SNIPPET_ANY = 1 << 25, /* ##any node */
-	SNIPPET_ALLOW_TEXT = 1 << 26, /* allow text childs in list of nodes */
+	SNIPPET_ALLOW_TEXT = 1 << 26 /* allow text childs in list of nodes */
 } SnippetType;
 
 struct XmlSnippet {
diff --git a/lasso/xml/sa_credentials.c b/lasso/xml/sa_credentials.c
index ca5f5c64..3e848f2e 100644
--- a/lasso/xml/sa_credentials.c
+++ b/lasso/xml/sa_credentials.c
@@ -47,8 +47,8 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoSaCredentials, any) },
-	{ NULL, 0, 0}
+	{ "", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoSaCredentials, any), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -87,6 +87,7 @@ lasso_sa_credentials_get_type()
 			sizeof(LassoSaCredentials),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/sa_parameter.c b/lasso/xml/sa_parameter.c
index df5c97a9..6b243848 100644
--- a/lasso/xml/sa_parameter.c
+++ b/lasso/xml/sa_parameter.c
@@ -49,9 +49,9 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "content", SNIPPET_TEXT_CHILD, G_STRUCT_OFFSET(LassoSaParameter, content) },
-	{ "name", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSaParameter, name) },
-	{ NULL, 0, 0}
+	{ "content", SNIPPET_TEXT_CHILD, G_STRUCT_OFFSET(LassoSaParameter, content), NULL, NULL, NULL},
+	{ "name", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSaParameter, name), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -92,6 +92,7 @@ lasso_sa_parameter_get_type()
 			sizeof(LassoSaParameter),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/sa_password_transforms.c b/lasso/xml/sa_password_transforms.c
index c4530de2..0338617c 100644
--- a/lasso/xml/sa_password_transforms.c
+++ b/lasso/xml/sa_password_transforms.c
@@ -67,8 +67,8 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Transform", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoSaPasswordTransforms, Transform) },
-	{ NULL, 0, 0}
+	{ "Transform", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoSaPasswordTransforms, Transform), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -108,6 +108,7 @@ lasso_sa_password_transforms_get_type()
 			sizeof(LassoSaPasswordTransforms),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/sa_sasl_request.c b/lasso/xml/sa_sasl_request.c
index 0a0883bf..8ba9b9fb 100644
--- a/lasso/xml/sa_sasl_request.c
+++ b/lasso/xml/sa_sasl_request.c
@@ -59,18 +59,18 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Data", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoSaSASLRequest, Data) },
+		G_STRUCT_OFFSET(LassoSaSASLRequest, Data), NULL, NULL, NULL},
 	{ "RequestAuthnContext", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSaSASLRequest, RequestAuthnContext) },
+		G_STRUCT_OFFSET(LassoSaSASLRequest, RequestAuthnContext), NULL, NULL, NULL},
 	{ "mechanism", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaSASLRequest, mechanism) },
+		G_STRUCT_OFFSET(LassoSaSASLRequest, mechanism), NULL, NULL, NULL},
 	{ "authzID", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaSASLRequest, authzID) },
+		G_STRUCT_OFFSET(LassoSaSASLRequest, authzID), NULL, NULL, NULL},
 	{ "advisoryAuthnID", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaSASLRequest, advisoryAuthnID) },
+		G_STRUCT_OFFSET(LassoSaSASLRequest, advisoryAuthnID), NULL, NULL, NULL},
 	{ "id", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaSASLRequest, id) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSaSASLRequest, id), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -116,6 +116,7 @@ lasso_sa_sasl_request_get_type()
 			sizeof(LassoSaSASLRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/sa_sasl_response.c b/lasso/xml/sa_sasl_response.c
index 2d6a938d..e66cbe56 100644
--- a/lasso/xml/sa_sasl_response.c
+++ b/lasso/xml/sa_sasl_response.c
@@ -66,19 +66,19 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSaSASLResponse, Status) },
+	{ "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSaSASLResponse, Status), NULL, NULL, NULL},
 	{ "PasswordTransforms", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSaSASLResponse, PasswordTransforms) },
+		G_STRUCT_OFFSET(LassoSaSASLResponse, PasswordTransforms), NULL, NULL, NULL},
 	{ "Data", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoSaSASLResponse, Data) },
+		G_STRUCT_OFFSET(LassoSaSASLResponse, Data), NULL, NULL, NULL},
 	{ "ResourceOffering", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSaSASLResponse, ResourceOffering) },
-	{ "Credentials", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoSaSASLResponse, Credentials) },
+		G_STRUCT_OFFSET(LassoSaSASLResponse, ResourceOffering), NULL, NULL, NULL},
+	{ "Credentials", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoSaSASLResponse, Credentials), NULL, NULL, NULL},
 	{ "serverMechanism", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaSASLResponse, serverMechanism) },
+		G_STRUCT_OFFSET(LassoSaSASLResponse, serverMechanism), NULL, NULL, NULL},
 	{ "id", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaSASLResponse, id) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSaSASLResponse, id), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -154,6 +154,7 @@ lasso_sa_sasl_response_get_type()
 			sizeof(LassoSaSASLResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/sa_transform.c b/lasso/xml/sa_transform.c
index 41e3cde9..027c2c52 100644
--- a/lasso/xml/sa_transform.c
+++ b/lasso/xml/sa_transform.c
@@ -56,10 +56,10 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Parameter", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoSaTransform, Parameter) },
-	{ "name", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSaTransform, name) },
-	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSaTransform, id) },
-	{ NULL, 0, 0}
+	{ "Parameter", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoSaTransform, Parameter), NULL, NULL, NULL},
+	{ "name", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSaTransform, name), NULL, NULL, NULL},
+	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSaTransform, id), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -101,6 +101,7 @@ lasso_sa_transform_get_type()
 			sizeof(LassoSaTransform),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/saml2_action.c b/lasso/xml/saml-2.0/saml2_action.c
index 39f6f7b5..ed76d23a 100644
--- a/lasso/xml/saml-2.0/saml2_action.c
+++ b/lasso/xml/saml-2.0/saml2_action.c
@@ -49,10 +49,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "content", SNIPPET_TEXT_CHILD,
-		G_STRUCT_OFFSET(LassoSaml2Action, content) },
+		G_STRUCT_OFFSET(LassoSaml2Action, content), NULL, NULL, NULL},
 	{ "Namespace", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2Action, Namespace) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSaml2Action, Namespace), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -97,6 +97,7 @@ lasso_saml2_action_get_type()
 			sizeof(LassoSaml2Action),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/saml2_advice.c b/lasso/xml/saml-2.0/saml2_advice.c
index 92244444..b60f1a89 100644
--- a/lasso/xml/saml-2.0/saml2_advice.c
+++ b/lasso/xml/saml-2.0/saml2_advice.c
@@ -51,14 +51,14 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "AssertionIDRef", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSaml2Advice, AssertionIDRef) },
+		G_STRUCT_OFFSET(LassoSaml2Advice, AssertionIDRef), NULL, NULL, NULL},
 	{ "AssertionURIRef", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSaml2Advice, AssertionURIRef) },
+		G_STRUCT_OFFSET(LassoSaml2Advice, AssertionURIRef), NULL, NULL, NULL},
 	{ "Assertion", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSaml2Advice, Assertion) },
+		G_STRUCT_OFFSET(LassoSaml2Advice, Assertion), NULL, NULL, NULL},
 	{ "EncryptedAssertion", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSaml2Advice, EncryptedAssertion) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSaml2Advice, EncryptedAssertion), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -105,6 +105,7 @@ lasso_saml2_advice_get_type()
 			sizeof(LassoSaml2Advice),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/saml2_assertion.c b/lasso/xml/saml-2.0/saml2_assertion.c
index 5b682cf6..854ae804 100644
--- a/lasso/xml/saml-2.0/saml2_assertion.c
+++ b/lasso/xml/saml-2.0/saml2_assertion.c
@@ -65,47 +65,47 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "Issuer", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoSaml2Assertion, Issuer),
-		"LassoSaml2NameID" },
+		"LassoSaml2NameID", NULL, NULL},
 	{ "Signature", SNIPPET_SIGNATURE,
-		G_STRUCT_OFFSET(LassoSaml2Assertion, ID) },
+		G_STRUCT_OFFSET(LassoSaml2Assertion, ID), NULL, NULL, NULL},
 	{ "Subject", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSaml2Assertion, Subject) },
+		G_STRUCT_OFFSET(LassoSaml2Assertion, Subject), NULL, NULL, NULL},
 	{ "Conditions", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSaml2Assertion, Conditions) },
+		G_STRUCT_OFFSET(LassoSaml2Assertion, Conditions), NULL, NULL, NULL},
 	{ "Advice", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSaml2Assertion, Advice) },
+		G_STRUCT_OFFSET(LassoSaml2Assertion, Advice), NULL, NULL, NULL},
 	{ "Statement", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSaml2Assertion, Statement) },
+		G_STRUCT_OFFSET(LassoSaml2Assertion, Statement), NULL, NULL, NULL},
 	{ "AuthnStatement", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSaml2Assertion, AuthnStatement) },
+		G_STRUCT_OFFSET(LassoSaml2Assertion, AuthnStatement), NULL, NULL, NULL},
 	{ "AuthzDecisionStatement", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSaml2Assertion, AuthzDecisionStatement) },
+		G_STRUCT_OFFSET(LassoSaml2Assertion, AuthzDecisionStatement), NULL, NULL, NULL},
 	{ "AttributeStatement", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSaml2Assertion, AttributeStatement) },
+		G_STRUCT_OFFSET(LassoSaml2Assertion, AttributeStatement), NULL, NULL, NULL},
 	{ "Version", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2Assertion, Version) },
+		G_STRUCT_OFFSET(LassoSaml2Assertion, Version), NULL, NULL, NULL},
 	{ "ID", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2Assertion, ID) },
+		G_STRUCT_OFFSET(LassoSaml2Assertion, ID), NULL, NULL, NULL},
 	{ "IssueInstant", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2Assertion, IssueInstant) },
+		G_STRUCT_OFFSET(LassoSaml2Assertion, IssueInstant), NULL, NULL, NULL},
 
 	/* hidden fields; used in lasso dumps */
 	{ "SignType", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_LASSO_DUMP,
-		G_STRUCT_OFFSET(LassoSaml2Assertion, sign_type) },
+		G_STRUCT_OFFSET(LassoSaml2Assertion, sign_type), NULL, NULL, NULL},
 	{ "SignMethod", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_LASSO_DUMP,
-		G_STRUCT_OFFSET(LassoSaml2Assertion, sign_method) },
+		G_STRUCT_OFFSET(LassoSaml2Assertion, sign_method), NULL, NULL, NULL},
 	{ "PrivateKeyFile", SNIPPET_CONTENT | SNIPPET_LASSO_DUMP,
-		G_STRUCT_OFFSET(LassoSaml2Assertion, private_key_file) },
+		G_STRUCT_OFFSET(LassoSaml2Assertion, private_key_file), NULL, NULL, NULL},
 	{ "CertificateFile", SNIPPET_CONTENT | SNIPPET_LASSO_DUMP,
-		G_STRUCT_OFFSET(LassoSaml2Assertion, certificate_file) },
+		G_STRUCT_OFFSET(LassoSaml2Assertion, certificate_file), NULL, NULL, NULL},
 	{ "EncryptionActivated", SNIPPET_ATTRIBUTE | SNIPPET_BOOLEAN | SNIPPET_LASSO_DUMP,
-		G_STRUCT_OFFSET(LassoSaml2Assertion, encryption_activated) },
+		G_STRUCT_OFFSET(LassoSaml2Assertion, encryption_activated), NULL, NULL, NULL},
 	{ "EncryptionPublicKeyStr", SNIPPET_CONTENT | SNIPPET_LASSO_DUMP,
-		G_STRUCT_OFFSET(LassoSaml2Assertion, encryption_public_key_str) },
+		G_STRUCT_OFFSET(LassoSaml2Assertion, encryption_public_key_str), NULL, NULL, NULL},
 	{ "EncryptionSymKeyType", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_LASSO_DUMP,
-		G_STRUCT_OFFSET(LassoSaml2Assertion, encryption_sym_key_type) },
+		G_STRUCT_OFFSET(LassoSaml2Assertion, encryption_sym_key_type), NULL, NULL, NULL},
 
-	{NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -196,6 +196,7 @@ lasso_saml2_assertion_get_type()
 			sizeof(LassoSaml2Assertion),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/saml2_attribute.c b/lasso/xml/saml-2.0/saml2_attribute.c
index b4977103..790d6af9 100644
--- a/lasso/xml/saml-2.0/saml2_attribute.c
+++ b/lasso/xml/saml-2.0/saml2_attribute.c
@@ -51,14 +51,14 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "AttributeValue", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSaml2Attribute, AttributeValue) },
+		G_STRUCT_OFFSET(LassoSaml2Attribute, AttributeValue), NULL, NULL, NULL},
 	{ "Name", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2Attribute, Name) },
+		G_STRUCT_OFFSET(LassoSaml2Attribute, Name), NULL, NULL, NULL},
 	{ "NameFormat", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2Attribute, NameFormat) },
+		G_STRUCT_OFFSET(LassoSaml2Attribute, NameFormat), NULL, NULL, NULL},
 	{ "FriendlyName", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2Attribute, FriendlyName) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSaml2Attribute, FriendlyName), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -105,6 +105,7 @@ lasso_saml2_attribute_get_type()
 			sizeof(LassoSaml2Attribute),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/saml2_attribute_statement.c b/lasso/xml/saml-2.0/saml2_attribute_statement.c
index 9eceaf29..d2553164 100644
--- a/lasso/xml/saml-2.0/saml2_attribute_statement.c
+++ b/lasso/xml/saml-2.0/saml2_attribute_statement.c
@@ -52,10 +52,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Attribute", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSaml2AttributeStatement, Attribute) },
+		G_STRUCT_OFFSET(LassoSaml2AttributeStatement, Attribute), NULL, NULL, NULL},
 	{ "EncryptedAttribute", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSaml2AttributeStatement, EncryptedAttribute) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSaml2AttributeStatement, EncryptedAttribute), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -100,6 +100,7 @@ lasso_saml2_attribute_statement_get_type()
 			sizeof(LassoSaml2AttributeStatement),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAML2_STATEMENT_ABSTRACT,
diff --git a/lasso/xml/saml-2.0/saml2_attribute_value.c b/lasso/xml/saml-2.0/saml2_attribute_value.c
index fd6e08df..129b002c 100644
--- a/lasso/xml/saml-2.0/saml2_attribute_value.c
+++ b/lasso/xml/saml-2.0/saml2_attribute_value.c
@@ -34,8 +34,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "", SNIPPET_LIST_NODES | SNIPPET_ALLOW_TEXT,
-		G_STRUCT_OFFSET(LassoSaml2AttributeValue, any) },
-	{ NULL, 0, 0 }
+		G_STRUCT_OFFSET(LassoSaml2AttributeValue, any), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -75,6 +75,7 @@ lasso_saml2_attribute_value_get_type()
 			sizeof(LassoSaml2AttributeValue),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/saml2_audience_restriction.c b/lasso/xml/saml-2.0/saml2_audience_restriction.c
index 9b9387d8..3679699a 100644
--- a/lasso/xml/saml-2.0/saml2_audience_restriction.c
+++ b/lasso/xml/saml-2.0/saml2_audience_restriction.c
@@ -51,8 +51,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Audience", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoSaml2AudienceRestriction, Audience) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSaml2AudienceRestriction, Audience), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_saml2_audience_restriction_get_type()
 			sizeof(LassoSaml2AudienceRestriction),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAML2_CONDITION_ABSTRACT,
diff --git a/lasso/xml/saml-2.0/saml2_authn_context.c b/lasso/xml/saml-2.0/saml2_authn_context.c
index 6bd0cfb2..e9dadbae 100644
--- a/lasso/xml/saml-2.0/saml2_authn_context.c
+++ b/lasso/xml/saml-2.0/saml2_authn_context.c
@@ -60,14 +60,14 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "AuthnContextClassRef", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoSaml2AuthnContext, AuthnContextClassRef) },
+		G_STRUCT_OFFSET(LassoSaml2AuthnContext, AuthnContextClassRef), NULL, NULL, NULL},
 	{ "AuthnContextDecl", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSaml2AuthnContext, AuthnContextDecl) },
+		G_STRUCT_OFFSET(LassoSaml2AuthnContext, AuthnContextDecl), NULL, NULL, NULL},
 	{ "AuthnContextDeclRef", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoSaml2AuthnContext, AuthnContextDeclRef) },
+		G_STRUCT_OFFSET(LassoSaml2AuthnContext, AuthnContextDeclRef), NULL, NULL, NULL},
 	{ "AuthenticatingAuthority", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoSaml2AuthnContext, AuthenticatingAuthority) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSaml2AuthnContext, AuthenticatingAuthority), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -114,6 +114,7 @@ lasso_saml2_authn_context_get_type()
 			sizeof(LassoSaml2AuthnContext),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/saml2_authn_statement.c b/lasso/xml/saml-2.0/saml2_authn_statement.c
index 0bc4071a..29085a9b 100644
--- a/lasso/xml/saml-2.0/saml2_authn_statement.c
+++ b/lasso/xml/saml-2.0/saml2_authn_statement.c
@@ -55,16 +55,16 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "SubjectLocality", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSaml2AuthnStatement, SubjectLocality) },
+		G_STRUCT_OFFSET(LassoSaml2AuthnStatement, SubjectLocality), NULL, NULL, NULL},
 	{ "AuthnContext", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSaml2AuthnStatement, AuthnContext) },
+		G_STRUCT_OFFSET(LassoSaml2AuthnStatement, AuthnContext), NULL, NULL, NULL},
 	{ "AuthnInstant", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2AuthnStatement, AuthnInstant) },
+		G_STRUCT_OFFSET(LassoSaml2AuthnStatement, AuthnInstant), NULL, NULL, NULL},
 	{ "SessionIndex", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2AuthnStatement, SessionIndex) },
+		G_STRUCT_OFFSET(LassoSaml2AuthnStatement, SessionIndex), NULL, NULL, NULL},
 	{ "SessionNotOnOrAfter", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2AuthnStatement, SessionNotOnOrAfter) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSaml2AuthnStatement, SessionNotOnOrAfter), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -112,6 +112,7 @@ lasso_saml2_authn_statement_get_type()
 			sizeof(LassoSaml2AuthnStatement),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAML2_STATEMENT_ABSTRACT,
diff --git a/lasso/xml/saml-2.0/saml2_authz_decision_statement.c b/lasso/xml/saml-2.0/saml2_authz_decision_statement.c
index df830b2c..80d70e2f 100644
--- a/lasso/xml/saml-2.0/saml2_authz_decision_statement.c
+++ b/lasso/xml/saml-2.0/saml2_authz_decision_statement.c
@@ -54,14 +54,14 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Action", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSaml2AuthzDecisionStatement, Action) },
+		G_STRUCT_OFFSET(LassoSaml2AuthzDecisionStatement, Action), NULL, NULL, NULL},
 	{ "Evidence", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSaml2AuthzDecisionStatement, Evidence) },
+		G_STRUCT_OFFSET(LassoSaml2AuthzDecisionStatement, Evidence), NULL, NULL, NULL},
 	{ "Resource", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2AuthzDecisionStatement, Resource) },
+		G_STRUCT_OFFSET(LassoSaml2AuthzDecisionStatement, Resource), NULL, NULL, NULL},
 	{ "Decision", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2AuthzDecisionStatement, Decision) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSaml2AuthzDecisionStatement, Decision), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -107,6 +107,7 @@ lasso_saml2_authz_decision_statement_get_type()
 			sizeof(LassoSaml2AuthzDecisionStatement),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAML2_STATEMENT_ABSTRACT,
diff --git a/lasso/xml/saml-2.0/saml2_base_idabstract.c b/lasso/xml/saml-2.0/saml2_base_idabstract.c
index 108da3c3..7b08e5ee 100644
--- a/lasso/xml/saml-2.0/saml2_base_idabstract.c
+++ b/lasso/xml/saml-2.0/saml2_base_idabstract.c
@@ -45,10 +45,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "NameQualifier", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2BaseIDAbstract, NameQualifier) },
+		G_STRUCT_OFFSET(LassoSaml2BaseIDAbstract, NameQualifier), NULL, NULL, NULL},
 	{ "SPNameQualifier", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2BaseIDAbstract, SPNameQualifier) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSaml2BaseIDAbstract, SPNameQualifier), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -93,6 +93,7 @@ lasso_saml2_base_idabstract_get_type()
 			sizeof(LassoSaml2BaseIDAbstract),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/saml2_condition_abstract.c b/lasso/xml/saml-2.0/saml2_condition_abstract.c
index a67e250d..f356dc73 100644
--- a/lasso/xml/saml-2.0/saml2_condition_abstract.c
+++ b/lasso/xml/saml-2.0/saml2_condition_abstract.c
@@ -52,7 +52,7 @@
 
 
 static struct XmlSnippet schema_snippets[] = {
-	{NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -90,6 +90,7 @@ lasso_saml2_condition_abstract_get_type()
 			sizeof(LassoSaml2ConditionAbstract),
 			0,
 			NULL,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/saml2_conditions.c b/lasso/xml/saml-2.0/saml2_conditions.c
index c1f3b361..eb28ca36 100644
--- a/lasso/xml/saml-2.0/saml2_conditions.c
+++ b/lasso/xml/saml-2.0/saml2_conditions.c
@@ -52,18 +52,18 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Condition", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSaml2Conditions, Condition) },
+		G_STRUCT_OFFSET(LassoSaml2Conditions, Condition), NULL, NULL, NULL},
 	{ "AudienceRestriction", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSaml2Conditions, AudienceRestriction) },
+		G_STRUCT_OFFSET(LassoSaml2Conditions, AudienceRestriction), NULL, NULL, NULL},
 	{ "OneTimeUse", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSaml2Conditions, OneTimeUse) },
+		G_STRUCT_OFFSET(LassoSaml2Conditions, OneTimeUse), NULL, NULL, NULL},
 	{ "ProxyRestriction", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSaml2Conditions, ProxyRestriction) },
+		G_STRUCT_OFFSET(LassoSaml2Conditions, ProxyRestriction), NULL, NULL, NULL},
 	{ "NotBefore", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2Conditions, NotBefore) },
+		G_STRUCT_OFFSET(LassoSaml2Conditions, NotBefore), NULL, NULL, NULL},
 	{ "NotOnOrAfter", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2Conditions, NotOnOrAfter) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSaml2Conditions, NotOnOrAfter), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -112,6 +112,7 @@ lasso_saml2_conditions_get_type()
 			sizeof(LassoSaml2Conditions),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/saml2_encrypted_element.c b/lasso/xml/saml-2.0/saml2_encrypted_element.c
index 5023e272..17f56d10 100644
--- a/lasso/xml/saml-2.0/saml2_encrypted_element.c
+++ b/lasso/xml/saml-2.0/saml2_encrypted_element.c
@@ -48,12 +48,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "EncryptedData", SNIPPET_XMLNODE,
-		G_STRUCT_OFFSET(LassoSaml2EncryptedElement, EncryptedData) },
+		G_STRUCT_OFFSET(LassoSaml2EncryptedElement, EncryptedData), NULL, NULL, NULL},
 	{ "EncryptedKey", SNIPPET_LIST_XMLNODES,
-		G_STRUCT_OFFSET(LassoSaml2EncryptedElement, EncryptedKey) },
+		G_STRUCT_OFFSET(LassoSaml2EncryptedElement, EncryptedKey), NULL, NULL, NULL},
 	{ "NameID", SNIPPET_NODE | SNIPPET_LASSO_DUMP,
-		G_STRUCT_OFFSET(LassoSaml2EncryptedElement, original_data) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSaml2EncryptedElement, original_data), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -100,6 +100,7 @@ lasso_saml2_encrypted_element_get_type()
 			sizeof(LassoSaml2EncryptedElement),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/saml2_evidence.c b/lasso/xml/saml-2.0/saml2_evidence.c
index 80e72992..0ae79f1b 100644
--- a/lasso/xml/saml-2.0/saml2_evidence.c
+++ b/lasso/xml/saml-2.0/saml2_evidence.c
@@ -50,14 +50,14 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "AssertionIDRef", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSaml2Evidence, AssertionIDRef) },
+		G_STRUCT_OFFSET(LassoSaml2Evidence, AssertionIDRef), NULL, NULL, NULL},
 	{ "AssertionURIRef", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSaml2Evidence, AssertionURIRef) },
+		G_STRUCT_OFFSET(LassoSaml2Evidence, AssertionURIRef), NULL, NULL, NULL},
 	{ "Assertion", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSaml2Evidence, Assertion) },
+		G_STRUCT_OFFSET(LassoSaml2Evidence, Assertion), NULL, NULL, NULL},
 	{ "EncryptedAssertion", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSaml2Evidence, EncryptedAssertion) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSaml2Evidence, EncryptedAssertion), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -104,6 +104,7 @@ lasso_saml2_evidence_get_type()
 			sizeof(LassoSaml2Evidence),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/saml2_key_info_confirmation_data.c b/lasso/xml/saml-2.0/saml2_key_info_confirmation_data.c
index 0cf04f2e..4b49a593 100644
--- a/lasso/xml/saml-2.0/saml2_key_info_confirmation_data.c
+++ b/lasso/xml/saml-2.0/saml2_key_info_confirmation_data.c
@@ -51,8 +51,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "KeyInfo", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSaml2KeyInfoConfirmationData, KeyInfo) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSaml2KeyInfoConfirmationData, KeyInfo), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_saml2_key_info_confirmation_data_get_type()
 			sizeof(LassoSaml2KeyInfoConfirmationData),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/saml2_name_id.c b/lasso/xml/saml-2.0/saml2_name_id.c
index 980c1957..0a67e803 100644
--- a/lasso/xml/saml-2.0/saml2_name_id.c
+++ b/lasso/xml/saml-2.0/saml2_name_id.c
@@ -51,16 +51,16 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "content", SNIPPET_TEXT_CHILD,
-		G_STRUCT_OFFSET(LassoSaml2NameID, content) },
+		G_STRUCT_OFFSET(LassoSaml2NameID, content), NULL, NULL, NULL},
 	{ "Format", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2NameID, Format) },
+		G_STRUCT_OFFSET(LassoSaml2NameID, Format), NULL, NULL, NULL},
 	{ "SPProvidedID", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2NameID, SPProvidedID) },
+		G_STRUCT_OFFSET(LassoSaml2NameID, SPProvidedID), NULL, NULL, NULL},
 	{ "NameQualifier", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2NameID, NameQualifier) },
+		G_STRUCT_OFFSET(LassoSaml2NameID, NameQualifier), NULL, NULL, NULL},
 	{ "SPNameQualifier", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2NameID, SPNameQualifier) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSaml2NameID, SPNameQualifier), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -108,6 +108,7 @@ lasso_saml2_name_id_get_type()
 			sizeof(LassoSaml2NameID),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/saml2_one_time_use.c b/lasso/xml/saml-2.0/saml2_one_time_use.c
index 9df5de1a..4ff0f193 100644
--- a/lasso/xml/saml-2.0/saml2_one_time_use.c
+++ b/lasso/xml/saml-2.0/saml2_one_time_use.c
@@ -46,7 +46,7 @@
 
 
 static struct XmlSnippet schema_snippets[] = {
-	{NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -84,6 +84,7 @@ lasso_saml2_one_time_use_get_type()
 			sizeof(LassoSaml2OneTimeUse),
 			0,
 			NULL,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAML2_CONDITION_ABSTRACT,
diff --git a/lasso/xml/saml-2.0/saml2_proxy_restriction.c b/lasso/xml/saml-2.0/saml2_proxy_restriction.c
index 28a8af97..30377b1b 100644
--- a/lasso/xml/saml-2.0/saml2_proxy_restriction.c
+++ b/lasso/xml/saml-2.0/saml2_proxy_restriction.c
@@ -52,10 +52,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Audience", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoSaml2ProxyRestriction, Audience) },
+		G_STRUCT_OFFSET(LassoSaml2ProxyRestriction, Audience), NULL, NULL, NULL},
 	{ "Count", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoSaml2ProxyRestriction, Count) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSaml2ProxyRestriction, Count), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -99,6 +99,7 @@ lasso_saml2_proxy_restriction_get_type()
 			sizeof(LassoSaml2ProxyRestriction),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAML2_CONDITION_ABSTRACT,
diff --git a/lasso/xml/saml-2.0/saml2_statement_abstract.c b/lasso/xml/saml-2.0/saml2_statement_abstract.c
index 95107616..e9615e07 100644
--- a/lasso/xml/saml-2.0/saml2_statement_abstract.c
+++ b/lasso/xml/saml-2.0/saml2_statement_abstract.c
@@ -56,7 +56,7 @@
 
 
 static struct XmlSnippet schema_snippets[] = {
-	{NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -94,6 +94,7 @@ lasso_saml2_statement_abstract_get_type()
 			sizeof(LassoSaml2StatementAbstract),
 			0,
 			NULL,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/saml2_subject.c b/lasso/xml/saml-2.0/saml2_subject.c
index 8209014a..fcb731cd 100644
--- a/lasso/xml/saml-2.0/saml2_subject.c
+++ b/lasso/xml/saml-2.0/saml2_subject.c
@@ -55,15 +55,15 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "BaseID", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSaml2Subject, BaseID) },
+		G_STRUCT_OFFSET(LassoSaml2Subject, BaseID), NULL, NULL, NULL},
 	{ "NameID", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSaml2Subject, NameID) },
+		G_STRUCT_OFFSET(LassoSaml2Subject, NameID), NULL, NULL, NULL},
 	{ "EncryptedID", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoSaml2Subject, EncryptedID),
-		"LassoSaml2EncryptedElement" },
+		"LassoSaml2EncryptedElement", NULL, NULL},
 	{ "SubjectConfirmation", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSaml2Subject, SubjectConfirmation) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSaml2Subject, SubjectConfirmation), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -110,6 +110,7 @@ lasso_saml2_subject_get_type()
 			sizeof(LassoSaml2Subject),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/saml2_subject_confirmation.c b/lasso/xml/saml-2.0/saml2_subject_confirmation.c
index c1e3a53e..f6e69741 100644
--- a/lasso/xml/saml-2.0/saml2_subject_confirmation.c
+++ b/lasso/xml/saml-2.0/saml2_subject_confirmation.c
@@ -53,17 +53,17 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "BaseID", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSaml2SubjectConfirmation, BaseID) },
+		G_STRUCT_OFFSET(LassoSaml2SubjectConfirmation, BaseID), NULL, NULL, NULL},
 	{ "NameID", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSaml2SubjectConfirmation, NameID) },
+		G_STRUCT_OFFSET(LassoSaml2SubjectConfirmation, NameID), NULL, NULL, NULL},
 	{ "EncryptedID", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoSaml2SubjectConfirmation, EncryptedID),
-		"LassoSaml2EncryptedElement" },
+		"LassoSaml2EncryptedElement", NULL, NULL},
 	{ "SubjectConfirmationData", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSaml2SubjectConfirmation, SubjectConfirmationData) },
+		G_STRUCT_OFFSET(LassoSaml2SubjectConfirmation, SubjectConfirmationData), NULL, NULL, NULL},
 	{ "Method", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2SubjectConfirmation, Method) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSaml2SubjectConfirmation, Method), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -111,6 +111,7 @@ lasso_saml2_subject_confirmation_get_type()
 			sizeof(LassoSaml2SubjectConfirmation),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/saml2_subject_confirmation_data.c b/lasso/xml/saml-2.0/saml2_subject_confirmation_data.c
index 29c22bd9..90a7526c 100644
--- a/lasso/xml/saml-2.0/saml2_subject_confirmation_data.c
+++ b/lasso/xml/saml-2.0/saml2_subject_confirmation_data.c
@@ -57,16 +57,16 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "NotBefore", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2SubjectConfirmationData, NotBefore) },
+		G_STRUCT_OFFSET(LassoSaml2SubjectConfirmationData, NotBefore), NULL, NULL, NULL},
 	{ "NotOnOrAfter", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2SubjectConfirmationData, NotOnOrAfter) },
+		G_STRUCT_OFFSET(LassoSaml2SubjectConfirmationData, NotOnOrAfter), NULL, NULL, NULL},
 	{ "Recipient", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2SubjectConfirmationData, Recipient) },
+		G_STRUCT_OFFSET(LassoSaml2SubjectConfirmationData, Recipient), NULL, NULL, NULL},
 	{ "InResponseTo", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2SubjectConfirmationData, InResponseTo) },
+		G_STRUCT_OFFSET(LassoSaml2SubjectConfirmationData, InResponseTo), NULL, NULL, NULL},
 	{ "Address", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2SubjectConfirmationData, Address) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSaml2SubjectConfirmationData, Address), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -114,6 +114,7 @@ lasso_saml2_subject_confirmation_data_get_type()
 			sizeof(LassoSaml2SubjectConfirmationData),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/saml2_subject_locality.c b/lasso/xml/saml-2.0/saml2_subject_locality.c
index 8410ee01..6c621431 100644
--- a/lasso/xml/saml-2.0/saml2_subject_locality.c
+++ b/lasso/xml/saml-2.0/saml2_subject_locality.c
@@ -46,10 +46,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Address", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2SubjectLocality, Address) },
+		G_STRUCT_OFFSET(LassoSaml2SubjectLocality, Address), NULL, NULL, NULL},
 	{ "DNSName", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSaml2SubjectLocality, DNSName) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSaml2SubjectLocality, DNSName), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -94,6 +94,7 @@ lasso_saml2_subject_locality_get_type()
 			sizeof(LassoSaml2SubjectLocality),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/samlp2_artifact_resolve.c b/lasso/xml/saml-2.0/samlp2_artifact_resolve.c
index bf87fff0..eb8db413 100644
--- a/lasso/xml/saml-2.0/samlp2_artifact_resolve.c
+++ b/lasso/xml/saml-2.0/samlp2_artifact_resolve.c
@@ -51,8 +51,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Artifact", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoSamlp2ArtifactResolve, Artifact) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSamlp2ArtifactResolve, Artifact), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_samlp2_artifact_resolve_get_type()
 			sizeof(LassoSamlp2ArtifactResolve),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAMLP2_REQUEST_ABSTRACT,
diff --git a/lasso/xml/saml-2.0/samlp2_artifact_response.c b/lasso/xml/saml-2.0/samlp2_artifact_response.c
index 0d92531b..b3ca3294 100644
--- a/lasso/xml/saml-2.0/samlp2_artifact_response.c
+++ b/lasso/xml/saml-2.0/samlp2_artifact_response.c
@@ -51,8 +51,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "any", SNIPPET_NODE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoSamlp2ArtifactResponse, any) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSamlp2ArtifactResponse, any), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_samlp2_artifact_response_get_type()
 			sizeof(LassoSamlp2ArtifactResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAMLP2_STATUS_RESPONSE,
diff --git a/lasso/xml/saml-2.0/samlp2_assertion_id_request.c b/lasso/xml/saml-2.0/samlp2_assertion_id_request.c
index e1f8c56d..06b581f7 100644
--- a/lasso/xml/saml-2.0/samlp2_assertion_id_request.c
+++ b/lasso/xml/saml-2.0/samlp2_assertion_id_request.c
@@ -51,8 +51,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "AssertionIDRef", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoSamlp2AssertionIDRequest, AssertionIDRef) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSamlp2AssertionIDRequest, AssertionIDRef), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -127,6 +127,7 @@ lasso_samlp2_assertion_id_request_get_type()
 			sizeof(LassoSamlp2AssertionIDRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAMLP2_REQUEST_ABSTRACT,
diff --git a/lasso/xml/saml-2.0/samlp2_attribute_query.c b/lasso/xml/saml-2.0/samlp2_attribute_query.c
index 547e9c64..9b0b9598 100644
--- a/lasso/xml/saml-2.0/samlp2_attribute_query.c
+++ b/lasso/xml/saml-2.0/samlp2_attribute_query.c
@@ -51,8 +51,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Attribute", SNIPPET_LIST_NODES ,
-		G_STRUCT_OFFSET(LassoSamlp2AttributeQuery, Attribute) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSamlp2AttributeQuery, Attribute), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_samlp2_attribute_query_get_type()
 			sizeof(LassoSamlp2AttributeQuery),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAMLP2_SUBJECT_QUERY_ABSTRACT,
diff --git a/lasso/xml/saml-2.0/samlp2_authn_query.c b/lasso/xml/saml-2.0/samlp2_authn_query.c
index 8e44aea2..29fe5328 100644
--- a/lasso/xml/saml-2.0/samlp2_authn_query.c
+++ b/lasso/xml/saml-2.0/samlp2_authn_query.c
@@ -52,10 +52,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "RequestedAuthnContext", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlp2AuthnQuery, RequestedAuthnContext) },
+		G_STRUCT_OFFSET(LassoSamlp2AuthnQuery, RequestedAuthnContext), NULL, NULL, NULL},
 	{ "SessionIndex", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlp2AuthnQuery, SessionIndex) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSamlp2AuthnQuery, SessionIndex), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -100,6 +100,7 @@ lasso_samlp2_authn_query_get_type()
 			sizeof(LassoSamlp2AuthnQuery),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAMLP2_SUBJECT_QUERY_ABSTRACT,
diff --git a/lasso/xml/saml-2.0/samlp2_authn_request.c b/lasso/xml/saml-2.0/samlp2_authn_request.c
index dd2f4c66..2934095f 100644
--- a/lasso/xml/saml-2.0/samlp2_authn_request.c
+++ b/lasso/xml/saml-2.0/samlp2_authn_request.c
@@ -62,32 +62,32 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Subject", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, Subject) },
+		G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, Subject), NULL, NULL, NULL},
 	{ "NameIDPolicy", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, NameIDPolicy) },
+		G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, NameIDPolicy), NULL, NULL, NULL},
 	{ "Conditions", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, Conditions) },
+		G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, Conditions), NULL, NULL, NULL},
 	{ "RequestedAuthnContext", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, RequestedAuthnContext) },
+		G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, RequestedAuthnContext), NULL, NULL, NULL},
 	{ "Scoping", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, Scoping) },
+		G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, Scoping), NULL, NULL, NULL},
 	{ "ForceAuthn", SNIPPET_ATTRIBUTE | SNIPPET_BOOLEAN,
-		G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, ForceAuthn) },
+		G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, ForceAuthn), NULL, NULL, NULL},
 	{ "IsPassive", SNIPPET_ATTRIBUTE | SNIPPET_BOOLEAN,
-		G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, IsPassive) },
+		G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, IsPassive), NULL, NULL, NULL},
 	{ "ProtocolBinding", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, ProtocolBinding) },
+		G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, ProtocolBinding), NULL, NULL, NULL},
 	{ "AssertionConsumerServiceIndex",
 		SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL_NEG,
-		G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, AssertionConsumerServiceIndex) },
+		G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, AssertionConsumerServiceIndex), NULL, NULL, NULL},
 	{ "AssertionConsumerServiceURL", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, AssertionConsumerServiceURL) },
+		G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, AssertionConsumerServiceURL), NULL, NULL, NULL},
 	{ "AttributeConsumingServiceIndex",
 		SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL_NEG,
-		G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, AttributeConsumingServiceIndex) },
+		G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, AttributeConsumingServiceIndex), NULL, NULL, NULL},
 	{ "ProviderName", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, ProviderName) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSamlp2AuthnRequest, ProviderName), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -176,6 +176,7 @@ lasso_samlp2_authn_request_get_type()
 			sizeof(LassoSamlp2AuthnRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAMLP2_REQUEST_ABSTRACT,
diff --git a/lasso/xml/saml-2.0/samlp2_authz_decision_query.c b/lasso/xml/saml-2.0/samlp2_authz_decision_query.c
index 6ca308c6..d1e7edf3 100644
--- a/lasso/xml/saml-2.0/samlp2_authz_decision_query.c
+++ b/lasso/xml/saml-2.0/samlp2_authz_decision_query.c
@@ -53,12 +53,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Action", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlp2AuthzDecisionQuery, Action) },
+		G_STRUCT_OFFSET(LassoSamlp2AuthzDecisionQuery, Action), NULL, NULL, NULL},
 	{ "Evidence", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlp2AuthzDecisionQuery, Evidence) },
+		G_STRUCT_OFFSET(LassoSamlp2AuthzDecisionQuery, Evidence), NULL, NULL, NULL},
 	{ "Resource", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlp2AuthzDecisionQuery, Resource) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSamlp2AuthzDecisionQuery, Resource), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -104,6 +104,7 @@ lasso_samlp2_authz_decision_query_get_type()
 			sizeof(LassoSamlp2AuthzDecisionQuery),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAMLP2_SUBJECT_QUERY_ABSTRACT,
diff --git a/lasso/xml/saml-2.0/samlp2_extensions.c b/lasso/xml/saml-2.0/samlp2_extensions.c
index 97e7c539..a30fc814 100644
--- a/lasso/xml/saml-2.0/samlp2_extensions.c
+++ b/lasso/xml/saml-2.0/samlp2_extensions.c
@@ -46,7 +46,7 @@
 
 
 static struct XmlSnippet schema_snippets[] = {
-	{NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -84,6 +84,7 @@ lasso_samlp2_extensions_get_type()
 			sizeof(LassoSamlp2Extensions),
 			0,
 			NULL,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/samlp2_idp_entry.c b/lasso/xml/saml-2.0/samlp2_idp_entry.c
index 2b16086c..befd89d6 100644
--- a/lasso/xml/saml-2.0/samlp2_idp_entry.c
+++ b/lasso/xml/saml-2.0/samlp2_idp_entry.c
@@ -47,12 +47,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "ProviderID", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlp2IDPEntry, ProviderID) },
+		G_STRUCT_OFFSET(LassoSamlp2IDPEntry, ProviderID), NULL, NULL, NULL},
 	{ "Name", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlp2IDPEntry, Name) },
+		G_STRUCT_OFFSET(LassoSamlp2IDPEntry, Name), NULL, NULL, NULL},
 	{ "Loc", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlp2IDPEntry, Loc) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSamlp2IDPEntry, Loc), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -98,6 +98,7 @@ lasso_samlp2_idp_entry_get_type()
 			sizeof(LassoSamlp2IDPEntry),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/samlp2_idp_list.c b/lasso/xml/saml-2.0/samlp2_idp_list.c
index cc358d38..a8ae6eb0 100644
--- a/lasso/xml/saml-2.0/samlp2_idp_list.c
+++ b/lasso/xml/saml-2.0/samlp2_idp_list.c
@@ -48,10 +48,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "IDPEntry", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlp2IDPList, IDPEntry) },
+		G_STRUCT_OFFSET(LassoSamlp2IDPList, IDPEntry), NULL, NULL, NULL},
 	{ "GetComplete", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoSamlp2IDPList, GetComplete) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSamlp2IDPList, GetComplete), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_samlp2_idp_list_get_type()
 			sizeof(LassoSamlp2IDPList),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/samlp2_logout_request.c b/lasso/xml/saml-2.0/samlp2_logout_request.c
index fbd42865..a72db124 100644
--- a/lasso/xml/saml-2.0/samlp2_logout_request.c
+++ b/lasso/xml/saml-2.0/samlp2_logout_request.c
@@ -58,19 +58,19 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "BaseID", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlp2LogoutRequest, BaseID) },
+		G_STRUCT_OFFSET(LassoSamlp2LogoutRequest, BaseID), NULL, NULL, NULL},
 	{ "NameID", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlp2LogoutRequest, NameID) },
+		G_STRUCT_OFFSET(LassoSamlp2LogoutRequest, NameID), NULL, NULL, NULL},
 	{ "EncryptedID", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoSamlp2LogoutRequest, EncryptedID),
-		"LassoSaml2EncryptedElement" },
+		"LassoSaml2EncryptedElement", NULL, NULL },
 	{ "SessionIndex", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoSamlp2LogoutRequest, SessionIndex) },
+		G_STRUCT_OFFSET(LassoSamlp2LogoutRequest, SessionIndex), NULL, NULL, NULL},
 	{ "Reason", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlp2LogoutRequest, Reason) },
+		G_STRUCT_OFFSET(LassoSamlp2LogoutRequest, Reason), NULL, NULL, NULL},
 	{ "NotOnOrAfter", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlp2LogoutRequest, NotOnOrAfter) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSamlp2LogoutRequest, NotOnOrAfter), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -153,6 +153,7 @@ lasso_samlp2_logout_request_get_type()
 			sizeof(LassoSamlp2LogoutRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAMLP2_REQUEST_ABSTRACT,
diff --git a/lasso/xml/saml-2.0/samlp2_logout_response.c b/lasso/xml/saml-2.0/samlp2_logout_response.c
index 3a9b90a8..3c553f4e 100644
--- a/lasso/xml/saml-2.0/samlp2_logout_response.c
+++ b/lasso/xml/saml-2.0/samlp2_logout_response.c
@@ -45,7 +45,7 @@
 
 
 static struct XmlSnippet schema_snippets[] = {
-	{NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -128,6 +128,7 @@ lasso_samlp2_logout_response_get_type()
 			sizeof(LassoSamlp2LogoutResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAMLP2_STATUS_RESPONSE,
diff --git a/lasso/xml/saml-2.0/samlp2_manage_name_id_request.c b/lasso/xml/saml-2.0/samlp2_manage_name_id_request.c
index 99e82b75..7c724d4c 100644
--- a/lasso/xml/saml-2.0/samlp2_manage_name_id_request.c
+++ b/lasso/xml/saml-2.0/samlp2_manage_name_id_request.c
@@ -59,18 +59,18 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "NameID", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlp2ManageNameIDRequest, NameID) },
+		G_STRUCT_OFFSET(LassoSamlp2ManageNameIDRequest, NameID), NULL, NULL, NULL},
 	{ "EncryptedID", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoSamlp2ManageNameIDRequest, EncryptedID),
-		"LassoSaml2EncryptedElement" },
+		"LassoSaml2EncryptedElement", NULL, NULL},
 	{ "NewID", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoSamlp2ManageNameIDRequest, NewID) },
+		G_STRUCT_OFFSET(LassoSamlp2ManageNameIDRequest, NewID), NULL, NULL, NULL},
 	{ "NewEncryptedID", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoSamlp2ManageNameIDRequest, NewEncryptedID),
-		"LassoSaml2EncryptedElement" },
+		"LassoSaml2EncryptedElement", NULL, NULL},
 	{ "Terminate", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlp2ManageNameIDRequest, Terminate) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSamlp2ManageNameIDRequest, Terminate), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -149,6 +149,7 @@ lasso_samlp2_manage_name_id_request_get_type()
 			sizeof(LassoSamlp2ManageNameIDRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAMLP2_REQUEST_ABSTRACT,
diff --git a/lasso/xml/saml-2.0/samlp2_manage_name_id_response.c b/lasso/xml/saml-2.0/samlp2_manage_name_id_response.c
index a0b53b3d..096a57d0 100644
--- a/lasso/xml/saml-2.0/samlp2_manage_name_id_response.c
+++ b/lasso/xml/saml-2.0/samlp2_manage_name_id_response.c
@@ -42,7 +42,7 @@
 
 
 static struct XmlSnippet schema_snippets[] = {
-	{NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -111,6 +111,7 @@ lasso_samlp2_manage_name_id_response_get_type()
 			sizeof(LassoSamlp2ManageNameIDResponse),
 			0,
 			NULL,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAMLP2_STATUS_RESPONSE,
diff --git a/lasso/xml/saml-2.0/samlp2_name_id_mapping_request.c b/lasso/xml/saml-2.0/samlp2_name_id_mapping_request.c
index 34b1e3e0..c4c58b48 100644
--- a/lasso/xml/saml-2.0/samlp2_name_id_mapping_request.c
+++ b/lasso/xml/saml-2.0/samlp2_name_id_mapping_request.c
@@ -56,15 +56,15 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "BaseID", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlp2NameIDMappingRequest, BaseID) },
+		G_STRUCT_OFFSET(LassoSamlp2NameIDMappingRequest, BaseID), NULL, NULL, NULL},
 	{ "NameID", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlp2NameIDMappingRequest, NameID) },
+		G_STRUCT_OFFSET(LassoSamlp2NameIDMappingRequest, NameID), NULL, NULL, NULL},
 	{ "EncryptedID", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoSamlp2NameIDMappingRequest, EncryptedID),
-		"LassoSaml2EncryptedElement" },
+		"LassoSaml2EncryptedElement", NULL, NULL },
 	{ "NameIDPolicy", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlp2NameIDMappingRequest, NameIDPolicy) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSamlp2NameIDMappingRequest, NameIDPolicy), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -142,6 +142,7 @@ lasso_samlp2_name_id_mapping_request_get_type()
 			sizeof(LassoSamlp2NameIDMappingRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAMLP2_REQUEST_ABSTRACT,
diff --git a/lasso/xml/saml-2.0/samlp2_name_id_mapping_response.c b/lasso/xml/saml-2.0/samlp2_name_id_mapping_response.c
index 58e40cf7..4bf25ca0 100644
--- a/lasso/xml/saml-2.0/samlp2_name_id_mapping_response.c
+++ b/lasso/xml/saml-2.0/samlp2_name_id_mapping_response.c
@@ -52,11 +52,11 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "NameID", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlp2NameIDMappingResponse, NameID) },
+		G_STRUCT_OFFSET(LassoSamlp2NameIDMappingResponse, NameID), NULL, NULL, NULL},
 	{ "EncryptedID", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoSamlp2NameIDMappingResponse, EncryptedID),
-		"LassoSaml2EncryptedElement" },
-	{NULL, 0, 0}
+		"LassoSaml2EncryptedElement", NULL, NULL },
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -132,6 +132,7 @@ lasso_samlp2_name_id_mapping_response_get_type()
 			sizeof(LassoSamlp2NameIDMappingResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAMLP2_STATUS_RESPONSE,
diff --git a/lasso/xml/saml-2.0/samlp2_name_id_policy.c b/lasso/xml/saml-2.0/samlp2_name_id_policy.c
index 3db20c13..5c45ac10 100644
--- a/lasso/xml/saml-2.0/samlp2_name_id_policy.c
+++ b/lasso/xml/saml-2.0/samlp2_name_id_policy.c
@@ -47,12 +47,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Format", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlp2NameIDPolicy, Format) },
+		G_STRUCT_OFFSET(LassoSamlp2NameIDPolicy, Format), NULL, NULL, NULL},
 	{ "SPNameQualifier", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlp2NameIDPolicy, SPNameQualifier) },
+		G_STRUCT_OFFSET(LassoSamlp2NameIDPolicy, SPNameQualifier), NULL, NULL, NULL},
 	{ "AllowCreate", SNIPPET_ATTRIBUTE | SNIPPET_BOOLEAN,
-		G_STRUCT_OFFSET(LassoSamlp2NameIDPolicy, AllowCreate) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSamlp2NameIDPolicy, AllowCreate), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -98,6 +98,7 @@ lasso_samlp2_name_id_policy_get_type()
 			sizeof(LassoSamlp2NameIDPolicy),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/samlp2_request_abstract.c b/lasso/xml/saml-2.0/samlp2_request_abstract.c
index 51b5ec11..8bea662f 100644
--- a/lasso/xml/saml-2.0/samlp2_request_abstract.c
+++ b/lasso/xml/saml-2.0/samlp2_request_abstract.c
@@ -59,33 +59,33 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "Issuer", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, Issuer),
-		"LassoSaml2NameID" },
+		"LassoSaml2NameID", NULL, NULL },
 	{ "Signature", SNIPPET_SIGNATURE,
-		G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, ID) },
+		G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, ID), NULL, NULL, NULL},
 	{ "Extensions", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, Extensions) },
+		G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, Extensions), NULL, NULL, NULL},
 	{ "ID", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, ID) },
+		G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, ID), NULL, NULL, NULL},
 	{ "Version", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, Version) },
+		G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, Version), NULL, NULL, NULL},
 	{ "IssueInstant", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, IssueInstant) },
+		G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, IssueInstant), NULL, NULL, NULL},
 	{ "Destination", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, Destination) },
+		G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, Destination), NULL, NULL, NULL},
 	{ "Consent", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, Consent) },
+		G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, Consent), NULL, NULL, NULL},
 
 	/* hidden fields; used in lasso dumps */
 	{ "SignType", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_LASSO_DUMP,
-		G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, sign_type) },
+		G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, sign_type), NULL, NULL, NULL},
 	{ "SignMethod", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_LASSO_DUMP,
-		G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, sign_method) },
+		G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, sign_method), NULL, NULL, NULL},
 	{ "PrivateKeyFile", SNIPPET_CONTENT | SNIPPET_LASSO_DUMP,
-		G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, private_key_file) },
+		G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, private_key_file), NULL, NULL, NULL},
 	{ "CertificateFile", SNIPPET_CONTENT | SNIPPET_LASSO_DUMP,
-		G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, certificate_file) },
+		G_STRUCT_OFFSET(LassoSamlp2RequestAbstract, certificate_file), NULL, NULL, NULL},
 
-	{NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -169,6 +169,7 @@ lasso_samlp2_request_abstract_get_type()
 			sizeof(LassoSamlp2RequestAbstract),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/samlp2_requested_authn_context.c b/lasso/xml/saml-2.0/samlp2_requested_authn_context.c
index 54624ef4..98206d18 100644
--- a/lasso/xml/saml-2.0/samlp2_requested_authn_context.c
+++ b/lasso/xml/saml-2.0/samlp2_requested_authn_context.c
@@ -55,8 +55,8 @@ static struct XmlSnippet schema_snippets[] = {
 		G_STRUCT_OFFSET(LassoSamlp2RequestedAuthnContext, AuthnContextDeclRef),
 		NULL, LASSO_SAML2_ASSERTION_PREFIX, LASSO_SAML2_ASSERTION_HREF },
 	{ "Comparison", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoSamlp2RequestedAuthnContext, Comparison) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSamlp2RequestedAuthnContext, Comparison), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -101,6 +101,7 @@ lasso_samlp2_requested_authn_context_get_type()
 			sizeof(LassoSamlp2RequestedAuthnContext),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/samlp2_response.c b/lasso/xml/saml-2.0/samlp2_response.c
index 2ffb0910..0cefd7c8 100644
--- a/lasso/xml/saml-2.0/samlp2_response.c
+++ b/lasso/xml/saml-2.0/samlp2_response.c
@@ -56,10 +56,10 @@ extern LassoNode* lasso_assertion_encrypt(LassoSaml2Assertion *assertion);
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Assertion", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSamlp2Response, Assertion) },
+		G_STRUCT_OFFSET(LassoSamlp2Response, Assertion), NULL, NULL, NULL},
 	{ "EncryptedAssertion", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSamlp2Response, EncryptedAssertion) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSamlp2Response, EncryptedAssertion), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -177,6 +177,7 @@ lasso_samlp2_response_get_type()
 			sizeof(LassoSamlp2Response),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAMLP2_STATUS_RESPONSE,
diff --git a/lasso/xml/saml-2.0/samlp2_scoping.c b/lasso/xml/saml-2.0/samlp2_scoping.c
index c97722fe..c3369de7 100644
--- a/lasso/xml/saml-2.0/samlp2_scoping.c
+++ b/lasso/xml/saml-2.0/samlp2_scoping.c
@@ -49,12 +49,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "IDPList", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlp2Scoping, IDPList) },
+		G_STRUCT_OFFSET(LassoSamlp2Scoping, IDPList), NULL, NULL, NULL},
 	{ "RequesterID", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoSamlp2Scoping, RequesterID) },
+		G_STRUCT_OFFSET(LassoSamlp2Scoping, RequesterID), NULL, NULL, NULL},
 	{ "ProxyCount", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoSamlp2Scoping, ProxyCount) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSamlp2Scoping, ProxyCount), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -99,6 +99,7 @@ lasso_samlp2_scoping_get_type()
 			sizeof(LassoSamlp2Scoping),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/samlp2_status.c b/lasso/xml/saml-2.0/samlp2_status.c
index 6c4836f5..b5198be7 100644
--- a/lasso/xml/saml-2.0/samlp2_status.c
+++ b/lasso/xml/saml-2.0/samlp2_status.c
@@ -49,12 +49,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "StatusCode", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlp2Status, StatusCode) },
+		G_STRUCT_OFFSET(LassoSamlp2Status, StatusCode), NULL, NULL, NULL},
 	{ "StatusMessage", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoSamlp2Status, StatusMessage) },
+		G_STRUCT_OFFSET(LassoSamlp2Status, StatusMessage), NULL, NULL, NULL},
 	{ "StatusDetail", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlp2Status, StatusDetail) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSamlp2Status, StatusDetail), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -100,6 +100,7 @@ lasso_samlp2_status_get_type()
 			sizeof(LassoSamlp2Status),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/samlp2_status_code.c b/lasso/xml/saml-2.0/samlp2_status_code.c
index ff01804e..429e18dd 100644
--- a/lasso/xml/saml-2.0/samlp2_status_code.c
+++ b/lasso/xml/saml-2.0/samlp2_status_code.c
@@ -48,10 +48,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "StatusCode", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlp2StatusCode, StatusCode) },
+		G_STRUCT_OFFSET(LassoSamlp2StatusCode, StatusCode), NULL, NULL, NULL},
 	{ "Value", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlp2StatusCode, Value) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSamlp2StatusCode, Value), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_samlp2_status_code_get_type()
 			sizeof(LassoSamlp2StatusCode),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/samlp2_status_detail.c b/lasso/xml/saml-2.0/samlp2_status_detail.c
index 1afab180..500a744b 100644
--- a/lasso/xml/saml-2.0/samlp2_status_detail.c
+++ b/lasso/xml/saml-2.0/samlp2_status_detail.c
@@ -46,7 +46,7 @@
 
 
 static struct XmlSnippet schema_snippets[] = {
-	{NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -84,6 +84,7 @@ lasso_samlp2_status_detail_get_type()
 			sizeof(LassoSamlp2StatusDetail),
 			0,
 			NULL,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/samlp2_status_response.c b/lasso/xml/saml-2.0/samlp2_status_response.c
index 1176be4c..ad694a20 100644
--- a/lasso/xml/saml-2.0/samlp2_status_response.c
+++ b/lasso/xml/saml-2.0/samlp2_status_response.c
@@ -61,37 +61,37 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "Issuer", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoSamlp2StatusResponse, Issuer),
-		"LassoSaml2NameID" },
+		"LassoSaml2NameID", NULL, NULL},
 	{ "Signature", SNIPPET_SIGNATURE,
-		G_STRUCT_OFFSET(LassoSamlp2StatusResponse, ID) },
+		G_STRUCT_OFFSET(LassoSamlp2StatusResponse, ID), NULL, NULL, NULL},
 	{ "Extensions", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlp2StatusResponse, Extensions) },
+		G_STRUCT_OFFSET(LassoSamlp2StatusResponse, Extensions), NULL, NULL, NULL},
 	{ "Status", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlp2StatusResponse, Status) },
+		G_STRUCT_OFFSET(LassoSamlp2StatusResponse, Status), NULL, NULL, NULL},
 	{ "ID", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlp2StatusResponse, ID) },
+		G_STRUCT_OFFSET(LassoSamlp2StatusResponse, ID), NULL, NULL, NULL},
 	{ "InResponseTo", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlp2StatusResponse, InResponseTo) },
+		G_STRUCT_OFFSET(LassoSamlp2StatusResponse, InResponseTo), NULL, NULL, NULL},
 	{ "Version", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlp2StatusResponse, Version) },
+		G_STRUCT_OFFSET(LassoSamlp2StatusResponse, Version), NULL, NULL, NULL},
 	{ "IssueInstant", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlp2StatusResponse, IssueInstant) },
+		G_STRUCT_OFFSET(LassoSamlp2StatusResponse, IssueInstant), NULL, NULL, NULL},
 	{ "Destination", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlp2StatusResponse, Destination) },
+		G_STRUCT_OFFSET(LassoSamlp2StatusResponse, Destination), NULL, NULL, NULL},
 	{ "Consent", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlp2StatusResponse, Consent) },
+		G_STRUCT_OFFSET(LassoSamlp2StatusResponse, Consent), NULL, NULL, NULL},
 
 	/* hidden fields; used in lasso dumps */
 	{ "SignType", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_LASSO_DUMP,
-		G_STRUCT_OFFSET(LassoSamlp2StatusResponse, sign_type) },
+		G_STRUCT_OFFSET(LassoSamlp2StatusResponse, sign_type), NULL, NULL, NULL},
 	{ "SignMethod", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_LASSO_DUMP,
-		G_STRUCT_OFFSET(LassoSamlp2StatusResponse, sign_method) },
+		G_STRUCT_OFFSET(LassoSamlp2StatusResponse, sign_method), NULL, NULL, NULL},
 	{ "PrivateKeyFile", SNIPPET_CONTENT | SNIPPET_LASSO_DUMP,
-		G_STRUCT_OFFSET(LassoSamlp2StatusResponse, private_key_file) },
+		G_STRUCT_OFFSET(LassoSamlp2StatusResponse, private_key_file), NULL, NULL, NULL},
 	{ "CertificateFile", SNIPPET_CONTENT | SNIPPET_LASSO_DUMP,
-		G_STRUCT_OFFSET(LassoSamlp2StatusResponse, certificate_file) },
+		G_STRUCT_OFFSET(LassoSamlp2StatusResponse, certificate_file), NULL, NULL, NULL},
 
-	{NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -208,6 +208,7 @@ lasso_samlp2_status_response_get_type()
 			sizeof(LassoSamlp2StatusResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml-2.0/samlp2_subject_query_abstract.c b/lasso/xml/saml-2.0/samlp2_subject_query_abstract.c
index 24aec678..67477d24 100644
--- a/lasso/xml/saml-2.0/samlp2_subject_query_abstract.c
+++ b/lasso/xml/saml-2.0/samlp2_subject_query_abstract.c
@@ -51,8 +51,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Subject", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlp2SubjectQueryAbstract, Subject) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSamlp2SubjectQueryAbstract, Subject), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -127,6 +127,7 @@ lasso_samlp2_subject_query_abstract_get_type()
 			sizeof(LassoSamlp2SubjectQueryAbstract),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAMLP2_REQUEST_ABSTRACT,
diff --git a/lasso/xml/saml-2.0/samlp2_terminate.c b/lasso/xml/saml-2.0/samlp2_terminate.c
index 0dc95d5b..4ba064fd 100644
--- a/lasso/xml/saml-2.0/samlp2_terminate.c
+++ b/lasso/xml/saml-2.0/samlp2_terminate.c
@@ -42,7 +42,7 @@
 
 
 static struct XmlSnippet schema_snippets[] = {
-	{NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -80,6 +80,7 @@ lasso_samlp2_terminate_get_type()
 			sizeof(LassoSamlp2Terminate),
 			0,
 			NULL,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml_advice.c b/lasso/xml/saml_advice.c
index a6b9914c..8ee20e20 100644
--- a/lasso/xml/saml_advice.c
+++ b/lasso/xml/saml_advice.c
@@ -54,10 +54,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 /*	{ "AssertionIDReference", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoSamlAdvice, AssertionIDReference) },
-	{ "Assertion", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlAdvice, Assertion) }, */
-	{ "", SNIPPET_LIST_XMLNODES, G_STRUCT_OFFSET(LassoSamlAdvice, any) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSamlAdvice, AssertionIDReference), NULL, NULL, NULL},
+	{ "Assertion", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlAdvice, Assertion), NULL, NULL, NULL}, */
+	{ "", SNIPPET_LIST_XMLNODES, G_STRUCT_OFFSET(LassoSamlAdvice, any), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -99,6 +99,7 @@ lasso_saml_advice_get_type()
 			sizeof(LassoSamlAdvice),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml_assertion.c b/lasso/xml/saml_assertion.c
index a17cb3c5..6a86fd33 100644
--- a/lasso/xml/saml_assertion.c
+++ b/lasso/xml/saml_assertion.c
@@ -70,34 +70,34 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Conditions", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlAssertion, Conditions) },
-	{ "Advice", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlAssertion, Advice) },
-	{ "SubjectStatement", SNIPPET_NODE,G_STRUCT_OFFSET(LassoSamlAssertion, SubjectStatement) },
+	{ "Conditions", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlAssertion, Conditions), NULL, NULL, NULL},
+	{ "Advice", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlAssertion, Advice), NULL, NULL, NULL},
+	{ "SubjectStatement", SNIPPET_NODE,G_STRUCT_OFFSET(LassoSamlAssertion, SubjectStatement), NULL, NULL, NULL},
 	{ "AuthenticationStatement", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlAssertion, AuthenticationStatement) },
+		G_STRUCT_OFFSET(LassoSamlAssertion, AuthenticationStatement), NULL, NULL, NULL},
 	{ "AttributeStatement", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlAssertion, AttributeStatement) },
+		G_STRUCT_OFFSET(LassoSamlAssertion, AttributeStatement), NULL, NULL, NULL},
 	{ "Signature", SNIPPET_SIGNATURE,
-		G_STRUCT_OFFSET(LassoSamlAssertion, AssertionID) },
+		G_STRUCT_OFFSET(LassoSamlAssertion, AssertionID), NULL, NULL, NULL},
 	{ "MajorVersion", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER,
-		G_STRUCT_OFFSET(LassoSamlAssertion, MajorVersion) },
+		G_STRUCT_OFFSET(LassoSamlAssertion, MajorVersion), NULL, NULL, NULL},
 	{ "MinorVersion", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER,
-		G_STRUCT_OFFSET(LassoSamlAssertion, MinorVersion) },
-	{ "AssertionID", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSamlAssertion, AssertionID) },
-	{ "Issuer", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSamlAssertion, Issuer) },
-	{ "IssueInstant", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSamlAssertion, IssueInstant) },
+		G_STRUCT_OFFSET(LassoSamlAssertion, MinorVersion), NULL, NULL, NULL},
+	{ "AssertionID", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSamlAssertion, AssertionID), NULL, NULL, NULL},
+	{ "Issuer", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSamlAssertion, Issuer), NULL, NULL, NULL},
+	{ "IssueInstant", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSamlAssertion, IssueInstant), NULL, NULL, NULL},
 
 	/* hidden fields; use in lasso dumps */
 	{ "SignType", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_LASSO_DUMP,
-		G_STRUCT_OFFSET(LassoSamlAssertion, sign_type) },
+		G_STRUCT_OFFSET(LassoSamlAssertion, sign_type), NULL, NULL, NULL},
 	{ "SignMethod", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_LASSO_DUMP,
-		G_STRUCT_OFFSET(LassoSamlAssertion, sign_method) },
+		G_STRUCT_OFFSET(LassoSamlAssertion, sign_method), NULL, NULL, NULL},
 	{ "PrivateKeyFile", SNIPPET_CONTENT | SNIPPET_LASSO_DUMP,
-		G_STRUCT_OFFSET(LassoSamlAssertion, private_key_file) },
+		G_STRUCT_OFFSET(LassoSamlAssertion, private_key_file), NULL, NULL, NULL},
 	{ "CertificateFile", SNIPPET_CONTENT | SNIPPET_LASSO_DUMP,
-		G_STRUCT_OFFSET(LassoSamlAssertion, certificate_file) },
+		G_STRUCT_OFFSET(LassoSamlAssertion, certificate_file), NULL, NULL, NULL},
 
-	{ NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -201,6 +201,7 @@ lasso_saml_assertion_get_type()
 			sizeof(LassoSamlAssertion),
 			0,
 			NULL,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml_attribute.c b/lasso/xml/saml_attribute.c
index c84d6ce2..fa18cf79 100644
--- a/lasso/xml/saml_attribute.c
+++ b/lasso/xml/saml_attribute.c
@@ -66,12 +66,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "AttributeName", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlAttribute, attributeName) },
+		G_STRUCT_OFFSET(LassoSamlAttribute, attributeName), NULL, NULL, NULL},
 	{ "AttributeNameSpace", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlAttribute, attributeNameSpace) },
+		G_STRUCT_OFFSET(LassoSamlAttribute, attributeNameSpace), NULL, NULL, NULL},
 	{ "AttributeValue", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSamlAttribute, AttributeValue) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSamlAttribute, AttributeValue), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -113,6 +113,7 @@ lasso_saml_attribute_get_type()
 			sizeof(LassoSamlAttribute),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAML_ATTRIBUTE_DESIGNATOR,
diff --git a/lasso/xml/saml_attribute_designator.c b/lasso/xml/saml_attribute_designator.c
index 74e0cde3..3760f9c0 100644
--- a/lasso/xml/saml_attribute_designator.c
+++ b/lasso/xml/saml_attribute_designator.c
@@ -40,10 +40,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "AttributeName", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlAttributeDesignator, AttributeName) },
+		G_STRUCT_OFFSET(LassoSamlAttributeDesignator, AttributeName), NULL, NULL, NULL},
 	{ "AttributeNamespace", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlAttributeDesignator, AttributeNamespace) },
-	{ NULL, 0, 0 }
+		G_STRUCT_OFFSET(LassoSamlAttributeDesignator, AttributeNamespace), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -84,6 +84,7 @@ lasso_saml_attribute_designator_get_type()
 			sizeof(LassoSamlAttributeDesignator),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml_attribute_statement.c b/lasso/xml/saml_attribute_statement.c
index d3c223cd..9964f789 100644
--- a/lasso/xml/saml_attribute_statement.c
+++ b/lasso/xml/saml_attribute_statement.c
@@ -45,8 +45,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Attribute", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSamlAttributeStatement, Attribute) },
-	{ NULL, 0, 0 }
+		G_STRUCT_OFFSET(LassoSamlAttributeStatement, Attribute), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -86,6 +86,7 @@ lasso_saml_attribute_statement_get_type()
 			sizeof(LassoSamlAttributeStatement),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAML_SUBJECT_STATEMENT_ABSTRACT,
diff --git a/lasso/xml/saml_attribute_value.c b/lasso/xml/saml_attribute_value.c
index 2c121af6..60504a53 100644
--- a/lasso/xml/saml_attribute_value.c
+++ b/lasso/xml/saml_attribute_value.c
@@ -36,8 +36,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "", SNIPPET_LIST_NODES | SNIPPET_ALLOW_TEXT,
-		G_STRUCT_OFFSET(LassoSamlAttributeValue, any) },
-	{ NULL, 0, 0 }
+		G_STRUCT_OFFSET(LassoSamlAttributeValue, any), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -77,6 +77,7 @@ lasso_saml_attribute_value_get_type()
 			sizeof(LassoSamlAttributeValue),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml_audience_restriction_condition.c b/lasso/xml/saml_audience_restriction_condition.c
index d9395015..bb2ba00f 100644
--- a/lasso/xml/saml_audience_restriction_condition.c
+++ b/lasso/xml/saml_audience_restriction_condition.c
@@ -47,8 +47,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Audience", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoSamlAudienceRestrictionCondition, Audience) },
-	{ NULL, 0, 0 }
+		G_STRUCT_OFFSET(LassoSamlAudienceRestrictionCondition, Audience), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -88,6 +88,7 @@ lasso_saml_audience_restriction_condition_get_type()
 			sizeof(LassoSamlAudienceRestrictionCondition),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAML_CONDITION_ABSTRACT,
diff --git a/lasso/xml/saml_authentication_statement.c b/lasso/xml/saml_authentication_statement.c
index b020fc6e..e8588d8f 100644
--- a/lasso/xml/saml_authentication_statement.c
+++ b/lasso/xml/saml_authentication_statement.c
@@ -54,14 +54,14 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "SubjectLocality", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlAuthenticationStatement, SubjectLocality) },
+		G_STRUCT_OFFSET(LassoSamlAuthenticationStatement, SubjectLocality), NULL, NULL, NULL},
 	{ "AuthorityBinding", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSamlAuthenticationStatement, AuthorityBinding) },
+		G_STRUCT_OFFSET(LassoSamlAuthenticationStatement, AuthorityBinding), NULL, NULL, NULL},
 	{ "AuthenticationMethod", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlAuthenticationStatement, AuthenticationMethod) },
+		G_STRUCT_OFFSET(LassoSamlAuthenticationStatement, AuthenticationMethod), NULL, NULL, NULL},
 	{ "AuthenticationInstant", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlAuthenticationStatement, AuthenticationInstant) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSamlAuthenticationStatement, AuthenticationInstant), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -104,6 +104,7 @@ lasso_saml_authentication_statement_get_type()
 			sizeof(LassoSamlAuthenticationStatement),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAML_SUBJECT_STATEMENT_ABSTRACT,
diff --git a/lasso/xml/saml_authority_binding.c b/lasso/xml/saml_authority_binding.c
index 966821ac..7d601a62 100644
--- a/lasso/xml/saml_authority_binding.c
+++ b/lasso/xml/saml_authority_binding.c
@@ -47,12 +47,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "AuthorityKind", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlAuthorityBinding, AuthorityKind) },
+		G_STRUCT_OFFSET(LassoSamlAuthorityBinding, AuthorityKind), NULL, NULL, NULL},
 	{ "Location", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlAuthorityBinding, Location) },
+		G_STRUCT_OFFSET(LassoSamlAuthorityBinding, Location), NULL, NULL, NULL},
 	{ "Binding", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlAuthorityBinding, Binding) },
-	{ NULL, 0, 0 }
+		G_STRUCT_OFFSET(LassoSamlAuthorityBinding, Binding), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -94,6 +94,7 @@ lasso_saml_authority_binding_get_type()
 			sizeof(LassoSamlAuthorityBinding),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml_condition_abstract.c b/lasso/xml/saml_condition_abstract.c
index 8d84ee65..a996db64 100644
--- a/lasso/xml/saml_condition_abstract.c
+++ b/lasso/xml/saml_condition_abstract.c
@@ -71,6 +71,7 @@ lasso_saml_condition_abstract_get_type()
 			sizeof(LassoSamlConditionAbstract),
 			0,
 			NULL,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml_conditions.c b/lasso/xml/saml_conditions.c
index 709bbef3..c9033875 100644
--- a/lasso/xml/saml_conditions.c
+++ b/lasso/xml/saml_conditions.c
@@ -50,12 +50,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "AudienceRestrictionCondition", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSamlConditions, AudienceRestrictionCondition) },
+		G_STRUCT_OFFSET(LassoSamlConditions, AudienceRestrictionCondition), NULL, NULL, NULL},
 	{ "NotBefore", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlConditions, NotBefore) },
+		G_STRUCT_OFFSET(LassoSamlConditions, NotBefore), NULL, NULL, NULL},
 	{ "NotOnOrAfter", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlConditions, NotOnOrAfter) },
-	{ NULL, 0, 0 }
+		G_STRUCT_OFFSET(LassoSamlConditions, NotOnOrAfter), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -98,6 +98,7 @@ lasso_saml_conditions_get_type()
 			sizeof(LassoSamlConditions),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml_name_identifier.c b/lasso/xml/saml_name_identifier.c
index 35240e14..b02d02bb 100644
--- a/lasso/xml/saml_name_identifier.c
+++ b/lasso/xml/saml_name_identifier.c
@@ -51,10 +51,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "NameQualifier", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlNameIdentifier, NameQualifier) },
-	{ "Format", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSamlNameIdentifier, Format) },
-	{ "content", SNIPPET_TEXT_CHILD, G_STRUCT_OFFSET(LassoSamlNameIdentifier, content) },
-	{ NULL, 0, 0 }
+		G_STRUCT_OFFSET(LassoSamlNameIdentifier, NameQualifier), NULL, NULL, NULL},
+	{ "Format", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSamlNameIdentifier, Format), NULL, NULL, NULL},
+	{ "content", SNIPPET_TEXT_CHILD, G_STRUCT_OFFSET(LassoSamlNameIdentifier, content), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -96,6 +96,7 @@ lasso_saml_name_identifier_get_type()
 			sizeof(LassoSamlNameIdentifier),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml_statement_abstract.c b/lasso/xml/saml_statement_abstract.c
index 20b91aa1..039b5e0d 100644
--- a/lasso/xml/saml_statement_abstract.c
+++ b/lasso/xml/saml_statement_abstract.c
@@ -71,6 +71,7 @@ lasso_saml_statement_abstract_get_type()
 			sizeof(LassoSamlStatementAbstract),
 			0,
 			NULL,
+			NULL,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml_subject.c b/lasso/xml/saml_subject.c
index 6987146a..db253c7c 100644
--- a/lasso/xml/saml_subject.c
+++ b/lasso/xml/saml_subject.c
@@ -51,13 +51,13 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "NameIdentifier", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlSubject, NameIdentifier) },
+		G_STRUCT_OFFSET(LassoSamlSubject, NameIdentifier), NULL, NULL, NULL},
 	{ "EncryptedNameIdentifier", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoSamlSubject, EncryptedNameIdentifier),
-		"LassoSaml2EncryptedElement" },
+		"LassoSaml2EncryptedElement", NULL, NULL },
 	{ "SubjectConfirmation", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlSubject, SubjectConfirmation) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSamlSubject, SubjectConfirmation), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -99,6 +99,7 @@ lasso_saml_subject_get_type()
 			sizeof(LassoSamlSubject),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml_subject_confirmation.c b/lasso/xml/saml_subject_confirmation.c
index ddc2e790..58115eff 100644
--- a/lasso/xml/saml_subject_confirmation.c
+++ b/lasso/xml/saml_subject_confirmation.c
@@ -52,12 +52,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "ConfirmationMethod", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoSamlSubjectConfirmation, ConfirmationMethod) },
+		G_STRUCT_OFFSET(LassoSamlSubjectConfirmation, ConfirmationMethod), NULL, NULL, NULL},
 	{ "SubjectConfirmationData", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoSamlSubjectConfirmation, SubjectConfirmationData) },
+		G_STRUCT_OFFSET(LassoSamlSubjectConfirmation, SubjectConfirmationData), NULL, NULL, NULL},
 	{ "KeyInfo", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlSubjectConfirmation, KeyInfo) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSamlSubjectConfirmation, KeyInfo), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -99,6 +99,7 @@ lasso_saml_subject_confirmation_get_type()
 			sizeof(LassoSamlSubjectConfirmation),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml_subject_locality.c b/lasso/xml/saml_subject_locality.c
index e6c48313..d662454c 100644
--- a/lasso/xml/saml_subject_locality.c
+++ b/lasso/xml/saml_subject_locality.c
@@ -45,9 +45,9 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "IPAddress", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSamlSubjectLocality, IPAddress) },
-	{ "DNSAddress", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSamlSubjectLocality, DNSAddress) },
-	{ NULL, 0, 0}
+	{ "IPAddress", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSamlSubjectLocality, IPAddress), NULL, NULL, NULL},
+	{ "DNSAddress", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSamlSubjectLocality, DNSAddress), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -88,6 +88,7 @@ lasso_saml_subject_locality_get_type()
 			sizeof(LassoSamlSubjectLocality),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/saml_subject_statement.c b/lasso/xml/saml_subject_statement.c
index 07896203..065efaeb 100644
--- a/lasso/xml/saml_subject_statement.c
+++ b/lasso/xml/saml_subject_statement.c
@@ -64,6 +64,7 @@ lasso_saml_subject_statement_get_type()
 			sizeof(LassoSamlSubjectStatement),
 			0,
 			NULL,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAML_SUBJECT_STATEMENT_ABSTRACT,
diff --git a/lasso/xml/saml_subject_statement_abstract.c b/lasso/xml/saml_subject_statement_abstract.c
index 0cfe4f75..6cb6178c 100644
--- a/lasso/xml/saml_subject_statement_abstract.c
+++ b/lasso/xml/saml_subject_statement_abstract.c
@@ -50,8 +50,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Subject", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSamlSubjectStatementAbstract, Subject) },
-	{ NULL, 0, 0 }
+		G_STRUCT_OFFSET(LassoSamlSubjectStatementAbstract, Subject), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -91,6 +91,7 @@ lasso_saml_subject_statement_abstract_get_type()
 			sizeof(LassoSamlSubjectStatementAbstract),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAML_STATEMENT_ABSTRACT,
diff --git a/lasso/xml/samlp_request.c b/lasso/xml/samlp_request.c
index e5f46486..9e28cf9c 100644
--- a/lasso/xml/samlp_request.c
+++ b/lasso/xml/samlp_request.c
@@ -58,8 +58,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "AssertionArtifact", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoSamlpRequest, AssertionArtifact) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSamlpRequest, AssertionArtifact), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -99,6 +99,7 @@ lasso_samlp_request_get_type()
 			sizeof(LassoSamlpRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAMLP_REQUEST_ABSTRACT,
diff --git a/lasso/xml/samlp_request_abstract.c b/lasso/xml/samlp_request_abstract.c
index 04ff2ce7..2c700220 100644
--- a/lasso/xml/samlp_request_abstract.c
+++ b/lasso/xml/samlp_request_abstract.c
@@ -61,17 +61,17 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "RespondWith", SNIPPET_LIST_CONTENT,
-		G_STRUCT_OFFSET(LassoSamlpRequestAbstract, RespondWith) },
+		G_STRUCT_OFFSET(LassoSamlpRequestAbstract, RespondWith), NULL, NULL, NULL},
 	{ "Signature", SNIPPET_SIGNATURE,
-		G_STRUCT_OFFSET(LassoSamlpRequestAbstract, RequestID) },
-	{ "RequestID", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSamlpRequestAbstract, RequestID) },
+		G_STRUCT_OFFSET(LassoSamlpRequestAbstract, RequestID), NULL, NULL, NULL},
+	{ "RequestID", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSamlpRequestAbstract, RequestID), NULL, NULL, NULL},
 	{ "MajorVersion", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER,
-		G_STRUCT_OFFSET(LassoSamlpRequestAbstract, MajorVersion) },
+		G_STRUCT_OFFSET(LassoSamlpRequestAbstract, MajorVersion), NULL, NULL, NULL},
 	{ "MinorVersion", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER,
-		G_STRUCT_OFFSET(LassoSamlpRequestAbstract, MinorVersion) },
+		G_STRUCT_OFFSET(LassoSamlpRequestAbstract, MinorVersion), NULL, NULL, NULL},
 	{ "IssueInstant", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlpRequestAbstract, IssueInstant) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSamlpRequestAbstract, IssueInstant), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -142,6 +142,7 @@ lasso_samlp_request_abstract_get_type()
 			sizeof(LassoSamlpRequestAbstract),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/samlp_response.c b/lasso/xml/samlp_response.c
index b17740e2..c9cefe20 100644
--- a/lasso/xml/samlp_response.c
+++ b/lasso/xml/samlp_response.c
@@ -52,9 +52,9 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlpResponse, Status) },
-	{ "Assertion", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoSamlpResponse, Assertion) },
-	{ NULL, 0, 0}
+	{ "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlpResponse, Status), NULL, NULL, NULL},
+	{ "Assertion", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoSamlpResponse, Assertion), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -141,6 +141,7 @@ lasso_samlp_response_get_type()
 			sizeof(LassoSamlpResponse),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		response_type = g_type_register_static(LASSO_TYPE_SAMLP_RESPONSE_ABSTRACT ,
diff --git a/lasso/xml/samlp_response_abstract.c b/lasso/xml/samlp_response_abstract.c
index 054e8608..56821ffb 100644
--- a/lasso/xml/samlp_response_abstract.c
+++ b/lasso/xml/samlp_response_abstract.c
@@ -63,19 +63,19 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Signature", SNIPPET_SIGNATURE,
-		G_STRUCT_OFFSET(LassoSamlpResponseAbstract, ResponseID) },
+		G_STRUCT_OFFSET(LassoSamlpResponseAbstract, ResponseID), NULL, NULL, NULL},
 	{ "ResponseID", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlpResponseAbstract, ResponseID) },
+		G_STRUCT_OFFSET(LassoSamlpResponseAbstract, ResponseID), NULL, NULL, NULL},
 	{ "MajorVersion", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER,
-		G_STRUCT_OFFSET(LassoSamlpResponseAbstract, MajorVersion) },
+		G_STRUCT_OFFSET(LassoSamlpResponseAbstract, MajorVersion), NULL, NULL, NULL},
 	{ "MinorVersion", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER,
-		G_STRUCT_OFFSET(LassoSamlpResponseAbstract, MinorVersion) },
+		G_STRUCT_OFFSET(LassoSamlpResponseAbstract, MinorVersion), NULL, NULL, NULL},
 	{ "IssueInstant", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlpResponseAbstract, IssueInstant) },
+		G_STRUCT_OFFSET(LassoSamlpResponseAbstract, IssueInstant), NULL, NULL, NULL},
 	{ "InResponseTo", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSamlpResponseAbstract, InResponseTo) },
-	{ "Recipient", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSamlpResponseAbstract, Recipient) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSamlpResponseAbstract, InResponseTo), NULL, NULL, NULL},
+	{ "Recipient", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSamlpResponseAbstract, Recipient), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -147,6 +147,7 @@ lasso_samlp_response_abstract_get_type()
 			sizeof(LassoSamlpResponseAbstract),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		response_abstract_type = g_type_register_static(LASSO_TYPE_NODE ,
diff --git a/lasso/xml/samlp_status.c b/lasso/xml/samlp_status.c
index 8caa43dc..35fd4ffa 100644
--- a/lasso/xml/samlp_status.c
+++ b/lasso/xml/samlp_status.c
@@ -50,9 +50,9 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "StatusCode", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlpStatus, StatusCode) },
-	{ "StatusMessage", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoSamlpStatus, StatusMessage) },
-	{ NULL, 0, 0}
+	{ "StatusCode", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlpStatus, StatusCode), NULL, NULL, NULL},
+	{ "StatusMessage", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoSamlpStatus, StatusMessage), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static gchar*
@@ -137,6 +137,7 @@ lasso_samlp_status_get_type()
 			sizeof(LassoSamlpStatus),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/samlp_status_code.c b/lasso/xml/samlp_status_code.c
index 016a75a7..6a3e01d4 100644
--- a/lasso/xml/samlp_status_code.c
+++ b/lasso/xml/samlp_status_code.c
@@ -47,9 +47,9 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "StatusCode", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlpStatusCode, StatusCode) },
-	{ "Value", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSamlpStatusCode, Value) },
-	{ NULL, 0, 0}
+	{ "StatusCode", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSamlpStatusCode, StatusCode), NULL, NULL, NULL},
+	{ "Value", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSamlpStatusCode, Value), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -83,6 +83,7 @@ lasso_samlp_status_code_get_type()
 			sizeof(LassoSamlpStatusCode),
 			0,
 			NULL,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/sec_resource_access_statement.c b/lasso/xml/sec_resource_access_statement.c
index e8facfe8..1267c72b 100644
--- a/lasso/xml/sec_resource_access_statement.c
+++ b/lasso/xml/sec_resource_access_statement.c
@@ -55,7 +55,7 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ NULL, 0, 0}
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -89,6 +89,7 @@ lasso_sec_resource_access_statement_get_type()
 			sizeof(LassoSecResourceAccessStatement),
 			0,
 			NULL,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_SAML_SUBJECT_STATEMENT_ABSTRACT,
diff --git a/lasso/xml/soap_binding_consent.c b/lasso/xml/soap_binding_consent.c
index b8ca8f77..76ef89b2 100644
--- a/lasso/xml/soap_binding_consent.c
+++ b/lasso/xml/soap_binding_consent.c
@@ -50,14 +50,14 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "uri", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSoapBindingConsent, uri) },
+		G_STRUCT_OFFSET(LassoSoapBindingConsent, uri), NULL, NULL, NULL},
 	{ "timestamp", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSoapBindingConsent, timestamp) },
-	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingConsent, id) },
+		G_STRUCT_OFFSET(LassoSoapBindingConsent, timestamp), NULL, NULL, NULL},
+	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingConsent, id), NULL, NULL, NULL},
 	{ "mustUnderstand", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSoapBindingConsent, mustUnderstand) },
-	{ "actor", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingConsent, actor) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSoapBindingConsent, mustUnderstand), NULL, NULL, NULL},
+	{ "actor", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingConsent, actor), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -101,6 +101,7 @@ lasso_soap_binding_consent_get_type()
 			sizeof(LassoSoapBindingConsent),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/soap_binding_correlation.c b/lasso/xml/soap_binding_correlation.c
index afb44506..9ff2d22f 100644
--- a/lasso/xml/soap_binding_correlation.c
+++ b/lasso/xml/soap_binding_correlation.c
@@ -48,16 +48,16 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "messageID", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSoapBindingCorrelation, messageID) },
+		G_STRUCT_OFFSET(LassoSoapBindingCorrelation, messageID), NULL, NULL, NULL},
 	{ "refToMessageID", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSoapBindingCorrelation, refToMessageID) },
+		G_STRUCT_OFFSET(LassoSoapBindingCorrelation, refToMessageID), NULL, NULL, NULL},
 	{ "timestamp", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSoapBindingCorrelation, timestamp) },
-	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingCorrelation, id) },
+		G_STRUCT_OFFSET(LassoSoapBindingCorrelation, timestamp), NULL, NULL, NULL},
+	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingCorrelation, id), NULL, NULL, NULL},
 	{ "mustUnderstand", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSoapBindingCorrelation, mustUnderstand) },
-	{ "actor", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingCorrelation, actor) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSoapBindingCorrelation, mustUnderstand), NULL, NULL, NULL},
+	{ "actor", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingCorrelation, actor), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -102,6 +102,7 @@ lasso_soap_binding_correlation_get_type()
 			sizeof(LassoSoapBindingCorrelation),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/soap_binding_ext_credential.c b/lasso/xml/soap_binding_ext_credential.c
index 49649e2c..523cfe35 100644
--- a/lasso/xml/soap_binding_ext_credential.c
+++ b/lasso/xml/soap_binding_ext_credential.c
@@ -50,10 +50,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSoapBindingExtCredential, any) },
+		G_STRUCT_OFFSET(LassoSoapBindingExtCredential, any), NULL, NULL, NULL},
 	{ "notOnOrAfter", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSoapBindingExtCredential, notOnOrAfter) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSoapBindingExtCredential, notOnOrAfter), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -94,6 +94,7 @@ lasso_soap_binding_ext_credential_get_type()
 			sizeof(LassoSoapBindingExtCredential),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/soap_binding_ext_credentials_context.c b/lasso/xml/soap_binding_ext_credentials_context.c
index 53f0773a..1459265a 100644
--- a/lasso/xml/soap_binding_ext_credentials_context.c
+++ b/lasso/xml/soap_binding_ext_credentials_context.c
@@ -52,15 +52,15 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "RequestAuthnContext", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSoapBindingExtCredentialsContext, RequestAuthnContext) },
+		G_STRUCT_OFFSET(LassoSoapBindingExtCredentialsContext, RequestAuthnContext), NULL, NULL, NULL},
 	{ "SecurityMechID", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoSoapBindingExtCredentialsContext, SecurityMechID) },
-	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingExtCredentialsContext, id) },
+		G_STRUCT_OFFSET(LassoSoapBindingExtCredentialsContext, SecurityMechID), NULL, NULL, NULL},
+	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingExtCredentialsContext, id), NULL, NULL, NULL},
 	{ "mustUnderstand", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSoapBindingExtCredentialsContext, mustUnderstand) },
+		G_STRUCT_OFFSET(LassoSoapBindingExtCredentialsContext, mustUnderstand), NULL, NULL, NULL},
 	{ "actor", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSoapBindingExtCredentialsContext, actor) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSoapBindingExtCredentialsContext, actor), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -104,6 +104,7 @@ lasso_soap_binding_ext_credentials_context_get_type()
 			sizeof(LassoSoapBindingExtCredentialsContext),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/soap_binding_ext_service_instance_update.c b/lasso/xml/soap_binding_ext_service_instance_update.c
index c5754e61..f37fd5d6 100644
--- a/lasso/xml/soap_binding_ext_service_instance_update.c
+++ b/lasso/xml/soap_binding_ext_service_instance_update.c
@@ -59,17 +59,17 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "SecurityMechID", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoSoapBindingExtServiceInstanceUpdate, SecurityMechID) },
+		G_STRUCT_OFFSET(LassoSoapBindingExtServiceInstanceUpdate, SecurityMechID), NULL, NULL, NULL},
 	{ "Credential", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoSoapBindingExtServiceInstanceUpdate, Credential) },
+		G_STRUCT_OFFSET(LassoSoapBindingExtServiceInstanceUpdate, Credential), NULL, NULL, NULL},
 	{ "Endpoint", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoSoapBindingExtServiceInstanceUpdate, Endpoint) },
-	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingExtServiceInstanceUpdate, id) },
+		G_STRUCT_OFFSET(LassoSoapBindingExtServiceInstanceUpdate, Endpoint), NULL, NULL, NULL},
+	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingExtServiceInstanceUpdate, id), NULL, NULL, NULL},
 	{ "mustUnderstand", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSoapBindingExtServiceInstanceUpdate, mustUnderstand) },
+		G_STRUCT_OFFSET(LassoSoapBindingExtServiceInstanceUpdate, mustUnderstand), NULL, NULL, NULL},
 	{ "actor", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSoapBindingExtServiceInstanceUpdate, actor) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSoapBindingExtServiceInstanceUpdate, actor), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -114,6 +114,7 @@ lasso_soap_binding_ext_service_instance_update_get_type()
 			sizeof(LassoSoapBindingExtServiceInstanceUpdate),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/soap_binding_ext_timeout.c b/lasso/xml/soap_binding_ext_timeout.c
index f5c28905..917d21c5 100644
--- a/lasso/xml/soap_binding_ext_timeout.c
+++ b/lasso/xml/soap_binding_ext_timeout.c
@@ -49,12 +49,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "maxProcessingTime", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER, \
-		G_STRUCT_OFFSET(LassoSoapBindingExtTimeout, maxProcessingTime) },
-	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingExtTimeout, id) },
+		G_STRUCT_OFFSET(LassoSoapBindingExtTimeout, maxProcessingTime), NULL, NULL, NULL},
+	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingExtTimeout, id), NULL, NULL, NULL},
 	{ "mustUnderstand", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSoapBindingExtTimeout, mustUnderstand) },
-	{ "actor", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingExtTimeout, actor) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSoapBindingExtTimeout, mustUnderstand), NULL, NULL, NULL},
+	{ "actor", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingExtTimeout, actor), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -97,6 +97,7 @@ lasso_soap_binding_ext_timeout_get_type()
 			sizeof(LassoSoapBindingExtTimeout),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/soap_binding_processing_context.c b/lasso/xml/soap_binding_processing_context.c
index 44037590..809ed3df 100644
--- a/lasso/xml/soap_binding_processing_context.c
+++ b/lasso/xml/soap_binding_processing_context.c
@@ -51,12 +51,12 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingProcessingContext, id) },
+	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingProcessingContext, id), NULL, NULL, NULL},
 	{ "mustUnderstand", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSoapBindingProcessingContext, mustUnderstand) },
-	{ "actor", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingProcessingContext, actor) },
-	{ "", SNIPPET_TEXT_CHILD, G_STRUCT_OFFSET(LassoSoapBindingProcessingContext, content) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSoapBindingProcessingContext, mustUnderstand), NULL, NULL, NULL},
+	{ "actor", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingProcessingContext, actor), NULL, NULL, NULL},
+	{ "", SNIPPET_TEXT_CHILD, G_STRUCT_OFFSET(LassoSoapBindingProcessingContext, content), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -99,6 +99,7 @@ lasso_soap_binding_processing_context_get_type()
 			sizeof(LassoSoapBindingProcessingContext),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/soap_binding_provider.c b/lasso/xml/soap_binding_provider.c
index 90e06260..54af5581 100644
--- a/lasso/xml/soap_binding_provider.c
+++ b/lasso/xml/soap_binding_provider.c
@@ -49,14 +49,14 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "providerID", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSoapBindingProvider, providerID) },
+		G_STRUCT_OFFSET(LassoSoapBindingProvider, providerID), NULL, NULL, NULL},
 	{ "affiliationID", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSoapBindingProvider, affiliationID) },
-	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingProvider, id) },
+		G_STRUCT_OFFSET(LassoSoapBindingProvider, affiliationID), NULL, NULL, NULL},
+	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingProvider, id), NULL, NULL, NULL},
 	{ "mustUnderstand", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSoapBindingProvider, mustUnderstand) },
-	{ "actor", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingProvider, actor) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSoapBindingProvider, mustUnderstand), NULL, NULL, NULL},
+	{ "actor", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingProvider, actor), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -100,6 +100,7 @@ lasso_soap_binding_provider_get_type()
 			sizeof(LassoSoapBindingProvider),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/soap_binding_usage_directive.c b/lasso/xml/soap_binding_usage_directive.c
index 537b3ffb..bfa7b92a 100644
--- a/lasso/xml/soap_binding_usage_directive.c
+++ b/lasso/xml/soap_binding_usage_directive.c
@@ -51,14 +51,14 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoSoapBindingUsageDirective, other) },
+		G_STRUCT_OFFSET(LassoSoapBindingUsageDirective, other), NULL, NULL, NULL},
 	{ "ref", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSoapBindingUsageDirective, ref) },
-	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingUsageDirective, id) },
+		G_STRUCT_OFFSET(LassoSoapBindingUsageDirective, ref), NULL, NULL, NULL},
+	{ "id", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingUsageDirective, id), NULL, NULL, NULL},
 	{ "mustUnderstand", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoSoapBindingUsageDirective, mustUnderstand) },
-	{ "actor", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingUsageDirective, actor) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoSoapBindingUsageDirective, mustUnderstand), NULL, NULL, NULL},
+	{ "actor", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoSoapBindingUsageDirective, actor), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -102,6 +102,7 @@ lasso_soap_binding_usage_directive_get_type()
 			sizeof(LassoSoapBindingUsageDirective),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/soap_body.c b/lasso/xml/soap_body.c
index 7f09bee9..1a0ce87e 100644
--- a/lasso/xml/soap_body.c
+++ b/lasso/xml/soap_body.c
@@ -54,8 +54,8 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoSoapBody, any) },
-	{ NULL, 0, 0}
+	{ "", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoSoapBody, any), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -118,6 +118,7 @@ lasso_soap_body_get_type()
 			sizeof(LassoSoapBody),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/soap_detail.c b/lasso/xml/soap_detail.c
index e5f9ff72..d8c68c71 100644
--- a/lasso/xml/soap_detail.c
+++ b/lasso/xml/soap_detail.c
@@ -55,8 +55,8 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoSoapDetail, any) },
-	{ NULL, 0, 0}
+	{ "", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoSoapDetail, any), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -96,6 +96,7 @@ lasso_soap_detail_get_type()
 			sizeof(LassoSoapDetail),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/soap_envelope.c b/lasso/xml/soap_envelope.c
index 351a6006..67655882 100644
--- a/lasso/xml/soap_envelope.c
+++ b/lasso/xml/soap_envelope.c
@@ -36,9 +36,9 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Header", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSoapEnvelope, Header) },
-	{ "Body", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSoapEnvelope, Body) },
-	{ NULL, 0, 0}
+	{ "Header", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSoapEnvelope, Header), NULL, NULL, NULL},
+	{ "Body", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSoapEnvelope, Body), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -79,6 +79,7 @@ lasso_soap_envelope_get_type()
 			sizeof(LassoSoapEnvelope),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/soap_fault.c b/lasso/xml/soap_fault.c
index 3731a73c..ac1e00ee 100644
--- a/lasso/xml/soap_fault.c
+++ b/lasso/xml/soap_fault.c
@@ -55,10 +55,10 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "faultcode", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoSoapFault, faultcode) },
-	{ "faultstring", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoSoapFault, faultstring) },
-	{ "detail", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSoapFault, Detail) },
-	{ NULL, 0, 0}
+	{ "faultcode", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoSoapFault, faultcode), NULL, NULL, NULL},
+	{ "faultstring", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoSoapFault, faultstring), NULL, NULL, NULL},
+	{ "detail", SNIPPET_NODE, G_STRUCT_OFFSET(LassoSoapFault, Detail), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -101,6 +101,7 @@ lasso_soap_fault_get_type()
 			sizeof(LassoSoapFault),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/soap_header.c b/lasso/xml/soap_header.c
index 494ecae5..9d8846fe 100644
--- a/lasso/xml/soap_header.c
+++ b/lasso/xml/soap_header.c
@@ -35,8 +35,8 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoSoapHeader, Other) },
-	{ NULL, 0, 0}
+	{ "", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoSoapHeader, Other), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -76,6 +76,7 @@ lasso_soap_header_get_type()
 			sizeof(LassoSoapHeader),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/utility_status.c b/lasso/xml/utility_status.c
index c78d3f3e..c932fc94 100644
--- a/lasso/xml/utility_status.c
+++ b/lasso/xml/utility_status.c
@@ -56,11 +56,11 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoUtilityStatus, Status) },
-	{ "code", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoUtilityStatus, code) },
-	{ "ref", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoUtilityStatus, ref) },
-	{ "comment", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoUtilityStatus, comment) },
-	{ NULL, 0, 0}
+	{ "Status", SNIPPET_NODE, G_STRUCT_OFFSET(LassoUtilityStatus, Status), NULL, NULL, NULL},
+	{ "code", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoUtilityStatus, code), NULL, NULL, NULL},
+	{ "ref", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoUtilityStatus, ref), NULL, NULL, NULL},
+	{ "comment", SNIPPET_ATTRIBUTE, G_STRUCT_OFFSET(LassoUtilityStatus, comment), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -103,6 +103,7 @@ lasso_utility_status_get_type()
 			sizeof(LassoUtilityStatus),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/ws/wsa_attributed_any.c b/lasso/xml/ws/wsa_attributed_any.c
index 4f669469..f9eb4ef7 100644
--- a/lasso/xml/ws/wsa_attributed_any.c
+++ b/lasso/xml/ws/wsa_attributed_any.c
@@ -42,10 +42,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "", SNIPPET_LIST_NODES | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoWsAddrAttributedAny, any) },
+		G_STRUCT_OFFSET(LassoWsAddrAttributedAny, any), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoWsAddrAttributedAny, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoWsAddrAttributedAny, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -91,6 +91,7 @@ lasso_wsa_attributed_any_get_type()
 			sizeof(LassoWsAddrAttributedAny),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/ws/wsa_attributed_qname.c b/lasso/xml/ws/wsa_attributed_qname.c
index 04d5cc05..a4a651eb 100644
--- a/lasso/xml/ws/wsa_attributed_qname.c
+++ b/lasso/xml/ws/wsa_attributed_qname.c
@@ -43,10 +43,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "content", SNIPPET_TEXT_CHILD,
-		G_STRUCT_OFFSET(LassoWsAddrAttributedQName, content) },
+		G_STRUCT_OFFSET(LassoWsAddrAttributedQName, content), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoWsAddrAttributedQName, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoWsAddrAttributedQName, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -92,6 +92,7 @@ lasso_wsa_attributed_qname_get_type()
 			sizeof(LassoWsAddrAttributedQName),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/ws/wsa_attributed_unsigned_long.c b/lasso/xml/ws/wsa_attributed_unsigned_long.c
index 2c669d7b..0dbf1d3b 100644
--- a/lasso/xml/ws/wsa_attributed_unsigned_long.c
+++ b/lasso/xml/ws/wsa_attributed_unsigned_long.c
@@ -43,10 +43,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "content", SNIPPET_TEXT_CHILD | SNIPPET_INTEGER,
-		G_STRUCT_OFFSET(LassoWsAddrAttributedUnsignedLong, content) },
+		G_STRUCT_OFFSET(LassoWsAddrAttributedUnsignedLong, content), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoWsAddrAttributedUnsignedLong, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoWsAddrAttributedUnsignedLong, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -92,6 +92,7 @@ lasso_wsa_attributed_unsigned_long_get_type()
 			sizeof(LassoWsAddrAttributedUnsignedLong),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/ws/wsa_attributed_uri.c b/lasso/xml/ws/wsa_attributed_uri.c
index e30a9931..7493027b 100644
--- a/lasso/xml/ws/wsa_attributed_uri.c
+++ b/lasso/xml/ws/wsa_attributed_uri.c
@@ -43,10 +43,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "content", SNIPPET_TEXT_CHILD,
-		G_STRUCT_OFFSET(LassoWsAddrAttributedURI, content) },
+		G_STRUCT_OFFSET(LassoWsAddrAttributedURI, content), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoWsAddrAttributedURI, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoWsAddrAttributedURI, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -92,6 +92,7 @@ lasso_wsa_attributed_uri_get_type()
 			sizeof(LassoWsAddrAttributedURI),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/ws/wsa_endpoint_reference.c b/lasso/xml/ws/wsa_endpoint_reference.c
index 4d03a938..4a7dc57f 100644
--- a/lasso/xml/ws/wsa_endpoint_reference.c
+++ b/lasso/xml/ws/wsa_endpoint_reference.c
@@ -46,18 +46,18 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "Address", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoWsAddrEndpointReference, Address),
-		"LassoWsAddrAttributedURI" },
+		"LassoWsAddrAttributedURI", NULL, NULL },
 	{ "ReferenceParameters", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoWsAddrEndpointReference, ReferenceParameters),
-		"LassoWsAddrReferenceParameters" },
+		"LassoWsAddrReferenceParameters", NULL, NULL },
 	{ "Metadata", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoWsAddrEndpointReference, Metadata),
-		"LassoWsAddrMetadata" },
+		"LassoWsAddrMetadata", NULL, NULL },
 	{ "", SNIPPET_LIST_NODES | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoWsAddrEndpointReference, any) },
+		G_STRUCT_OFFSET(LassoWsAddrEndpointReference, any), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoWsAddrEndpointReference, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoWsAddrEndpointReference, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -106,6 +106,7 @@ lasso_wsa_endpoint_reference_get_type()
 			sizeof(LassoWsAddrEndpointReference),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/ws/wsa_metadata.c b/lasso/xml/ws/wsa_metadata.c
index 46467b14..3e8ae87a 100644
--- a/lasso/xml/ws/wsa_metadata.c
+++ b/lasso/xml/ws/wsa_metadata.c
@@ -42,10 +42,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "", SNIPPET_LIST_NODES | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoWsAddrMetadata, any) },
+		G_STRUCT_OFFSET(LassoWsAddrMetadata, any), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoWsAddrMetadata, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoWsAddrMetadata, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -91,6 +91,7 @@ lasso_wsa_metadata_get_type()
 			sizeof(LassoWsAddrMetadata),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/ws/wsa_problem_action.c b/lasso/xml/ws/wsa_problem_action.c
index d3cb5d54..a298a26c 100644
--- a/lasso/xml/ws/wsa_problem_action.c
+++ b/lasso/xml/ws/wsa_problem_action.c
@@ -44,12 +44,12 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "Action", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoWsAddrProblemAction, Action),
-		"LassoWsAddrAttributedURI" },
+		"LassoWsAddrAttributedURI", NULL, NULL },
 	{ "SoapAction", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoWsAddrProblemAction, SoapAction) },
+		G_STRUCT_OFFSET(LassoWsAddrProblemAction, SoapAction), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoWsAddrProblemAction, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoWsAddrProblemAction, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_wsa_problem_action_get_type()
 			sizeof(LassoWsAddrProblemAction),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/ws/wsa_reference_parameters.c b/lasso/xml/ws/wsa_reference_parameters.c
index 08d7175c..a664a1c2 100644
--- a/lasso/xml/ws/wsa_reference_parameters.c
+++ b/lasso/xml/ws/wsa_reference_parameters.c
@@ -42,10 +42,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "", SNIPPET_LIST_NODES | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoWsAddrReferenceParameters, any) },
+		G_STRUCT_OFFSET(LassoWsAddrReferenceParameters, any), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoWsAddrReferenceParameters, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoWsAddrReferenceParameters, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -91,6 +91,7 @@ lasso_wsa_reference_parameters_get_type()
 			sizeof(LassoWsAddrReferenceParameters),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/ws/wsa_relates_to.c b/lasso/xml/ws/wsa_relates_to.c
index f1e9a505..a84f781d 100644
--- a/lasso/xml/ws/wsa_relates_to.c
+++ b/lasso/xml/ws/wsa_relates_to.c
@@ -45,12 +45,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "content", SNIPPET_TEXT_CHILD,
-		G_STRUCT_OFFSET(LassoWsAddrRelatesTo, content) },
+		G_STRUCT_OFFSET(LassoWsAddrRelatesTo, content), NULL, NULL, NULL},
 	{ "RelationshipType", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
-		G_STRUCT_OFFSET(LassoWsAddrRelatesTo, RelationshipType) },
+		G_STRUCT_OFFSET(LassoWsAddrRelatesTo, RelationshipType), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoWsAddrRelatesTo, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoWsAddrRelatesTo, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -97,6 +97,7 @@ lasso_wsa_relates_to_get_type()
 			sizeof(LassoWsAddrRelatesTo),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/ws/wsse_embedded.c b/lasso/xml/ws/wsse_embedded.c
index 76213442..e8a594d4 100644
--- a/lasso/xml/ws/wsse_embedded.c
+++ b/lasso/xml/ws/wsse_embedded.c
@@ -47,10 +47,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "ValueType", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoWsSec1Embedded, ValueType) },
+		G_STRUCT_OFFSET(LassoWsSec1Embedded, ValueType), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoWsSec1Embedded, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoWsSec1Embedded, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -96,6 +96,7 @@ lasso_wsse_embedded_get_type()
 			sizeof(LassoWsSec1Embedded),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/ws/wsse_reference.c b/lasso/xml/ws/wsse_reference.c
index 63221db0..e5a7ad41 100644
--- a/lasso/xml/ws/wsse_reference.c
+++ b/lasso/xml/ws/wsse_reference.c
@@ -45,12 +45,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "URI", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoWsSec1Reference, URI) },
+		G_STRUCT_OFFSET(LassoWsSec1Reference, URI), NULL, NULL, NULL},
 	{ "ValueType", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoWsSec1Reference, ValueType) },
+		G_STRUCT_OFFSET(LassoWsSec1Reference, ValueType), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoWsSec1Reference, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoWsSec1Reference, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -97,6 +97,7 @@ lasso_wsse_reference_get_type()
 			sizeof(LassoWsSec1Reference),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/ws/wsse_security_header.c b/lasso/xml/ws/wsse_security_header.c
index 62c3d53b..d3f7f888 100644
--- a/lasso/xml/ws/wsse_security_header.c
+++ b/lasso/xml/ws/wsse_security_header.c
@@ -51,10 +51,10 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "", SNIPPET_LIST_NODES | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoWsSec1SecurityHeader, any) },
+		G_STRUCT_OFFSET(LassoWsSec1SecurityHeader, any), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoWsSec1SecurityHeader, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoWsSec1SecurityHeader, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -100,6 +100,7 @@ lasso_wsse_security_header_get_type()
 			sizeof(LassoWsSec1SecurityHeader),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/ws/wsse_security_token_reference.c b/lasso/xml/ws/wsse_security_token_reference.c
index 348b691b..bc4040d7 100644
--- a/lasso/xml/ws/wsse_security_token_reference.c
+++ b/lasso/xml/ws/wsse_security_token_reference.c
@@ -47,12 +47,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Id", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoWsSec1SecurityTokenReference, Id) },
+		G_STRUCT_OFFSET(LassoWsSec1SecurityTokenReference, Id), NULL, NULL, NULL},
 	{ "Usage", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoWsSec1SecurityTokenReference, Usage) },
+		G_STRUCT_OFFSET(LassoWsSec1SecurityTokenReference, Usage), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoWsSec1SecurityTokenReference, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoWsSec1SecurityTokenReference, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -99,6 +99,7 @@ lasso_wsse_security_token_reference_get_type()
 			sizeof(LassoWsSec1SecurityTokenReference),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/ws/wsse_transformation_parameters.c b/lasso/xml/ws/wsse_transformation_parameters.c
index a0dee89f..f2220e71 100644
--- a/lasso/xml/ws/wsse_transformation_parameters.c
+++ b/lasso/xml/ws/wsse_transformation_parameters.c
@@ -52,8 +52,8 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoWsSec1TransformationParameters, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoWsSec1TransformationParameters, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -98,6 +98,7 @@ lasso_wsse_transformation_parameters_get_type()
 			sizeof(LassoWsSec1TransformationParameters),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/ws/wsse_username_token.c b/lasso/xml/ws/wsse_username_token.c
index 98658955..a11854d6 100644
--- a/lasso/xml/ws/wsse_username_token.c
+++ b/lasso/xml/ws/wsse_username_token.c
@@ -48,12 +48,12 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Username", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoWsSec1UsernameToken, Username) },
+		G_STRUCT_OFFSET(LassoWsSec1UsernameToken, Username), NULL, NULL, NULL},
 	{ "Id", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoWsSec1UsernameToken, Id) },
+		G_STRUCT_OFFSET(LassoWsSec1UsernameToken, Id), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoWsSec1UsernameToken, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoWsSec1UsernameToken, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -100,6 +100,7 @@ lasso_wsse_username_token_get_type()
 			sizeof(LassoWsSec1UsernameToken),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/ws/wsu_timestamp.c b/lasso/xml/ws/wsu_timestamp.c
index 0a5bc00c..0491e16c 100644
--- a/lasso/xml/ws/wsu_timestamp.c
+++ b/lasso/xml/ws/wsu_timestamp.c
@@ -51,14 +51,14 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Created", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoWsUtil1Timestamp, Created) },
+		G_STRUCT_OFFSET(LassoWsUtil1Timestamp, Created), NULL, NULL, NULL},
 	{ "Expires", SNIPPET_CONTENT,
-		G_STRUCT_OFFSET(LassoWsUtil1Timestamp, Expires) },
+		G_STRUCT_OFFSET(LassoWsUtil1Timestamp, Expires), NULL, NULL, NULL},
 	{ "Id", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoWsUtil1Timestamp, Id) },
+		G_STRUCT_OFFSET(LassoWsUtil1Timestamp, Id), NULL, NULL, NULL},
 	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
-		G_STRUCT_OFFSET(LassoWsUtil1Timestamp, attributes) },
-	{NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoWsUtil1Timestamp, attributes), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 static LassoNodeClass *parent_class = NULL;
@@ -106,6 +106,7 @@ lasso_wsu_timestamp_get_type()
 			sizeof(LassoWsUtil1Timestamp),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/wsse_security.c b/lasso/xml/wsse_security.c
index 0f812369..c4609f91 100644
--- a/lasso/xml/wsse_security.c
+++ b/lasso/xml/wsse_security.c
@@ -32,8 +32,8 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "", SNIPPET_LIST_XMLNODES, G_STRUCT_OFFSET(LassoWsseSecurity, any) },
-	{ NULL, 0, 0}
+	{ "", SNIPPET_LIST_XMLNODES, G_STRUCT_OFFSET(LassoWsseSecurity, any), NULL, NULL, NULL},
+	{NULL, 0, 0, NULL, NULL, NULL}
 };
 
 /*****************************************************************************/
@@ -73,6 +73,7 @@ lasso_wsse_security_get_type()
 			sizeof(LassoWsseSecurity),
 			0,
 			(GInstanceInitFunc) instance_init,
+			NULL
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c
index ac3f7ed7..e8cbbd61 100644
--- a/lasso/xml/xml.c
+++ b/lasso/xml/xml.c
@@ -1519,6 +1519,7 @@ lasso_node_get_type()
 			sizeof(LassoNode),
 			0,
 			NULL,
+			NULL,
 		};
 
 		this_type = g_type_register_static(G_TYPE_OBJECT , "LassoNode", &this_info, 0);
diff --git a/tests/basic_tests.c b/tests/basic_tests.c
index cd29118a..737e5eb4 100644
--- a/tests/basic_tests.c
+++ b/tests/basic_tests.c
@@ -140,6 +140,7 @@ START_TEST(test08_test_new_from_xmlNode)
 		sizeof(LassoNode),
 		0,
 		NULL,
+		NULL
 	};
 
 	this_type = g_type_register_static(LASSO_TYPE_NODE,