adds all classes from ID-WSF 2 required schemas; with appropriate changes to

other files.

473 files changed, 33620 insertions, 1069 deletions

diff --git a/configure.ac b/configure.ac
index a0b7f802..0382539f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -888,6 +888,7 @@ swig/Makefile
 swig/wsf-support.i
 swig/saml-2.0/Makefile
 swig/id-wsf-2.0/Makefile
+swig/ws/Makefile
 tests/Makefile
 tests/data/Makefile
 tests/data/ca1-la/Makefile
diff --git a/lasso/Makefile.am b/lasso/Makefile.am
index 4af72c72..34362692 100644
--- a/lasso/Makefile.am
+++ b/lasso/Makefile.am
@@ -40,7 +40,7 @@ if WSF_ENABLED
 WSF_LIB_FILE = $(top_builddir)/lasso/id-wsf/liblasso-id-wsf.la
 
 WSF2_LIB_FILES = $(top_builddir)/lasso/id-wsf-2.0/liblasso-id-wsf2.la \
-	$(top_builddir)/lasso/xml/id-wsf-2.0/liblasso-xml-id-wsf2.la \
+	$(top_builddir)/lasso/xml/id-wsf-2.0/liblasso-xml-id-wsf-2.la \
 	$(top_builddir)/lasso/xml/ws/liblasso-xml-ws.la
 endif
 
diff --git a/lasso/id-ff/server.c b/lasso/id-ff/server.c
index 08cbe657..da8f0ab5 100644
--- a/lasso/id-ff/server.c
+++ b/lasso/id-ff/server.c
@@ -34,6 +34,7 @@
 
 #ifdef LASSO_WSF_ENABLED
 #include <lasso/id-wsf-2.0/server.h>
+#include <lasso/xml/id-wsf-2.0/disco_service_context.h>
 #endif
 
 /*****************************************************************************/
@@ -167,8 +168,11 @@ lasso_server_get_svc_metadatas_with_id_and_type(LassoServer *server, GList *svcM
 	for (i = g_list_first(server->private_data->svc_metadatas); i != NULL;
 			i = g_list_next(i)) {
 		md = LASSO_IDWSF2_DISCO_SVC_METADATA(i->data);
-		if (md->ServiceContext == NULL
-				|| strcmp(md->ServiceContext->ServiceType, service_type) != 0) {
+		/* FIXME: this assumes there is one and only one service
+		 * context, and service type, this should be fixed to iterate
+		 * properly on the GList */
+		if (md->ServiceContext == NULL || strcmp((char*)(LASSO_IDWSF2_DISCO_SERVICE_CONTEXT(
+				md->ServiceContext->data)->ServiceType)->data, service_type) != 0) {
 			continue;
 		}
 		if (svcMDIDs == NULL) {
diff --git a/lasso/id-ff/session.c b/lasso/id-ff/session.c
index 4de6c822..82d81303 100644
--- a/lasso/id-ff/session.c
+++ b/lasso/id-ff/session.c
@@ -575,7 +575,7 @@ instance_init(LassoSession *session)
 #ifdef LASSO_WSF_ENABLED
 	session->private_data->eprs = g_hash_table_new_full(g_str_hash, g_str_equal,
 			(GDestroyNotify)g_free,
-			(GDestroyNotify)lasso_wsa_endpoint_reference_destroy);
+			(GDestroyNotify)lasso_node_destroy);
 #endif
 	session->assertions = g_hash_table_new_full(g_str_hash, g_str_equal,
 			(GDestroyNotify)g_free,
diff --git a/lasso/id-wsf-2.0/data_service.c b/lasso/id-wsf-2.0/data_service.c
index 24ba001e..38767e67 100644
--- a/lasso/id-wsf-2.0/data_service.c
+++ b/lasso/id-wsf-2.0/data_service.c
@@ -33,7 +33,7 @@
 #include <lasso/xml/id-wsf-2.0/dstref_query_response.h>
 #include <lasso/xml/id-wsf-2.0/dstref_data.h>
 #include <lasso/xml/id-wsf-2.0/util_status.h>
-#include <lasso/xml/id-wsf-2.0/soap_binding2_redirect_request.h>
+#include <lasso/xml/id-wsf-2.0/sb2_redirect_request.h>
 
 #include <lasso/xml/soap_fault.h>
 
@@ -210,7 +210,8 @@ lasso_idwsf2_data_service_parse_query_items(LassoIdWsf2DataService *service)
 
 	response2 = LASSO_IDWSF2_UTIL_RESPONSE(response);
 	/* Default is Failed, will be OK or Partial when some items are successfully parsed */
-	response2->Status = lasso_util_status_new(LASSO_DST_STATUS_CODE_FAILED);
+	response2->Status = lasso_idwsf2_util_status_new();
+	response2->Status->code = g_strdup(LASSO_DST_STATUS_CODE_FAILED);
 
 	/* Initialise XML parsing */
 	doc = xmlNewDoc((xmlChar*)"1.0");
@@ -278,7 +279,7 @@ lasso_idwsf2_data_service_process_query_response_soap_fault_msg(LassoIdWsf2DataS
 {
 	LassoIdWsf2Profile *profile = LASSO_IDWSF2_PROFILE(service);
 	LassoSoapFault *fault;
-	LassoIdWsf2SoapBinding2RedirectRequest *redirect_request = NULL;
+	LassoIdWsf2Sb2RedirectRequest *redirect_request = NULL;
 	GList *iter;
 	int res;
 
@@ -295,8 +296,8 @@ lasso_idwsf2_data_service_process_query_response_soap_fault_msg(LassoIdWsf2DataS
 
 	/* Get RedirectRequest element from soap fault detail */
 	for (iter = fault->Detail->any; iter != NULL; iter = iter->next) {
-		if (LASSO_IS_IDWSF2_SOAP_BINDING2_REDIRECT_REQUEST(iter->data) == TRUE) {
-			redirect_request = LASSO_IDWSF2_SOAP_BINDING2_REDIRECT_REQUEST(iter->data);
+		if (LASSO_IS_IDWSF2_SB2_REDIRECT_REQUEST(iter->data) == TRUE) {
+			redirect_request = LASSO_IDWSF2_SB2_REDIRECT_REQUEST(iter->data);
 			break;
 		}
 	}
@@ -444,7 +445,7 @@ lasso_idwsf2_data_service_init_redirect_user_for_consent(LassoIdWsf2DataService
 	fault->faultstring = g_strdup(LASSO_SOAP_FAULT_STRING_SERVER);
 	detail = lasso_soap_detail_new();
 	detail->any = g_list_append(
-		detail->any, lasso_idwsf2_soap_binding2_redirect_request_new_full(redirect_url));
+		detail->any, lasso_idwsf2_sb2_redirect_request_new_full(redirect_url));
 	fault->Detail = detail;
 
 	/* Response envelope body */
diff --git a/lasso/id-wsf-2.0/discovery.c b/lasso/id-wsf-2.0/discovery.c
index f44da55b..a9b01b44 100644
--- a/lasso/id-wsf-2.0/discovery.c
+++ b/lasso/id-wsf-2.0/discovery.c
@@ -41,9 +41,11 @@
 #include <lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.h>
 #include <lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.h>
 #include <lasso/xml/id-wsf-2.0/disco_abstract.h>
-#include <lasso/xml/id-wsf-2.0/disco_providerid.h>
+#include <lasso/xml/id-wsf-2.0/disco_provider_id.h>
 #include <lasso/xml/id-wsf-2.0/disco_service_type.h>
 #include <lasso/xml/id-wsf-2.0/disco_security_context.h>
+#include <lasso/xml/id-wsf-2.0/disco_service_context.h>
+#include <lasso/xml/id-wsf-2.0/disco_endpoint_context.h>
 #include <lasso/xml/id-wsf-2.0/sec_token.h>
 
 #include <lasso/xml/ws/wsa_endpoint_reference.h>
@@ -183,7 +185,8 @@ lasso_idwsf2_discovery_process_metadata_register_msg(LassoIdWsf2Discovery *disco
 		request = LASSO_IDWSF2_DISCO_SVC_MD_REGISTER(LASSO_PROFILE(profile)->request);
 		/* FIXME : foreach on the list instead */
 		if (request != NULL && request->SvcMD != NULL) {
-			discovery->metadata = LASSO_IDWSF2_DISCO_SVC_METADATA(request->SvcMD->data);
+			discovery->metadata =
+				LASSO_IDWSF2_DISCO_SVC_METADATA(request->SvcMD->data);
 			/* Build a unique SvcMDID */
 			lasso_build_random_sequence(unique_id, 32);
 			unique_id[32] = 0;
@@ -198,12 +201,14 @@ lasso_idwsf2_discovery_process_metadata_register_msg(LassoIdWsf2Discovery *disco
 	response = lasso_idwsf2_disco_svc_md_register_response_new();
 
 	if (res == 0) {
-		response->Status = lasso_util_status_new(LASSO_DISCO_STATUS_CODE_OK);
+		response->Status = lasso_idwsf2_util_status_new();
+		response->Status->code = g_strdup(LASSO_DISCO_STATUS_CODE_OK);
 		/* FIXME : foreach here as well */
 		response->SvcMDID = g_list_append(response->SvcMDID,
 			g_strdup(discovery->metadata->svcMDID));
 	} else {
-		response->Status = lasso_util_status_new(LASSO_DISCO_STATUS_CODE_FAILED);
+		response->Status = lasso_idwsf2_util_status_new();
+		response->Status->code = g_strdup(LASSO_DISCO_STATUS_CODE_FAILED);
 		/* XXX : May add secondary status codes here */
 	}
 
@@ -349,9 +354,11 @@ lasso_idwsf2_discovery_register_metadata(LassoIdWsf2Discovery *discovery)
 	response = LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_ADD_RESPONSE(
 			LASSO_PROFILE(profile)->response);
 	if (res == 0) {
-		response->Status = lasso_util_status_new(LASSO_DISCO_STATUS_CODE_OK);
+		response->Status = lasso_idwsf2_util_status_new();
+		response->Status->code = g_strdup(LASSO_DISCO_STATUS_CODE_OK);
 	} else {
-		response->Status = lasso_util_status_new(LASSO_DISCO_STATUS_CODE_FAILED);
+		response->Status = lasso_idwsf2_util_status_new();
+		response->Status->code = g_strdup(LASSO_DISCO_STATUS_CODE_FAILED);
 	}
 
 	return res;
@@ -489,6 +496,8 @@ lasso_idwsf2_discovery_build_epr(LassoIdWsf2DiscoRequestedService *service,
 	LassoFederation* federation;
 	LassoProvider *provider;
 	LassoSaml2EncryptedElement *encrypted_element;
+	LassoIdWsf2DiscoEndpointContext *endpoint_context;
+	LassoIdWsf2DiscoServiceContext *service_context;
 
 	if (service != NULL && service->ServiceType != NULL && service->ServiceType->data != NULL) {
 		service_type = (gchar *)service->ServiceType->data;
@@ -506,34 +515,37 @@ lasso_idwsf2_discovery_build_epr(LassoIdWsf2DiscoRequestedService *service,
 	/* FIXME : foreach on the whole list and build an epr for each svcMD */
 	svcMD = svcMDs->data;
 
-	if (svcMD == NULL || svcMD->ServiceContext == NULL
-			|| svcMD->ServiceContext->EndpointContext == NULL) {
+	if (svcMD == NULL || svcMD->ServiceContext == NULL || svcMD->ServiceContext->data == NULL) {
 		return NULL;
 	}
 
 	/* Build EndpointReference */
 
 	epr = lasso_wsa_endpoint_reference_new();
+	service_context = LASSO_IDWSF2_DISCO_SERVICE_CONTEXT(svcMD->ServiceContext->data);
+	endpoint_context = LASSO_IDWSF2_DISCO_ENDPOINT_CONTEXT(
+			service_context->EndpointContext->data);
 
+	/* XXX: there may be more than one endpoint context */
 	epr->Address = lasso_wsa_attributed_uri_new_with_string(
-		svcMD->ServiceContext->EndpointContext->Address);
+		(gchar*)endpoint_context->Address->data);
 
 	metadata = lasso_wsa_metadata_new();
 
 	/* Abstract */
 	metadata->any = g_list_append(metadata->any,
- 		lasso_idwsf2_disco_abstract_new_with_content(svcMD->Abstract));
+ 		lasso_idwsf2_disco_abstract_new_with_string(svcMD->Abstract));
  	/* ProviderID */
 	metadata->any = g_list_append(metadata->any,
- 		lasso_idwsf2_disco_providerid_new_with_content(svcMD->ProviderID));
+ 		lasso_idwsf2_disco_provider_id_new_with_string(svcMD->ProviderID));
  	/* ServiceType */
 	metadata->any = g_list_append(metadata->any,
- 		lasso_idwsf2_disco_service_type_new_with_content(
- 			svcMD->ServiceContext->ServiceType));
+ 		lasso_idwsf2_disco_service_type_new_with_string(
+ 			(char*)service_context->ServiceType->data));
 	/* Framework */
-	if (svcMD->ServiceContext->EndpointContext->Framework != NULL) {
+	if (endpoint_context->Framework != NULL) {
 		metadata->any = g_list_append(metadata->any,
-			g_object_ref(svcMD->ServiceContext->EndpointContext->Framework));
+			g_object_ref((GObject*)endpoint_context->Framework->data));
 	}
 	
 	/* Identity token */	
@@ -632,9 +644,11 @@ lasso_idwsf2_discovery_build_query_response_eprs(LassoIdWsf2Discovery *discovery
 
 	/* Set response status code */		
 	if (res == 0) {
-		response->Status = lasso_util_status_new(LASSO_DISCO_STATUS_CODE_OK);	
+		response->Status = lasso_idwsf2_util_status_new();
+		response->Status->code = g_strdup(LASSO_DISCO_STATUS_CODE_OK);
 	} else {
-		response->Status = lasso_util_status_new(LASSO_DISCO_STATUS_CODE_FAILED);
+		response->Status = lasso_idwsf2_util_status_new();
+		response->Status->code = g_strdup(LASSO_DISCO_STATUS_CODE_FAILED);
 		/* XXX : May add secondary status codes here */
 	}
 
diff --git a/lasso/id-wsf-2.0/profile.c b/lasso/id-wsf-2.0/profile.c
index 8c06df7d..78b857c5 100644
--- a/lasso/id-wsf-2.0/profile.c
+++ b/lasso/id-wsf-2.0/profile.c
@@ -43,7 +43,7 @@
 #include <lasso/xml/soap_binding_processing_context.h>
 #include <lasso/xml/xml_enc.h>
 
-#include <lasso/xml/ws/wsse_200401_security.h>
+#include <lasso/xml/ws/wsse_security_header.h>
 
 #include <lasso/xml/saml-2.0/saml2_assertion.h>
 
@@ -89,7 +89,7 @@ lasso_idwsf2_profile_init_soap_request(LassoIdWsf2Profile *profile, LassoNode *r
 	LassoSoapEnvelope *envelope;
 	LassoSession *session = LASSO_PROFILE(profile)->session;
 	LassoSaml2Assertion *assertion;
-	LassoWsse200401Security *wsse_security;
+	LassoWsSec1SecurityHeader *wsse_security;
 
 	/* Initialise soap envelope */
 	envelope = lasso_idwsf2_profile_build_soap_envelope(NULL,
@@ -100,7 +100,7 @@ lasso_idwsf2_profile_init_soap_request(LassoIdWsf2Profile *profile, LassoNode *r
 	assertion = lasso_session_get_assertion_identity_token(session, service_type);
 
 	if (assertion != NULL) {
-		wsse_security = lasso_wsse_200401_security_new();
+		wsse_security = lasso_wsse_security_header_new();
 		wsse_security->any = g_list_append(wsse_security->any, assertion);
 
 		envelope->Header->Other = g_list_append(envelope->Header->Other, wsse_security);
@@ -129,7 +129,7 @@ lasso_idwsf2_profile_process_soap_request_msg(LassoIdWsf2Profile *profile, const
 {
 	LassoSoapEnvelope *envelope = NULL;
 	LassoSaml2Assertion *assertion;
-	LassoWsse200401Security *wsse_security;
+	LassoWsSec1SecurityHeader *wsse_security;
 	LassoSaml2EncryptedElement *encrypted_id = NULL;
 	LassoNode *decrypted_name_id = NULL;
 	xmlSecKey *encryption_private_key = NULL;
@@ -153,10 +153,10 @@ lasso_idwsf2_profile_process_soap_request_msg(LassoIdWsf2Profile *profile, const
 
 	/* Get NameIdentifier (if exists) from the soap header */
 	for (i = g_list_first(envelope->Header->Other); i != NULL; i = g_list_next(i)) {
-		if (! LASSO_IS_WSSE_200401_SECURITY(i->data)) {
+		if (! LASSO_IS_WSSE_SECURITY_HEADER(i->data)) {
 			continue;
 		}
-		wsse_security = LASSO_WSSE_200401_SECURITY(i->data);
+		wsse_security = LASSO_WSSE_SECURITY_HEADER(i->data);
 		for (j = g_list_first(wsse_security->any); j != NULL; j = g_list_next(j)) {
 			if (! LASSO_IS_SAML2_ASSERTION(j->data)) {
 				continue;
diff --git a/lasso/saml-2.0/login.c b/lasso/saml-2.0/login.c
index 80d64afe..1e13bc75 100644
--- a/lasso/saml-2.0/login.c
+++ b/lasso/saml-2.0/login.c
@@ -56,8 +56,9 @@
 #include <lasso/xml/ws/wsa_endpoint_reference.h>
 #include <lasso/xml/id-wsf-2.0/disco_svc_metadata.h>
 #include <lasso/xml/id-wsf-2.0/disco_abstract.h>
-#include <lasso/xml/id-wsf-2.0/disco_providerid.h>
+#include <lasso/xml/id-wsf-2.0/disco_provider_id.h>
 #include <lasso/xml/id-wsf-2.0/disco_service_type.h>
+#include <lasso/xml/id-wsf-2.0/disco_service_context.h>
 #include <lasso/xml/id-wsf-2.0/disco_security_context.h>
 #include <lasso/xml/id-wsf-2.0/sec_token.h>
 #endif
@@ -610,6 +611,8 @@ lasso_saml20_login_assertion_add_discovery(LassoLogin *login, LassoSaml2Assertio
 	LassoIdWsf2DiscoSecurityContext *security_context;
 	LassoIdWsf2SecToken *sec_token;
 	LassoSaml2Assertion *assertion_identity_token;
+	LassoIdWsf2DiscoServiceContext *service_context;
+	LassoIdWsf2DiscoEndpointContext *endpoint_context;
 
 	/* Get metadatas ids to which the user is associated */
 	svcMDIDs = lasso_identity_get_svc_md_ids(LASSO_PROFILE(login)->identity);
@@ -633,33 +636,37 @@ lasso_saml20_login_assertion_add_discovery(LassoLogin *login, LassoSaml2Assertio
 	/* FIXME : foreach on the whole list and build on epr for each svcMD */
 	svcMD = svcMDs->data;
 
-	if (svcMD == NULL || svcMD->ServiceContext == NULL
-			|| svcMD->ServiceContext->EndpointContext == NULL) {
+	if (svcMD == NULL || svcMD->ServiceContext == NULL || svcMD->ServiceContext->data == NULL) {
 		return;
 	}
 
 	/* Build EndpointReference */
 
-	epr = LASSO_WSA_ENDPOINT_REFERENCE(lasso_wsa_endpoint_reference_new());
+	epr = lasso_wsa_endpoint_reference_new();
+	service_context = LASSO_IDWSF2_DISCO_SERVICE_CONTEXT(svcMD->ServiceContext->data);
+	endpoint_context = LASSO_IDWSF2_DISCO_ENDPOINT_CONTEXT(
+			service_context->EndpointContext->data);
 
-	epr->Address = LASSO_WSA_ATTRIBUTED_URI(lasso_wsa_attributed_uri_new_with_string(
-		svcMD->ServiceContext->EndpointContext->Address));
+	epr->Address = lasso_wsa_attributed_uri_new_with_string(
+		(gchar*)endpoint_context->Address->data);
 
 	metadata = LASSO_WSA_METADATA(lasso_wsa_metadata_new());
 
 	/* Abstract */
 	metadata->any = g_list_append(metadata->any,
- 		lasso_idwsf2_disco_abstract_new_with_content(svcMD->Abstract));
+ 		lasso_idwsf2_disco_abstract_new_with_string(svcMD->Abstract));
  	/* ProviderID */
 	metadata->any = g_list_append(metadata->any,
- 		lasso_idwsf2_disco_providerid_new_with_content(svcMD->ProviderID));
+ 		lasso_idwsf2_disco_provider_id_new_with_string(svcMD->ProviderID));
  	/* ServiceType */
 	metadata->any = g_list_append(metadata->any,
- 		lasso_idwsf2_disco_service_type_new_with_content(
- 			svcMD->ServiceContext->ServiceType));
+ 		lasso_idwsf2_disco_service_type_new_with_string(
+ 			(char*)service_context->ServiceType->data));
 	/* Framework */
-	metadata->any = g_list_append(metadata->any,
-		g_object_ref(svcMD->ServiceContext->EndpointContext->Framework));
+	if (endpoint_context->Framework != NULL) {
+		metadata->any = g_list_append(metadata->any,
+			g_object_ref((GObject*)endpoint_context->Framework->data));
+	}
 	
 	/* Identity token */
 	assertion_identity_token = LASSO_SAML2_ASSERTION(lasso_saml2_assertion_new());
diff --git a/lasso/xml/id-wsf-2.0/Makefile.am b/lasso/xml/id-wsf-2.0/Makefile.am
index ac43e59a..8205a5f3 100644
--- a/lasso/xml/id-wsf-2.0/Makefile.am
+++ b/lasso/xml/id-wsf-2.0/Makefile.am
@@ -6,69 +6,279 @@ INCLUDES = \
 	$(LASSO_CORE_CFLAGS) \
 	-DG_LOG_DOMAIN=\"lasso\"
 
-noinst_LTLIBRARIES = liblasso-xml-id-wsf2.la
+noinst_LTLIBRARIES = liblasso-xml-id-wsf-2.la
 
-liblasso_xml_id_wsf2_la_SOURCES = \
+liblasso_xml_id_wsf_2_la_SOURCES = \
+	disco_abstract.c \
 	disco_endpoint_context.c \
+	disco_keys.c \
 	disco_options.c \
+	disco_provider_id.c \
 	disco_query.c \
 	disco_query_response.c \
 	disco_requested_service.c \
 	disco_security_context.c \
 	disco_service_context.c \
-	disco_svc_metadata.c \
+	disco_service_type.c \
 	disco_svc_md_association_add.c \
 	disco_svc_md_association_add_response.c \
+	disco_svc_md_association_delete.c \
+	disco_svc_md_association_delete_response.c \
+	disco_svc_md_association_query.c \
+	disco_svc_md_association_query_response.c \
+	disco_svc_md_delete.c \
+	disco_svc_md_delete_response.c \
+	disco_svc_md_query.c \
+	disco_svc_md_query_response.c \
 	disco_svc_md_register.c \
 	disco_svc_md_register_response.c \
-	disco_abstract.c \
-	disco_providerid.c \
-	disco_service_type.c \
+	disco_svc_md_replace.c \
+	disco_svc_md_replace_response.c \
+	disco_svc_metadata.c \
 	dst_data_response_base.c \
+	dst_delete_item_base.c \
+	dst_delete_response.c \
 	dst_request.c \
 	dst_result_query_base.c \
+	dst_test_item_base.c \
+	dstref_app_data.c \
+	dstref_create.c \
+	dstref_create_item.c \
+	dstref_create_response.c \
 	dstref_data.c \
+	dstref_data_response.c \
+	dstref_delete.c \
+	dstref_delete_item.c \
+	dstref_delete_response.c \
 	dstref_item_data.c \
+	dstref_modify.c \
+	dstref_modify_item.c \
+	dstref_modify_response.c \
 	dstref_query.c \
 	dstref_query_item.c \
 	dstref_query_response.c \
 	dstref_result_query.c \
-	dstref_sort.c \
+	dstref_test_item.c \
+	ims_identity_mapping_request.c \
+	ims_identity_mapping_response.c \
+	ims_mapping_input.c \
+	ims_mapping_output.c \
+	is_help.c \
+	is_inquiry.c \
+	is_inquiry_element.c \
+	is_interaction_request.c \
+	is_interaction_response.c \
+	is_interaction_statement.c \
+	is_item.c \
+	is_parameter.c \
+	is_select.c \
+	is_text.c \
+	ps_add_collection_request.c \
+	ps_add_collection_response.c \
+	ps_add_entity_request.c \
+	ps_add_entity_response.c \
+	ps_add_known_entity_request.c \
+	ps_add_known_entity_response.c \
+	ps_add_to_collection_request.c \
+	ps_get_object_info_request.c \
+	ps_get_object_info_response.c \
+	ps_item_data.c \
+	ps_list_members_request.c \
+	ps_list_members_response.c \
+	ps_notification.c \
+	ps_notify.c \
+	ps_object.c \
+	ps_query_objects_request.c \
+	ps_query_objects_response.c \
+	ps_remove_collection_request.c \
+	ps_remove_entity_request.c \
+	ps_remove_from_collection_request.c \
+	ps_request_abstract.c \
+	ps_resolve_identifier_request.c \
+	ps_resolve_identifier_response.c \
+	ps_resolve_input.c \
+	ps_response_abstract.c \
+	ps_set_object_info_request.c \
+	ps_test_membership_request.c \
+	ps_test_membership_response.c \
+	sb2_consent.c \
+	sb2_credentials_context.c \
+	sb2_endpoint_update.c \
+	sb2_redirect_request.c \
+	sb2_sender.c \
+	sb2_target_identity.c \
+	sb2_timeout.c \
+	sb2_usage_directive.c \
+	sb2_user_interaction_header.c \
+	sbf_framework.c \
 	sec_token.c \
-	soap_binding_framework.c \
-	soap_binding2_redirect_request.c \
-	util_status.c \
-	util_response.c
+	sec_token_policy.c \
+	sec_transited_provider_path.c \
+	subs_notification.c \
+	subs_notify_response.c \
+	subs_ref_item.c \
+	subs_subscription.c \
+	subsref_app_data.c \
+	subsref_create.c \
+	subsref_create_item.c \
+	subsref_create_response.c \
+	subsref_data.c \
+	subsref_data_response.c \
+	subsref_delete.c \
+	subsref_delete_item.c \
+	subsref_delete_response.c \
+	subsref_item_data.c \
+	subsref_modify.c \
+	subsref_modify_item.c \
+	subsref_modify_response.c \
+	subsref_notification.c \
+	subsref_notify.c \
+	subsref_notify_response.c \
+	subsref_query.c \
+	subsref_query_item.c \
+	subsref_query_response.c \
+	subsref_result_query.c \
+	subsref_subscription.c \
+	subsref_test_item.c \
+	util_empty.c \
+	util_extension.c \
+	util_response.c \
+	util_status.c
 
 liblassoinclude_HEADERS = \
+	disco_abstract.h \
 	disco_endpoint_context.h \
+	disco_keys.h \
 	disco_options.h \
+	disco_provider_id.h \
 	disco_query.h \
 	disco_query_response.h \
 	disco_requested_service.h \
 	disco_security_context.h \
 	disco_service_context.h \
-	disco_svc_metadata.h \
+	disco_service_type.h \
 	disco_svc_md_association_add.h \
 	disco_svc_md_association_add_response.h \
+	disco_svc_md_association_delete.h \
+	disco_svc_md_association_delete_response.h \
+	disco_svc_md_association_query.h \
+	disco_svc_md_association_query_response.h \
+	disco_svc_md_delete.h \
+	disco_svc_md_delete_response.h \
+	disco_svc_md_query.h \
+	disco_svc_md_query_response.h \
 	disco_svc_md_register.h \
 	disco_svc_md_register_response.h \
-	disco_abstract.h \
-	disco_providerid.h \
-	disco_service_type.h \
+	disco_svc_md_replace.h \
+	disco_svc_md_replace_response.h \
+	disco_svc_metadata.h \
 	dst_data_response_base.h \
+	dst_delete_item_base.h \
+	dst_delete_response.h \
 	dst_request.h \
 	dst_result_query_base.h \
+	dst_test_item_base.h \
+	dstref_app_data.h \
+	dstref_create.h \
+	dstref_create_item.h \
+	dstref_create_response.h \
 	dstref_data.h \
+	dstref_data_response.h \
+	dstref_delete.h \
+	dstref_delete_item.h \
+	dstref_delete_response.h \
 	dstref_item_data.h \
+	dstref_modify.h \
+	dstref_modify_item.h \
+	dstref_modify_response.h \
 	dstref_query.h \
 	dstref_query_item.h \
 	dstref_query_response.h \
 	dstref_result_query.h \
-	dstref_sort.h \
+	dstref_test_item.h \
+	ims_identity_mapping_request.h \
+	ims_identity_mapping_response.h \
+	ims_mapping_input.h \
+	ims_mapping_output.h \
+	is_help.h \
+	is_inquiry.h \
+	is_inquiry_element.h \
+	is_interaction_request.h \
+	is_interaction_response.h \
+	is_interaction_statement.h \
+	is_item.h \
+	is_parameter.h \
+	is_select.h \
+	is_text.h \
+	ps_add_collection_request.h \
+	ps_add_collection_response.h \
+	ps_add_entity_request.h \
+	ps_add_entity_response.h \
+	ps_add_known_entity_request.h \
+	ps_add_known_entity_response.h \
+	ps_add_to_collection_request.h \
+	ps_get_object_info_request.h \
+	ps_get_object_info_response.h \
+	ps_item_data.h \
+	ps_list_members_request.h \
+	ps_list_members_response.h \
+	ps_notification.h \
+	ps_notify.h \
+	ps_object.h \
+	ps_query_objects_request.h \
+	ps_query_objects_response.h \
+	ps_remove_collection_request.h \
+	ps_remove_entity_request.h \
+	ps_remove_from_collection_request.h \
+	ps_request_abstract.h \
+	ps_resolve_identifier_request.h \
+	ps_resolve_identifier_response.h \
+	ps_resolve_input.h \
+	ps_response_abstract.h \
+	ps_set_object_info_request.h \
+	ps_test_membership_request.h \
+	ps_test_membership_response.h \
+	sb2_consent.h \
+	sb2_credentials_context.h \
+	sb2_endpoint_update.h \
+	sb2_redirect_request.h \
+	sb2_sender.h \
+	sb2_target_identity.h \
+	sb2_timeout.h \
+	sb2_usage_directive.h \
+	sb2_user_interaction_header.h \
+	sbf_framework.h \
 	sec_token.h \
-	soap_binding_framework.h \
-	soap_binding2_redirect_request.h \
-	util_status.h \
-	util_response.h
+	sec_token_policy.h \
+	sec_transited_provider_path.h \
+	subs_notification.h \
+	subs_notify_response.h \
+	subs_ref_item.h \
+	subs_subscription.h \
+	subsref_app_data.h \
+	subsref_create.h \
+	subsref_create_item.h \
+	subsref_create_response.h \
+	subsref_data.h \
+	subsref_data_response.h \
+	subsref_delete.h \
+	subsref_delete_item.h \
+	subsref_delete_response.h \
+	subsref_item_data.h \
+	subsref_modify.h \
+	subsref_modify_item.h \
+	subsref_modify_response.h \
+	subsref_notification.h \
+	subsref_notify.h \
+	subsref_notify_response.h \
+	subsref_query.h \
+	subsref_query_item.h \
+	subsref_query_response.h \
+	subsref_result_query.h \
+	subsref_subscription.h \
+	subsref_test_item.h \
+	util_empty.h \
+	util_extension.h \
+	util_response.h \
+	util_status.h
 
diff --git a/lasso/xml/id-wsf-2.0/disco_abstract.c b/lasso/xml/id-wsf-2.0/disco_abstract.c
index 52046dc5..13cf2b20 100644
--- a/lasso/xml/id-wsf-2.0/disco_abstract.c
+++ b/lasso/xml/id-wsf-2.0/disco_abstract.c
@@ -1,4 +1,4 @@
-/* $Id: disco_abstract.c 2183 2005-01-22 15:57:56 dlaniel $ 
+/* $Id: disco_abstract.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
  *
  * Lasso - A free implementation of the Liberty Alliance specifications.
  *
@@ -22,17 +22,28 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <lasso/xml/id-wsf-2.0/disco_abstract.h>
+#include "disco_abstract.h"
+
+/*
+ * Schema fragment (liberty-idwsf-disco-svc-v2.0.xsd):
+ *
+ * <xs:element name="Abstract" type="xs:string"/>
+ */
 
 /*****************************************************************************/
 /* private methods                                                           */
 /*****************************************************************************/
 
+
 static struct XmlSnippet schema_snippets[] = {
-	{ "content", SNIPPET_TEXT_CHILD, G_STRUCT_OFFSET(LassoIdWsf2DiscoAbstract, content) },
-	{ NULL, 0, 0}
+	{ "content", SNIPPET_TEXT_CHILD,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoAbstract, content) },
+	{NULL, 0, 0}
 };
 
+static LassoNodeClass *parent_class = NULL;
+
+
 /*****************************************************************************/
 /* instance and class init functions                                         */
 /*****************************************************************************/
@@ -48,10 +59,10 @@ class_init(LassoIdWsf2DiscoAbstractClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
 
+	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "Abstract");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF,
-			LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
@@ -79,19 +90,34 @@ lasso_idwsf2_disco_abstract_get_type()
 	return this_type;
 }
 
+/**
+ * lasso_idwsf2_disco_abstract_new:
+ *
+ * Creates a new #LassoIdWsf2DiscoAbstract object.
+ *
+ * Return value: a newly created #LassoIdWsf2DiscoAbstract object
+ **/
 LassoIdWsf2DiscoAbstract*
 lasso_idwsf2_disco_abstract_new()
 {
-	return LASSO_IDWSF2_DISCO_ABSTRACT(g_object_new(LASSO_TYPE_IDWSF2_DISCO_ABSTRACT, NULL));
+	return g_object_new(LASSO_TYPE_IDWSF2_DISCO_ABSTRACT, NULL);
 }
 
+
+/**
+ * lasso_idwsf2_disco_abstract_new_with_string:
+ * @content: 
+ *
+ * Creates a new #LassoIdWsf2DiscoAbstract object and initializes it
+ * with @content.
+ *
+ * Return value: a newly created #LassoIdWsf2DiscoAbstract object
+ **/
 LassoIdWsf2DiscoAbstract*
-lasso_idwsf2_disco_abstract_new_with_content(gchar *content)
+lasso_idwsf2_disco_abstract_new_with_string(char *content)
 {
-	LassoIdWsf2DiscoAbstract *idwsf2_disco_abstract = LASSO_IDWSF2_DISCO_ABSTRACT(
-		g_object_new(LASSO_TYPE_IDWSF2_DISCO_ABSTRACT, NULL));
-	
-	idwsf2_disco_abstract->content = g_strdup(content);
-
-	return idwsf2_disco_abstract;
+	LassoIdWsf2DiscoAbstract *object;
+	object = g_object_new(LASSO_TYPE_IDWSF2_DISCO_ABSTRACT, NULL);
+	object->content = g_strdup(content);
+	return object;
 }
diff --git a/lasso/xml/id-wsf-2.0/disco_abstract.h b/lasso/xml/id-wsf-2.0/disco_abstract.h
index 48eb25ee..452e5a4f 100644
--- a/lasso/xml/id-wsf-2.0/disco_abstract.h
+++ b/lasso/xml/id-wsf-2.0/disco_abstract.h
@@ -1,4 +1,4 @@
-/* $Id: disco_abstract.h 2183 2005-01-22 15:57:56Z dlaniel $ 
+/* $Id: disco_abstract.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
  *
  * Lasso - A free implementation of the Liberty Alliance specifications.
  *
@@ -27,40 +27,53 @@
 
 #ifdef __cplusplus
 extern "C" {
-#endif /* __cplusplus */ 
+#endif /* __cplusplus */
 
 #include <lasso/xml/xml.h>
 
 #define LASSO_TYPE_IDWSF2_DISCO_ABSTRACT (lasso_idwsf2_disco_abstract_get_type())
-#define LASSO_IDWSF2_DISCO_ABSTRACT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-	 LASSO_TYPE_IDWSF2_DISCO_ABSTRACT, LassoIdWsf2DiscoAbstract))
-#define LASSO_IDWSF2_DISCO_ABSTRACT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
-	 LASSO_TYPE_IDWSF2_DISCO_ABSTRACT, LassoIdWsf2DiscoAbstractClass))
-#define LASSO_IS_IDWSF2_DISCO_ABSTRACT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
-	 LASSO_TYPE_IDWSF2_DISCO_ABSTRACT))
-#define LASSO_IS_IDWSF2_DISCO_ABSTRACT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-	 LASSO_TYPE_IDWSF2_DISCO_ABSTRACT))
-#define LASSO_IDWSF2_DISCO_ABSTRACT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
-	 LASSO_TYPE_IDWSF2_DISCO_ABSTRACT, LassoIdWsf2DiscoAbstractClass)) 
+#define LASSO_IDWSF2_DISCO_ABSTRACT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_ABSTRACT, \
+		LassoIdWsf2DiscoAbstract))
+#define LASSO_IDWSF2_DISCO_ABSTRACT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_ABSTRACT, \
+		LassoIdWsf2DiscoAbstractClass))
+#define LASSO_IS_IDWSF2_DISCO_ABSTRACT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_ABSTRACT))
+#define LASSO_IS_IDWSF2_DISCO_ABSTRACT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_ABSTRACT))
+#define LASSO_IDWSF2_DISCO_ABSTRACT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DISCO_ABSTRACT, \
+		LassoIdWsf2DiscoAbstractClass)) 
+
 
 typedef struct _LassoIdWsf2DiscoAbstract LassoIdWsf2DiscoAbstract;
 typedef struct _LassoIdWsf2DiscoAbstractClass LassoIdWsf2DiscoAbstractClass;
 
+
 struct _LassoIdWsf2DiscoAbstract {
 	LassoNode parent;
 
-	gchar *content;
+	/*< public >*/
+	/* elements */
+	char *content;
 };
 
+
 struct _LassoIdWsf2DiscoAbstractClass {
 	LassoNodeClass parent;
 };
 
 LASSO_EXPORT GType lasso_idwsf2_disco_abstract_get_type(void);
-
 LASSO_EXPORT LassoIdWsf2DiscoAbstract* lasso_idwsf2_disco_abstract_new(void);
 
-LASSO_EXPORT LassoIdWsf2DiscoAbstract* lasso_idwsf2_disco_abstract_new_with_content(gchar *content);
+LASSO_EXPORT LassoIdWsf2DiscoAbstract* lasso_idwsf2_disco_abstract_new_with_string(char *content);
+
 
 #ifdef __cplusplus
 }
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 30636b71..841df2e9 100644
--- a/lasso/xml/id-wsf-2.0/disco_endpoint_context.c
+++ b/lasso/xml/id-wsf-2.0/disco_endpoint_context.c
@@ -1,4 +1,4 @@
-/* $Id: disco_endpoint_context.c 2261 2005-01-27 23:41:05 $ 
+/* $Id: disco_endpoint_context.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
  *
  * Lasso - A free implementation of the Liberty Alliance specifications.
  *
@@ -22,44 +22,43 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <lasso/xml/id-wsf-2.0/disco_endpoint_context.h>
+#include "disco_endpoint_context.h"
+#include "sbf_framework.h"
 
 /*
  * Schema fragment (liberty-idwsf-disco-svc-v2.0.xsd):
- * 
- * <xs:element name="EndpointContext" type="EndpointContextType" />
+ *
  * <xs:complexType name="EndpointContextType">
- *    <xs:sequence>
- *       <xs:element ref="Address"        maxOccurs="unbounded" />
- *       <xs:element ref="sbf:Framework"  maxOccurs="unbounded" />
- *       <xs:element ref="SecurityMechID" maxOccurs="unbounded" />
- *       <xs:element ref="Action"         minOccurs="0" 
- *                                        maxOccurs="unbounded" />
- *    </xs:sequence>
- * </xs:complexType>
- * 
- * <xs:element name="Address" type="xs:anyURI"/>
- * <xs:element name="Framework" type="sbf:FrameworkType"/>
- * <xs:element name="SecurityMechID" type="xs:anyURI"/>
- * <xs:element name="Action" type="xs:anyURI"/>
+ *   <xs:sequence>
+ *     <xs:element ref="Address"        maxOccurs="unbounded" />
+ *     <xs:element ref="sbf:Framework"  maxOccurs="unbounded" />
+ *     <xs:element ref="SecurityMechID" maxOccurs="unbounded" />
+ *     <xs:element ref="Action"         minOccurs="0"
+ *       maxOccurs="unbounded" />
+ *     </xs:sequence>
+ *   </xs:complexType>
  */
 
 /*****************************************************************************/
 /* private methods                                                           */
 /*****************************************************************************/
 
+
 static struct XmlSnippet schema_snippets[] = {
-	{ "Address", SNIPPET_CONTENT,
-	  G_STRUCT_OFFSET(LassoIdWsf2DiscoEndpointContext, Address) },
-	{ "Framework", SNIPPET_NODE,
-	  G_STRUCT_OFFSET(LassoIdWsf2DiscoEndpointContext, Framework) },
-	{ "SecurityMechID", SNIPPET_CONTENT,
-	  G_STRUCT_OFFSET(LassoIdWsf2DiscoEndpointContext, SecurityMechID) },
-	{ "Action", SNIPPET_CONTENT,
-	  G_STRUCT_OFFSET(LassoIdWsf2DiscoEndpointContext, Action) },
-	{ NULL, 0, 0}
+	{ "Address", SNIPPET_LIST_CONTENT,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoEndpointContext, Address) },
+	{ "Framework", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoEndpointContext, Framework) },
+	{ "SecurityMechID", SNIPPET_LIST_CONTENT,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoEndpointContext, SecurityMechID) },
+	{ "Action", SNIPPET_LIST_CONTENT,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoEndpointContext, Action) },
+	{NULL, 0, 0}
 };
 
+static LassoNodeClass *parent_class = NULL;
+
+
 /*****************************************************************************/
 /* instance and class init functions                                         */
 /*****************************************************************************/
@@ -78,6 +77,7 @@ class_init(LassoIdWsf2DiscoEndpointContextClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
 
+	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "EndpointContext");
 	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
@@ -108,22 +108,32 @@ lasso_idwsf2_disco_endpoint_context_get_type()
 	return this_type;
 }
 
+/**
+ * lasso_idwsf2_disco_endpoint_context_new:
+ *
+ * Creates a new #LassoIdWsf2DiscoEndpointContext object.
+ *
+ * Return value: a newly created #LassoIdWsf2DiscoEndpointContext object
+ **/
 LassoIdWsf2DiscoEndpointContext*
 lasso_idwsf2_disco_endpoint_context_new()
 {
 	return g_object_new(LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT, NULL);
 }
 
+
 LassoIdWsf2DiscoEndpointContext*
 lasso_idwsf2_disco_endpoint_context_new_full(const gchar *address)
 {
 	LassoIdWsf2DiscoEndpointContext *context;
+	LassoIdWsf2SbfFramework *sbf_framework;
 
-	context = g_object_new(LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT, NULL);
+	context = lasso_idwsf2_disco_endpoint_context_new();
 
-	context->Address = g_strdup(address);
-	context->Framework = lasso_soap_binding_framework_new("2.0");
+	context->Address = g_list_append(NULL, g_strdup(address));
+	sbf_framework = lasso_idwsf2_sbf_framework_new();
+	sbf_framework->version = g_strdup("2.0");
+	context->Framework = g_list_append(NULL, sbf_framework);
 
 	return context;
 }
-
diff --git a/lasso/xml/id-wsf-2.0/disco_endpoint_context.h b/lasso/xml/id-wsf-2.0/disco_endpoint_context.h
index 195deed7..c311ebd0 100644
--- a/lasso/xml/id-wsf-2.0/disco_endpoint_context.h
+++ b/lasso/xml/id-wsf-2.0/disco_endpoint_context.h
@@ -1,4 +1,4 @@
-/* $Id: disco_endpoint_context.h 2428 2005-03-10 08:13:36 $
+/* $Id: disco_endpoint_context.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
  *
  * Lasso - A free implementation of the Liberty Alliance specifications.
  *
@@ -27,49 +27,58 @@
 
 #ifdef __cplusplus
 extern "C" {
-#endif /* __cplusplus */ 
+#endif /* __cplusplus */
 
 #include <lasso/xml/xml.h>
-#include <lasso/xml/id-wsf-2.0/soap_binding_framework.h>
 
-#define LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT (lasso_idwsf2_disco_endpoint_context_get_type())
+#define LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT \
+	(lasso_idwsf2_disco_endpoint_context_get_type())
 #define LASSO_IDWSF2_DISCO_ENDPOINT_CONTEXT(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT, \
-				    LassoIdWsf2DiscoEndpointContext))
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT, \
+		LassoIdWsf2DiscoEndpointContext))
 #define LASSO_IDWSF2_DISCO_ENDPOINT_CONTEXT_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT, \
-				 LassoIdWsf2DiscoEndpointContextClass))
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT, \
+		LassoIdWsf2DiscoEndpointContextClass))
 #define LASSO_IS_IDWSF2_DISCO_ENDPOINT_CONTEXT(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT))
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT))
 #define LASSO_IS_IDWSF2_DISCO_ENDPOINT_CONTEXT_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT))
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT))
 #define LASSO_IDWSF2_DISCO_ENDPOINT_CONTEXT_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT, \
-				    LassoIdWsf2DiscoEndpointContextClass)) 
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT, \
+		LassoIdWsf2DiscoEndpointContextClass)) 
+
 
 typedef struct _LassoIdWsf2DiscoEndpointContext LassoIdWsf2DiscoEndpointContext;
 typedef struct _LassoIdWsf2DiscoEndpointContextClass LassoIdWsf2DiscoEndpointContextClass;
 
+
 struct _LassoIdWsf2DiscoEndpointContext {
 	LassoNode parent;
 
+	/*< public >*/
 	/* elements */
-	gchar *Address;
-	LassoSoapBindingFramework *Framework;
-	gchar *SecurityMechID;
-	gchar *Action;
+	GList *Address;
+	GList *Framework;
+	GList *SecurityMechID;
+	GList *Action;
 };
 
+
 struct _LassoIdWsf2DiscoEndpointContextClass {
 	LassoNodeClass parent;
 };
 
 LASSO_EXPORT GType lasso_idwsf2_disco_endpoint_context_get_type(void);
+LASSO_EXPORT LassoIdWsf2DiscoEndpointContext* lasso_idwsf2_disco_endpoint_context_new(void);
 
-LASSO_EXPORT LassoIdWsf2DiscoEndpointContext* lasso_idwsf2_disco_endpoint_context_new();
-		
 LASSO_EXPORT LassoIdWsf2DiscoEndpointContext* lasso_idwsf2_disco_endpoint_context_new_full(
-	const gchar *address);
+		const gchar *address);
+
 
 #ifdef __cplusplus
 }
diff --git a/lasso/xml/id-wsf-2.0/disco_keys.c b/lasso/xml/id-wsf-2.0/disco_keys.c
new file mode 100644
index 00000000..06068b76
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/disco_keys.c
@@ -0,0 +1,110 @@
+/* $Id: disco_keys.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "disco_keys.h"
+
+/*
+ * Schema fragment (liberty-idwsf-disco-svc-v2.0.xsd):
+ *
+ * <xs:complexType name="KeysType">
+ *   <xs:sequence>
+ *     <xs:element ref="md:KeyDescriptor"
+ *       minOccurs="1"
+ *       maxOccurs="unbounded"/>
+ *     </xs:sequence>
+ *   </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "KeyDescriptor", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoKeys, KeyDescriptor) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2DiscoKeys *node)
+{
+	node->KeyDescriptor = NULL;
+}
+
+static void
+class_init(LassoIdWsf2DiscoKeysClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Keys");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_disco_keys_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2DiscoKeysClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2DiscoKeys),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2DiscoKeys", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_disco_keys_new:
+ *
+ * Creates a new #LassoIdWsf2DiscoKeys object.
+ *
+ * Return value: a newly created #LassoIdWsf2DiscoKeys object
+ **/
+LassoIdWsf2DiscoKeys*
+lasso_idwsf2_disco_keys_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_DISCO_KEYS, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/disco_keys.h b/lasso/xml/id-wsf-2.0/disco_keys.h
new file mode 100644
index 00000000..61001026
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/disco_keys.h
@@ -0,0 +1,81 @@
+/* $Id: disco_keys.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_DISCO_KEYS_H__
+#define __LASSO_IDWSF2_DISCO_KEYS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_DISCO_KEYS (lasso_idwsf2_disco_keys_get_type())
+#define LASSO_IDWSF2_DISCO_KEYS(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_KEYS, \
+		LassoIdWsf2DiscoKeys))
+#define LASSO_IDWSF2_DISCO_KEYS_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_KEYS, \
+		LassoIdWsf2DiscoKeysClass))
+#define LASSO_IS_IDWSF2_DISCO_KEYS(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_KEYS))
+#define LASSO_IS_IDWSF2_DISCO_KEYS_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_KEYS))
+#define LASSO_IDWSF2_DISCO_KEYS_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DISCO_KEYS, \
+		LassoIdWsf2DiscoKeysClass)) 
+
+
+typedef struct _LassoIdWsf2DiscoKeys LassoIdWsf2DiscoKeys;
+typedef struct _LassoIdWsf2DiscoKeysClass LassoIdWsf2DiscoKeysClass;
+
+
+struct _LassoIdWsf2DiscoKeys {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	GList *KeyDescriptor;
+};
+
+
+struct _LassoIdWsf2DiscoKeysClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_disco_keys_get_type(void);
+LASSO_EXPORT LassoIdWsf2DiscoKeys* lasso_idwsf2_disco_keys_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_DISCO_KEYS_H__ */
diff --git a/lasso/xml/id-wsf-2.0/disco_options.c b/lasso/xml/id-wsf-2.0/disco_options.c
index 60a353c2..9825373f 100644
--- a/lasso/xml/id-wsf-2.0/disco_options.c
+++ b/lasso/xml/id-wsf-2.0/disco_options.c
@@ -1,4 +1,4 @@
-/* $Id: disco_options.c 2183 2005-01-22 15:57:56 $ 
+/* $Id: disco_options.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
  *
  * Lasso - A free implementation of the Liberty Alliance specifications.
  *
@@ -22,30 +22,32 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <lasso/xml/id-wsf-2.0/disco_options.h>
+#include "disco_options.h"
 
 /*
  * Schema fragment (liberty-idwsf-disco-svc-v2.0.xsd):
- * 
- * <xs:element name="Options" type="OptionsType"/>
+ *
  * <xs:complexType name="OptionsType">
- *    <xs:sequence>
- *       <xs:element ref="Option" minOccurs="0" maxOccurs="unbounded"/>
- *    </xs:sequence>
+ *   <xs:sequence>
+ *     <xs:element ref="Option" minOccurs="0" maxOccurs="unbounded"/>
+ *   </xs:sequence>
  * </xs:complexType>
- *  
- * <xs:element name="Option" type="xs:anyURI" />
  */
 
 /*****************************************************************************/
 /* private methods                                                           */
 /*****************************************************************************/
 
+
 static struct XmlSnippet schema_snippets[] = {
-	{ "Option", SNIPPET_LIST_CONTENT, G_STRUCT_OFFSET(LassoIdWsf2DiscoOptions, Option) },
-	{ NULL, 0, 0}
+	{ "Option", SNIPPET_LIST_CONTENT,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoOptions, Option) },
+	{NULL, 0, 0}
 };
 
+static LassoNodeClass *parent_class = NULL;
+
+
 /*****************************************************************************/
 /* instance and class init functions                                         */
 /*****************************************************************************/
@@ -61,6 +63,7 @@ class_init(LassoIdWsf2DiscoOptionsClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
 
+	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "Options");
 	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
@@ -86,11 +89,18 @@ lasso_idwsf2_disco_options_get_type()
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
-						   "LassoIdWsf2DiscoOptions", &this_info, 0);
+				"LassoIdWsf2DiscoOptions", &this_info, 0);
 	}
 	return this_type;
 }
 
+/**
+ * lasso_idwsf2_disco_options_new:
+ *
+ * Creates a new #LassoIdWsf2DiscoOptions object.
+ *
+ * Return value: a newly created #LassoIdWsf2DiscoOptions object
+ **/
 LassoIdWsf2DiscoOptions*
 lasso_idwsf2_disco_options_new()
 {
diff --git a/lasso/xml/id-wsf-2.0/disco_options.h b/lasso/xml/id-wsf-2.0/disco_options.h
index f4fbbd64..0e90d08f 100644
--- a/lasso/xml/id-wsf-2.0/disco_options.h
+++ b/lasso/xml/id-wsf-2.0/disco_options.h
@@ -1,4 +1,4 @@
-/* $Id: disco_options.h 2183 2005-01-22 15:57:56Z $ 
+/* $Id: disco_options.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
  *
  * Lasso - A free implementation of the Liberty Alliance specifications.
  *
@@ -27,39 +27,53 @@
 
 #ifdef __cplusplus
 extern "C" {
-#endif /* __cplusplus */ 
+#endif /* __cplusplus */
 
 #include <lasso/xml/xml.h>
 
 #define LASSO_TYPE_IDWSF2_DISCO_OPTIONS (lasso_idwsf2_disco_options_get_type())
 #define LASSO_IDWSF2_DISCO_OPTIONS(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_IDWSF2_DISCO_OPTIONS, LassoIdWsf2DiscoOptions))
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_OPTIONS, \
+		LassoIdWsf2DiscoOptions))
 #define LASSO_IDWSF2_DISCO_OPTIONS_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_IDWSF2_DISCO_OPTIONS, LassoIdWsf2DiscoOptionsClass))
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_OPTIONS, \
+		LassoIdWsf2DiscoOptionsClass))
 #define LASSO_IS_IDWSF2_DISCO_OPTIONS(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_IDWSF2_DISCO_OPTIONS))
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_OPTIONS))
 #define LASSO_IS_IDWSF2_DISCO_OPTIONS_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_IDWSF2_DISCO_OPTIONS))
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_OPTIONS))
 #define LASSO_IDWSF2_DISCO_OPTIONS_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_IDWSF2_DISCO_OPTIONS, LassoIdWsf2DiscoOptionsClass)) 
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DISCO_OPTIONS, \
+		LassoIdWsf2DiscoOptionsClass)) 
+
 
 typedef struct _LassoIdWsf2DiscoOptions LassoIdWsf2DiscoOptions;
 typedef struct _LassoIdWsf2DiscoOptionsClass LassoIdWsf2DiscoOptionsClass;
 
+
 struct _LassoIdWsf2DiscoOptions {
 	LassoNode parent;
 
+	/*< public >*/
+	/* elements */
 	GList *Option;
 };
 
+
 struct _LassoIdWsf2DiscoOptionsClass {
 	LassoNodeClass parent;
 };
 
 LASSO_EXPORT GType lasso_idwsf2_disco_options_get_type(void);
-
 LASSO_EXPORT LassoIdWsf2DiscoOptions* lasso_idwsf2_disco_options_new(void);
 
+
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/lasso/xml/id-wsf-2.0/disco_providerid.c b/lasso/xml/id-wsf-2.0/disco_provider_id.c
index 4e999103..e1024713 100644
--- a/lasso/xml/id-wsf-2.0/disco_providerid.c
+++ b/lasso/xml/id-wsf-2.0/disco_provider_id.c
@@ -1,4 +1,4 @@
-/* $Id: disco_providerid.c 2183 2005-01-22 15:57:56 dlaniel $ 
+/* $Id: disco_provider_id.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
  *
  * Lasso - A free implementation of the Liberty Alliance specifications.
  *
@@ -22,17 +22,28 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <lasso/xml/id-wsf-2.0/disco_providerid.h>
+#include "disco_provider_id.h"
+
+/*
+ * Schema fragment (liberty-idwsf-disco-svc-v2.0.xsd):
+ *
+ * <xs:element name="ProviderID" type="xs:anyURI"/>
+ */
 
 /*****************************************************************************/
 /* private methods                                                           */
 /*****************************************************************************/
 
+
 static struct XmlSnippet schema_snippets[] = {
-	{ "content", SNIPPET_TEXT_CHILD, G_STRUCT_OFFSET(LassoIdWsf2DiscoProviderID, content) },
-	{ NULL, 0, 0}
+	{ "content", SNIPPET_TEXT_CHILD,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoProviderID, content) },
+	{NULL, 0, 0}
 };
 
+static LassoNodeClass *parent_class = NULL;
+
+
 /*****************************************************************************/
 /* instance and class init functions                                         */
 /*****************************************************************************/
@@ -48,15 +59,15 @@ class_init(LassoIdWsf2DiscoProviderIDClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
 
+	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "ProviderID");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF,
-			LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
 GType
-lasso_idwsf2_disco_providerid_get_type()
+lasso_idwsf2_disco_provider_id_get_type()
 {
 	static GType this_type = 0;
 
@@ -79,20 +90,34 @@ lasso_idwsf2_disco_providerid_get_type()
 	return this_type;
 }
 
+/**
+ * lasso_idwsf2_disco_provider_id_new:
+ *
+ * Creates a new #LassoIdWsf2DiscoProviderID object.
+ *
+ * Return value: a newly created #LassoIdWsf2DiscoProviderID object
+ **/
 LassoIdWsf2DiscoProviderID*
-lasso_idwsf2_disco_providerid_new()
+lasso_idwsf2_disco_provider_id_new()
 {
-	return LASSO_IDWSF2_DISCO_PROVIDERID(g_object_new(
-		LASSO_TYPE_IDWSF2_DISCO_PROVIDERID, NULL));
+	return g_object_new(LASSO_TYPE_IDWSF2_DISCO_PROVIDER_ID, NULL);
 }
 
+
+/**
+ * lasso_idwsf2_disco_provider_id_new_with_string:
+ * @content: 
+ *
+ * Creates a new #LassoIdWsf2DiscoProviderID object and initializes it
+ * with @content.
+ *
+ * Return value: a newly created #LassoIdWsf2DiscoProviderID object
+ **/
 LassoIdWsf2DiscoProviderID*
-lasso_idwsf2_disco_providerid_new_with_content(gchar *content)
+lasso_idwsf2_disco_provider_id_new_with_string(char *content)
 {
-	LassoIdWsf2DiscoProviderID *idwsf2_disco_providerid = LASSO_IDWSF2_DISCO_PROVIDERID(
-		g_object_new(LASSO_TYPE_IDWSF2_DISCO_PROVIDERID, NULL));
-	
-	idwsf2_disco_providerid->content = g_strdup(content);
-
-	return idwsf2_disco_providerid;
+	LassoIdWsf2DiscoProviderID *object;
+	object = g_object_new(LASSO_TYPE_IDWSF2_DISCO_PROVIDER_ID, NULL);
+	object->content = g_strdup(content);
+	return object;
 }
diff --git a/lasso/xml/id-wsf-2.0/disco_providerid.h b/lasso/xml/id-wsf-2.0/disco_provider_id.h
index 8305f8f4..9905bebc 100644
--- a/lasso/xml/id-wsf-2.0/disco_providerid.h
+++ b/lasso/xml/id-wsf-2.0/disco_provider_id.h
@@ -1,4 +1,4 @@
-/* $Id: disco_providerid.h 2183 2005-01-22 15:57:56Z dlaniel $ 
+/* $Id: disco_provider_id.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
  *
  * Lasso - A free implementation of the Liberty Alliance specifications.
  *
@@ -22,49 +22,61 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __LASSO_IDWSF2_DISCO_PROVIDERID_H__
-#define __LASSO_IDWSF2_DISCO_PROVIDERID_H__
+#ifndef __LASSO_IDWSF2_DISCO_PROVIDER_ID_H__
+#define __LASSO_IDWSF2_DISCO_PROVIDER_ID_H__
 
 #ifdef __cplusplus
 extern "C" {
-#endif /* __cplusplus */ 
+#endif /* __cplusplus */
 
 #include <lasso/xml/xml.h>
 
-#define LASSO_TYPE_IDWSF2_DISCO_PROVIDERID (lasso_idwsf2_disco_providerid_get_type())
-#define LASSO_IDWSF2_DISCO_PROVIDERID(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-	 LASSO_TYPE_IDWSF2_DISCO_PROVIDERID, LassoIdWsf2DiscoProviderID))
-#define LASSO_IDWSF2_DISCO_PROVIDERID_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
-	 LASSO_TYPE_IDWSF2_DISCO_PROVIDERID, LassoIdWsf2DiscoProviderIDClass))
-#define LASSO_IS_IDWSF2_DISCO_PROVIDERID(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
-	 LASSO_TYPE_IDWSF2_DISCO_PROVIDERID))
-#define LASSO_IS_IDWSF2_DISCO_PROVIDERID_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-	 LASSO_TYPE_IDWSF2_DISCO_PROVIDERID))
-#define LASSO_IDWSF2_DISCO_PROVIDERID_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
-	 LASSO_TYPE_IDWSF2_DISCO_PROVIDERID, LassoIdWsf2DiscoProviderIDClass)) 
+#define LASSO_TYPE_IDWSF2_DISCO_PROVIDER_ID (lasso_idwsf2_disco_provider_id_get_type())
+#define LASSO_IDWSF2_DISCO_PROVIDER_ID(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_PROVIDER_ID, \
+		LassoIdWsf2DiscoProviderID))
+#define LASSO_IDWSF2_DISCO_PROVIDER_ID_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_PROVIDER_ID, \
+		LassoIdWsf2DiscoProviderIDClass))
+#define LASSO_IS_IDWSF2_DISCO_PROVIDER_ID(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_PROVIDER_ID))
+#define LASSO_IS_IDWSF2_DISCO_PROVIDER_ID_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_PROVIDER_ID))
+#define LASSO_IDWSF2_DISCO_PROVIDER_ID_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DISCO_PROVIDER_ID, \
+		LassoIdWsf2DiscoProviderIDClass)) 
+
 
 typedef struct _LassoIdWsf2DiscoProviderID LassoIdWsf2DiscoProviderID;
 typedef struct _LassoIdWsf2DiscoProviderIDClass LassoIdWsf2DiscoProviderIDClass;
 
+
 struct _LassoIdWsf2DiscoProviderID {
 	LassoNode parent;
 
-	gchar *content;
+	/*< public >*/
+	/* elements */
+	char *content;
 };
 
+
 struct _LassoIdWsf2DiscoProviderIDClass {
 	LassoNodeClass parent;
 };
 
-LASSO_EXPORT GType lasso_idwsf2_disco_providerid_get_type(void);
+LASSO_EXPORT GType lasso_idwsf2_disco_provider_id_get_type(void);
+LASSO_EXPORT LassoIdWsf2DiscoProviderID* lasso_idwsf2_disco_provider_id_new(void);
 
-LASSO_EXPORT LassoIdWsf2DiscoProviderID* lasso_idwsf2_disco_providerid_new(void);
+LASSO_EXPORT LassoIdWsf2DiscoProviderID* lasso_idwsf2_disco_provider_id_new_with_string(char *content);
 
-LASSO_EXPORT LassoIdWsf2DiscoProviderID*
-	lasso_idwsf2_disco_providerid_new_with_content(gchar *content);
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* __LASSO_IDWSF2_DISCO_PROVIDERID_H__ */
+#endif /* __LASSO_IDWSF2_DISCO_PROVIDER_ID_H__ */
diff --git a/lasso/xml/id-wsf-2.0/disco_query.c b/lasso/xml/id-wsf-2.0/disco_query.c
index caf5c524..27a103dd 100644
--- a/lasso/xml/id-wsf-2.0/disco_query.c
+++ b/lasso/xml/id-wsf-2.0/disco_query.c
@@ -48,7 +48,7 @@ static struct XmlSnippet schema_snippets[] = {
 	{ "RequestedService", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoQuery, RequestedService),
 		"LassoIdWsf2DiscoRequestedService" },
-	{ "any", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoQuery, attributes) },
 	{NULL, 0, 0}
 };
@@ -111,7 +111,7 @@ lasso_idwsf2_disco_query_get_type()
  *
  * Return value: a newly created #LassoIdWsf2DiscoQuery object
  **/
-LassoNode*
+LassoIdWsf2DiscoQuery*
 lasso_idwsf2_disco_query_new()
 {
 	return g_object_new(LASSO_TYPE_IDWSF2_DISCO_QUERY, NULL);
diff --git a/lasso/xml/id-wsf-2.0/disco_query.h b/lasso/xml/id-wsf-2.0/disco_query.h
index 2285d5ee..5804a9fe 100644
--- a/lasso/xml/id-wsf-2.0/disco_query.h
+++ b/lasso/xml/id-wsf-2.0/disco_query.h
@@ -72,7 +72,7 @@ struct _LassoIdWsf2DiscoQueryClass {
 };
 
 LASSO_EXPORT GType lasso_idwsf2_disco_query_get_type(void);
-LASSO_EXPORT LassoNode* lasso_idwsf2_disco_query_new(void);
+LASSO_EXPORT LassoIdWsf2DiscoQuery* lasso_idwsf2_disco_query_new(void);
 
 
 
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 1c3b0a2f..8a67f945 100644
--- a/lasso/xml/id-wsf-2.0/disco_query_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_query_response.c
@@ -51,7 +51,7 @@ static struct XmlSnippet schema_snippets[] = {
 	{ "EndpointReference", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoQueryResponse, EndpointReference),
 		"LassoWsAddrEndpointReference" },
-	{ "any", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoQueryResponse, attributes) },
 	{NULL, 0, 0}
 };
diff --git a/lasso/xml/id-wsf-2.0/disco_query_response.h b/lasso/xml/id-wsf-2.0/disco_query_response.h
index 260f5816..c1eb18fd 100644
--- a/lasso/xml/id-wsf-2.0/disco_query_response.h
+++ b/lasso/xml/id-wsf-2.0/disco_query_response.h
@@ -32,8 +32,7 @@ extern "C" {
 #include <lasso/xml/xml.h>
 #include "util_status.h"
 
-#define LASSO_TYPE_IDWSF2_DISCO_QUERY_RESPONSE \
-	(lasso_idwsf2_disco_query_response_get_type())
+#define LASSO_TYPE_IDWSF2_DISCO_QUERY_RESPONSE (lasso_idwsf2_disco_query_response_get_type())
 #define LASSO_IDWSF2_DISCO_QUERY_RESPONSE(obj) \
 	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
 		LASSO_TYPE_IDWSF2_DISCO_QUERY_RESPONSE, \
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 9c3ed7e4..2449ad34 100644
--- a/lasso/xml/id-wsf-2.0/disco_requested_service.c
+++ b/lasso/xml/id-wsf-2.0/disco_requested_service.c
@@ -73,11 +73,11 @@ static struct XmlSnippet schema_snippets[] = {
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoRequestedService, Framework) },
 	{ "Action", SNIPPET_LIST_CONTENT,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoRequestedService, Action) },
-	{ "any", SNIPPET_NODE | SNIPPET_ANY,
+	{ "", SNIPPET_NODE | SNIPPET_ANY | SNIPPET_ANY,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoRequestedService, any) },
-	{ "reqID", SNIPPET_ATTRIBUTE,
+	{ "reqID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoRequestedService, reqID) },
-	{ "resultsType", SNIPPET_ATTRIBUTE,
+	{ "resultsType", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoRequestedService, resultsType) },
 	{NULL, 0, 0}
 };
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 12ba926b..0cb36269 100644
--- a/lasso/xml/id-wsf-2.0/disco_security_context.c
+++ b/lasso/xml/id-wsf-2.0/disco_security_context.c
@@ -112,7 +112,7 @@ lasso_idwsf2_disco_security_context_get_type()
  *
  * Return value: a newly created #LassoIdWsf2DiscoSecurityContext object
  **/
-LassoNode*
+LassoIdWsf2DiscoSecurityContext*
 lasso_idwsf2_disco_security_context_new()
 {
 	return g_object_new(LASSO_TYPE_IDWSF2_DISCO_SECURITY_CONTEXT, NULL);
diff --git a/lasso/xml/id-wsf-2.0/disco_security_context.h b/lasso/xml/id-wsf-2.0/disco_security_context.h
index e6aa7e29..8484b19d 100644
--- a/lasso/xml/id-wsf-2.0/disco_security_context.h
+++ b/lasso/xml/id-wsf-2.0/disco_security_context.h
@@ -72,7 +72,7 @@ struct _LassoIdWsf2DiscoSecurityContextClass {
 };
 
 LASSO_EXPORT GType lasso_idwsf2_disco_security_context_get_type(void);
-LASSO_EXPORT LassoNode* lasso_idwsf2_disco_security_context_new(void);
+LASSO_EXPORT LassoIdWsf2DiscoSecurityContext* lasso_idwsf2_disco_security_context_new(void);
 
 
 
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 c1a24797..824abcfa 100644
--- a/lasso/xml/id-wsf-2.0/disco_service_context.c
+++ b/lasso/xml/id-wsf-2.0/disco_service_context.c
@@ -1,4 +1,4 @@
-/* $Id: disco_service_context.c 2261 2005-01-27 23:41:05 $ 
+/* $Id: disco_service_context.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
  *
  * Lasso - A free implementation of the Liberty Alliance specifications.
  *
@@ -22,38 +22,41 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <lasso/xml/id-wsf-2.0/disco_service_context.h>
+#include "disco_service_context.h"
 
 /*
  * Schema fragment (liberty-idwsf-disco-svc-v2.0.xsd):
- * 
- * <xs:element name="ServiceContext" type="ServiceContextType"/>
+ *
  * <xs:complexType name="ServiceContextType">
- *    <xs:sequence>
- *       <xs:element ref="ServiceType"     maxOccurs="unbounded" />
- *       <xs:element ref="Options"         minOccurs="0"
- *                                         maxOccurs="unbounded" />
+ *   <xs:sequence>
+ *     <xs:element ref="ServiceType"     maxOccurs="unbounded" />
+ *     <xs:element ref="Options"         minOccurs="0"
+ *       maxOccurs="unbounded" />
  *       <xs:element ref="EndpointContext" maxOccurs="unbounded" />
- *    </xs:sequence>
- * </xs:complexType>
- * 
- * <xs:element name="ServiceType" type="xs:anyURI"/>
+ *     </xs:sequence>
+ *   </xs:complexType>
  */
 
 /*****************************************************************************/
 /* private methods                                                           */
 /*****************************************************************************/
 
+
 static struct XmlSnippet schema_snippets[] = {
-	{ "ServiceType", SNIPPET_CONTENT,
-	  G_STRUCT_OFFSET(LassoIdWsf2DiscoServiceContext, ServiceType) },
-	{ "Options", SNIPPET_NODE,
-	  G_STRUCT_OFFSET(LassoIdWsf2DiscoServiceContext, Options) },
-	{ "EndpointContext", SNIPPET_NODE,
-	  G_STRUCT_OFFSET(LassoIdWsf2DiscoServiceContext, EndpointContext) },
-	{ NULL, 0, 0}
+	{ "ServiceType", SNIPPET_LIST_CONTENT,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoServiceContext, ServiceType) },
+	{ "Options", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoServiceContext, Options),
+		"LassoIdWsf2DiscoOptions" },
+	{ "EndpointContext", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoServiceContext, EndpointContext),
+		"LassoIdWsf2DiscoEndpointContext" },
+	{NULL, 0, 0}
 };
 
+static LassoNodeClass *parent_class = NULL;
+
+
 /*****************************************************************************/
 /* instance and class init functions                                         */
 /*****************************************************************************/
@@ -71,6 +74,7 @@ class_init(LassoIdWsf2DiscoServiceContextClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
 
+	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "ServiceContext");
 	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
@@ -101,23 +105,30 @@ lasso_idwsf2_disco_service_context_get_type()
 	return this_type;
 }
 
+/**
+ * lasso_idwsf2_disco_service_context_new:
+ *
+ * Creates a new #LassoIdWsf2DiscoServiceContext object.
+ *
+ * Return value: a newly created #LassoIdWsf2DiscoServiceContext object
+ **/
 LassoIdWsf2DiscoServiceContext*
 lasso_idwsf2_disco_service_context_new()
 {
 	return g_object_new(LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT, NULL);
 }
 
+
 LassoIdWsf2DiscoServiceContext*
-lasso_idwsf2_disco_service_context_new_full(const gchar *serviceType,
-		LassoIdWsf2DiscoEndpointContext *endpointContext)
+lasso_idwsf2_disco_service_context_new_full(
+		const gchar *serviceType, LassoIdWsf2DiscoEndpointContext *endpointContext)
 {
 	LassoIdWsf2DiscoServiceContext *context;
 
-	context = g_object_new(LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT, NULL);
+	context = lasso_idwsf2_disco_service_context_new();
 
-	context->ServiceType = g_strdup(serviceType);
-	context->EndpointContext = g_object_ref(endpointContext);
+	context->ServiceType = g_list_append(NULL, g_strdup(serviceType));
+	context->EndpointContext = g_list_append(NULL, g_object_ref(endpointContext));
 
 	return context;
 }
-
diff --git a/lasso/xml/id-wsf-2.0/disco_service_context.h b/lasso/xml/id-wsf-2.0/disco_service_context.h
index 42283a52..51752630 100644
--- a/lasso/xml/id-wsf-2.0/disco_service_context.h
+++ b/lasso/xml/id-wsf-2.0/disco_service_context.h
@@ -1,4 +1,4 @@
-/* $Id: disco_service_context.h 2428 2005-03-10 08:13:36 $
+/* $Id: disco_service_context.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
  *
  * Lasso - A free implementation of the Liberty Alliance specifications.
  *
@@ -27,49 +27,57 @@
 
 #ifdef __cplusplus
 extern "C" {
-#endif /* __cplusplus */ 
+#endif /* __cplusplus */
 
 #include <lasso/xml/xml.h>
-#include <lasso/xml/id-wsf-2.0/disco_endpoint_context.h>
-#include <lasso/xml/id-wsf-2.0/disco_options.h>
+#include "disco_endpoint_context.h"
 
 #define LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT (lasso_idwsf2_disco_service_context_get_type())
 #define LASSO_IDWSF2_DISCO_SERVICE_CONTEXT(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT, \
-				    LassoIdWsf2DiscoServiceContext))
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT, \
+		LassoIdWsf2DiscoServiceContext))
 #define LASSO_IDWSF2_DISCO_SERVICE_CONTEXT_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT, \
-				 LassoIdWsf2DiscoServiceContextClass))
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT, \
+		LassoIdWsf2DiscoServiceContextClass))
 #define LASSO_IS_IDWSF2_DISCO_SERVICE_CONTEXT(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT))
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT))
 #define LASSO_IS_IDWSF2_DISCO_SERVICE_CONTEXT_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT))
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT))
 #define LASSO_IDWSF2_DISCO_SERVICE_CONTEXT_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT, \
-				    LassoIdWsf2DiscoServiceContextClass)) 
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT, \
+		LassoIdWsf2DiscoServiceContextClass)) 
+
 
 typedef struct _LassoIdWsf2DiscoServiceContext LassoIdWsf2DiscoServiceContext;
 typedef struct _LassoIdWsf2DiscoServiceContextClass LassoIdWsf2DiscoServiceContextClass;
 
+
 struct _LassoIdWsf2DiscoServiceContext {
 	LassoNode parent;
 
+	/*< public >*/
 	/* elements */
-	gchar *ServiceType;
-	LassoIdWsf2DiscoOptions *Options;
-	LassoIdWsf2DiscoEndpointContext *EndpointContext;
+	GList *ServiceType;
+	GList *Options; /* of LassoIdWsf2DiscoOptions */
+	GList *EndpointContext; /* of LassoIdWsf2DiscoEndpointContext */
 };
 
+
 struct _LassoIdWsf2DiscoServiceContextClass {
 	LassoNodeClass parent;
 };
 
 LASSO_EXPORT GType lasso_idwsf2_disco_service_context_get_type(void);
-
-LASSO_EXPORT LassoIdWsf2DiscoServiceContext* lasso_idwsf2_disco_service_context_new();
+LASSO_EXPORT LassoIdWsf2DiscoServiceContext* lasso_idwsf2_disco_service_context_new(void);
 
 LASSO_EXPORT LassoIdWsf2DiscoServiceContext* lasso_idwsf2_disco_service_context_new_full(
-	const gchar *serviceType, LassoIdWsf2DiscoEndpointContext *endpointContext);
+		const gchar *serviceType, LassoIdWsf2DiscoEndpointContext *endpointContext);
+
 
 #ifdef __cplusplus
 }
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 ccebc765..f34a22bd 100644
--- a/lasso/xml/id-wsf-2.0/disco_service_type.c
+++ b/lasso/xml/id-wsf-2.0/disco_service_type.c
@@ -1,4 +1,4 @@
-/* $Id: disco_service_type.c 2183 2005-01-22 15:57:56 dlaniel $ 
+/* $Id: disco_service_type.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
  *
  * Lasso - A free implementation of the Liberty Alliance specifications.
  *
@@ -22,17 +22,28 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <lasso/xml/id-wsf-2.0/disco_service_type.h>
+#include "disco_service_type.h"
+
+/*
+ * Schema fragment (liberty-idwsf-disco-svc-v2.0.xsd):
+ *
+ * <xs:element name="ServiceType" type="xs:anyURI"/>
+ */
 
 /*****************************************************************************/
 /* private methods                                                           */
 /*****************************************************************************/
 
+
 static struct XmlSnippet schema_snippets[] = {
-	{ "content", SNIPPET_TEXT_CHILD, G_STRUCT_OFFSET(LassoIdWsf2DiscoServiceType, content) },
-	{ NULL, 0, 0}
+	{ "content", SNIPPET_TEXT_CHILD,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoServiceType, content) },
+	{NULL, 0, 0}
 };
 
+static LassoNodeClass *parent_class = NULL;
+
+
 /*****************************************************************************/
 /* instance and class init functions                                         */
 /*****************************************************************************/
@@ -48,10 +59,10 @@ class_init(LassoIdWsf2DiscoServiceTypeClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
 
+	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "ServiceType");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF,
-			LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
@@ -79,20 +90,34 @@ lasso_idwsf2_disco_service_type_get_type()
 	return this_type;
 }
 
+/**
+ * lasso_idwsf2_disco_service_type_new:
+ *
+ * Creates a new #LassoIdWsf2DiscoServiceType object.
+ *
+ * Return value: a newly created #LassoIdWsf2DiscoServiceType object
+ **/
 LassoIdWsf2DiscoServiceType*
 lasso_idwsf2_disco_service_type_new()
 {
-	return LASSO_IDWSF2_DISCO_SERVICE_TYPE(g_object_new(
-		LASSO_TYPE_IDWSF2_DISCO_SERVICE_TYPE, NULL));
+	return g_object_new(LASSO_TYPE_IDWSF2_DISCO_SERVICE_TYPE, NULL);
 }
 
+
+/**
+ * lasso_idwsf2_disco_service_type_new_with_string:
+ * @content: 
+ *
+ * Creates a new #LassoIdWsf2DiscoServiceType object and initializes it
+ * with @content.
+ *
+ * Return value: a newly created #LassoIdWsf2DiscoServiceType object
+ **/
 LassoIdWsf2DiscoServiceType*
-lasso_idwsf2_disco_service_type_new_with_content(gchar *content)
+lasso_idwsf2_disco_service_type_new_with_string(char *content)
 {
-	LassoIdWsf2DiscoServiceType *idwsf2_disco_service_type = LASSO_IDWSF2_DISCO_SERVICE_TYPE(
-		g_object_new(LASSO_TYPE_IDWSF2_DISCO_SERVICE_TYPE, NULL));
-	
-	idwsf2_disco_service_type->content = g_strdup(content);
-
-	return idwsf2_disco_service_type;
+	LassoIdWsf2DiscoServiceType *object;
+	object = g_object_new(LASSO_TYPE_IDWSF2_DISCO_SERVICE_TYPE, NULL);
+	object->content = g_strdup(content);
+	return object;
 }
diff --git a/lasso/xml/id-wsf-2.0/disco_service_type.h b/lasso/xml/id-wsf-2.0/disco_service_type.h
index 9ba7aee7..eaa3f866 100644
--- a/lasso/xml/id-wsf-2.0/disco_service_type.h
+++ b/lasso/xml/id-wsf-2.0/disco_service_type.h
@@ -1,4 +1,4 @@
-/* $Id: disco_service_type.h 2183 2005-01-22 15:57:56Z dlaniel $ 
+/* $Id: disco_service_type.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
  *
  * Lasso - A free implementation of the Liberty Alliance specifications.
  *
@@ -27,41 +27,53 @@
 
 #ifdef __cplusplus
 extern "C" {
-#endif /* __cplusplus */ 
+#endif /* __cplusplus */
 
 #include <lasso/xml/xml.h>
 
 #define LASSO_TYPE_IDWSF2_DISCO_SERVICE_TYPE (lasso_idwsf2_disco_service_type_get_type())
-#define LASSO_IDWSF2_DISCO_SERVICE_TYPE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-	 LASSO_TYPE_IDWSF2_DISCO_SERVICE_TYPE, LassoIdWsf2DiscoServiceType))
-#define LASSO_IDWSF2_DISCO_SERVICE_TYPE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
-	 LASSO_TYPE_IDWSF2_DISCO_SERVICE_TYPE, LassoIdWsf2DiscoServiceTypeClass))
-#define LASSO_IS_IDWSF2_DISCO_SERVICE_TYPE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
-	 LASSO_TYPE_IDWSF2_DISCO_SERVICE_TYPE))
-#define LASSO_IS_IDWSF2_DISCO_SERVICE_TYPE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-	 LASSO_TYPE_IDWSF2_DISCO_SERVICE_TYPE))
-#define LASSO_IDWSF2_DISCO_SERVICE_TYPE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
-	 LASSO_TYPE_IDWSF2_DISCO_SERVICE_TYPE, LassoIdWsf2DiscoServiceTypeClass)) 
+#define LASSO_IDWSF2_DISCO_SERVICE_TYPE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SERVICE_TYPE, \
+		LassoIdWsf2DiscoServiceType))
+#define LASSO_IDWSF2_DISCO_SERVICE_TYPE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SERVICE_TYPE, \
+		LassoIdWsf2DiscoServiceTypeClass))
+#define LASSO_IS_IDWSF2_DISCO_SERVICE_TYPE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SERVICE_TYPE))
+#define LASSO_IS_IDWSF2_DISCO_SERVICE_TYPE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SERVICE_TYPE))
+#define LASSO_IDWSF2_DISCO_SERVICE_TYPE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DISCO_SERVICE_TYPE, \
+		LassoIdWsf2DiscoServiceTypeClass)) 
+
 
 typedef struct _LassoIdWsf2DiscoServiceType LassoIdWsf2DiscoServiceType;
 typedef struct _LassoIdWsf2DiscoServiceTypeClass LassoIdWsf2DiscoServiceTypeClass;
 
+
 struct _LassoIdWsf2DiscoServiceType {
 	LassoNode parent;
 
-	gchar *content;
+	/*< public >*/
+	/* elements */
+	char *content;
 };
 
+
 struct _LassoIdWsf2DiscoServiceTypeClass {
 	LassoNodeClass parent;
 };
 
 LASSO_EXPORT GType lasso_idwsf2_disco_service_type_get_type(void);
-
 LASSO_EXPORT LassoIdWsf2DiscoServiceType* lasso_idwsf2_disco_service_type_new(void);
 
-LASSO_EXPORT LassoIdWsf2DiscoServiceType*
-	lasso_idwsf2_disco_service_type_new_with_content(gchar *content);
+LASSO_EXPORT LassoIdWsf2DiscoServiceType* lasso_idwsf2_disco_service_type_new_with_string(char *content);
+
 
 #ifdef __cplusplus
 }
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 3250a1d3..37407b5f 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
@@ -43,7 +43,7 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "SvcMDID", SNIPPET_LIST_CONTENT,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationAdd, SvcMDID) },
-	{ "any", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationAdd, attributes) },
 	{NULL, 0, 0}
 };
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.h b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.h
index 33f0e00f..6be107ec 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.h
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.h
@@ -73,8 +73,7 @@ struct _LassoIdWsf2DiscoSvcMDAssociationAddClass {
 };
 
 LASSO_EXPORT GType lasso_idwsf2_disco_svc_md_association_add_get_type(void);
-LASSO_EXPORT LassoIdWsf2DiscoSvcMDAssociationAdd*
-        lasso_idwsf2_disco_svc_md_association_add_new(void);
+LASSO_EXPORT LassoIdWsf2DiscoSvcMDAssociationAdd* lasso_idwsf2_disco_svc_md_association_add_new(void);
 
 
 
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 0637ab0b..4787d722 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
@@ -44,7 +44,7 @@ static struct XmlSnippet schema_snippets[] = {
 	{ "Status", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationAddResponse, Status),
 		"LassoIdWsf2UtilStatus" },
-	{ "any", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationAddResponse, attributes) },
 	{NULL, 0, 0}
 };
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.h b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.h
index c9f56d3f..29322b5f 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.h
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.h
@@ -76,8 +76,7 @@ struct _LassoIdWsf2DiscoSvcMDAssociationAddResponseClass {
 };
 
 LASSO_EXPORT GType lasso_idwsf2_disco_svc_md_association_add_response_get_type(void);
-LASSO_EXPORT LassoIdWsf2DiscoSvcMDAssociationAddResponse*
-        lasso_idwsf2_disco_svc_md_association_add_response_new(void);
+LASSO_EXPORT LassoIdWsf2DiscoSvcMDAssociationAddResponse* lasso_idwsf2_disco_svc_md_association_add_response_new(void);
 
 
 
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
new file mode 100644
index 00000000..d464e27c
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.c
@@ -0,0 +1,113 @@
+/* $Id: disco_svc_md_association_delete.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "disco_svc_md_association_delete.h"
+
+/*
+ * Schema fragment (liberty-idwsf-disco-svc-v2.0.xsd):
+ *
+ * <xs:complexType name="SvcMDAssociationDeleteType">
+ *   <xs:sequence>
+ *     <xs:element ref="SvcMDID" maxOccurs="unbounded" />
+ *   </xs:sequence>
+ *   <xs:anyAttribute namespace="##other" processContents="lax"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "SvcMDID", SNIPPET_LIST_CONTENT,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationDelete, SvcMDID) },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationDelete, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2DiscoSvcMDAssociationDelete *node)
+{
+	node->SvcMDID = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoIdWsf2DiscoSvcMDAssociationDeleteClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "SvcMDAssociationDelete");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_disco_svc_md_association_delete_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2DiscoSvcMDAssociationDeleteClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2DiscoSvcMDAssociationDelete),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2DiscoSvcMDAssociationDelete", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_disco_svc_md_association_delete_new:
+ *
+ * Creates a new #LassoIdWsf2DiscoSvcMDAssociationDelete object.
+ *
+ * Return value: a newly created #LassoIdWsf2DiscoSvcMDAssociationDelete object
+ **/
+LassoIdWsf2DiscoSvcMDAssociationDelete*
+lasso_idwsf2_disco_svc_md_association_delete_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.h b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.h
new file mode 100644
index 00000000..6f80969c
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.h
@@ -0,0 +1,86 @@
+/* $Id: disco_svc_md_association_delete.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE_H__
+#define __LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE \
+	(lasso_idwsf2_disco_svc_md_association_delete_get_type())
+#define LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE, \
+		LassoIdWsf2DiscoSvcMDAssociationDelete))
+#define LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE, \
+		LassoIdWsf2DiscoSvcMDAssociationDeleteClass))
+#define LASSO_IS_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE))
+#define LASSO_IS_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE))
+#define LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE, \
+		LassoIdWsf2DiscoSvcMDAssociationDeleteClass)) 
+
+
+typedef struct _LassoIdWsf2DiscoSvcMDAssociationDelete \
+	LassoIdWsf2DiscoSvcMDAssociationDelete;
+typedef struct _LassoIdWsf2DiscoSvcMDAssociationDeleteClass \
+	LassoIdWsf2DiscoSvcMDAssociationDeleteClass;
+
+
+struct _LassoIdWsf2DiscoSvcMDAssociationDelete {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	GList *SvcMDID;
+	/* attributes */
+	GHashTable *attributes;
+};
+
+
+struct _LassoIdWsf2DiscoSvcMDAssociationDeleteClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_disco_svc_md_association_delete_get_type(void);
+LASSO_EXPORT LassoIdWsf2DiscoSvcMDAssociationDelete* lasso_idwsf2_disco_svc_md_association_delete_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE_H__ */
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
new file mode 100644
index 00000000..1c0c7733
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.c
@@ -0,0 +1,114 @@
+/* $Id: disco_svc_md_association_delete_response.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "disco_svc_md_association_delete_response.h"
+
+/*
+ * Schema fragment (liberty-idwsf-disco-svc-v2.0.xsd):
+ *
+ * <xs:complexType name="SvcMDAssociationDeleteResponseType">
+ *   <xs:sequence>
+ *     <xs:element ref="lu:Status" />
+ *   </xs:sequence>
+ *   <xs:anyAttribute namespace="##other" processContents="lax"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Status", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationDeleteResponse, Status),
+		"LassoIdWsf2UtilStatus" },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationDeleteResponse, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2DiscoSvcMDAssociationDeleteResponse *node)
+{
+	node->Status = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoIdWsf2DiscoSvcMDAssociationDeleteResponseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "SvcMDAssociationDeleteResponse");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_disco_svc_md_association_delete_response_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2DiscoSvcMDAssociationDeleteResponseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2DiscoSvcMDAssociationDeleteResponse),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2DiscoSvcMDAssociationDeleteResponse", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_disco_svc_md_association_delete_response_new:
+ *
+ * Creates a new #LassoIdWsf2DiscoSvcMDAssociationDeleteResponse object.
+ *
+ * Return value: a newly created #LassoIdWsf2DiscoSvcMDAssociationDeleteResponse object
+ **/
+LassoIdWsf2DiscoSvcMDAssociationDeleteResponse*
+lasso_idwsf2_disco_svc_md_association_delete_response_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE_RESPONSE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.h b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.h
new file mode 100644
index 00000000..de11bf5a
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.h
@@ -0,0 +1,87 @@
+/* $Id: disco_svc_md_association_delete_response.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE_RESPONSE_H__
+#define __LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE_RESPONSE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "util_status.h"
+
+#define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE_RESPONSE \
+	(lasso_idwsf2_disco_svc_md_association_delete_response_get_type())
+#define LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE_RESPONSE, \
+		LassoIdWsf2DiscoSvcMDAssociationDeleteResponse))
+#define LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE_RESPONSE, \
+		LassoIdWsf2DiscoSvcMDAssociationDeleteResponseClass))
+#define LASSO_IS_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE_RESPONSE))
+#define LASSO_IS_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE_RESPONSE))
+#define LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE_RESPONSE, \
+		LassoIdWsf2DiscoSvcMDAssociationDeleteResponseClass)) 
+
+
+typedef struct _LassoIdWsf2DiscoSvcMDAssociationDeleteResponse \
+	LassoIdWsf2DiscoSvcMDAssociationDeleteResponse;
+typedef struct _LassoIdWsf2DiscoSvcMDAssociationDeleteResponseClass \
+	LassoIdWsf2DiscoSvcMDAssociationDeleteResponseClass;
+
+
+struct _LassoIdWsf2DiscoSvcMDAssociationDeleteResponse {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	LassoIdWsf2UtilStatus *Status;
+	/* attributes */
+	GHashTable *attributes;
+};
+
+
+struct _LassoIdWsf2DiscoSvcMDAssociationDeleteResponseClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_disco_svc_md_association_delete_response_get_type(void);
+LASSO_EXPORT LassoIdWsf2DiscoSvcMDAssociationDeleteResponse* lasso_idwsf2_disco_svc_md_association_delete_response_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_DELETE_RESPONSE_H__ */
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
new file mode 100644
index 00000000..727a4875
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.c
@@ -0,0 +1,113 @@
+/* $Id: disco_svc_md_association_query.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "disco_svc_md_association_query.h"
+
+/*
+ * Schema fragment (liberty-idwsf-disco-svc-v2.0.xsd):
+ *
+ * <xs:complexType name="SvcMDAssociationQueryType">
+ *   <xs:sequence>
+ *     <xs:element ref="SvcMDID" minOccurs="0" maxOccurs="unbounded" />
+ *   </xs:sequence>
+ *   <xs:anyAttribute namespace="##other" processContents="lax"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "SvcMDID", SNIPPET_LIST_CONTENT,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationQuery, SvcMDID) },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationQuery, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2DiscoSvcMDAssociationQuery *node)
+{
+	node->SvcMDID = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoIdWsf2DiscoSvcMDAssociationQueryClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "SvcMDAssociationQuery");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_disco_svc_md_association_query_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2DiscoSvcMDAssociationQueryClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2DiscoSvcMDAssociationQuery),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2DiscoSvcMDAssociationQuery", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_disco_svc_md_association_query_new:
+ *
+ * Creates a new #LassoIdWsf2DiscoSvcMDAssociationQuery object.
+ *
+ * Return value: a newly created #LassoIdWsf2DiscoSvcMDAssociationQuery object
+ **/
+LassoIdWsf2DiscoSvcMDAssociationQuery*
+lasso_idwsf2_disco_svc_md_association_query_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.h b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.h
new file mode 100644
index 00000000..9bf7b166
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.h
@@ -0,0 +1,86 @@
+/* $Id: disco_svc_md_association_query.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY_H__
+#define __LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY \
+	(lasso_idwsf2_disco_svc_md_association_query_get_type())
+#define LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY, \
+		LassoIdWsf2DiscoSvcMDAssociationQuery))
+#define LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY, \
+		LassoIdWsf2DiscoSvcMDAssociationQueryClass))
+#define LASSO_IS_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY))
+#define LASSO_IS_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY))
+#define LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY, \
+		LassoIdWsf2DiscoSvcMDAssociationQueryClass)) 
+
+
+typedef struct _LassoIdWsf2DiscoSvcMDAssociationQuery \
+	LassoIdWsf2DiscoSvcMDAssociationQuery;
+typedef struct _LassoIdWsf2DiscoSvcMDAssociationQueryClass \
+	LassoIdWsf2DiscoSvcMDAssociationQueryClass;
+
+
+struct _LassoIdWsf2DiscoSvcMDAssociationQuery {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	GList *SvcMDID;
+	/* attributes */
+	GHashTable *attributes;
+};
+
+
+struct _LassoIdWsf2DiscoSvcMDAssociationQueryClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_disco_svc_md_association_query_get_type(void);
+LASSO_EXPORT LassoIdWsf2DiscoSvcMDAssociationQuery* lasso_idwsf2_disco_svc_md_association_query_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY_H__ */
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
new file mode 100644
index 00000000..b8afb899
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.c
@@ -0,0 +1,118 @@
+/* $Id: disco_svc_md_association_query_response.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "disco_svc_md_association_query_response.h"
+
+/*
+ * Schema fragment (liberty-idwsf-disco-svc-v2.0.xsd):
+ *
+ * <xs:complexType name="SvcMDAssociationQueryResponseType">
+ *   <xs:sequence>
+ *     <xs:element ref="lu:Status" />
+ *     <xs:element ref="SvcMDID" minOccurs="0" maxOccurs="unbounded" />
+ *   </xs:sequence>
+ *   <xs:anyAttribute namespace="##other" processContents="lax"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Status", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationQueryResponse, Status),
+		"LassoIdWsf2UtilStatus" },
+	{ "SvcMDID", SNIPPET_LIST_CONTENT,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationQueryResponse, SvcMDID) },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDAssociationQueryResponse, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2DiscoSvcMDAssociationQueryResponse *node)
+{
+	node->Status = NULL;
+	node->SvcMDID = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoIdWsf2DiscoSvcMDAssociationQueryResponseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "SvcMDAssociationQueryResponse");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_disco_svc_md_association_query_response_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2DiscoSvcMDAssociationQueryResponseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2DiscoSvcMDAssociationQueryResponse),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2DiscoSvcMDAssociationQueryResponse", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_disco_svc_md_association_query_response_new:
+ *
+ * Creates a new #LassoIdWsf2DiscoSvcMDAssociationQueryResponse object.
+ *
+ * Return value: a newly created #LassoIdWsf2DiscoSvcMDAssociationQueryResponse object
+ **/
+LassoIdWsf2DiscoSvcMDAssociationQueryResponse*
+lasso_idwsf2_disco_svc_md_association_query_response_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY_RESPONSE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.h b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.h
new file mode 100644
index 00000000..22bda6bf
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.h
@@ -0,0 +1,88 @@
+/* $Id: disco_svc_md_association_query_response.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY_RESPONSE_H__
+#define __LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY_RESPONSE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "util_status.h"
+
+#define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY_RESPONSE \
+	(lasso_idwsf2_disco_svc_md_association_query_response_get_type())
+#define LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY_RESPONSE, \
+		LassoIdWsf2DiscoSvcMDAssociationQueryResponse))
+#define LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY_RESPONSE, \
+		LassoIdWsf2DiscoSvcMDAssociationQueryResponseClass))
+#define LASSO_IS_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY_RESPONSE))
+#define LASSO_IS_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY_RESPONSE))
+#define LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY_RESPONSE, \
+		LassoIdWsf2DiscoSvcMDAssociationQueryResponseClass)) 
+
+
+typedef struct _LassoIdWsf2DiscoSvcMDAssociationQueryResponse \
+	LassoIdWsf2DiscoSvcMDAssociationQueryResponse;
+typedef struct _LassoIdWsf2DiscoSvcMDAssociationQueryResponseClass \
+	LassoIdWsf2DiscoSvcMDAssociationQueryResponseClass;
+
+
+struct _LassoIdWsf2DiscoSvcMDAssociationQueryResponse {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	LassoIdWsf2UtilStatus *Status;
+	GList *SvcMDID;
+	/* attributes */
+	GHashTable *attributes;
+};
+
+
+struct _LassoIdWsf2DiscoSvcMDAssociationQueryResponseClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_disco_svc_md_association_query_response_get_type(void);
+LASSO_EXPORT LassoIdWsf2DiscoSvcMDAssociationQueryResponse* lasso_idwsf2_disco_svc_md_association_query_response_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_DISCO_SVC_MD_ASSOCIATION_QUERY_RESPONSE_H__ */
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
new file mode 100644
index 00000000..2d235591
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_delete.c
@@ -0,0 +1,113 @@
+/* $Id: disco_svc_md_delete.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "disco_svc_md_delete.h"
+
+/*
+ * Schema fragment (liberty-idwsf-disco-svc-v2.0.xsd):
+ *
+ * <xs:complexType name="SvcMDDeleteType">
+ *   <xs:sequence>
+ *     <xs:element ref="SvcMDID" maxOccurs="unbounded" />
+ *   </xs:sequence>
+ *   <xs:anyAttribute namespace="##other" processContents="lax"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "SvcMDID", SNIPPET_LIST_CONTENT,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDDelete, SvcMDID) },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDDelete, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2DiscoSvcMDDelete *node)
+{
+	node->SvcMDID = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoIdWsf2DiscoSvcMDDeleteClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "SvcMDDelete");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_disco_svc_md_delete_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2DiscoSvcMDDeleteClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2DiscoSvcMDDelete),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2DiscoSvcMDDelete", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_disco_svc_md_delete_new:
+ *
+ * Creates a new #LassoIdWsf2DiscoSvcMDDelete object.
+ *
+ * Return value: a newly created #LassoIdWsf2DiscoSvcMDDelete object
+ **/
+LassoIdWsf2DiscoSvcMDDelete*
+lasso_idwsf2_disco_svc_md_delete_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_DISCO_SVC_MD_DELETE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_delete.h b/lasso/xml/id-wsf-2.0/disco_svc_md_delete.h
new file mode 100644
index 00000000..28ecd994
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_delete.h
@@ -0,0 +1,83 @@
+/* $Id: disco_svc_md_delete.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_DISCO_SVC_MD_DELETE_H__
+#define __LASSO_IDWSF2_DISCO_SVC_MD_DELETE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_DELETE (lasso_idwsf2_disco_svc_md_delete_get_type())
+#define LASSO_IDWSF2_DISCO_SVC_MD_DELETE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_DELETE, \
+		LassoIdWsf2DiscoSvcMDDelete))
+#define LASSO_IDWSF2_DISCO_SVC_MD_DELETE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_DELETE, \
+		LassoIdWsf2DiscoSvcMDDeleteClass))
+#define LASSO_IS_IDWSF2_DISCO_SVC_MD_DELETE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_DELETE))
+#define LASSO_IS_IDWSF2_DISCO_SVC_MD_DELETE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_DELETE))
+#define LASSO_IDWSF2_DISCO_SVC_MD_DELETE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_DELETE, \
+		LassoIdWsf2DiscoSvcMDDeleteClass)) 
+
+
+typedef struct _LassoIdWsf2DiscoSvcMDDelete LassoIdWsf2DiscoSvcMDDelete;
+typedef struct _LassoIdWsf2DiscoSvcMDDeleteClass LassoIdWsf2DiscoSvcMDDeleteClass;
+
+
+struct _LassoIdWsf2DiscoSvcMDDelete {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	GList *SvcMDID;
+	/* attributes */
+	GHashTable *attributes;
+};
+
+
+struct _LassoIdWsf2DiscoSvcMDDeleteClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_disco_svc_md_delete_get_type(void);
+LASSO_EXPORT LassoIdWsf2DiscoSvcMDDelete* lasso_idwsf2_disco_svc_md_delete_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_DISCO_SVC_MD_DELETE_H__ */
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
new file mode 100644
index 00000000..e253dd59
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.c
@@ -0,0 +1,114 @@
+/* $Id: disco_svc_md_delete_response.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "disco_svc_md_delete_response.h"
+
+/*
+ * Schema fragment (liberty-idwsf-disco-svc-v2.0.xsd):
+ *
+ * <xs:complexType name="SvcMDDeleteResponseType">
+ *   <xs:sequence>
+ *     <xs:element ref="lu:Status" />
+ *   </xs:sequence>
+ *   <xs:anyAttribute namespace="##other" processContents="lax"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Status", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDDeleteResponse, Status),
+		"LassoIdWsf2UtilStatus" },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDDeleteResponse, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2DiscoSvcMDDeleteResponse *node)
+{
+	node->Status = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoIdWsf2DiscoSvcMDDeleteResponseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "SvcMDDeleteResponse");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_disco_svc_md_delete_response_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2DiscoSvcMDDeleteResponseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2DiscoSvcMDDeleteResponse),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2DiscoSvcMDDeleteResponse", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_disco_svc_md_delete_response_new:
+ *
+ * Creates a new #LassoIdWsf2DiscoSvcMDDeleteResponse object.
+ *
+ * Return value: a newly created #LassoIdWsf2DiscoSvcMDDeleteResponse object
+ **/
+LassoIdWsf2DiscoSvcMDDeleteResponse*
+lasso_idwsf2_disco_svc_md_delete_response_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_DISCO_SVC_MD_DELETE_RESPONSE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.h b/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.h
new file mode 100644
index 00000000..5ca6d9f7
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.h
@@ -0,0 +1,85 @@
+/* $Id: disco_svc_md_delete_response.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_DISCO_SVC_MD_DELETE_RESPONSE_H__
+#define __LASSO_IDWSF2_DISCO_SVC_MD_DELETE_RESPONSE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "util_status.h"
+
+#define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_DELETE_RESPONSE \
+	(lasso_idwsf2_disco_svc_md_delete_response_get_type())
+#define LASSO_IDWSF2_DISCO_SVC_MD_DELETE_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_DELETE_RESPONSE, \
+		LassoIdWsf2DiscoSvcMDDeleteResponse))
+#define LASSO_IDWSF2_DISCO_SVC_MD_DELETE_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_DELETE_RESPONSE, \
+		LassoIdWsf2DiscoSvcMDDeleteResponseClass))
+#define LASSO_IS_IDWSF2_DISCO_SVC_MD_DELETE_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_DELETE_RESPONSE))
+#define LASSO_IS_IDWSF2_DISCO_SVC_MD_DELETE_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_DELETE_RESPONSE))
+#define LASSO_IDWSF2_DISCO_SVC_MD_DELETE_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_DELETE_RESPONSE, \
+		LassoIdWsf2DiscoSvcMDDeleteResponseClass)) 
+
+
+typedef struct _LassoIdWsf2DiscoSvcMDDeleteResponse LassoIdWsf2DiscoSvcMDDeleteResponse;
+typedef struct _LassoIdWsf2DiscoSvcMDDeleteResponseClass LassoIdWsf2DiscoSvcMDDeleteResponseClass;
+
+
+struct _LassoIdWsf2DiscoSvcMDDeleteResponse {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	LassoIdWsf2UtilStatus *Status;
+	/* attributes */
+	GHashTable *attributes;
+};
+
+
+struct _LassoIdWsf2DiscoSvcMDDeleteResponseClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_disco_svc_md_delete_response_get_type(void);
+LASSO_EXPORT LassoIdWsf2DiscoSvcMDDeleteResponse* lasso_idwsf2_disco_svc_md_delete_response_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_DISCO_SVC_MD_DELETE_RESPONSE_H__ */
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
new file mode 100644
index 00000000..f4a2f803
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_query.c
@@ -0,0 +1,115 @@
+/* $Id: disco_svc_md_query.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "disco_svc_md_query.h"
+
+/*
+ * Schema fragment (liberty-idwsf-disco-svc-v2.0.xsd):
+ *
+ * <xs:complexType name="SvcMDQueryType">
+ *   <xs:sequence>
+ *     <xs:element ref="SvcMDID"
+ *       minOccurs="0"
+ *       maxOccurs="unbounded"/>
+ *     </xs:sequence>
+ *     <xs:anyAttribute namespace="##other" processContents="lax"/>
+ *   </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "SvcMDID", SNIPPET_LIST_CONTENT,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDQuery, SvcMDID) },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDQuery, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2DiscoSvcMDQuery *node)
+{
+	node->SvcMDID = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoIdWsf2DiscoSvcMDQueryClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "SvcMDQuery");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_disco_svc_md_query_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2DiscoSvcMDQueryClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2DiscoSvcMDQuery),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2DiscoSvcMDQuery", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_disco_svc_md_query_new:
+ *
+ * Creates a new #LassoIdWsf2DiscoSvcMDQuery object.
+ *
+ * Return value: a newly created #LassoIdWsf2DiscoSvcMDQuery object
+ **/
+LassoIdWsf2DiscoSvcMDQuery*
+lasso_idwsf2_disco_svc_md_query_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_DISCO_SVC_MD_QUERY, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_query.h b/lasso/xml/id-wsf-2.0/disco_svc_md_query.h
new file mode 100644
index 00000000..f1c89847
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_query.h
@@ -0,0 +1,83 @@
+/* $Id: disco_svc_md_query.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_DISCO_SVC_MD_QUERY_H__
+#define __LASSO_IDWSF2_DISCO_SVC_MD_QUERY_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_QUERY (lasso_idwsf2_disco_svc_md_query_get_type())
+#define LASSO_IDWSF2_DISCO_SVC_MD_QUERY(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_QUERY, \
+		LassoIdWsf2DiscoSvcMDQuery))
+#define LASSO_IDWSF2_DISCO_SVC_MD_QUERY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_QUERY, \
+		LassoIdWsf2DiscoSvcMDQueryClass))
+#define LASSO_IS_IDWSF2_DISCO_SVC_MD_QUERY(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_QUERY))
+#define LASSO_IS_IDWSF2_DISCO_SVC_MD_QUERY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_QUERY))
+#define LASSO_IDWSF2_DISCO_SVC_MD_QUERY_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_QUERY, \
+		LassoIdWsf2DiscoSvcMDQueryClass)) 
+
+
+typedef struct _LassoIdWsf2DiscoSvcMDQuery LassoIdWsf2DiscoSvcMDQuery;
+typedef struct _LassoIdWsf2DiscoSvcMDQueryClass LassoIdWsf2DiscoSvcMDQueryClass;
+
+
+struct _LassoIdWsf2DiscoSvcMDQuery {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	GList *SvcMDID;
+	/* attributes */
+	GHashTable *attributes;
+};
+
+
+struct _LassoIdWsf2DiscoSvcMDQueryClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_disco_svc_md_query_get_type(void);
+LASSO_EXPORT LassoIdWsf2DiscoSvcMDQuery* lasso_idwsf2_disco_svc_md_query_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_DISCO_SVC_MD_QUERY_H__ */
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
new file mode 100644
index 00000000..891d0d33
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.c
@@ -0,0 +1,119 @@
+/* $Id: disco_svc_md_query_response.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "disco_svc_md_query_response.h"
+
+/*
+ * Schema fragment (liberty-idwsf-disco-svc-v2.0.xsd):
+ *
+ * <xs:complexType name="SvcMDQueryResponseType">
+ *   <xs:sequence>
+ *     <xs:element ref="lu:Status" />
+ *     <xs:element ref="SvcMD" minOccurs="0" maxOccurs="unbounded" />
+ *   </xs:sequence>
+ *   <xs:anyAttribute namespace="##other" processContents="lax"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Status", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDQueryResponse, Status),
+		"LassoIdWsf2UtilStatus" },
+	{ "SvcMD", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDQueryResponse, SvcMD),
+		"LassoIdWsf2DiscoSvcMetadata" },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDQueryResponse, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2DiscoSvcMDQueryResponse *node)
+{
+	node->Status = NULL;
+	node->SvcMD = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoIdWsf2DiscoSvcMDQueryResponseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "SvcMDQueryResponse");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_disco_svc_md_query_response_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2DiscoSvcMDQueryResponseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2DiscoSvcMDQueryResponse),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2DiscoSvcMDQueryResponse", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_disco_svc_md_query_response_new:
+ *
+ * Creates a new #LassoIdWsf2DiscoSvcMDQueryResponse object.
+ *
+ * Return value: a newly created #LassoIdWsf2DiscoSvcMDQueryResponse object
+ **/
+LassoIdWsf2DiscoSvcMDQueryResponse*
+lasso_idwsf2_disco_svc_md_query_response_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_DISCO_SVC_MD_QUERY_RESPONSE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.h b/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.h
new file mode 100644
index 00000000..eaca1ca1
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.h
@@ -0,0 +1,86 @@
+/* $Id: disco_svc_md_query_response.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_DISCO_SVC_MD_QUERY_RESPONSE_H__
+#define __LASSO_IDWSF2_DISCO_SVC_MD_QUERY_RESPONSE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "util_status.h"
+
+#define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_QUERY_RESPONSE \
+	(lasso_idwsf2_disco_svc_md_query_response_get_type())
+#define LASSO_IDWSF2_DISCO_SVC_MD_QUERY_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_QUERY_RESPONSE, \
+		LassoIdWsf2DiscoSvcMDQueryResponse))
+#define LASSO_IDWSF2_DISCO_SVC_MD_QUERY_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_QUERY_RESPONSE, \
+		LassoIdWsf2DiscoSvcMDQueryResponseClass))
+#define LASSO_IS_IDWSF2_DISCO_SVC_MD_QUERY_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_QUERY_RESPONSE))
+#define LASSO_IS_IDWSF2_DISCO_SVC_MD_QUERY_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_QUERY_RESPONSE))
+#define LASSO_IDWSF2_DISCO_SVC_MD_QUERY_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_QUERY_RESPONSE, \
+		LassoIdWsf2DiscoSvcMDQueryResponseClass)) 
+
+
+typedef struct _LassoIdWsf2DiscoSvcMDQueryResponse LassoIdWsf2DiscoSvcMDQueryResponse;
+typedef struct _LassoIdWsf2DiscoSvcMDQueryResponseClass LassoIdWsf2DiscoSvcMDQueryResponseClass;
+
+
+struct _LassoIdWsf2DiscoSvcMDQueryResponse {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	LassoIdWsf2UtilStatus *Status;
+	GList *SvcMD; /* of LassoIdWsf2DiscoSvcMetadata */
+	/* attributes */
+	GHashTable *attributes;
+};
+
+
+struct _LassoIdWsf2DiscoSvcMDQueryResponseClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_disco_svc_md_query_response_get_type(void);
+LASSO_EXPORT LassoIdWsf2DiscoSvcMDQueryResponse* lasso_idwsf2_disco_svc_md_query_response_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_DISCO_SVC_MD_QUERY_RESPONSE_H__ */
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 80cf16d0..af21a40a 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
@@ -1,4 +1,4 @@
-/* $Id: disco_svc_md_register.c 2261 2005-01-27 23:41:05 $ 
+/* $Id: disco_svc_md_register.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
  *
  * Lasso - A free implementation of the Liberty Alliance specifications.
  *
@@ -22,19 +22,17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <lasso/xml/id-wsf-2.0/disco_svc_md_register.h>
-#include <lasso/xml/id-wsf-2.0/disco_svc_metadata.h>
-
+#include "disco_svc_md_register.h"
+#include "disco_svc_metadata.h"
 
 /*
  * Schema fragment (liberty-idwsf-disco-svc-v2.0.xsd):
- * 
- * <xs:element name="SvcMDRegister" type="SvcMDRegisterType"/>
+ *
  * <xs:complexType name="SvcMDRegisterType">
- *    <xs:sequence>
- *       <xs:element ref="SvcMD" maxOccurs="unbounded"/>
- *    </xs:sequence>
- *    <xs:anyAttribute namespace="##other" processContents="lax"/>
+ *   <xs:sequence>
+ *     <xs:element ref="SvcMD" maxOccurs="unbounded" />
+ *   </xs:sequence>
+ *   <xs:anyAttribute namespace="##other" processContents="lax"/>
  * </xs:complexType>
  */
 
@@ -42,12 +40,19 @@
 /* private methods                                                           */
 /*****************************************************************************/
 
+
 static struct XmlSnippet schema_snippets[] = {
 	{ "SvcMD", SNIPPET_LIST_NODES,
-	  G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDRegister, SvcMD), "LassoIdWsf2DiscoSvcMetadata" },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDRegister, SvcMD),
+		"LassoIdWsf2DiscoSvcMetadata" },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDRegister, attributes) },
+	{NULL, 0, 0}
 };
 
+static LassoNodeClass *parent_class = NULL;
+
+
 /*****************************************************************************/
 /* instance and class init functions                                         */
 /*****************************************************************************/
@@ -56,6 +61,8 @@ static void
 instance_init(LassoIdWsf2DiscoSvcMDRegister *node)
 {
 	node->SvcMD = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
 }
 
 static void
@@ -63,6 +70,7 @@ class_init(LassoIdWsf2DiscoSvcMDRegisterClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
 
+	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "SvcMDRegister");
 	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
@@ -93,12 +101,20 @@ lasso_idwsf2_disco_svc_md_register_get_type()
 	return this_type;
 }
 
+/**
+ * lasso_idwsf2_disco_svc_md_register_new:
+ *
+ * Creates a new #LassoIdWsf2DiscoSvcMDRegister object.
+ *
+ * Return value: a newly created #LassoIdWsf2DiscoSvcMDRegister object
+ **/
 LassoIdWsf2DiscoSvcMDRegister*
 lasso_idwsf2_disco_svc_md_register_new()
 {
-        return g_object_new(LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER, NULL);
+	return g_object_new(LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER, NULL);
 }
 
+
 LassoIdWsf2DiscoSvcMDRegister*
 lasso_idwsf2_disco_svc_md_register_new_full(const gchar *service_type, const gchar *abstract,
 		const gchar *provider_id, const gchar *soap_endpoint)
@@ -106,9 +122,9 @@ lasso_idwsf2_disco_svc_md_register_new_full(const gchar *service_type, const gch
 	LassoIdWsf2DiscoSvcMDRegister *metadata_register;
 	LassoIdWsf2DiscoSvcMetadata *metadata;
 
-	metadata_register = g_object_new(LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER, NULL);
+	metadata_register = lasso_idwsf2_disco_svc_md_register_new();
 	metadata = lasso_idwsf2_disco_svc_metadata_new_full(service_type, abstract, provider_id,
-		soap_endpoint);
+			soap_endpoint);
 	metadata_register->SvcMD = g_list_append(
 			metadata_register->SvcMD, metadata);
 
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_register.h b/lasso/xml/id-wsf-2.0/disco_svc_md_register.h
index 6d647519..9ebac2b5 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_register.h
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_register.h
@@ -1,4 +1,4 @@
-/* $Id: disco_svc_md_register.h 2428 2005-03-10 08:13:36Z nclapies $
+/* $Id: disco_svc_md_register.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
  *
  * Lasso - A free implementation of the Liberty Alliance specifications.
  *
@@ -27,49 +27,57 @@
 
 #ifdef __cplusplus
 extern "C" {
-#endif /* __cplusplus */ 
+#endif /* __cplusplus */
 
 #include <lasso/xml/xml.h>
 
 #define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER (lasso_idwsf2_disco_svc_md_register_get_type())
 #define LASSO_IDWSF2_DISCO_SVC_MD_REGISTER(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER, \
-				    LassoIdWsf2DiscoSvcMDRegister))
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER, \
+		LassoIdWsf2DiscoSvcMDRegister))
 #define LASSO_IDWSF2_DISCO_SVC_MD_REGISTER_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER, \
-				 LassoIdWsf2DiscoSvcMDRegisterClass))
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER, \
+		LassoIdWsf2DiscoSvcMDRegisterClass))
 #define LASSO_IS_IDWSF2_DISCO_SVC_MD_REGISTER(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER))
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER))
 #define LASSO_IS_IDWSF2_DISCO_SVC_MD_REGISTER_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER))
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER))
 #define LASSO_IDWSF2_DISCO_SVC_MD_REGISTER_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER, \
-				    LassoIdWsf2DiscoSvcMDRegisterClass)) 
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER, \
+		LassoIdWsf2DiscoSvcMDRegisterClass)) 
+
 
 typedef struct _LassoIdWsf2DiscoSvcMDRegister LassoIdWsf2DiscoSvcMDRegister;
 typedef struct _LassoIdWsf2DiscoSvcMDRegisterClass LassoIdWsf2DiscoSvcMDRegisterClass;
 
+
 struct _LassoIdWsf2DiscoSvcMDRegister {
 	LassoNode parent;
 
+	/*< public >*/
 	/* elements */
-	GList *SvcMD;
+	GList *SvcMD; /* of LassoIdWsf2DiscoSvcMetadata */
+	/* attributes */
+	GHashTable *attributes;
 };
 
+
 struct _LassoIdWsf2DiscoSvcMDRegisterClass {
 	LassoNodeClass parent;
 };
 
 LASSO_EXPORT GType lasso_idwsf2_disco_svc_md_register_get_type(void);
-
 LASSO_EXPORT LassoIdWsf2DiscoSvcMDRegister* lasso_idwsf2_disco_svc_md_register_new(void);
 
 LASSO_EXPORT LassoIdWsf2DiscoSvcMDRegister* lasso_idwsf2_disco_svc_md_register_new_full(
-	const gchar *service_type, const gchar *abstract,
-	const gchar *provider_id, const gchar *soap_endpoint);
+		const gchar *service_type, const gchar *abstract,
+		const gchar *provider_id, const gchar *soap_endpoint);
 
-LASSO_EXPORT LassoIdWsf2DiscoSvcMDRegister*
-lasso_idwsf2_disco_svc_md_register_new_from_message(const gchar *message);
 
 #ifdef __cplusplus
 }
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 9525a904..d61079d7 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
@@ -51,7 +51,10 @@ static struct XmlSnippet schema_snippets[] = {
 	{ "SvcMDID", SNIPPET_LIST_CONTENT,
 		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDRegisterResponse, SvcMDID) },
 	{ "Keys", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDRegisterResponse, Keys) },
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDRegisterResponse, Keys),
+		"LassoIdWsf2DiscoKeys" },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDRegisterResponse, attributes) },
 	{NULL, 0, 0}
 };
 
@@ -68,6 +71,8 @@ instance_init(LassoIdWsf2DiscoSvcMDRegisterResponse *node)
 	node->Status = NULL;
 	node->SvcMDID = NULL;
 	node->Keys = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
 }
 
 static void
@@ -77,7 +82,7 @@ class_init(LassoIdWsf2DiscoSvcMDRegisterResponseClass *klass)
 
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
-	lasso_node_class_set_nodename(nclass, "SvcMDRegisterResponse"); 
+	lasso_node_class_set_nodename(nclass, "SvcMDRegisterResponse");
 	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
@@ -118,4 +123,3 @@ lasso_idwsf2_disco_svc_md_register_response_new()
 {
 	return g_object_new(LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE, NULL);
 }
-
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.h b/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.h
index 72ef1bd7..33c4dfc1 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.h
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.h
@@ -32,23 +32,32 @@ extern "C" {
 #include <lasso/xml/xml.h>
 #include "util_status.h"
 
-#define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE (lasso_idwsf2_disco_svc_md_register_response_get_type())
+#define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE \
+	(lasso_idwsf2_disco_svc_md_register_response_get_type())
 #define LASSO_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE, \
-				LassoIdWsf2DiscoSvcMDRegisterResponse))
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE, \
+		LassoIdWsf2DiscoSvcMDRegisterResponse))
 #define LASSO_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE, \
-				LassoIdWsf2DiscoSvcMDRegisterResponseClass))
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE, \
+		LassoIdWsf2DiscoSvcMDRegisterResponseClass))
 #define LASSO_IS_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE))
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE))
 #define LASSO_IS_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE))
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE))
 #define LASSO_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE, \
-				LassoIdWsf2DiscoSvcMDRegisterResponseClass)) 
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE, \
+		LassoIdWsf2DiscoSvcMDRegisterResponseClass)) 
 
-typedef struct _LassoIdWsf2DiscoSvcMDRegisterResponse LassoIdWsf2DiscoSvcMDRegisterResponse;
-typedef struct _LassoIdWsf2DiscoSvcMDRegisterResponseClass LassoIdWsf2DiscoSvcMDRegisterResponseClass;
+
+typedef struct _LassoIdWsf2DiscoSvcMDRegisterResponse \
+	LassoIdWsf2DiscoSvcMDRegisterResponse;
+typedef struct _LassoIdWsf2DiscoSvcMDRegisterResponseClass \
+	LassoIdWsf2DiscoSvcMDRegisterResponseClass;
 
 
 struct _LassoIdWsf2DiscoSvcMDRegisterResponse {
@@ -58,7 +67,9 @@ struct _LassoIdWsf2DiscoSvcMDRegisterResponse {
 	/* elements */
 	LassoIdWsf2UtilStatus *Status;
 	GList *SvcMDID;
-	GList *Keys;
+	GList *Keys; /* of LassoIdWsf2DiscoKeys */
+	/* attributes */
+	GHashTable *attributes;
 };
 
 
@@ -67,8 +78,7 @@ struct _LassoIdWsf2DiscoSvcMDRegisterResponseClass {
 };
 
 LASSO_EXPORT GType lasso_idwsf2_disco_svc_md_register_response_get_type(void);
-LASSO_EXPORT LassoIdWsf2DiscoSvcMDRegisterResponse*
-        lasso_idwsf2_disco_svc_md_register_response_new(void);
+LASSO_EXPORT LassoIdWsf2DiscoSvcMDRegisterResponse* lasso_idwsf2_disco_svc_md_register_response_new(void);
 
 
 
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
new file mode 100644
index 00000000..1c21ad5c
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_replace.c
@@ -0,0 +1,114 @@
+/* $Id: disco_svc_md_replace.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "disco_svc_md_replace.h"
+
+/*
+ * Schema fragment (liberty-idwsf-disco-svc-v2.0.xsd):
+ *
+ * <xs:complexType name="SvcMDReplaceType">
+ *   <xs:sequence>
+ *     <xs:element ref="SvcMD" maxOccurs="unbounded" />
+ *   </xs:sequence>
+ *   <xs:anyAttribute namespace="##other" processContents="lax"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "SvcMD", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDReplace, SvcMD),
+		"LassoIdWsf2DiscoSvcMetadata" },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDReplace, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2DiscoSvcMDReplace *node)
+{
+	node->SvcMD = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoIdWsf2DiscoSvcMDReplaceClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "SvcMDReplace");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_disco_svc_md_replace_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2DiscoSvcMDReplaceClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2DiscoSvcMDReplace),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2DiscoSvcMDReplace", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_disco_svc_md_replace_new:
+ *
+ * Creates a new #LassoIdWsf2DiscoSvcMDReplace object.
+ *
+ * Return value: a newly created #LassoIdWsf2DiscoSvcMDReplace object
+ **/
+LassoIdWsf2DiscoSvcMDReplace*
+lasso_idwsf2_disco_svc_md_replace_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REPLACE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_replace.h b/lasso/xml/id-wsf-2.0/disco_svc_md_replace.h
new file mode 100644
index 00000000..06331082
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_replace.h
@@ -0,0 +1,83 @@
+/* $Id: disco_svc_md_replace.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_DISCO_SVC_MD_REPLACE_H__
+#define __LASSO_IDWSF2_DISCO_SVC_MD_REPLACE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REPLACE (lasso_idwsf2_disco_svc_md_replace_get_type())
+#define LASSO_IDWSF2_DISCO_SVC_MD_REPLACE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REPLACE, \
+		LassoIdWsf2DiscoSvcMDReplace))
+#define LASSO_IDWSF2_DISCO_SVC_MD_REPLACE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REPLACE, \
+		LassoIdWsf2DiscoSvcMDReplaceClass))
+#define LASSO_IS_IDWSF2_DISCO_SVC_MD_REPLACE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REPLACE))
+#define LASSO_IS_IDWSF2_DISCO_SVC_MD_REPLACE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REPLACE))
+#define LASSO_IDWSF2_DISCO_SVC_MD_REPLACE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REPLACE, \
+		LassoIdWsf2DiscoSvcMDReplaceClass)) 
+
+
+typedef struct _LassoIdWsf2DiscoSvcMDReplace LassoIdWsf2DiscoSvcMDReplace;
+typedef struct _LassoIdWsf2DiscoSvcMDReplaceClass LassoIdWsf2DiscoSvcMDReplaceClass;
+
+
+struct _LassoIdWsf2DiscoSvcMDReplace {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	GList *SvcMD; /* of LassoIdWsf2DiscoSvcMetadata */
+	/* attributes */
+	GHashTable *attributes;
+};
+
+
+struct _LassoIdWsf2DiscoSvcMDReplaceClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_disco_svc_md_replace_get_type(void);
+LASSO_EXPORT LassoIdWsf2DiscoSvcMDReplace* lasso_idwsf2_disco_svc_md_replace_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_DISCO_SVC_MD_REPLACE_H__ */
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
new file mode 100644
index 00000000..c244016f
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.c
@@ -0,0 +1,114 @@
+/* $Id: disco_svc_md_replace_response.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "disco_svc_md_replace_response.h"
+
+/*
+ * Schema fragment (liberty-idwsf-disco-svc-v2.0.xsd):
+ *
+ * <xs:complexType name="SvcMDReplaceResponseType">
+ *   <xs:sequence>
+ *     <xs:element ref="lu:Status" />
+ *   </xs:sequence>
+ *   <xs:anyAttribute namespace="##other" processContents="lax"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Status", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDReplaceResponse, Status),
+		"LassoIdWsf2UtilStatus" },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMDReplaceResponse, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2DiscoSvcMDReplaceResponse *node)
+{
+	node->Status = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoIdWsf2DiscoSvcMDReplaceResponseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "SvcMDReplaceResponse");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_disco_svc_md_replace_response_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2DiscoSvcMDReplaceResponseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2DiscoSvcMDReplaceResponse),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2DiscoSvcMDReplaceResponse", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_disco_svc_md_replace_response_new:
+ *
+ * Creates a new #LassoIdWsf2DiscoSvcMDReplaceResponse object.
+ *
+ * Return value: a newly created #LassoIdWsf2DiscoSvcMDReplaceResponse object
+ **/
+LassoIdWsf2DiscoSvcMDReplaceResponse*
+lasso_idwsf2_disco_svc_md_replace_response_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REPLACE_RESPONSE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.h b/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.h
new file mode 100644
index 00000000..6f496f79
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.h
@@ -0,0 +1,87 @@
+/* $Id: disco_svc_md_replace_response.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_DISCO_SVC_MD_REPLACE_RESPONSE_H__
+#define __LASSO_IDWSF2_DISCO_SVC_MD_REPLACE_RESPONSE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "util_status.h"
+
+#define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REPLACE_RESPONSE \
+	(lasso_idwsf2_disco_svc_md_replace_response_get_type())
+#define LASSO_IDWSF2_DISCO_SVC_MD_REPLACE_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REPLACE_RESPONSE, \
+		LassoIdWsf2DiscoSvcMDReplaceResponse))
+#define LASSO_IDWSF2_DISCO_SVC_MD_REPLACE_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REPLACE_RESPONSE, \
+		LassoIdWsf2DiscoSvcMDReplaceResponseClass))
+#define LASSO_IS_IDWSF2_DISCO_SVC_MD_REPLACE_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REPLACE_RESPONSE))
+#define LASSO_IS_IDWSF2_DISCO_SVC_MD_REPLACE_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REPLACE_RESPONSE))
+#define LASSO_IDWSF2_DISCO_SVC_MD_REPLACE_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REPLACE_RESPONSE, \
+		LassoIdWsf2DiscoSvcMDReplaceResponseClass)) 
+
+
+typedef struct _LassoIdWsf2DiscoSvcMDReplaceResponse \
+	LassoIdWsf2DiscoSvcMDReplaceResponse;
+typedef struct _LassoIdWsf2DiscoSvcMDReplaceResponseClass \
+	LassoIdWsf2DiscoSvcMDReplaceResponseClass;
+
+
+struct _LassoIdWsf2DiscoSvcMDReplaceResponse {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	LassoIdWsf2UtilStatus *Status;
+	/* attributes */
+	GHashTable *attributes;
+};
+
+
+struct _LassoIdWsf2DiscoSvcMDReplaceResponseClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_disco_svc_md_replace_response_get_type(void);
+LASSO_EXPORT LassoIdWsf2DiscoSvcMDReplaceResponse* lasso_idwsf2_disco_svc_md_replace_response_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_DISCO_SVC_MD_REPLACE_RESPONSE_H__ */
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 6c61f287..4c5fbe4c 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_metadata.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_metadata.c
@@ -1,4 +1,4 @@
-/* $Id: disco_svc_metadata.c 2261 2005-01-27 23:41:05 $ 
+/* $Id: disco_svc_metadata.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
  *
  * Lasso - A free implementation of the Liberty Alliance specifications.
  *
@@ -22,43 +22,44 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <lasso/xml/id-wsf-2.0/disco_svc_metadata.h>
-#include <lasso/xml/id-wsf-2.0/disco_endpoint_context.h>
+#include "disco_svc_metadata.h"
+#include "disco_endpoint_context.h"
+#include "disco_service_context.h"
 
 /*
  * Schema fragment (liberty-idwsf-disco-svc-v2.0.xsd):
- * 
- * <xs:element name="SvcMD" type="SvcMetadataType"/>
+ *
  * <xs:complexType name="SvcMetadataType">
- *    <xs:sequence>
- *       <xs:element ref="Abstract"                              />
- *       <xs:element ref="ProviderID"                            />
- *       <xs:element ref="ServiceContext"  maxOccurs="unbounded" />
- *    </xs:sequence>
- *    <xs:attribute name="svcMDID" type="xs:string" use="optional" />
+ *   <xs:sequence>
+ *     <xs:element ref="Abstract"                              />
+ *     <xs:element ref="ProviderID"                            />
+ *     <xs:element ref="ServiceContext"  maxOccurs="unbounded" />
+ *   </xs:sequence>
+ *   <xs:attribute name="svcMDID" type="xs:string" use="optional" />
  * </xs:complexType>
- * 
- * <xs:element name="Abstract" type="xs:string"/>
- * <xs:element name="ProviderID" type="xs:anyURI"/>
- * <xs:element name="SvcMDID" type="xs:string" />
  */
 
 /*****************************************************************************/
 /* private methods                                                           */
 /*****************************************************************************/
 
+
 static struct XmlSnippet schema_snippets[] = {
 	{ "Abstract", SNIPPET_CONTENT,
-	  G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMetadata, Abstract) },
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMetadata, Abstract) },
 	{ "ProviderID", SNIPPET_CONTENT,
-	  G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMetadata, ProviderID) },
-	{ "ServiceContext", SNIPPET_NODE,
-	  G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMetadata, ServiceContext) },
-	{ "svcMDID", SNIPPET_ATTRIBUTE,
-	  G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMetadata, svcMDID) },
-	{ NULL, 0, 0}
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMetadata, ProviderID) },
+	{ "ServiceContext", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMetadata, ServiceContext),
+		"LassoIdWsf2DiscoServiceContext" },
+	{ "svcMDID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2DiscoSvcMetadata, svcMDID) },
+	{NULL, 0, 0}
 };
 
+static LassoNodeClass *parent_class = NULL;
+
+
 /*****************************************************************************/
 /* instance and class init functions                                         */
 /*****************************************************************************/
@@ -77,6 +78,7 @@ class_init(LassoIdWsf2DiscoSvcMetadataClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
 
+	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "SvcMD");
 	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
@@ -107,27 +109,36 @@ lasso_idwsf2_disco_svc_metadata_get_type()
 	return this_type;
 }
 
+/**
+ * lasso_idwsf2_disco_svc_metadata_new:
+ *
+ * Creates a new #LassoIdWsf2DiscoSvcMetadata object.
+ *
+ * Return value: a newly created #LassoIdWsf2DiscoSvcMetadata object
+ **/
 LassoIdWsf2DiscoSvcMetadata*
 lasso_idwsf2_disco_svc_metadata_new()
 {
 	return g_object_new(LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA, NULL);
 }
 
+
 LassoIdWsf2DiscoSvcMetadata*
 lasso_idwsf2_disco_svc_metadata_new_full(const gchar *service_type, const gchar *abstract,
-	const gchar *provider_id, const gchar *soap_endpoint)
+		const gchar *provider_id, const gchar *soap_endpoint)
 {
 	LassoIdWsf2DiscoSvcMetadata *metadata;
 	LassoIdWsf2DiscoEndpointContext *endpoint_context;
 
-	metadata = g_object_new(LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA, NULL);
+	metadata = lasso_idwsf2_disco_svc_metadata_new();
 
 	metadata->Abstract = g_strdup(abstract);
 	metadata->ProviderID = g_strdup(provider_id);
 
 	endpoint_context = lasso_idwsf2_disco_endpoint_context_new_full(soap_endpoint);
-	metadata->ServiceContext = lasso_idwsf2_disco_service_context_new_full(service_type,
-		endpoint_context);
+	metadata->ServiceContext = g_list_append(NULL,
+		lasso_idwsf2_disco_service_context_new_full(service_type, endpoint_context));
 
 	return metadata;
 }
+
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_metadata.h b/lasso/xml/id-wsf-2.0/disco_svc_metadata.h
index 1a945c7c..5ee56e6e 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_metadata.h
+++ b/lasso/xml/id-wsf-2.0/disco_svc_metadata.h
@@ -1,4 +1,4 @@
-/* $Id: disco_svc_metadata.h 2428 2005-03-10 08:13:36Z nclapies $
+/* $Id: disco_svc_metadata.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
  *
  * Lasso - A free implementation of the Liberty Alliance specifications.
  *
@@ -27,53 +27,60 @@
 
 #ifdef __cplusplus
 extern "C" {
-#endif /* __cplusplus */ 
+#endif /* __cplusplus */
 
 #include <lasso/xml/xml.h>
-#include <lasso/xml/id-wsf-2.0/disco_service_context.h>
 
 #define LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA (lasso_idwsf2_disco_svc_metadata_get_type())
 #define LASSO_IDWSF2_DISCO_SVC_METADATA(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA, \
-				    LassoIdWsf2DiscoSvcMetadata))
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA, \
+		LassoIdWsf2DiscoSvcMetadata))
 #define LASSO_IDWSF2_DISCO_SVC_METADATA_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA, \
-				 LassoIdWsf2DiscoSvcMetadataClass))
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA, \
+		LassoIdWsf2DiscoSvcMetadataClass))
 #define LASSO_IS_IDWSF2_DISCO_SVC_METADATA(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA))
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA))
 #define LASSO_IS_IDWSF2_DISCO_SVC_METADATA_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA))
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA))
 #define LASSO_IDWSF2_DISCO_SVC_METADATA_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA, \
-				    LassoIdWsf2DiscoSvcMetadataClass)) 
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA, \
+		LassoIdWsf2DiscoSvcMetadataClass)) 
+
 
 typedef struct _LassoIdWsf2DiscoSvcMetadata LassoIdWsf2DiscoSvcMetadata;
 typedef struct _LassoIdWsf2DiscoSvcMetadataClass LassoIdWsf2DiscoSvcMetadataClass;
 
+
 struct _LassoIdWsf2DiscoSvcMetadata {
 	LassoNode parent;
 
+	/*< public >*/
 	/* elements */
-	gchar *Abstract;
-	gchar *ProviderID;
-	LassoIdWsf2DiscoServiceContext *ServiceContext;
-
+	char *Abstract;
+	char *ProviderID;
+	GList *ServiceContext; /* of LassoIdWsf2DiscoServiceContext */
 	/* attributes */
-	gchar *svcMDID;
+	char *svcMDID;
 };
 
+
 struct _LassoIdWsf2DiscoSvcMetadataClass {
 	LassoNodeClass parent;
 };
 
 LASSO_EXPORT GType lasso_idwsf2_disco_svc_metadata_get_type(void);
-
-LASSO_EXPORT LassoIdWsf2DiscoSvcMetadata* lasso_idwsf2_disco_svc_metadata_new();
+LASSO_EXPORT LassoIdWsf2DiscoSvcMetadata* lasso_idwsf2_disco_svc_metadata_new(void);
 
 LASSO_EXPORT LassoIdWsf2DiscoSvcMetadata* lasso_idwsf2_disco_svc_metadata_new_full(
 		const gchar *service_type, const gchar *abstract,
 		const gchar *provider_id, const gchar *soap_endpoint);
-	
+
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
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 638361d1..b7560bf5 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
@@ -42,7 +42,7 @@
 
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "timeStamp", SNIPPET_ATTRIBUTE,
+	{ "timeStamp", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
 		G_STRUCT_OFFSET(LassoIdWsf2DstDataResponseBase, timeStamp) },
 	{NULL, 0, 0}
 };
@@ -103,7 +103,7 @@ lasso_idwsf2_dst_data_response_base_get_type()
  *
  * Return value: a newly created #LassoIdWsf2DstDataResponseBase object
  **/
-LassoNode*
+LassoIdWsf2DstDataResponseBase*
 lasso_idwsf2_dst_data_response_base_new()
 {
 	return g_object_new(LASSO_TYPE_IDWSF2_DST_DATA_RESPONSE_BASE, NULL);
diff --git a/lasso/xml/id-wsf-2.0/dst_data_response_base.h b/lasso/xml/id-wsf-2.0/dst_data_response_base.h
index cfb708ce..88f71a51 100644
--- a/lasso/xml/id-wsf-2.0/dst_data_response_base.h
+++ b/lasso/xml/id-wsf-2.0/dst_data_response_base.h
@@ -32,8 +32,7 @@ extern "C" {
 #include <lasso/xml/xml.h>
 #include "util_response.h"
 
-#define LASSO_TYPE_IDWSF2_DST_DATA_RESPONSE_BASE \
-	(lasso_idwsf2_dst_data_response_base_get_type())
+#define LASSO_TYPE_IDWSF2_DST_DATA_RESPONSE_BASE (lasso_idwsf2_dst_data_response_base_get_type())
 #define LASSO_IDWSF2_DST_DATA_RESPONSE_BASE(obj) \
 	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
 		LASSO_TYPE_IDWSF2_DST_DATA_RESPONSE_BASE, \
@@ -72,7 +71,7 @@ struct _LassoIdWsf2DstDataResponseBaseClass {
 };
 
 LASSO_EXPORT GType lasso_idwsf2_dst_data_response_base_get_type(void);
-LASSO_EXPORT LassoNode* lasso_idwsf2_dst_data_response_base_new(void);
+LASSO_EXPORT LassoIdWsf2DstDataResponseBase* lasso_idwsf2_dst_data_response_base_new(void);
 
 
 
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
new file mode 100644
index 00000000..1b4c3d4c
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dst_delete_item_base.c
@@ -0,0 +1,121 @@
+/* $Id: dst_delete_item_base.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "dst_delete_item_base.h"
+
+/*
+ * Schema fragment (liberty-idwsf-dst-v2.1.xsd):
+ *
+ * <xs:complexType name="DeleteItemBaseType">
+ *   <xs:attributeGroup ref="dst:selectQualif"/>
+ *   <xs:attribute name="notChangedSince" use="optional" type="xs:dateTime"/>
+ *   <xs:attribute name="id" use="optional" type="xs:ID"/>
+ *   <xs:attribute ref="lu:itemID" use="optional"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "notChangedSince", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2DstDeleteItemBase, notChangedSince) },
+	{ "id", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2DstDeleteItemBase, id) },
+	{ "itemID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2DstDeleteItemBase, itemID) },
+	{ "objectType", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoIdWsf2DstDeleteItemBase, objectType) },
+	{ "predefined", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoIdWsf2DstDeleteItemBase, predefined) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2DstDeleteItemBase *node)
+{
+	node->notChangedSince = NULL;
+	node->id = NULL;
+	node->itemID = NULL;
+	node->objectType = NULL;
+	node->predefined = NULL;
+}
+
+static void
+class_init(LassoIdWsf2DstDeleteItemBaseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "DeleteItemBase");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DST_HREF, LASSO_IDWSF2_DST_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_dst_delete_item_base_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2DstDeleteItemBaseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2DstDeleteItemBase),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2DstDeleteItemBase", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_dst_delete_item_base_new:
+ *
+ * Creates a new #LassoIdWsf2DstDeleteItemBase object.
+ *
+ * Return value: a newly created #LassoIdWsf2DstDeleteItemBase object
+ **/
+LassoIdWsf2DstDeleteItemBase*
+lasso_idwsf2_dst_delete_item_base_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_DST_DELETE_ITEM_BASE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/dst_delete_item_base.h b/lasso/xml/id-wsf-2.0/dst_delete_item_base.h
new file mode 100644
index 00000000..1d8d3c78
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dst_delete_item_base.h
@@ -0,0 +1,85 @@
+/* $Id: dst_delete_item_base.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_DST_DELETE_ITEM_BASE_H__
+#define __LASSO_IDWSF2_DST_DELETE_ITEM_BASE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_DST_DELETE_ITEM_BASE (lasso_idwsf2_dst_delete_item_base_get_type())
+#define LASSO_IDWSF2_DST_DELETE_ITEM_BASE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DST_DELETE_ITEM_BASE, \
+		LassoIdWsf2DstDeleteItemBase))
+#define LASSO_IDWSF2_DST_DELETE_ITEM_BASE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DST_DELETE_ITEM_BASE, \
+		LassoIdWsf2DstDeleteItemBaseClass))
+#define LASSO_IS_IDWSF2_DST_DELETE_ITEM_BASE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DST_DELETE_ITEM_BASE))
+#define LASSO_IS_IDWSF2_DST_DELETE_ITEM_BASE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DST_DELETE_ITEM_BASE))
+#define LASSO_IDWSF2_DST_DELETE_ITEM_BASE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DST_DELETE_ITEM_BASE, \
+		LassoIdWsf2DstDeleteItemBaseClass)) 
+
+
+typedef struct _LassoIdWsf2DstDeleteItemBase LassoIdWsf2DstDeleteItemBase;
+typedef struct _LassoIdWsf2DstDeleteItemBaseClass LassoIdWsf2DstDeleteItemBaseClass;
+
+
+struct _LassoIdWsf2DstDeleteItemBase {
+	LassoNode parent;
+
+	/*< public >*/
+	/* attributes */
+	char *notChangedSince;
+	char *id;
+	char *itemID;
+	char *objectType;
+	char *predefined;
+};
+
+
+struct _LassoIdWsf2DstDeleteItemBaseClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_dst_delete_item_base_get_type(void);
+LASSO_EXPORT LassoIdWsf2DstDeleteItemBase* lasso_idwsf2_dst_delete_item_base_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_DST_DELETE_ITEM_BASE_H__ */
diff --git a/lasso/xml/id-wsf-2.0/dst_delete_response.c b/lasso/xml/id-wsf-2.0/dst_delete_response.c
new file mode 100644
index 00000000..181922f8
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dst_delete_response.c
@@ -0,0 +1,105 @@
+/* $Id: dst_delete_response.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "dst_delete_response.h"
+
+/*
+ * Schema fragment (liberty-idwsf-dst-v2.1.xsd):
+ *
+ * <xs:complexType name="DeleteResponseType">
+ *   <xs:complexContent>
+ *     <xs:extension base="lu:ResponseType"/>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2DstDeleteResponse *node)
+{
+}
+
+static void
+class_init(LassoIdWsf2DstDeleteResponseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "DeleteResponse");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DST_HREF, LASSO_IDWSF2_DST_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_dst_delete_response_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2DstDeleteResponseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2DstDeleteResponse),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_UTIL_RESPONSE,
+				"LassoIdWsf2DstDeleteResponse", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_dst_delete_response_new:
+ *
+ * Creates a new #LassoIdWsf2DstDeleteResponse object.
+ *
+ * Return value: a newly created #LassoIdWsf2DstDeleteResponse object
+ **/
+LassoIdWsf2DstDeleteResponse*
+lasso_idwsf2_dst_delete_response_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_DST_DELETE_RESPONSE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/dst_delete_response.h b/lasso/xml/id-wsf-2.0/dst_delete_response.h
new file mode 100644
index 00000000..a4c87f5e
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dst_delete_response.h
@@ -0,0 +1,80 @@
+/* $Id: dst_delete_response.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_DST_DELETE_RESPONSE_H__
+#define __LASSO_IDWSF2_DST_DELETE_RESPONSE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "util_response.h"
+
+#define LASSO_TYPE_IDWSF2_DST_DELETE_RESPONSE (lasso_idwsf2_dst_delete_response_get_type())
+#define LASSO_IDWSF2_DST_DELETE_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DST_DELETE_RESPONSE, \
+		LassoIdWsf2DstDeleteResponse))
+#define LASSO_IDWSF2_DST_DELETE_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DST_DELETE_RESPONSE, \
+		LassoIdWsf2DstDeleteResponseClass))
+#define LASSO_IS_IDWSF2_DST_DELETE_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DST_DELETE_RESPONSE))
+#define LASSO_IS_IDWSF2_DST_DELETE_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DST_DELETE_RESPONSE))
+#define LASSO_IDWSF2_DST_DELETE_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DST_DELETE_RESPONSE, \
+		LassoIdWsf2DstDeleteResponseClass)) 
+
+
+typedef struct _LassoIdWsf2DstDeleteResponse LassoIdWsf2DstDeleteResponse;
+typedef struct _LassoIdWsf2DstDeleteResponseClass LassoIdWsf2DstDeleteResponseClass;
+
+
+struct _LassoIdWsf2DstDeleteResponse {
+	LassoIdWsf2UtilResponse parent;
+
+	/*< public >*/
+};
+
+
+struct _LassoIdWsf2DstDeleteResponseClass {
+	LassoIdWsf2UtilResponseClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_dst_delete_response_get_type(void);
+LASSO_EXPORT LassoIdWsf2DstDeleteResponse* lasso_idwsf2_dst_delete_response_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_DST_DELETE_RESPONSE_H__ */
diff --git a/lasso/xml/id-wsf-2.0/dst_request.c b/lasso/xml/id-wsf-2.0/dst_request.c
index e1ee3a93..ae85f1a4 100644
--- a/lasso/xml/id-wsf-2.0/dst_request.c
+++ b/lasso/xml/id-wsf-2.0/dst_request.c
@@ -45,9 +45,9 @@ static struct XmlSnippet schema_snippets[] = {
 	{ "Extension", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2DstRequest, Extension),
 		"LassoIdWsf2Utilextension" },
-	{ "itemID", SNIPPET_ATTRIBUTE,
+	{ "itemID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
 		G_STRUCT_OFFSET(LassoIdWsf2DstRequest, itemID) },
-	{ "any", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
 		G_STRUCT_OFFSET(LassoIdWsf2DstRequest, attributes) },
 	{NULL, 0, 0}
 };
@@ -111,7 +111,7 @@ lasso_idwsf2_dst_request_get_type()
  *
  * Return value: a newly created #LassoIdWsf2DstRequest object
  **/
-LassoNode*
+LassoIdWsf2DstRequest*
 lasso_idwsf2_dst_request_new()
 {
 	return g_object_new(LASSO_TYPE_IDWSF2_DST_REQUEST, NULL);
diff --git a/lasso/xml/id-wsf-2.0/dst_request.h b/lasso/xml/id-wsf-2.0/dst_request.h
index 99825189..1447f913 100644
--- a/lasso/xml/id-wsf-2.0/dst_request.h
+++ b/lasso/xml/id-wsf-2.0/dst_request.h
@@ -73,7 +73,7 @@ struct _LassoIdWsf2DstRequestClass {
 };
 
 LASSO_EXPORT GType lasso_idwsf2_dst_request_get_type(void);
-LASSO_EXPORT LassoNode* lasso_idwsf2_dst_request_new(void);
+LASSO_EXPORT LassoIdWsf2DstRequest* lasso_idwsf2_dst_request_new(void);
 
 
 
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 17779450..6bfe6728 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
@@ -49,15 +49,15 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "ChangeFormat", SNIPPET_CONTENT,
 		G_STRUCT_OFFSET(LassoIdWsf2DstResultQueryBase, ChangeFormat) },
-	{ "itemIDRef", SNIPPET_ATTRIBUTE,
+	{ "itemIDRef", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
 		G_STRUCT_OFFSET(LassoIdWsf2DstResultQueryBase, itemIDRef) },
 	{ "contingency", SNIPPET_ATTRIBUTE | SNIPPET_BOOLEAN | SNIPPET_OPTIONAL,
 		G_STRUCT_OFFSET(LassoIdWsf2DstResultQueryBase, contingency) },
 	{ "includeCommonAttributes", SNIPPET_ATTRIBUTE | SNIPPET_BOOLEAN | SNIPPET_OPTIONAL,
 		G_STRUCT_OFFSET(LassoIdWsf2DstResultQueryBase, includeCommonAttributes) },
-	{ "changedSince", SNIPPET_ATTRIBUTE,
+	{ "changedSince", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
 		G_STRUCT_OFFSET(LassoIdWsf2DstResultQueryBase, changedSince) },
-	{ "itemID", SNIPPET_ATTRIBUTE,
+	{ "itemID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
 		G_STRUCT_OFFSET(LassoIdWsf2DstResultQueryBase, itemID) },
 	{ "objectType", SNIPPET_ATTRIBUTE,
 		G_STRUCT_OFFSET(LassoIdWsf2DstResultQueryBase, objectType) },
@@ -78,8 +78,8 @@ instance_init(LassoIdWsf2DstResultQueryBase *node)
 {
 	node->ChangeFormat = NULL;
 	node->itemIDRef = NULL;
-	node->contingency = NULL;
-	node->includeCommonAttributes = NULL;
+	node->contingency = FALSE;
+	node->includeCommonAttributes = FALSE;
 	node->changedSince = NULL;
 	node->itemID = NULL;
 	node->objectType = NULL;
@@ -129,7 +129,7 @@ lasso_idwsf2_dst_result_query_base_get_type()
  *
  * Return value: a newly created #LassoIdWsf2DstResultQueryBase object
  **/
-LassoNode*
+LassoIdWsf2DstResultQueryBase*
 lasso_idwsf2_dst_result_query_base_new()
 {
 	return g_object_new(LASSO_TYPE_IDWSF2_DST_RESULT_QUERY_BASE, NULL);
diff --git a/lasso/xml/id-wsf-2.0/dst_result_query_base.h b/lasso/xml/id-wsf-2.0/dst_result_query_base.h
index 7423a1f8..6e371bee 100644
--- a/lasso/xml/id-wsf-2.0/dst_result_query_base.h
+++ b/lasso/xml/id-wsf-2.0/dst_result_query_base.h
@@ -64,8 +64,8 @@ struct _LassoIdWsf2DstResultQueryBase {
 	char *ChangeFormat;
 	/* attributes */
 	char *itemIDRef;
-	char *contingency;
-	char *includeCommonAttributes;
+	gboolean contingency;
+	gboolean includeCommonAttributes;
 	char *changedSince;
 	char *itemID;
 	char *objectType;
@@ -78,7 +78,7 @@ struct _LassoIdWsf2DstResultQueryBaseClass {
 };
 
 LASSO_EXPORT GType lasso_idwsf2_dst_result_query_base_get_type(void);
-LASSO_EXPORT LassoNode* lasso_idwsf2_dst_result_query_base_new(void);
+LASSO_EXPORT LassoIdWsf2DstResultQueryBase* lasso_idwsf2_dst_result_query_base_new(void);
 
 
 
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
new file mode 100644
index 00000000..ec44e011
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dst_test_item_base.c
@@ -0,0 +1,117 @@
+/* $Id: dst_test_item_base.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "dst_test_item_base.h"
+
+/*
+ * Schema fragment (liberty-idwsf-dst-v2.1.xsd):
+ *
+ * <xs:complexType name="TestItemBaseType">
+ *   <xs:attributeGroup ref="dst:selectQualif"/>
+ *   <xs:attribute name="id" use="optional" type="xs:ID"/>
+ *   <xs:attribute ref="lu:itemID" use="optional"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "id", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2DstTestItemBase, id) },
+	{ "itemID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2DstTestItemBase, itemID) },
+	{ "objectType", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoIdWsf2DstTestItemBase, objectType) },
+	{ "predefined", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoIdWsf2DstTestItemBase, predefined) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2DstTestItemBase *node)
+{
+	node->id = NULL;
+	node->itemID = NULL;
+	node->objectType = NULL;
+	node->predefined = NULL;
+}
+
+static void
+class_init(LassoIdWsf2DstTestItemBaseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "TestItemBase");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DST_HREF, LASSO_IDWSF2_DST_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_dst_test_item_base_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2DstTestItemBaseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2DstTestItemBase),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2DstTestItemBase", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_dst_test_item_base_new:
+ *
+ * Creates a new #LassoIdWsf2DstTestItemBase object.
+ *
+ * Return value: a newly created #LassoIdWsf2DstTestItemBase object
+ **/
+LassoIdWsf2DstTestItemBase*
+lasso_idwsf2_dst_test_item_base_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_DST_TEST_ITEM_BASE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/dst_test_item_base.h b/lasso/xml/id-wsf-2.0/dst_test_item_base.h
new file mode 100644
index 00000000..3fc809b0
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dst_test_item_base.h
@@ -0,0 +1,84 @@
+/* $Id: dst_test_item_base.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_DST_TEST_ITEM_BASE_H__
+#define __LASSO_IDWSF2_DST_TEST_ITEM_BASE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_DST_TEST_ITEM_BASE (lasso_idwsf2_dst_test_item_base_get_type())
+#define LASSO_IDWSF2_DST_TEST_ITEM_BASE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DST_TEST_ITEM_BASE, \
+		LassoIdWsf2DstTestItemBase))
+#define LASSO_IDWSF2_DST_TEST_ITEM_BASE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DST_TEST_ITEM_BASE, \
+		LassoIdWsf2DstTestItemBaseClass))
+#define LASSO_IS_IDWSF2_DST_TEST_ITEM_BASE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DST_TEST_ITEM_BASE))
+#define LASSO_IS_IDWSF2_DST_TEST_ITEM_BASE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DST_TEST_ITEM_BASE))
+#define LASSO_IDWSF2_DST_TEST_ITEM_BASE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DST_TEST_ITEM_BASE, \
+		LassoIdWsf2DstTestItemBaseClass)) 
+
+
+typedef struct _LassoIdWsf2DstTestItemBase LassoIdWsf2DstTestItemBase;
+typedef struct _LassoIdWsf2DstTestItemBaseClass LassoIdWsf2DstTestItemBaseClass;
+
+
+struct _LassoIdWsf2DstTestItemBase {
+	LassoNode parent;
+
+	/*< public >*/
+	/* attributes */
+	char *id;
+	char *itemID;
+	char *objectType;
+	char *predefined;
+};
+
+
+struct _LassoIdWsf2DstTestItemBaseClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_dst_test_item_base_get_type(void);
+LASSO_EXPORT LassoIdWsf2DstTestItemBase* lasso_idwsf2_dst_test_item_base_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_DST_TEST_ITEM_BASE_H__ */
diff --git a/lasso/xml/id-wsf-2.0/dstref_sort.c b/lasso/xml/id-wsf-2.0/dstref_app_data.c
index 11af9b6f..a64a5f68 100644
--- a/lasso/xml/id-wsf-2.0/dstref_sort.c
+++ b/lasso/xml/id-wsf-2.0/dstref_app_data.c
@@ -1,4 +1,4 @@
-/* $Id: dstref_sort.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+/* $Id: dstref_app_data.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
  *
  * Lasso - A free implementation of the Liberty Alliance specifications.
  *
@@ -22,12 +22,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "dstref_sort.h"
+#include "dstref_app_data.h"
 
 /*
  * Schema fragment (liberty-idwsf-dst-ref-v2.1.xsd):
  *
- * <xs:complexType name="SortType">
+ * <xs:complexType name="AppDataType">
  *   <xs:simpleContent>
  *     <xs:extension base="xs:string"/>
  *   </xs:simpleContent>
@@ -41,7 +41,7 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "content", SNIPPET_TEXT_CHILD,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRefSort, content) },
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefAppData, content) },
 	{NULL, 0, 0}
 };
 
@@ -53,75 +53,75 @@ static LassoNodeClass *parent_class = NULL;
 /*****************************************************************************/
 
 static void
-instance_init(LassoIdWsf2DstRefSort *node)
+instance_init(LassoIdWsf2DstRefAppData *node)
 {
 	node->content = NULL;
 }
 
 static void
-class_init(LassoIdWsf2DstRefSortClass *klass)
+class_init(LassoIdWsf2DstRefAppDataClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
 
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
-	lasso_node_class_set_nodename(nclass, "Sort");
+	lasso_node_class_set_nodename(nclass, "NewData");
 	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DSTREF_HREF, LASSO_IDWSF2_DSTREF_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
 GType
-lasso_idwsf2_dstref_sort_get_type()
+lasso_idwsf2_dstref_app_data_get_type()
 {
 	static GType this_type = 0;
 
 	if (!this_type) {
 		static const GTypeInfo this_info = {
-			sizeof (LassoIdWsf2DstRefSortClass),
+			sizeof (LassoIdWsf2DstRefAppDataClass),
 			NULL,
 			NULL,
 			(GClassInitFunc) class_init,
 			NULL,
 			NULL,
-			sizeof(LassoIdWsf2DstRefSort),
+			sizeof(LassoIdWsf2DstRefAppData),
 			0,
 			(GInstanceInitFunc) instance_init,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
-				"LassoIdWsf2DstRefSort", &this_info, 0);
+				"LassoIdWsf2DstRefAppData", &this_info, 0);
 	}
 	return this_type;
 }
 
 /**
- * lasso_idwsf2_dstref_sort_new:
+ * lasso_idwsf2_dstref_app_data_new:
  *
- * Creates a new #LassoIdWsf2DstRefSort object.
+ * Creates a new #LassoIdWsf2DstRefAppData object.
  *
- * Return value: a newly created #LassoIdWsf2DstRefSort object
+ * Return value: a newly created #LassoIdWsf2DstRefAppData object
  **/
-LassoNode*
-lasso_idwsf2_dstref_sort_new()
+LassoIdWsf2DstRefAppData*
+lasso_idwsf2_dstref_app_data_new()
 {
-	return g_object_new(LASSO_TYPE_IDWSF2_DSTREF_SORT, NULL);
+	return g_object_new(LASSO_TYPE_IDWSF2_DSTREF_APP_DATA, NULL);
 }
 
 
 /**
- * lasso_idwsf2_dstref_sort_new_with_string:
+ * lasso_idwsf2_dstref_app_data_new_with_string:
  * @content: 
  *
- * Creates a new #LassoIdWsf2DstRefSort object and initializes it
+ * Creates a new #LassoIdWsf2DstRefAppData object and initializes it
  * with @content.
  *
- * Return value: a newly created #LassoIdWsf2DstRefSort object
+ * Return value: a newly created #LassoIdWsf2DstRefAppData object
  **/
-LassoNode*
-lasso_idwsf2_dstref_sort_new_with_string(char *content)
+LassoIdWsf2DstRefAppData*
+lasso_idwsf2_dstref_app_data_new_with_string(char *content)
 {
-	LassoIdWsf2DstRefSort *object;
-	object = g_object_new(LASSO_TYPE_IDWSF2_DSTREF_SORT, NULL);
+	LassoIdWsf2DstRefAppData *object;
+	object = g_object_new(LASSO_TYPE_IDWSF2_DSTREF_APP_DATA, NULL);
 	object->content = g_strdup(content);
-	return LASSO_NODE(object);
+	return object;
 }
diff --git a/lasso/xml/id-wsf-2.0/dstref_app_data.h b/lasso/xml/id-wsf-2.0/dstref_app_data.h
new file mode 100644
index 00000000..e8f59a03
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dstref_app_data.h
@@ -0,0 +1,82 @@
+/* $Id: dstref_app_data.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_DSTREF_APP_DATA_H__
+#define __LASSO_IDWSF2_DSTREF_APP_DATA_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_DSTREF_APP_DATA (lasso_idwsf2_dstref_app_data_get_type())
+#define LASSO_IDWSF2_DSTREF_APP_DATA(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DSTREF_APP_DATA, \
+		LassoIdWsf2DstRefAppData))
+#define LASSO_IDWSF2_DSTREF_APP_DATA_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DSTREF_APP_DATA, \
+		LassoIdWsf2DstRefAppDataClass))
+#define LASSO_IS_IDWSF2_DSTREF_APP_DATA(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DSTREF_APP_DATA))
+#define LASSO_IS_IDWSF2_DSTREF_APP_DATA_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DSTREF_APP_DATA))
+#define LASSO_IDWSF2_DSTREF_APP_DATA_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DSTREF_APP_DATA, \
+		LassoIdWsf2DstRefAppDataClass)) 
+
+
+typedef struct _LassoIdWsf2DstRefAppData LassoIdWsf2DstRefAppData;
+typedef struct _LassoIdWsf2DstRefAppDataClass LassoIdWsf2DstRefAppDataClass;
+
+
+struct _LassoIdWsf2DstRefAppData {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	char *content;
+};
+
+
+struct _LassoIdWsf2DstRefAppDataClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_dstref_app_data_get_type(void);
+LASSO_EXPORT LassoIdWsf2DstRefAppData* lasso_idwsf2_dstref_app_data_new(void);
+
+LASSO_EXPORT LassoIdWsf2DstRefAppData* lasso_idwsf2_dstref_app_data_new_with_string(char *content);
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_DSTREF_APP_DATA_H__ */
diff --git a/lasso/xml/id-wsf-2.0/dstref_create.c b/lasso/xml/id-wsf-2.0/dstref_create.c
new file mode 100644
index 00000000..d92e1c0f
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dstref_create.c
@@ -0,0 +1,118 @@
+/* $Id: dstref_create.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "dstref_create.h"
+
+/*
+ * Schema fragment (liberty-idwsf-dst-ref-v2.1.xsd):
+ *
+ * <xs:complexType name="CreateType">
+ *   <xs:complexContent>
+ *     <xs:extension base="dst:RequestType">
+ *       <xs:sequence>
+ *         <xs:element ref="dstref:CreateItem" minOccurs="1" maxOccurs="unbounded"/>
+ *         <xs:element ref="dstref:ResultQuery" minOccurs="0" maxOccurs="unbounded"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "CreateItem", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefCreate, CreateItem),
+		"LassoIdWsf2DstRefCreateItem" },
+	{ "ResultQuery", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefCreate, ResultQuery),
+		"LassoIdWsf2DstRefResultQuery" },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2DstRefCreate *node)
+{
+	node->CreateItem = NULL;
+	node->ResultQuery = NULL;
+}
+
+static void
+class_init(LassoIdWsf2DstRefCreateClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Create");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DSTREF_HREF, LASSO_IDWSF2_DSTREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_dstref_create_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2DstRefCreateClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2DstRefCreate),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_REQUEST,
+				"LassoIdWsf2DstRefCreate", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_dstref_create_new:
+ *
+ * Creates a new #LassoIdWsf2DstRefCreate object.
+ *
+ * Return value: a newly created #LassoIdWsf2DstRefCreate object
+ **/
+LassoIdWsf2DstRefCreate*
+lasso_idwsf2_dstref_create_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_DSTREF_CREATE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/dstref_create.h b/lasso/xml/id-wsf-2.0/dstref_create.h
new file mode 100644
index 00000000..7efce3af
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dstref_create.h
@@ -0,0 +1,83 @@
+/* $Id: dstref_create.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_DSTREF_CREATE_H__
+#define __LASSO_IDWSF2_DSTREF_CREATE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "dst_request.h"
+
+#define LASSO_TYPE_IDWSF2_DSTREF_CREATE (lasso_idwsf2_dstref_create_get_type())
+#define LASSO_IDWSF2_DSTREF_CREATE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DSTREF_CREATE, \
+		LassoIdWsf2DstRefCreate))
+#define LASSO_IDWSF2_DSTREF_CREATE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DSTREF_CREATE, \
+		LassoIdWsf2DstRefCreateClass))
+#define LASSO_IS_IDWSF2_DSTREF_CREATE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DSTREF_CREATE))
+#define LASSO_IS_IDWSF2_DSTREF_CREATE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DSTREF_CREATE))
+#define LASSO_IDWSF2_DSTREF_CREATE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DSTREF_CREATE, \
+		LassoIdWsf2DstRefCreateClass)) 
+
+
+typedef struct _LassoIdWsf2DstRefCreate LassoIdWsf2DstRefCreate;
+typedef struct _LassoIdWsf2DstRefCreateClass LassoIdWsf2DstRefCreateClass;
+
+
+struct _LassoIdWsf2DstRefCreate {
+	LassoIdWsf2DstRequest parent;
+
+	/*< public >*/
+	/* elements */
+	GList *CreateItem; /* of LassoIdWsf2DstRefCreateItem */
+	GList *ResultQuery; /* of LassoIdWsf2DstRefResultQuery */
+};
+
+
+struct _LassoIdWsf2DstRefCreateClass {
+	LassoIdWsf2DstRequestClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_dstref_create_get_type(void);
+LASSO_EXPORT LassoIdWsf2DstRefCreate* lasso_idwsf2_dstref_create_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_DSTREF_CREATE_H__ */
diff --git a/lasso/xml/id-wsf-2.0/dstref_create_item.c b/lasso/xml/id-wsf-2.0/dstref_create_item.c
new file mode 100644
index 00000000..5ed81016
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dstref_create_item.c
@@ -0,0 +1,119 @@
+/* $Id: dstref_create_item.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "dstref_create_item.h"
+
+/*
+ * Schema fragment (liberty-idwsf-dst-ref-v2.1.xsd):
+ *
+ * <xs:complexType name="CreateItemType">
+ *   <xs:sequence>
+ *     <xs:element ref="dstref:NewData" minOccurs="0" maxOccurs="1"/>
+ *   </xs:sequence>
+ *   <xs:attributeGroup ref="dst:CreateItemAttributeGroup"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "NewData", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefCreateItem, NewData),
+		"LassoIdWsf2DstRefAppData" },
+	{ "objectType", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefCreateItem, objectType) },
+	{ "id", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefCreateItem, id) },
+	{ "itemID", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefCreateItem, itemID) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2DstRefCreateItem *node)
+{
+	node->NewData = NULL;
+	node->objectType = NULL;
+	node->id = NULL;
+	node->itemID = NULL;
+}
+
+static void
+class_init(LassoIdWsf2DstRefCreateItemClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "CreateItem");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DSTREF_HREF, LASSO_IDWSF2_DSTREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_dstref_create_item_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2DstRefCreateItemClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2DstRefCreateItem),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2DstRefCreateItem", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_dstref_create_item_new:
+ *
+ * Creates a new #LassoIdWsf2DstRefCreateItem object.
+ *
+ * Return value: a newly created #LassoIdWsf2DstRefCreateItem object
+ **/
+LassoIdWsf2DstRefCreateItem*
+lasso_idwsf2_dstref_create_item_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_DSTREF_CREATE_ITEM, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/dstref_create_item.h b/lasso/xml/id-wsf-2.0/dstref_create_item.h
new file mode 100644
index 00000000..22c08541
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dstref_create_item.h
@@ -0,0 +1,86 @@
+/* $Id: dstref_create_item.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_DSTREF_CREATE_ITEM_H__
+#define __LASSO_IDWSF2_DSTREF_CREATE_ITEM_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "dstref_app_data.h"
+
+#define LASSO_TYPE_IDWSF2_DSTREF_CREATE_ITEM (lasso_idwsf2_dstref_create_item_get_type())
+#define LASSO_IDWSF2_DSTREF_CREATE_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DSTREF_CREATE_ITEM, \
+		LassoIdWsf2DstRefCreateItem))
+#define LASSO_IDWSF2_DSTREF_CREATE_ITEM_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DSTREF_CREATE_ITEM, \
+		LassoIdWsf2DstRefCreateItemClass))
+#define LASSO_IS_IDWSF2_DSTREF_CREATE_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DSTREF_CREATE_ITEM))
+#define LASSO_IS_IDWSF2_DSTREF_CREATE_ITEM_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DSTREF_CREATE_ITEM))
+#define LASSO_IDWSF2_DSTREF_CREATE_ITEM_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DSTREF_CREATE_ITEM, \
+		LassoIdWsf2DstRefCreateItemClass)) 
+
+
+typedef struct _LassoIdWsf2DstRefCreateItem LassoIdWsf2DstRefCreateItem;
+typedef struct _LassoIdWsf2DstRefCreateItemClass LassoIdWsf2DstRefCreateItemClass;
+
+
+struct _LassoIdWsf2DstRefCreateItem {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	LassoIdWsf2DstRefAppData *NewData;
+	/* attributes */
+	char *objectType;
+	char *id;
+	char *itemID;
+};
+
+
+struct _LassoIdWsf2DstRefCreateItemClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_dstref_create_item_get_type(void);
+LASSO_EXPORT LassoIdWsf2DstRefCreateItem* lasso_idwsf2_dstref_create_item_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_DSTREF_CREATE_ITEM_H__ */
diff --git a/lasso/xml/id-wsf-2.0/dstref_create_response.c b/lasso/xml/id-wsf-2.0/dstref_create_response.c
new file mode 100644
index 00000000..7be62b17
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dstref_create_response.c
@@ -0,0 +1,105 @@
+/* $Id: dstref_create_response.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "dstref_create_response.h"
+
+/*
+ * Schema fragment (liberty-idwsf-dst-ref-v2.1.xsd):
+ *
+ * <xs:complexType name="CreateResponseType">
+ *   <xs:complexContent>
+ *     <xs:extension base="dstref:DataResponseType"/>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2DstRefCreateResponse *node)
+{
+}
+
+static void
+class_init(LassoIdWsf2DstRefCreateResponseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "CreateResponse");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DSTREF_HREF, LASSO_IDWSF2_DSTREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_dstref_create_response_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2DstRefCreateResponseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2DstRefCreateResponse),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DSTREF_DATA_RESPONSE,
+				"LassoIdWsf2DstRefCreateResponse", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_dstref_create_response_new:
+ *
+ * Creates a new #LassoIdWsf2DstRefCreateResponse object.
+ *
+ * Return value: a newly created #LassoIdWsf2DstRefCreateResponse object
+ **/
+LassoIdWsf2DstRefCreateResponse*
+lasso_idwsf2_dstref_create_response_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_DSTREF_CREATE_RESPONSE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/dstref_create_response.h b/lasso/xml/id-wsf-2.0/dstref_create_response.h
new file mode 100644
index 00000000..3e03bf2a
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dstref_create_response.h
@@ -0,0 +1,81 @@
+/* $Id: dstref_create_response.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_DSTREF_CREATE_RESPONSE_H__
+#define __LASSO_IDWSF2_DSTREF_CREATE_RESPONSE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "dstref_data_response.h"
+
+#define LASSO_TYPE_IDWSF2_DSTREF_CREATE_RESPONSE \
+	(lasso_idwsf2_dstref_create_response_get_type())
+#define LASSO_IDWSF2_DSTREF_CREATE_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DSTREF_CREATE_RESPONSE, \
+		LassoIdWsf2DstRefCreateResponse))
+#define LASSO_IDWSF2_DSTREF_CREATE_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DSTREF_CREATE_RESPONSE, \
+		LassoIdWsf2DstRefCreateResponseClass))
+#define LASSO_IS_IDWSF2_DSTREF_CREATE_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DSTREF_CREATE_RESPONSE))
+#define LASSO_IS_IDWSF2_DSTREF_CREATE_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DSTREF_CREATE_RESPONSE))
+#define LASSO_IDWSF2_DSTREF_CREATE_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DSTREF_CREATE_RESPONSE, \
+		LassoIdWsf2DstRefCreateResponseClass)) 
+
+
+typedef struct _LassoIdWsf2DstRefCreateResponse LassoIdWsf2DstRefCreateResponse;
+typedef struct _LassoIdWsf2DstRefCreateResponseClass LassoIdWsf2DstRefCreateResponseClass;
+
+
+struct _LassoIdWsf2DstRefCreateResponse {
+	LassoIdWsf2DstRefDataResponse parent;
+
+	/*< public >*/
+};
+
+
+struct _LassoIdWsf2DstRefCreateResponseClass {
+	LassoIdWsf2DstRefDataResponseClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_dstref_create_response_get_type(void);
+LASSO_EXPORT LassoIdWsf2DstRefCreateResponse* lasso_idwsf2_dstref_create_response_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_DSTREF_CREATE_RESPONSE_H__ */
diff --git a/lasso/xml/id-wsf-2.0/dstref_data.c b/lasso/xml/id-wsf-2.0/dstref_data.c
index 261b9723..468cf245 100644
--- a/lasso/xml/id-wsf-2.0/dstref_data.c
+++ b/lasso/xml/id-wsf-2.0/dstref_data.c
@@ -44,9 +44,9 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "remaining", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL,
 		G_STRUCT_OFFSET(LassoIdWsf2DstRefData, remaining) },
-	{ "nextOffset", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL,
+	{ "nextOffset", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL_NEG,
 		G_STRUCT_OFFSET(LassoIdWsf2DstRefData, nextOffset) },
-	{ "setID", SNIPPET_ATTRIBUTE,
+	{ "setID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
 		G_STRUCT_OFFSET(LassoIdWsf2DstRefData, setID) },
 	{NULL, 0, 0}
 };
@@ -61,8 +61,8 @@ static LassoNodeClass *parent_class = NULL;
 static void
 instance_init(LassoIdWsf2DstRefData *node)
 {
-	node->remaining = NULL;
-	node->nextOffset = NULL;
+	node->remaining = 0;
+	node->nextOffset = -1;
 	node->setID = NULL;
 }
 
@@ -114,4 +114,3 @@ lasso_idwsf2_dstref_data_new()
 {
 	return g_object_new(LASSO_TYPE_IDWSF2_DSTREF_DATA, NULL);
 }
-
diff --git a/lasso/xml/id-wsf-2.0/dstref_data.h b/lasso/xml/id-wsf-2.0/dstref_data.h
index 1a9ac70e..21903645 100644
--- a/lasso/xml/id-wsf-2.0/dstref_data.h
+++ b/lasso/xml/id-wsf-2.0/dstref_data.h
@@ -62,8 +62,8 @@ struct _LassoIdWsf2DstRefData {
 
 	/*< public >*/
 	/* attributes */
-	char *remaining;
-	char *nextOffset;
+	int remaining;
+	int nextOffset;
 	char *setID;
 };
 
diff --git a/lasso/xml/id-wsf-2.0/dstref_data_response.c b/lasso/xml/id-wsf-2.0/dstref_data_response.c
new file mode 100644
index 00000000..d845142d
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dstref_data_response.c
@@ -0,0 +1,113 @@
+/* $Id: dstref_data_response.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "dstref_data_response.h"
+
+/*
+ * Schema fragment (liberty-idwsf-dst-ref-v2.1.xsd):
+ *
+ * <xs:complexType name="DataResponseType">
+ *   <xs:complexContent>
+ *     <xs:extension base="dst:DataResponseBaseType">
+ *       <xs:sequence>
+ *         <xs:element ref="dstref:ItemData" minOccurs="0" maxOccurs="unbounded"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "ItemData", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefDataResponse, ItemData),
+		"LassoIdWsf2DstRefItemData" },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2DstRefDataResponse *node)
+{
+	node->ItemData = NULL;
+}
+
+static void
+class_init(LassoIdWsf2DstRefDataResponseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "DataResponse");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DSTREF_HREF, LASSO_IDWSF2_DSTREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_dstref_data_response_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2DstRefDataResponseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2DstRefDataResponse),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_DATA_RESPONSE_BASE,
+				"LassoIdWsf2DstRefDataResponse", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_dstref_data_response_new:
+ *
+ * Creates a new #LassoIdWsf2DstRefDataResponse object.
+ *
+ * Return value: a newly created #LassoIdWsf2DstRefDataResponse object
+ **/
+LassoIdWsf2DstRefDataResponse*
+lasso_idwsf2_dstref_data_response_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_DSTREF_DATA_RESPONSE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/dstref_data_response.h b/lasso/xml/id-wsf-2.0/dstref_data_response.h
new file mode 100644
index 00000000..e6beb857
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dstref_data_response.h
@@ -0,0 +1,82 @@
+/* $Id: dstref_data_response.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_DSTREF_DATA_RESPONSE_H__
+#define __LASSO_IDWSF2_DSTREF_DATA_RESPONSE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "dst_data_response_base.h"
+
+#define LASSO_TYPE_IDWSF2_DSTREF_DATA_RESPONSE (lasso_idwsf2_dstref_data_response_get_type())
+#define LASSO_IDWSF2_DSTREF_DATA_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DSTREF_DATA_RESPONSE, \
+		LassoIdWsf2DstRefDataResponse))
+#define LASSO_IDWSF2_DSTREF_DATA_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DSTREF_DATA_RESPONSE, \
+		LassoIdWsf2DstRefDataResponseClass))
+#define LASSO_IS_IDWSF2_DSTREF_DATA_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DSTREF_DATA_RESPONSE))
+#define LASSO_IS_IDWSF2_DSTREF_DATA_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DSTREF_DATA_RESPONSE))
+#define LASSO_IDWSF2_DSTREF_DATA_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DSTREF_DATA_RESPONSE, \
+		LassoIdWsf2DstRefDataResponseClass)) 
+
+
+typedef struct _LassoIdWsf2DstRefDataResponse LassoIdWsf2DstRefDataResponse;
+typedef struct _LassoIdWsf2DstRefDataResponseClass LassoIdWsf2DstRefDataResponseClass;
+
+
+struct _LassoIdWsf2DstRefDataResponse {
+	LassoIdWsf2DstDataResponseBase parent;
+
+	/*< public >*/
+	/* elements */
+	GList *ItemData; /* of LassoIdWsf2DstRefItemData */
+};
+
+
+struct _LassoIdWsf2DstRefDataResponseClass {
+	LassoIdWsf2DstDataResponseBaseClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_dstref_data_response_get_type(void);
+LASSO_EXPORT LassoIdWsf2DstRefDataResponse* lasso_idwsf2_dstref_data_response_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_DSTREF_DATA_RESPONSE_H__ */
diff --git a/lasso/xml/id-wsf-2.0/dstref_delete.c b/lasso/xml/id-wsf-2.0/dstref_delete.c
new file mode 100644
index 00000000..a09ffba5
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dstref_delete.c
@@ -0,0 +1,113 @@
+/* $Id: dstref_delete.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "dstref_delete.h"
+
+/*
+ * Schema fragment (liberty-idwsf-dst-ref-v2.1.xsd):
+ *
+ * <xs:complexType name="DeleteType">
+ *   <xs:complexContent>
+ *     <xs:extension base="dst:RequestType">
+ *       <xs:sequence>
+ *         <xs:element ref="dstref:DeleteItem" minOccurs="1" maxOccurs="unbounded"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "DeleteItem", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefDelete, DeleteItem),
+		"LassoIdWsf2DstRefDeleteItem" },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2DstRefDelete *node)
+{
+	node->DeleteItem = NULL;
+}
+
+static void
+class_init(LassoIdWsf2DstRefDeleteClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Delete");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DSTREF_HREF, LASSO_IDWSF2_DSTREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_dstref_delete_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2DstRefDeleteClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2DstRefDelete),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_REQUEST,
+				"LassoIdWsf2DstRefDelete", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_dstref_delete_new:
+ *
+ * Creates a new #LassoIdWsf2DstRefDelete object.
+ *
+ * Return value: a newly created #LassoIdWsf2DstRefDelete object
+ **/
+LassoIdWsf2DstRefDelete*
+lasso_idwsf2_dstref_delete_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_DSTREF_DELETE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/dstref_delete.h b/lasso/xml/id-wsf-2.0/dstref_delete.h
new file mode 100644
index 00000000..32101ed1
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dstref_delete.h
@@ -0,0 +1,82 @@
+/* $Id: dstref_delete.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_DSTREF_DELETE_H__
+#define __LASSO_IDWSF2_DSTREF_DELETE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "dst_request.h"
+
+#define LASSO_TYPE_IDWSF2_DSTREF_DELETE (lasso_idwsf2_dstref_delete_get_type())
+#define LASSO_IDWSF2_DSTREF_DELETE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DSTREF_DELETE, \
+		LassoIdWsf2DstRefDelete))
+#define LASSO_IDWSF2_DSTREF_DELETE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DSTREF_DELETE, \
+		LassoIdWsf2DstRefDeleteClass))
+#define LASSO_IS_IDWSF2_DSTREF_DELETE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DSTREF_DELETE))
+#define LASSO_IS_IDWSF2_DSTREF_DELETE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DSTREF_DELETE))
+#define LASSO_IDWSF2_DSTREF_DELETE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DSTREF_DELETE, \
+		LassoIdWsf2DstRefDeleteClass)) 
+
+
+typedef struct _LassoIdWsf2DstRefDelete LassoIdWsf2DstRefDelete;
+typedef struct _LassoIdWsf2DstRefDeleteClass LassoIdWsf2DstRefDeleteClass;
+
+
+struct _LassoIdWsf2DstRefDelete {
+	LassoIdWsf2DstRequest parent;
+
+	/*< public >*/
+	/* elements */
+	GList *DeleteItem; /* of LassoIdWsf2DstRefDeleteItem */
+};
+
+
+struct _LassoIdWsf2DstRefDeleteClass {
+	LassoIdWsf2DstRequestClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_dstref_delete_get_type(void);
+LASSO_EXPORT LassoIdWsf2DstRefDelete* lasso_idwsf2_dstref_delete_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_DSTREF_DELETE_H__ */
diff --git a/lasso/xml/id-wsf-2.0/dstref_delete_item.c b/lasso/xml/id-wsf-2.0/dstref_delete_item.c
new file mode 100644
index 00000000..9bb092fd
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dstref_delete_item.c
@@ -0,0 +1,112 @@
+/* $Id: dstref_delete_item.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "dstref_delete_item.h"
+
+/*
+ * Schema fragment (liberty-idwsf-dst-ref-v2.1.xsd):
+ *
+ * <xs:complexType name="DeleteItemType">
+ *   <xs:complexContent>
+ *     <xs:extension base="dst:DeleteItemBaseType">
+ *       <xs:sequence>
+ *         <xs:element ref="dstref:Select" minOccurs="0" maxOccurs="1"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Select", SNIPPET_CONTENT,
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefDeleteItem, Select) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2DstRefDeleteItem *node)
+{
+	node->Select = NULL;
+}
+
+static void
+class_init(LassoIdWsf2DstRefDeleteItemClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "DeleteItem");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DSTREF_HREF, LASSO_IDWSF2_DSTREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_dstref_delete_item_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2DstRefDeleteItemClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2DstRefDeleteItem),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_DELETE_ITEM_BASE,
+				"LassoIdWsf2DstRefDeleteItem", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_dstref_delete_item_new:
+ *
+ * Creates a new #LassoIdWsf2DstRefDeleteItem object.
+ *
+ * Return value: a newly created #LassoIdWsf2DstRefDeleteItem object
+ **/
+LassoIdWsf2DstRefDeleteItem*
+lasso_idwsf2_dstref_delete_item_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_DSTREF_DELETE_ITEM, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/dstref_delete_item.h b/lasso/xml/id-wsf-2.0/dstref_delete_item.h
new file mode 100644
index 00000000..ce828e7d
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dstref_delete_item.h
@@ -0,0 +1,82 @@
+/* $Id: dstref_delete_item.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_DSTREF_DELETE_ITEM_H__
+#define __LASSO_IDWSF2_DSTREF_DELETE_ITEM_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "dst_delete_item_base.h"
+
+#define LASSO_TYPE_IDWSF2_DSTREF_DELETE_ITEM (lasso_idwsf2_dstref_delete_item_get_type())
+#define LASSO_IDWSF2_DSTREF_DELETE_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DSTREF_DELETE_ITEM, \
+		LassoIdWsf2DstRefDeleteItem))
+#define LASSO_IDWSF2_DSTREF_DELETE_ITEM_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DSTREF_DELETE_ITEM, \
+		LassoIdWsf2DstRefDeleteItemClass))
+#define LASSO_IS_IDWSF2_DSTREF_DELETE_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DSTREF_DELETE_ITEM))
+#define LASSO_IS_IDWSF2_DSTREF_DELETE_ITEM_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DSTREF_DELETE_ITEM))
+#define LASSO_IDWSF2_DSTREF_DELETE_ITEM_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DSTREF_DELETE_ITEM, \
+		LassoIdWsf2DstRefDeleteItemClass)) 
+
+
+typedef struct _LassoIdWsf2DstRefDeleteItem LassoIdWsf2DstRefDeleteItem;
+typedef struct _LassoIdWsf2DstRefDeleteItemClass LassoIdWsf2DstRefDeleteItemClass;
+
+
+struct _LassoIdWsf2DstRefDeleteItem {
+	LassoIdWsf2DstDeleteItemBase parent;
+
+	/*< public >*/
+	/* elements */
+	char *Select;
+};
+
+
+struct _LassoIdWsf2DstRefDeleteItemClass {
+	LassoIdWsf2DstDeleteItemBaseClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_dstref_delete_item_get_type(void);
+LASSO_EXPORT LassoIdWsf2DstRefDeleteItem* lasso_idwsf2_dstref_delete_item_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_DSTREF_DELETE_ITEM_H__ */
diff --git a/lasso/xml/id-wsf-2.0/dstref_delete_response.c b/lasso/xml/id-wsf-2.0/dstref_delete_response.c
new file mode 100644
index 00000000..796d4030
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dstref_delete_response.c
@@ -0,0 +1,105 @@
+/* $Id: dstref_delete_response.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "dstref_delete_response.h"
+
+/*
+ * Schema fragment (liberty-idwsf-dst-ref-v2.1.xsd):
+ *
+ * <xs:complexType name="DeleteResponseType">
+ *   <xs:complexContent>
+ *     <xs:extension base="lu:ResponseType"/>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2DstRefDeleteResponse *node)
+{
+}
+
+static void
+class_init(LassoIdWsf2DstRefDeleteResponseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "DeleteResponse");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DSTREF_HREF, LASSO_IDWSF2_DSTREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_dstref_delete_response_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2DstRefDeleteResponseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2DstRefDeleteResponse),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_UTIL_RESPONSE,
+				"LassoIdWsf2DstRefDeleteResponse", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_dstref_delete_response_new:
+ *
+ * Creates a new #LassoIdWsf2DstRefDeleteResponse object.
+ *
+ * Return value: a newly created #LassoIdWsf2DstRefDeleteResponse object
+ **/
+LassoIdWsf2DstRefDeleteResponse*
+lasso_idwsf2_dstref_delete_response_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_DSTREF_DELETE_RESPONSE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/dstref_delete_response.h b/lasso/xml/id-wsf-2.0/dstref_delete_response.h
new file mode 100644
index 00000000..e78ba3b4
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dstref_delete_response.h
@@ -0,0 +1,81 @@
+/* $Id: dstref_delete_response.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_DSTREF_DELETE_RESPONSE_H__
+#define __LASSO_IDWSF2_DSTREF_DELETE_RESPONSE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "util_response.h"
+
+#define LASSO_TYPE_IDWSF2_DSTREF_DELETE_RESPONSE \
+	(lasso_idwsf2_dstref_delete_response_get_type())
+#define LASSO_IDWSF2_DSTREF_DELETE_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DSTREF_DELETE_RESPONSE, \
+		LassoIdWsf2DstRefDeleteResponse))
+#define LASSO_IDWSF2_DSTREF_DELETE_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DSTREF_DELETE_RESPONSE, \
+		LassoIdWsf2DstRefDeleteResponseClass))
+#define LASSO_IS_IDWSF2_DSTREF_DELETE_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DSTREF_DELETE_RESPONSE))
+#define LASSO_IS_IDWSF2_DSTREF_DELETE_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DSTREF_DELETE_RESPONSE))
+#define LASSO_IDWSF2_DSTREF_DELETE_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DSTREF_DELETE_RESPONSE, \
+		LassoIdWsf2DstRefDeleteResponseClass)) 
+
+
+typedef struct _LassoIdWsf2DstRefDeleteResponse LassoIdWsf2DstRefDeleteResponse;
+typedef struct _LassoIdWsf2DstRefDeleteResponseClass LassoIdWsf2DstRefDeleteResponseClass;
+
+
+struct _LassoIdWsf2DstRefDeleteResponse {
+	LassoIdWsf2UtilResponse parent;
+
+	/*< public >*/
+};
+
+
+struct _LassoIdWsf2DstRefDeleteResponseClass {
+	LassoIdWsf2UtilResponseClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_dstref_delete_response_get_type(void);
+LASSO_EXPORT LassoIdWsf2DstRefDeleteResponse* lasso_idwsf2_dstref_delete_response_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_DSTREF_DELETE_RESPONSE_H__ */
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 902dc21f..cc25cee3 100644
--- a/lasso/xml/id-wsf-2.0/dstref_item_data.c
+++ b/lasso/xml/id-wsf-2.0/dstref_item_data.c
@@ -112,9 +112,8 @@ lasso_idwsf2_dstref_item_data_get_type()
  *
  * Return value: a newly created #LassoIdWsf2DstRefItemData object
  **/
-LassoNode*
+LassoIdWsf2DstRefItemData*
 lasso_idwsf2_dstref_item_data_new()
 {
 	return g_object_new(LASSO_TYPE_IDWSF2_DSTREF_ITEM_DATA, NULL);
 }
-
diff --git a/lasso/xml/id-wsf-2.0/dstref_item_data.h b/lasso/xml/id-wsf-2.0/dstref_item_data.h
index c16c0f8b..42379f56 100644
--- a/lasso/xml/id-wsf-2.0/dstref_item_data.h
+++ b/lasso/xml/id-wsf-2.0/dstref_item_data.h
@@ -61,8 +61,7 @@ struct _LassoIdWsf2DstRefItemData {
 
 	/*< public >*/
 	/* elements */
-	GList *any; /* list of xmlNodes */
-
+	GList *any; /* of xmlNode */
 	/* attributes */
 	char *itemIDRef;
 	char *notSorted;
@@ -75,9 +74,8 @@ struct _LassoIdWsf2DstRefItemDataClass {
 };
 
 LASSO_EXPORT GType lasso_idwsf2_dstref_item_data_get_type(void);
-LASSO_EXPORT LassoNode* lasso_idwsf2_dstref_item_data_new(void);
+LASSO_EXPORT LassoIdWsf2DstRefItemData* lasso_idwsf2_dstref_item_data_new(void);
 
-LASSO_EXPORT LassoNode* lasso_idwsf2_dstref_item_data_new_with_string(char *content);
 
 
 #ifdef __cplusplus
diff --git a/lasso/xml/id-wsf-2.0/dstref_modify.c b/lasso/xml/id-wsf-2.0/dstref_modify.c
new file mode 100644
index 00000000..fd658fb2
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dstref_modify.c
@@ -0,0 +1,118 @@
+/* $Id: dstref_modify.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "dstref_modify.h"
+
+/*
+ * Schema fragment (liberty-idwsf-dst-ref-v2.1.xsd):
+ *
+ * <xs:complexType name="ModifyType">
+ *   <xs:complexContent>
+ *     <xs:extension base="dst:RequestType">
+ *       <xs:sequence>
+ *         <xs:element ref="dstref:ModifyItem" minOccurs="1" maxOccurs="unbounded"/>
+ *         <xs:element ref="dstref:ResultQuery" minOccurs="0" maxOccurs="unbounded"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "ModifyItem", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefModify, ModifyItem),
+		"LassoIdWsf2DstRefModifyItem" },
+	{ "ResultQuery", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefModify, ResultQuery),
+		"LassoIdWsf2DstRefResultQuery" },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2DstRefModify *node)
+{
+	node->ModifyItem = NULL;
+	node->ResultQuery = NULL;
+}
+
+static void
+class_init(LassoIdWsf2DstRefModifyClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Modify");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DSTREF_HREF, LASSO_IDWSF2_DSTREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_dstref_modify_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2DstRefModifyClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2DstRefModify),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_REQUEST,
+				"LassoIdWsf2DstRefModify", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_dstref_modify_new:
+ *
+ * Creates a new #LassoIdWsf2DstRefModify object.
+ *
+ * Return value: a newly created #LassoIdWsf2DstRefModify object
+ **/
+LassoIdWsf2DstRefModify*
+lasso_idwsf2_dstref_modify_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_DSTREF_MODIFY, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/dstref_modify.h b/lasso/xml/id-wsf-2.0/dstref_modify.h
new file mode 100644
index 00000000..1f3049ed
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dstref_modify.h
@@ -0,0 +1,83 @@
+/* $Id: dstref_modify.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_DSTREF_MODIFY_H__
+#define __LASSO_IDWSF2_DSTREF_MODIFY_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "dst_request.h"
+
+#define LASSO_TYPE_IDWSF2_DSTREF_MODIFY (lasso_idwsf2_dstref_modify_get_type())
+#define LASSO_IDWSF2_DSTREF_MODIFY(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DSTREF_MODIFY, \
+		LassoIdWsf2DstRefModify))
+#define LASSO_IDWSF2_DSTREF_MODIFY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DSTREF_MODIFY, \
+		LassoIdWsf2DstRefModifyClass))
+#define LASSO_IS_IDWSF2_DSTREF_MODIFY(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DSTREF_MODIFY))
+#define LASSO_IS_IDWSF2_DSTREF_MODIFY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DSTREF_MODIFY))
+#define LASSO_IDWSF2_DSTREF_MODIFY_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DSTREF_MODIFY, \
+		LassoIdWsf2DstRefModifyClass)) 
+
+
+typedef struct _LassoIdWsf2DstRefModify LassoIdWsf2DstRefModify;
+typedef struct _LassoIdWsf2DstRefModifyClass LassoIdWsf2DstRefModifyClass;
+
+
+struct _LassoIdWsf2DstRefModify {
+	LassoIdWsf2DstRequest parent;
+
+	/*< public >*/
+	/* elements */
+	GList *ModifyItem; /* of LassoIdWsf2DstRefModifyItem */
+	GList *ResultQuery; /* of LassoIdWsf2DstRefResultQuery */
+};
+
+
+struct _LassoIdWsf2DstRefModifyClass {
+	LassoIdWsf2DstRequestClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_dstref_modify_get_type(void);
+LASSO_EXPORT LassoIdWsf2DstRefModify* lasso_idwsf2_dstref_modify_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_DSTREF_MODIFY_H__ */
diff --git a/lasso/xml/id-wsf-2.0/dstref_modify_item.c b/lasso/xml/id-wsf-2.0/dstref_modify_item.c
new file mode 100644
index 00000000..bc872417
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dstref_modify_item.c
@@ -0,0 +1,126 @@
+/* $Id: dstref_modify_item.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "dstref_modify_item.h"
+
+/*
+ * Schema fragment (liberty-idwsf-dst-ref-v2.1.xsd):
+ *
+ * <xs:complexType name="ModifyItemType">
+ *   <xs:sequence>
+ *     <xs:element ref="dstref:Select" minOccurs="0" maxOccurs="1"/>
+ *     <xs:element ref="dstref:NewData" minOccurs="0" maxOccurs="1"/>
+ *   </xs:sequence>
+ *   <xs:attributeGroup ref="dst:ModifyItemAttributeGroup"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Select", SNIPPET_CONTENT,
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefModifyItem, Select) },
+	{ "NewData", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefModifyItem, NewData),
+		"LassoIdWsf2DstRefAppData" },
+	{ "notChangedSince", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefModifyItem, notChangedSince) },
+	{ "overrideAllowed", SNIPPET_ATTRIBUTE | SNIPPET_BOOLEAN | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefModifyItem, overrideAllowed) },
+	{ "id", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefModifyItem, id) },
+	{ "itemID", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefModifyItem, itemID) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2DstRefModifyItem *node)
+{
+	node->Select = NULL;
+	node->NewData = NULL;
+	node->notChangedSince = NULL;
+	node->overrideAllowed = FALSE;
+	node->id = NULL;
+	node->itemID = NULL;
+}
+
+static void
+class_init(LassoIdWsf2DstRefModifyItemClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "ModifyItem");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DSTREF_HREF, LASSO_IDWSF2_DSTREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_dstref_modify_item_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2DstRefModifyItemClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2DstRefModifyItem),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2DstRefModifyItem", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_dstref_modify_item_new:
+ *
+ * Creates a new #LassoIdWsf2DstRefModifyItem object.
+ *
+ * Return value: a newly created #LassoIdWsf2DstRefModifyItem object
+ **/
+LassoIdWsf2DstRefModifyItem*
+lasso_idwsf2_dstref_modify_item_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_DSTREF_MODIFY_ITEM, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/dstref_modify_item.h b/lasso/xml/id-wsf-2.0/dstref_modify_item.h
new file mode 100644
index 00000000..1b99ef63
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dstref_modify_item.h
@@ -0,0 +1,88 @@
+/* $Id: dstref_modify_item.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_DSTREF_MODIFY_ITEM_H__
+#define __LASSO_IDWSF2_DSTREF_MODIFY_ITEM_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "dstref_app_data.h"
+
+#define LASSO_TYPE_IDWSF2_DSTREF_MODIFY_ITEM (lasso_idwsf2_dstref_modify_item_get_type())
+#define LASSO_IDWSF2_DSTREF_MODIFY_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DSTREF_MODIFY_ITEM, \
+		LassoIdWsf2DstRefModifyItem))
+#define LASSO_IDWSF2_DSTREF_MODIFY_ITEM_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DSTREF_MODIFY_ITEM, \
+		LassoIdWsf2DstRefModifyItemClass))
+#define LASSO_IS_IDWSF2_DSTREF_MODIFY_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DSTREF_MODIFY_ITEM))
+#define LASSO_IS_IDWSF2_DSTREF_MODIFY_ITEM_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DSTREF_MODIFY_ITEM))
+#define LASSO_IDWSF2_DSTREF_MODIFY_ITEM_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DSTREF_MODIFY_ITEM, \
+		LassoIdWsf2DstRefModifyItemClass)) 
+
+
+typedef struct _LassoIdWsf2DstRefModifyItem LassoIdWsf2DstRefModifyItem;
+typedef struct _LassoIdWsf2DstRefModifyItemClass LassoIdWsf2DstRefModifyItemClass;
+
+
+struct _LassoIdWsf2DstRefModifyItem {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	char *Select;
+	LassoIdWsf2DstRefAppData *NewData;
+	/* attributes */
+	char *notChangedSince;
+	gboolean overrideAllowed;
+	char *id;
+	char *itemID;
+};
+
+
+struct _LassoIdWsf2DstRefModifyItemClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_dstref_modify_item_get_type(void);
+LASSO_EXPORT LassoIdWsf2DstRefModifyItem* lasso_idwsf2_dstref_modify_item_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_DSTREF_MODIFY_ITEM_H__ */
diff --git a/lasso/xml/id-wsf-2.0/dstref_modify_response.c b/lasso/xml/id-wsf-2.0/dstref_modify_response.c
new file mode 100644
index 00000000..1db6b1d2
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dstref_modify_response.c
@@ -0,0 +1,105 @@
+/* $Id: dstref_modify_response.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "dstref_modify_response.h"
+
+/*
+ * Schema fragment (liberty-idwsf-dst-ref-v2.1.xsd):
+ *
+ * <xs:complexType name="ModifyResponseType">
+ *   <xs:complexContent>
+ *     <xs:extension base="dstref:DataResponseType"/>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2DstRefModifyResponse *node)
+{
+}
+
+static void
+class_init(LassoIdWsf2DstRefModifyResponseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "ModifyResponse");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DSTREF_HREF, LASSO_IDWSF2_DSTREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_dstref_modify_response_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2DstRefModifyResponseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2DstRefModifyResponse),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DSTREF_DATA_RESPONSE,
+				"LassoIdWsf2DstRefModifyResponse", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_dstref_modify_response_new:
+ *
+ * Creates a new #LassoIdWsf2DstRefModifyResponse object.
+ *
+ * Return value: a newly created #LassoIdWsf2DstRefModifyResponse object
+ **/
+LassoIdWsf2DstRefModifyResponse*
+lasso_idwsf2_dstref_modify_response_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_DSTREF_MODIFY_RESPONSE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/dstref_modify_response.h b/lasso/xml/id-wsf-2.0/dstref_modify_response.h
new file mode 100644
index 00000000..70399c58
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dstref_modify_response.h
@@ -0,0 +1,81 @@
+/* $Id: dstref_modify_response.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_DSTREF_MODIFY_RESPONSE_H__
+#define __LASSO_IDWSF2_DSTREF_MODIFY_RESPONSE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "dstref_data_response.h"
+
+#define LASSO_TYPE_IDWSF2_DSTREF_MODIFY_RESPONSE \
+	(lasso_idwsf2_dstref_modify_response_get_type())
+#define LASSO_IDWSF2_DSTREF_MODIFY_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DSTREF_MODIFY_RESPONSE, \
+		LassoIdWsf2DstRefModifyResponse))
+#define LASSO_IDWSF2_DSTREF_MODIFY_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DSTREF_MODIFY_RESPONSE, \
+		LassoIdWsf2DstRefModifyResponseClass))
+#define LASSO_IS_IDWSF2_DSTREF_MODIFY_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DSTREF_MODIFY_RESPONSE))
+#define LASSO_IS_IDWSF2_DSTREF_MODIFY_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DSTREF_MODIFY_RESPONSE))
+#define LASSO_IDWSF2_DSTREF_MODIFY_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DSTREF_MODIFY_RESPONSE, \
+		LassoIdWsf2DstRefModifyResponseClass)) 
+
+
+typedef struct _LassoIdWsf2DstRefModifyResponse LassoIdWsf2DstRefModifyResponse;
+typedef struct _LassoIdWsf2DstRefModifyResponseClass LassoIdWsf2DstRefModifyResponseClass;
+
+
+struct _LassoIdWsf2DstRefModifyResponse {
+	LassoIdWsf2DstRefDataResponse parent;
+
+	/*< public >*/
+};
+
+
+struct _LassoIdWsf2DstRefModifyResponseClass {
+	LassoIdWsf2DstRefDataResponseClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_dstref_modify_response_get_type(void);
+LASSO_EXPORT LassoIdWsf2DstRefModifyResponse* lasso_idwsf2_dstref_modify_response_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_DSTREF_MODIFY_RESPONSE_H__ */
diff --git a/lasso/xml/id-wsf-2.0/dstref_query.c b/lasso/xml/id-wsf-2.0/dstref_query.c
index 5f6e2d22..4a9791fe 100644
--- a/lasso/xml/id-wsf-2.0/dstref_query.c
+++ b/lasso/xml/id-wsf-2.0/dstref_query.c
@@ -56,40 +56,42 @@ static struct XmlSnippet schema_snippets[] = {
 
 static LassoNodeClass *parent_class = NULL;
 
+
 static xmlNode*
 get_xmlNode(LassoNode *node, gboolean lasso_dump)
 {
-	xmlNode *xmlnode;
+       xmlNode *xmlnode;
 
-	xmlnode = parent_class->get_xmlNode(node, lasso_dump);
-	xml_insure_namespace(xmlnode, NULL, TRUE,
-			LASSO_IDWSF2_DSTREF_QUERY(node)->hrefServiceType,
-			LASSO_IDWSF2_DSTREF_QUERY(node)->prefixServiceType);
+       xmlnode = parent_class->get_xmlNode(node, lasso_dump);
+       xml_insure_namespace(xmlnode, NULL, TRUE,
+                       LASSO_IDWSF2_DSTREF_QUERY(node)->hrefServiceType,
+                       LASSO_IDWSF2_DSTREF_QUERY(node)->prefixServiceType);
 
-	return xmlnode;
+       return xmlnode;
 }
 
 static int
 init_from_xml(LassoNode *node, xmlNode *xmlnode)
 {
-	LassoIdWsf2DstRefQuery *query = LASSO_IDWSF2_DSTREF_QUERY(node);
-	int res;
-
-	res = parent_class->init_from_xml(node, xmlnode);
-	if (res != 0) {
-		return res;
-	}
-
-	query->hrefServiceType = g_strdup((char*)xmlnode->ns->href);
-	query->prefixServiceType = lasso_get_prefix_for_idwsf2_dst_service_href(
-			query->hrefServiceType);
-	if (query->prefixServiceType == NULL) {
-		/* XXX: what to do here ? */
-	}
-
-	return 0;
+       LassoIdWsf2DstRefQuery *object = LASSO_IDWSF2_DSTREF_QUERY(node);
+       int res;
+
+       res = parent_class->init_from_xml(node, xmlnode);
+       if (res != 0) {
+               return res;
+       }
+
+       object->hrefServiceType = g_strdup((char*)xmlnode->ns->href);
+       object->prefixServiceType = lasso_get_prefix_for_idwsf2_dst_service_href(
+                       object->hrefServiceType);
+       if (object->prefixServiceType == NULL) {
+               /* XXX: what to do here ? */
+       }
+
+       return 0;
 }
 
+
 /*****************************************************************************/
 /* instance and class init functions                                         */
 /*****************************************************************************/
@@ -151,5 +153,5 @@ lasso_idwsf2_dstref_query_get_type()
 LassoIdWsf2DstRefQuery*
 lasso_idwsf2_dstref_query_new()
 {
-	return LASSO_IDWSF2_DSTREF_QUERY(g_object_new(LASSO_TYPE_IDWSF2_DSTREF_QUERY, NULL));
+	return g_object_new(LASSO_TYPE_IDWSF2_DSTREF_QUERY, NULL);
 }
diff --git a/lasso/xml/id-wsf-2.0/dstref_query.h b/lasso/xml/id-wsf-2.0/dstref_query.h
index ba392a8c..9717fda6 100644
--- a/lasso/xml/id-wsf-2.0/dstref_query.h
+++ b/lasso/xml/id-wsf-2.0/dstref_query.h
@@ -64,12 +64,13 @@ struct _LassoIdWsf2DstRefQuery {
 	/* elements */
 	GList *TestItem; /* of LassoIdWsf2DstRefTestItem */
 	GList *QueryItem; /* of LassoIdWsf2DstRefQueryItem */
-	
+
 	/*< private >*/
 	char *prefixServiceType;
 	char *hrefServiceType;
 };
 
+
 struct _LassoIdWsf2DstRefQueryClass {
 	LassoIdWsf2DstRequestClass parent;
 };
@@ -77,9 +78,10 @@ struct _LassoIdWsf2DstRefQueryClass {
 LASSO_EXPORT GType lasso_idwsf2_dstref_query_get_type(void);
 LASSO_EXPORT LassoIdWsf2DstRefQuery* lasso_idwsf2_dstref_query_new(void);
 
+
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
 #endif /* __LASSO_IDWSF2_DSTREF_QUERY_H__ */
-
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 e336ac6b..e37c699a 100644
--- a/lasso/xml/id-wsf-2.0/dstref_query_item.c
+++ b/lasso/xml/id-wsf-2.0/dstref_query_item.c
@@ -46,7 +46,7 @@ static struct XmlSnippet schema_snippets[] = {
 		G_STRUCT_OFFSET(LassoIdWsf2DstRefQueryItem, count) },
 	{ "offset", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL_NEG,
 		G_STRUCT_OFFSET(LassoIdWsf2DstRefQueryItem, offset) },
-	{ "setID", SNIPPET_ATTRIBUTE,
+	{ "setID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
 		G_STRUCT_OFFSET(LassoIdWsf2DstRefQueryItem, setID) },
 	{ "setReq", SNIPPET_ATTRIBUTE,
 		G_STRUCT_OFFSET(LassoIdWsf2DstRefQueryItem, setReq) },
@@ -112,17 +112,18 @@ lasso_idwsf2_dstref_query_item_get_type()
  *
  * Return value: a newly created #LassoIdWsf2DstRefQueryItem object
  **/
-LassoNode*
+LassoIdWsf2DstRefQueryItem*
 lasso_idwsf2_dstref_query_item_new()
 {
 	return g_object_new(LASSO_TYPE_IDWSF2_DSTREF_QUERY_ITEM, NULL);
 }
 
+
 LassoIdWsf2DstRefQueryItem*
 lasso_idwsf2_dstref_query_item_new_full(const gchar *item_xpath, const gchar *item_id)
 {
 	LassoIdWsf2DstRefResultQuery *item_result_query = LASSO_IDWSF2_DSTREF_RESULT_QUERY(
-		g_object_new(LASSO_TYPE_IDWSF2_DSTREF_QUERY_ITEM, NULL));
+		lasso_idwsf2_dstref_query_item_new());
 	LassoIdWsf2DstResultQueryBase *item_result_query_base = LASSO_IDWSF2_DST_RESULT_QUERY_BASE(
 		item_result_query);
 
@@ -131,4 +132,3 @@ lasso_idwsf2_dstref_query_item_new_full(const gchar *item_xpath, const gchar *it
 
 	return LASSO_IDWSF2_DSTREF_QUERY_ITEM(item_result_query);
 }
-
diff --git a/lasso/xml/id-wsf-2.0/dstref_query_item.h b/lasso/xml/id-wsf-2.0/dstref_query_item.h
index 4668ee56..1fbb3ca0 100644
--- a/lasso/xml/id-wsf-2.0/dstref_query_item.h
+++ b/lasso/xml/id-wsf-2.0/dstref_query_item.h
@@ -74,10 +74,11 @@ struct _LassoIdWsf2DstRefQueryItemClass {
 };
 
 LASSO_EXPORT GType lasso_idwsf2_dstref_query_item_get_type(void);
-LASSO_EXPORT LassoNode* lasso_idwsf2_dstref_query_item_new(void);
+LASSO_EXPORT LassoIdWsf2DstRefQueryItem* lasso_idwsf2_dstref_query_item_new(void);
 
 LASSO_EXPORT LassoIdWsf2DstRefQueryItem* lasso_idwsf2_dstref_query_item_new_full(
-	const gchar *item_xpath, const gchar *item_id);
+		const gchar *item_xpath, const gchar *item_id);
+
 
 #ifdef __cplusplus
 }
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 12fc6da2..98f1bfb5 100644
--- a/lasso/xml/id-wsf-2.0/dstref_query_response.c
+++ b/lasso/xml/id-wsf-2.0/dstref_query_response.c
@@ -55,40 +55,42 @@ static struct XmlSnippet schema_snippets[] = {
 
 static LassoNodeClass *parent_class = NULL;
 
+
 static xmlNode*
 get_xmlNode(LassoNode *node, gboolean lasso_dump)
 {
-	xmlNode *xmlnode;
+       xmlNode *xmlnode;
 
-	xmlnode = parent_class->get_xmlNode(node, lasso_dump);
-	xml_insure_namespace(xmlnode, NULL, TRUE,
-			LASSO_IDWSF2_DSTREF_QUERY_RESPONSE(node)->hrefServiceType,
-			LASSO_IDWSF2_DSTREF_QUERY_RESPONSE(node)->prefixServiceType);
+       xmlnode = parent_class->get_xmlNode(node, lasso_dump);
+       xml_insure_namespace(xmlnode, NULL, TRUE,
+                       LASSO_IDWSF2_DSTREF_QUERY_RESPONSE(node)->hrefServiceType,
+                       LASSO_IDWSF2_DSTREF_QUERY_RESPONSE(node)->prefixServiceType);
 
-	return xmlnode;
+       return xmlnode;
 }
 
 static int
 init_from_xml(LassoNode *node, xmlNode *xmlnode)
 {
-	LassoIdWsf2DstRefQueryResponse *response = LASSO_IDWSF2_DSTREF_QUERY_RESPONSE(node);
-	int res;
-
-	res = parent_class->init_from_xml(node, xmlnode);
-	if (res) {
-		return res;
-	}
-
-	response->hrefServiceType = g_strdup((char*)xmlnode->ns->href);
-	response->prefixServiceType = lasso_get_prefix_for_dst_service_href(
-			response->hrefServiceType);
-	if (response->prefixServiceType == NULL) {
-		/* XXX: what to do here ? */
-	}
-
-	return 0;
+       LassoIdWsf2DstRefQueryResponse *object = LASSO_IDWSF2_DSTREF_QUERY_RESPONSE(node);
+       int res;
+
+       res = parent_class->init_from_xml(node, xmlnode);
+       if (res != 0) {
+               return res;
+       }
+
+       object->hrefServiceType = g_strdup((char*)xmlnode->ns->href);
+       object->prefixServiceType = lasso_get_prefix_for_idwsf2_dst_service_href(
+                       object->hrefServiceType);
+       if (object->prefixServiceType == NULL) {
+               /* XXX: what to do here ? */
+       }
+
+       return 0;
 }
 
+
 /*****************************************************************************/
 /* instance and class init functions                                         */
 /*****************************************************************************/
@@ -152,4 +154,3 @@ lasso_idwsf2_dstref_query_response_new()
 {
 	return g_object_new(LASSO_TYPE_IDWSF2_DSTREF_QUERY_RESPONSE, NULL);
 }
-
diff --git a/lasso/xml/id-wsf-2.0/dstref_query_response.h b/lasso/xml/id-wsf-2.0/dstref_query_response.h
index 25e571a0..f338ace3 100644
--- a/lasso/xml/id-wsf-2.0/dstref_query_response.h
+++ b/lasso/xml/id-wsf-2.0/dstref_query_response.h
@@ -65,7 +65,7 @@ struct _LassoIdWsf2DstRefQueryResponse {
 	/* elements */
 	GList *TestResult;
 	GList *Data; /* of LassoIdWsf2DstRefData */
-	
+
 	/*< private >*/
 	char *prefixServiceType;
 	char *hrefServiceType;
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 89251c2d..74b89d2f 100644
--- a/lasso/xml/id-wsf-2.0/dstref_result_query.c
+++ b/lasso/xml/id-wsf-2.0/dstref_result_query.c
@@ -45,10 +45,10 @@
 
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "Select", SNIPPET_CONTENT, G_STRUCT_OFFSET(LassoIdWsf2DstRefResultQuery, Select) },
-	{ "Sort", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2DstRefResultQuery, Sort),
-		"LassoIdWsf2DstRefSort" },
+	{ "Select", SNIPPET_CONTENT,
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefResultQuery, Select) },
+	{ "Sort", SNIPPET_CONTENT,
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefResultQuery, Sort) },
 	{NULL, 0, 0}
 };
 
@@ -109,9 +109,8 @@ lasso_idwsf2_dstref_result_query_get_type()
  *
  * Return value: a newly created #LassoIdWsf2DstRefResultQuery object
  **/
-LassoNode*
+LassoIdWsf2DstRefResultQuery*
 lasso_idwsf2_dstref_result_query_new()
 {
 	return g_object_new(LASSO_TYPE_IDWSF2_DSTREF_RESULT_QUERY, NULL);
 }
-
diff --git a/lasso/xml/id-wsf-2.0/dstref_result_query.h b/lasso/xml/id-wsf-2.0/dstref_result_query.h
index 38777f03..26e8edb1 100644
--- a/lasso/xml/id-wsf-2.0/dstref_result_query.h
+++ b/lasso/xml/id-wsf-2.0/dstref_result_query.h
@@ -31,10 +31,8 @@ extern "C" {
 
 #include <lasso/xml/xml.h>
 #include "dst_result_query_base.h"
-#include "dstref_sort.h"
 
-#define LASSO_TYPE_IDWSF2_DSTREF_RESULT_QUERY \
-	(lasso_idwsf2_dstref_result_query_get_type())
+#define LASSO_TYPE_IDWSF2_DSTREF_RESULT_QUERY (lasso_idwsf2_dstref_result_query_get_type())
 #define LASSO_IDWSF2_DSTREF_RESULT_QUERY(obj) \
 	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
 		LASSO_TYPE_IDWSF2_DSTREF_RESULT_QUERY, \
@@ -64,8 +62,8 @@ struct _LassoIdWsf2DstRefResultQuery {
 
 	/*< public >*/
 	/* elements */
-	gchar *Select;
-	LassoIdWsf2DstRefSort *Sort;
+	char *Select;
+	char *Sort;
 };
 
 
@@ -74,7 +72,7 @@ struct _LassoIdWsf2DstRefResultQueryClass {
 };
 
 LASSO_EXPORT GType lasso_idwsf2_dstref_result_query_get_type(void);
-LASSO_EXPORT LassoNode* lasso_idwsf2_dstref_result_query_new(void);
+LASSO_EXPORT LassoIdWsf2DstRefResultQuery* lasso_idwsf2_dstref_result_query_new(void);
 
 
 
diff --git a/lasso/xml/id-wsf-2.0/dstref_test_item.c b/lasso/xml/id-wsf-2.0/dstref_test_item.c
new file mode 100644
index 00000000..989c1ac3
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dstref_test_item.c
@@ -0,0 +1,112 @@
+/* $Id: dstref_test_item.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "dstref_test_item.h"
+
+/*
+ * Schema fragment (liberty-idwsf-dst-ref-v2.1.xsd):
+ *
+ * <xs:complexType name="TestItemType">
+ *   <xs:complexContent>
+ *     <xs:extension base="dst:TestItemBaseType">
+ *       <xs:sequence>
+ *         <xs:element name="TestOp" minOccurs="0" maxOccurs="1" type="dstref:TestOpType"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "TestOp", SNIPPET_CONTENT,
+		G_STRUCT_OFFSET(LassoIdWsf2DstRefTestItem, TestOp) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2DstRefTestItem *node)
+{
+	node->TestOp = NULL;
+}
+
+static void
+class_init(LassoIdWsf2DstRefTestItemClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "TestItem");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DSTREF_HREF, LASSO_IDWSF2_DSTREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_dstref_test_item_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2DstRefTestItemClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2DstRefTestItem),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_TEST_ITEM_BASE,
+				"LassoIdWsf2DstRefTestItem", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_dstref_test_item_new:
+ *
+ * Creates a new #LassoIdWsf2DstRefTestItem object.
+ *
+ * Return value: a newly created #LassoIdWsf2DstRefTestItem object
+ **/
+LassoIdWsf2DstRefTestItem*
+lasso_idwsf2_dstref_test_item_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_DSTREF_TEST_ITEM, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/dstref_test_item.h b/lasso/xml/id-wsf-2.0/dstref_test_item.h
new file mode 100644
index 00000000..98732fe1
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/dstref_test_item.h
@@ -0,0 +1,82 @@
+/* $Id: dstref_test_item.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_DSTREF_TEST_ITEM_H__
+#define __LASSO_IDWSF2_DSTREF_TEST_ITEM_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "dst_test_item_base.h"
+
+#define LASSO_TYPE_IDWSF2_DSTREF_TEST_ITEM (lasso_idwsf2_dstref_test_item_get_type())
+#define LASSO_IDWSF2_DSTREF_TEST_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_DSTREF_TEST_ITEM, \
+		LassoIdWsf2DstRefTestItem))
+#define LASSO_IDWSF2_DSTREF_TEST_ITEM_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_DSTREF_TEST_ITEM, \
+		LassoIdWsf2DstRefTestItemClass))
+#define LASSO_IS_IDWSF2_DSTREF_TEST_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_DSTREF_TEST_ITEM))
+#define LASSO_IS_IDWSF2_DSTREF_TEST_ITEM_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_DSTREF_TEST_ITEM))
+#define LASSO_IDWSF2_DSTREF_TEST_ITEM_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_DSTREF_TEST_ITEM, \
+		LassoIdWsf2DstRefTestItemClass)) 
+
+
+typedef struct _LassoIdWsf2DstRefTestItem LassoIdWsf2DstRefTestItem;
+typedef struct _LassoIdWsf2DstRefTestItemClass LassoIdWsf2DstRefTestItemClass;
+
+
+struct _LassoIdWsf2DstRefTestItem {
+	LassoIdWsf2DstTestItemBase parent;
+
+	/*< public >*/
+	/* elements */
+	char *TestOp;
+};
+
+
+struct _LassoIdWsf2DstRefTestItemClass {
+	LassoIdWsf2DstTestItemBaseClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_dstref_test_item_get_type(void);
+LASSO_EXPORT LassoIdWsf2DstRefTestItem* lasso_idwsf2_dstref_test_item_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_DSTREF_TEST_ITEM_H__ */
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
new file mode 100644
index 00000000..ebc21b59
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ims_identity_mapping_request.c
@@ -0,0 +1,113 @@
+/* $Id: ims_identity_mapping_request.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ims_identity_mapping_request.h"
+
+/*
+ * Schema fragment (liberty-idwsf-idmapping-svc-v2.0.xsd):
+ *
+ * <xs:complexType name="IdentityMappingRequestType">
+ *   <xs:sequence>
+ *     <xs:element ref="MappingInput" maxOccurs="unbounded"/>
+ *   </xs:sequence>
+ *   <xs:anyAttribute namespace="##other" processContents="lax"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "MappingInput", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2ImsIdentityMappingRequest, MappingInput) },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoIdWsf2ImsIdentityMappingRequest, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2ImsIdentityMappingRequest *node)
+{
+	node->MappingInput = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoIdWsf2ImsIdentityMappingRequestClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "IdentityMappingRequest");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_IMS_HREF, LASSO_IDWSF2_IMS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ims_identity_mapping_request_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2ImsIdentityMappingRequestClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2ImsIdentityMappingRequest),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2ImsIdentityMappingRequest", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ims_identity_mapping_request_new:
+ *
+ * Creates a new #LassoIdWsf2ImsIdentityMappingRequest object.
+ *
+ * Return value: a newly created #LassoIdWsf2ImsIdentityMappingRequest object
+ **/
+LassoIdWsf2ImsIdentityMappingRequest*
+lasso_idwsf2_ims_identity_mapping_request_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_IMS_IDENTITY_MAPPING_REQUEST, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ims_identity_mapping_request.h b/lasso/xml/id-wsf-2.0/ims_identity_mapping_request.h
new file mode 100644
index 00000000..52bb6615
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ims_identity_mapping_request.h
@@ -0,0 +1,86 @@
+/* $Id: ims_identity_mapping_request.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_IMS_IDENTITY_MAPPING_REQUEST_H__
+#define __LASSO_IDWSF2_IMS_IDENTITY_MAPPING_REQUEST_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_IMS_IDENTITY_MAPPING_REQUEST \
+	(lasso_idwsf2_ims_identity_mapping_request_get_type())
+#define LASSO_IDWSF2_IMS_IDENTITY_MAPPING_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_IMS_IDENTITY_MAPPING_REQUEST, \
+		LassoIdWsf2ImsIdentityMappingRequest))
+#define LASSO_IDWSF2_IMS_IDENTITY_MAPPING_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_IMS_IDENTITY_MAPPING_REQUEST, \
+		LassoIdWsf2ImsIdentityMappingRequestClass))
+#define LASSO_IS_IDWSF2_IMS_IDENTITY_MAPPING_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_IMS_IDENTITY_MAPPING_REQUEST))
+#define LASSO_IS_IDWSF2_IMS_IDENTITY_MAPPING_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_IMS_IDENTITY_MAPPING_REQUEST))
+#define LASSO_IDWSF2_IMS_IDENTITY_MAPPING_REQUEST_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_IMS_IDENTITY_MAPPING_REQUEST, \
+		LassoIdWsf2ImsIdentityMappingRequestClass)) 
+
+
+typedef struct _LassoIdWsf2ImsIdentityMappingRequest \
+	LassoIdWsf2ImsIdentityMappingRequest;
+typedef struct _LassoIdWsf2ImsIdentityMappingRequestClass \
+	LassoIdWsf2ImsIdentityMappingRequestClass;
+
+
+struct _LassoIdWsf2ImsIdentityMappingRequest {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	GList *MappingInput;
+	/* attributes */
+	GHashTable *attributes;
+};
+
+
+struct _LassoIdWsf2ImsIdentityMappingRequestClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ims_identity_mapping_request_get_type(void);
+LASSO_EXPORT LassoIdWsf2ImsIdentityMappingRequest* lasso_idwsf2_ims_identity_mapping_request_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_IMS_IDENTITY_MAPPING_REQUEST_H__ */
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
new file mode 100644
index 00000000..c0410967
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.c
@@ -0,0 +1,118 @@
+/* $Id: ims_identity_mapping_response.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ims_identity_mapping_response.h"
+
+/*
+ * Schema fragment (liberty-idwsf-idmapping-svc-v2.0.xsd):
+ *
+ * <xs:complexType name="IdentityMappingResponseType">
+ *   <xs:sequence>
+ *     <xs:element ref="lu:Status"/>
+ *     <xs:element ref="MappingOutput" minOccurs="0" maxOccurs="unbounded"/>
+ *   </xs:sequence>
+ *   <xs:anyAttribute namespace="##other" processContents="lax"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Status", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2ImsIdentityMappingResponse, Status),
+		"LassoIdWsf2UtilStatus" },
+	{ "MappingOutput", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2ImsIdentityMappingResponse, MappingOutput) },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoIdWsf2ImsIdentityMappingResponse, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2ImsIdentityMappingResponse *node)
+{
+	node->Status = NULL;
+	node->MappingOutput = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoIdWsf2ImsIdentityMappingResponseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "IdentityMappingResponse");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_IMS_HREF, LASSO_IDWSF2_IMS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ims_identity_mapping_response_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2ImsIdentityMappingResponseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2ImsIdentityMappingResponse),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2ImsIdentityMappingResponse", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ims_identity_mapping_response_new:
+ *
+ * Creates a new #LassoIdWsf2ImsIdentityMappingResponse object.
+ *
+ * Return value: a newly created #LassoIdWsf2ImsIdentityMappingResponse object
+ **/
+LassoIdWsf2ImsIdentityMappingResponse*
+lasso_idwsf2_ims_identity_mapping_response_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_IMS_IDENTITY_MAPPING_RESPONSE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.h b/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.h
new file mode 100644
index 00000000..64c7dd0b
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.h
@@ -0,0 +1,88 @@
+/* $Id: ims_identity_mapping_response.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_IMS_IDENTITY_MAPPING_RESPONSE_H__
+#define __LASSO_IDWSF2_IMS_IDENTITY_MAPPING_RESPONSE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "util_status.h"
+
+#define LASSO_TYPE_IDWSF2_IMS_IDENTITY_MAPPING_RESPONSE \
+	(lasso_idwsf2_ims_identity_mapping_response_get_type())
+#define LASSO_IDWSF2_IMS_IDENTITY_MAPPING_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_IMS_IDENTITY_MAPPING_RESPONSE, \
+		LassoIdWsf2ImsIdentityMappingResponse))
+#define LASSO_IDWSF2_IMS_IDENTITY_MAPPING_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_IMS_IDENTITY_MAPPING_RESPONSE, \
+		LassoIdWsf2ImsIdentityMappingResponseClass))
+#define LASSO_IS_IDWSF2_IMS_IDENTITY_MAPPING_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_IMS_IDENTITY_MAPPING_RESPONSE))
+#define LASSO_IS_IDWSF2_IMS_IDENTITY_MAPPING_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_IMS_IDENTITY_MAPPING_RESPONSE))
+#define LASSO_IDWSF2_IMS_IDENTITY_MAPPING_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_IMS_IDENTITY_MAPPING_RESPONSE, \
+		LassoIdWsf2ImsIdentityMappingResponseClass)) 
+
+
+typedef struct _LassoIdWsf2ImsIdentityMappingResponse \
+	LassoIdWsf2ImsIdentityMappingResponse;
+typedef struct _LassoIdWsf2ImsIdentityMappingResponseClass \
+	LassoIdWsf2ImsIdentityMappingResponseClass;
+
+
+struct _LassoIdWsf2ImsIdentityMappingResponse {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	LassoIdWsf2UtilStatus *Status;
+	GList *MappingOutput;
+	/* attributes */
+	GHashTable *attributes;
+};
+
+
+struct _LassoIdWsf2ImsIdentityMappingResponseClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ims_identity_mapping_response_get_type(void);
+LASSO_EXPORT LassoIdWsf2ImsIdentityMappingResponse* lasso_idwsf2_ims_identity_mapping_response_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_IMS_IDENTITY_MAPPING_RESPONSE_H__ */
diff --git a/lasso/xml/id-wsf-2.0/ims_mapping_input.c b/lasso/xml/id-wsf-2.0/ims_mapping_input.c
new file mode 100644
index 00000000..204f85b3
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ims_mapping_input.c
@@ -0,0 +1,116 @@
+/* $Id: ims_mapping_input.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ims_mapping_input.h"
+
+/*
+ * Schema fragment (liberty-idwsf-idmapping-svc-v2.0.xsd):
+ *
+ * <xs:complexType name="MappingInputType">
+ *   <xs:sequence>
+ *     <xs:element ref="sec:TokenPolicy" minOccurs="0"/>
+ *     <xs:element ref="sec:Token" minOccurs="0"/>
+ *   </xs:sequence>
+ *   <xs:attribute name="reqID" type="lu:IDType" use="optional"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "TokenPolicy", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2ImsMappingInput, TokenPolicy) },
+	{ "Token", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2ImsMappingInput, Token) },
+	{ "reqID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2ImsMappingInput, reqID) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2ImsMappingInput *node)
+{
+	node->TokenPolicy = NULL;
+	node->Token = NULL;
+	node->reqID = NULL;
+}
+
+static void
+class_init(LassoIdWsf2ImsMappingInputClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "MappingInput");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_IMS_HREF, LASSO_IDWSF2_IMS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ims_mapping_input_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2ImsMappingInputClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2ImsMappingInput),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2ImsMappingInput", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ims_mapping_input_new:
+ *
+ * Creates a new #LassoIdWsf2ImsMappingInput object.
+ *
+ * Return value: a newly created #LassoIdWsf2ImsMappingInput object
+ **/
+LassoIdWsf2ImsMappingInput*
+lasso_idwsf2_ims_mapping_input_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_IMS_MAPPING_INPUT, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ims_mapping_input.h b/lasso/xml/id-wsf-2.0/ims_mapping_input.h
new file mode 100644
index 00000000..d4769667
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ims_mapping_input.h
@@ -0,0 +1,86 @@
+/* $Id: ims_mapping_input.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_IMS_MAPPING_INPUT_H__
+#define __LASSO_IDWSF2_IMS_MAPPING_INPUT_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "sec_token_policy.h"
+#include "sec_token.h"
+
+#define LASSO_TYPE_IDWSF2_IMS_MAPPING_INPUT (lasso_idwsf2_ims_mapping_input_get_type())
+#define LASSO_IDWSF2_IMS_MAPPING_INPUT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_IMS_MAPPING_INPUT, \
+		LassoIdWsf2ImsMappingInput))
+#define LASSO_IDWSF2_IMS_MAPPING_INPUT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_IMS_MAPPING_INPUT, \
+		LassoIdWsf2ImsMappingInputClass))
+#define LASSO_IS_IDWSF2_IMS_MAPPING_INPUT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_IMS_MAPPING_INPUT))
+#define LASSO_IS_IDWSF2_IMS_MAPPING_INPUT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_IMS_MAPPING_INPUT))
+#define LASSO_IDWSF2_IMS_MAPPING_INPUT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_IMS_MAPPING_INPUT, \
+		LassoIdWsf2ImsMappingInputClass)) 
+
+
+typedef struct _LassoIdWsf2ImsMappingInput LassoIdWsf2ImsMappingInput;
+typedef struct _LassoIdWsf2ImsMappingInputClass LassoIdWsf2ImsMappingInputClass;
+
+
+struct _LassoIdWsf2ImsMappingInput {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	/* XXX */ void *TokenPolicy;
+	/* XXX */ void *Token;
+	/* attributes */
+	char *reqID;
+};
+
+
+struct _LassoIdWsf2ImsMappingInputClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ims_mapping_input_get_type(void);
+LASSO_EXPORT LassoIdWsf2ImsMappingInput* lasso_idwsf2_ims_mapping_input_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_IMS_MAPPING_INPUT_H__ */
diff --git a/lasso/xml/id-wsf-2.0/ims_mapping_output.c b/lasso/xml/id-wsf-2.0/ims_mapping_output.c
new file mode 100644
index 00000000..3945daad
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ims_mapping_output.c
@@ -0,0 +1,112 @@
+/* $Id: ims_mapping_output.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ims_mapping_output.h"
+
+/*
+ * Schema fragment (liberty-idwsf-idmapping-svc-v2.0.xsd):
+ *
+ * <xs:complexType name="MappingOutputType">
+ *   <xs:sequence>
+ *     <xs:element ref="sec:Token"/>
+ *   </xs:sequence>
+ *   <xs:attribute name="reqRef" type="lu:IDReferenceType" use="optional"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Token", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2ImsMappingOutput, Token) },
+	{ "reqRef", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2ImsMappingOutput, reqRef) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2ImsMappingOutput *node)
+{
+	node->Token = NULL;
+	node->reqRef = NULL;
+}
+
+static void
+class_init(LassoIdWsf2ImsMappingOutputClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "MappingOutput");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_IMS_HREF, LASSO_IDWSF2_IMS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ims_mapping_output_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2ImsMappingOutputClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2ImsMappingOutput),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2ImsMappingOutput", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ims_mapping_output_new:
+ *
+ * Creates a new #LassoIdWsf2ImsMappingOutput object.
+ *
+ * Return value: a newly created #LassoIdWsf2ImsMappingOutput object
+ **/
+LassoIdWsf2ImsMappingOutput*
+lasso_idwsf2_ims_mapping_output_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_IMS_MAPPING_OUTPUT, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ims_mapping_output.h b/lasso/xml/id-wsf-2.0/ims_mapping_output.h
new file mode 100644
index 00000000..4fbfb3a9
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ims_mapping_output.h
@@ -0,0 +1,84 @@
+/* $Id: ims_mapping_output.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_IMS_MAPPING_OUTPUT_H__
+#define __LASSO_IDWSF2_IMS_MAPPING_OUTPUT_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "sec_token.h"
+
+#define LASSO_TYPE_IDWSF2_IMS_MAPPING_OUTPUT (lasso_idwsf2_ims_mapping_output_get_type())
+#define LASSO_IDWSF2_IMS_MAPPING_OUTPUT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_IMS_MAPPING_OUTPUT, \
+		LassoIdWsf2ImsMappingOutput))
+#define LASSO_IDWSF2_IMS_MAPPING_OUTPUT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_IMS_MAPPING_OUTPUT, \
+		LassoIdWsf2ImsMappingOutputClass))
+#define LASSO_IS_IDWSF2_IMS_MAPPING_OUTPUT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_IMS_MAPPING_OUTPUT))
+#define LASSO_IS_IDWSF2_IMS_MAPPING_OUTPUT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_IMS_MAPPING_OUTPUT))
+#define LASSO_IDWSF2_IMS_MAPPING_OUTPUT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_IMS_MAPPING_OUTPUT, \
+		LassoIdWsf2ImsMappingOutputClass)) 
+
+
+typedef struct _LassoIdWsf2ImsMappingOutput LassoIdWsf2ImsMappingOutput;
+typedef struct _LassoIdWsf2ImsMappingOutputClass LassoIdWsf2ImsMappingOutputClass;
+
+
+struct _LassoIdWsf2ImsMappingOutput {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	/* XXX */ void *Token;
+	/* attributes */
+	char *reqRef;
+};
+
+
+struct _LassoIdWsf2ImsMappingOutputClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ims_mapping_output_get_type(void);
+LASSO_EXPORT LassoIdWsf2ImsMappingOutput* lasso_idwsf2_ims_mapping_output_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_IMS_MAPPING_OUTPUT_H__ */
diff --git a/lasso/xml/id-wsf-2.0/is_help.c b/lasso/xml/id-wsf-2.0/is_help.c
new file mode 100644
index 00000000..0fc5de05
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/is_help.c
@@ -0,0 +1,114 @@
+/* $Id: is_help.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "is_help.h"
+
+/*
+ * Schema fragment (liberty-idwsf-interaction-svc-v2.0.xsd):
+ *
+ * <xs:complexType name="HelpType">
+ *   <xs:attribute name="label" type="xs:string" use="optional"/>
+ *   <xs:attribute name="link" type="xs:anyURI" use="optional"/>
+ *   <xs:attribute name="moreLink" type="xs:anyURI" use="optional"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "label", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2IsHelp, label) },
+	{ "link", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2IsHelp, link) },
+	{ "moreLink", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2IsHelp, moreLink) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2IsHelp *node)
+{
+	node->label = NULL;
+	node->link = NULL;
+	node->moreLink = NULL;
+}
+
+static void
+class_init(LassoIdWsf2IsHelpClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Help");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_IS_HREF, LASSO_IDWSF2_IS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_is_help_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2IsHelpClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2IsHelp),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2IsHelp", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_is_help_new:
+ *
+ * Creates a new #LassoIdWsf2IsHelp object.
+ *
+ * Return value: a newly created #LassoIdWsf2IsHelp object
+ **/
+LassoIdWsf2IsHelp*
+lasso_idwsf2_is_help_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_IS_HELP, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/is_help.h b/lasso/xml/id-wsf-2.0/is_help.h
new file mode 100644
index 00000000..5ec7deb2
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/is_help.h
@@ -0,0 +1,83 @@
+/* $Id: is_help.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_IS_HELP_H__
+#define __LASSO_IDWSF2_IS_HELP_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_IS_HELP (lasso_idwsf2_is_help_get_type())
+#define LASSO_IDWSF2_IS_HELP(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_IS_HELP, \
+		LassoIdWsf2IsHelp))
+#define LASSO_IDWSF2_IS_HELP_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_IS_HELP, \
+		LassoIdWsf2IsHelpClass))
+#define LASSO_IS_IDWSF2_IS_HELP(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_IS_HELP))
+#define LASSO_IS_IDWSF2_IS_HELP_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_IS_HELP))
+#define LASSO_IDWSF2_IS_HELP_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_IS_HELP, \
+		LassoIdWsf2IsHelpClass)) 
+
+
+typedef struct _LassoIdWsf2IsHelp LassoIdWsf2IsHelp;
+typedef struct _LassoIdWsf2IsHelpClass LassoIdWsf2IsHelpClass;
+
+
+struct _LassoIdWsf2IsHelp {
+	LassoNode parent;
+
+	/*< public >*/
+	/* attributes */
+	char *label;
+	char *link;
+	char *moreLink;
+};
+
+
+struct _LassoIdWsf2IsHelpClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_is_help_get_type(void);
+LASSO_EXPORT LassoIdWsf2IsHelp* lasso_idwsf2_is_help_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_IS_HELP_H__ */
diff --git a/lasso/xml/id-wsf-2.0/is_inquiry.c b/lasso/xml/id-wsf-2.0/is_inquiry.c
new file mode 100644
index 00000000..b4e68195
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/is_inquiry.c
@@ -0,0 +1,131 @@
+/* $Id: is_inquiry.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "is_inquiry.h"
+
+/*
+ * Schema fragment (liberty-idwsf-interaction-svc-v2.0.xsd):
+ *
+ * <xs:complexType name="InquiryType">
+ *   <xs:sequence>
+ *     <xs:element ref="Help" minOccurs="0"/>
+ *     <xs:choice maxOccurs="unbounded">
+ *       <xs:element ref="Select" minOccurs="0" maxOccurs="unbounded"/>
+ *       <xs:element name="Confirm" type="InquiryElementType"
+ *         minOccurs="0" maxOccurs="unbounded"/>
+ *         <xs:element ref="Text" minOccurs="0" maxOccurs="unbounded"/>
+ *       </xs:choice>
+ *     </xs:sequence>
+ *     <xs:attribute name="id" type="xs:ID" use="optional"/>
+ *     <xs:attribute name="title" type="xs:string" use="optional"/>
+ *   </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Help", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2IsInquiry, Help) },
+	{ "Select", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2IsInquiry, Select) },
+	{ "Confirm", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2IsInquiry, Confirm) },
+	{ "Text", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2IsInquiry, Text) },
+	{ "id", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2IsInquiry, id) },
+	{ "title", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2IsInquiry, title) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2IsInquiry *node)
+{
+	node->Help = NULL;
+	node->Select = NULL;
+	node->Confirm = NULL;
+	node->Text = NULL;
+	node->id = NULL;
+	node->title = NULL;
+}
+
+static void
+class_init(LassoIdWsf2IsInquiryClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Inquiry");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_IS_HREF, LASSO_IDWSF2_IS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_is_inquiry_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2IsInquiryClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2IsInquiry),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2IsInquiry", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_is_inquiry_new:
+ *
+ * Creates a new #LassoIdWsf2IsInquiry object.
+ *
+ * Return value: a newly created #LassoIdWsf2IsInquiry object
+ **/
+LassoIdWsf2IsInquiry*
+lasso_idwsf2_is_inquiry_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_IS_INQUIRY, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/is_inquiry.h b/lasso/xml/id-wsf-2.0/is_inquiry.h
new file mode 100644
index 00000000..417db63b
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/is_inquiry.h
@@ -0,0 +1,88 @@
+/* $Id: is_inquiry.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_IS_INQUIRY_H__
+#define __LASSO_IDWSF2_IS_INQUIRY_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "is_help.h"
+
+#define LASSO_TYPE_IDWSF2_IS_INQUIRY (lasso_idwsf2_is_inquiry_get_type())
+#define LASSO_IDWSF2_IS_INQUIRY(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_IS_INQUIRY, \
+		LassoIdWsf2IsInquiry))
+#define LASSO_IDWSF2_IS_INQUIRY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_IS_INQUIRY, \
+		LassoIdWsf2IsInquiryClass))
+#define LASSO_IS_IDWSF2_IS_INQUIRY(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_IS_INQUIRY))
+#define LASSO_IS_IDWSF2_IS_INQUIRY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_IS_INQUIRY))
+#define LASSO_IDWSF2_IS_INQUIRY_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_IS_INQUIRY, \
+		LassoIdWsf2IsInquiryClass)) 
+
+
+typedef struct _LassoIdWsf2IsInquiry LassoIdWsf2IsInquiry;
+typedef struct _LassoIdWsf2IsInquiryClass LassoIdWsf2IsInquiryClass;
+
+
+struct _LassoIdWsf2IsInquiry {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	/* XXX */ void *Help;
+	GList *Select;
+	GList *Confirm;
+	GList *Text;
+	/* attributes */
+	char *id;
+	char *title;
+};
+
+
+struct _LassoIdWsf2IsInquiryClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_is_inquiry_get_type(void);
+LASSO_EXPORT LassoIdWsf2IsInquiry* lasso_idwsf2_is_inquiry_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_IS_INQUIRY_H__ */
diff --git a/lasso/xml/id-wsf-2.0/is_inquiry_element.c b/lasso/xml/id-wsf-2.0/is_inquiry_element.c
new file mode 100644
index 00000000..66069eb4
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/is_inquiry_element.c
@@ -0,0 +1,124 @@
+/* $Id: is_inquiry_element.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "is_inquiry_element.h"
+
+/*
+ * Schema fragment (liberty-idwsf-interaction-svc-v2.0.xsd):
+ *
+ * <xs:complexType name="InquiryElementType" abstract="true">
+ *   <xs:sequence>
+ *     <xs:element ref="Help" minOccurs="0"/>
+ *     <xs:element ref="Hint" minOccurs="0"/>
+ *     <xs:element name="Label" type="xs:normalizedString" minOccurs="0"/>
+ *     <xs:element name="Value" type="xs:normalizedString" minOccurs="0"/>
+ *   </xs:sequence>
+ *   <xs:attribute name="name" type="xs:ID" use="required"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Help", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2IsInquiryElement, Help) },
+	{ "Hint", SNIPPET_CONTENT,
+		G_STRUCT_OFFSET(LassoIdWsf2IsInquiryElement, Hint) },
+	{ "Label", SNIPPET_CONTENT,
+		G_STRUCT_OFFSET(LassoIdWsf2IsInquiryElement, Label) },
+	{ "Value", SNIPPET_CONTENT,
+		G_STRUCT_OFFSET(LassoIdWsf2IsInquiryElement, Value) },
+	{ "name", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoIdWsf2IsInquiryElement, name) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2IsInquiryElement *node)
+{
+	node->Help = NULL;
+	node->Hint = NULL;
+	node->Label = NULL;
+	node->Value = NULL;
+	node->name = NULL;
+}
+
+static void
+class_init(LassoIdWsf2IsInquiryElementClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Confirm");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_IS_HREF, LASSO_IDWSF2_IS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_is_inquiry_element_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2IsInquiryElementClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2IsInquiryElement),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2IsInquiryElement", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_is_inquiry_element_new:
+ *
+ * Creates a new #LassoIdWsf2IsInquiryElement object.
+ *
+ * Return value: a newly created #LassoIdWsf2IsInquiryElement object
+ **/
+LassoIdWsf2IsInquiryElement*
+lasso_idwsf2_is_inquiry_element_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_IS_INQUIRY_ELEMENT, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/is_inquiry_element.h b/lasso/xml/id-wsf-2.0/is_inquiry_element.h
new file mode 100644
index 00000000..26d56025
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/is_inquiry_element.h
@@ -0,0 +1,87 @@
+/* $Id: is_inquiry_element.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_IS_INQUIRY_ELEMENT_H__
+#define __LASSO_IDWSF2_IS_INQUIRY_ELEMENT_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "is_help.h"
+
+#define LASSO_TYPE_IDWSF2_IS_INQUIRY_ELEMENT (lasso_idwsf2_is_inquiry_element_get_type())
+#define LASSO_IDWSF2_IS_INQUIRY_ELEMENT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_IS_INQUIRY_ELEMENT, \
+		LassoIdWsf2IsInquiryElement))
+#define LASSO_IDWSF2_IS_INQUIRY_ELEMENT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_IS_INQUIRY_ELEMENT, \
+		LassoIdWsf2IsInquiryElementClass))
+#define LASSO_IS_IDWSF2_IS_INQUIRY_ELEMENT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_IS_INQUIRY_ELEMENT))
+#define LASSO_IS_IDWSF2_IS_INQUIRY_ELEMENT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_IS_INQUIRY_ELEMENT))
+#define LASSO_IDWSF2_IS_INQUIRY_ELEMENT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_IS_INQUIRY_ELEMENT, \
+		LassoIdWsf2IsInquiryElementClass)) 
+
+
+typedef struct _LassoIdWsf2IsInquiryElement LassoIdWsf2IsInquiryElement;
+typedef struct _LassoIdWsf2IsInquiryElementClass LassoIdWsf2IsInquiryElementClass;
+
+
+struct _LassoIdWsf2IsInquiryElement {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	/* XXX */ void *Help;
+	char *Hint;
+	char *Label;
+	char *Value;
+	/* attributes */
+	char *name;
+};
+
+
+struct _LassoIdWsf2IsInquiryElementClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_is_inquiry_element_get_type(void);
+LASSO_EXPORT LassoIdWsf2IsInquiryElement* lasso_idwsf2_is_inquiry_element_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_IS_INQUIRY_ELEMENT_H__ */
diff --git a/lasso/xml/id-wsf-2.0/is_interaction_request.c b/lasso/xml/id-wsf-2.0/is_interaction_request.c
new file mode 100644
index 00000000..e363e5c4
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/is_interaction_request.c
@@ -0,0 +1,128 @@
+/* $Id: is_interaction_request.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "is_interaction_request.h"
+
+/*
+ * Schema fragment (liberty-idwsf-interaction-svc-v2.0.xsd):
+ *
+ * <xs:complexType name="InteractionRequestType">
+ *   <xs:sequence>
+ *     <xs:element ref="Inquiry" maxOccurs="unbounded"/>
+ *     <xs:element ref="ds:KeyInfo" minOccurs="0"/>
+ *   </xs:sequence>
+ *   <xs:attribute name="id" type="xs:ID" use="optional"/>
+ *   <xs:attribute name="language" type="xs:NMTOKENS" use="optional"/>
+ *   <xs:attribute name="maxInteractTime" type="xs:integer" use="optional"/>
+ *   <xs:attribute name="signed" type="xs:token" use="optional"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Inquiry", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionRequest, Inquiry) },
+	{ "KeyInfo", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionRequest, KeyInfo) },
+	{ "id", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionRequest, id) },
+	{ "language", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionRequest, language) },
+	{ "maxInteractTime", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionRequest, maxInteractTime) },
+	{ "signed", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionRequest, signed_) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2IsInteractionRequest *node)
+{
+	node->Inquiry = NULL;
+	node->KeyInfo = NULL;
+	node->id = NULL;
+	node->language = NULL;
+	node->maxInteractTime = 0;
+	node->signed_ = NULL;
+}
+
+static void
+class_init(LassoIdWsf2IsInteractionRequestClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "InteractionRequest");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_IS_HREF, LASSO_IDWSF2_IS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_is_interaction_request_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2IsInteractionRequestClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2IsInteractionRequest),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2IsInteractionRequest", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_is_interaction_request_new:
+ *
+ * Creates a new #LassoIdWsf2IsInteractionRequest object.
+ *
+ * Return value: a newly created #LassoIdWsf2IsInteractionRequest object
+ **/
+LassoIdWsf2IsInteractionRequest*
+lasso_idwsf2_is_interaction_request_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_IS_INTERACTION_REQUEST, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/is_interaction_request.h b/lasso/xml/id-wsf-2.0/is_interaction_request.h
new file mode 100644
index 00000000..3f1e716f
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/is_interaction_request.h
@@ -0,0 +1,88 @@
+/* $Id: is_interaction_request.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_IS_INTERACTION_REQUEST_H__
+#define __LASSO_IDWSF2_IS_INTERACTION_REQUEST_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "is_inquiry.h"
+
+#define LASSO_TYPE_IDWSF2_IS_INTERACTION_REQUEST (lasso_idwsf2_is_interaction_request_get_type())
+#define LASSO_IDWSF2_IS_INTERACTION_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_IS_INTERACTION_REQUEST, \
+		LassoIdWsf2IsInteractionRequest))
+#define LASSO_IDWSF2_IS_INTERACTION_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_IS_INTERACTION_REQUEST, \
+		LassoIdWsf2IsInteractionRequestClass))
+#define LASSO_IS_IDWSF2_IS_INTERACTION_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_IS_INTERACTION_REQUEST))
+#define LASSO_IS_IDWSF2_IS_INTERACTION_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_IS_INTERACTION_REQUEST))
+#define LASSO_IDWSF2_IS_INTERACTION_REQUEST_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_IS_INTERACTION_REQUEST, \
+		LassoIdWsf2IsInteractionRequestClass)) 
+
+
+typedef struct _LassoIdWsf2IsInteractionRequest LassoIdWsf2IsInteractionRequest;
+typedef struct _LassoIdWsf2IsInteractionRequestClass LassoIdWsf2IsInteractionRequestClass;
+
+
+struct _LassoIdWsf2IsInteractionRequest {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	GList *Inquiry;
+	/* XXX */ void *KeyInfo;
+	/* attributes */
+	char *id;
+	char *language;
+	int maxInteractTime;
+	char *signed_;
+};
+
+
+struct _LassoIdWsf2IsInteractionRequestClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_is_interaction_request_get_type(void);
+LASSO_EXPORT LassoIdWsf2IsInteractionRequest* lasso_idwsf2_is_interaction_request_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_IS_INTERACTION_REQUEST_H__ */
diff --git a/lasso/xml/id-wsf-2.0/is_interaction_response.c b/lasso/xml/id-wsf-2.0/is_interaction_response.c
new file mode 100644
index 00000000..4e54266a
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/is_interaction_response.c
@@ -0,0 +1,120 @@
+/* $Id: is_interaction_response.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "is_interaction_response.h"
+
+/*
+ * Schema fragment (liberty-idwsf-interaction-svc-v2.0.xsd):
+ *
+ * <xs:complexType name="InteractionResponseType">
+ *   <xs:sequence>
+ *     <xs:element ref="lu:Status"/>
+ *     <xs:choice>
+ *       <xs:element name="InteractionStatement" type="InteractionStatementType"
+ *         minOccurs="0" maxOccurs="unbounded"/>
+ *         <xs:element name="Parameter" type="ParameterType" minOccurs="0" maxOccurs="unbounded"/>
+ *       </xs:choice>
+ *     </xs:sequence>
+ *   </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Status", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionResponse, Status),
+		"LassoIdWsf2UtilStatus" },
+	{ "InteractionStatement", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionResponse, InteractionStatement) },
+	{ "Parameter", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionResponse, Parameter) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2IsInteractionResponse *node)
+{
+	node->Status = NULL;
+	node->InteractionStatement = NULL;
+	node->Parameter = NULL;
+}
+
+static void
+class_init(LassoIdWsf2IsInteractionResponseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "InteractionResponse");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_IS_HREF, LASSO_IDWSF2_IS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_is_interaction_response_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2IsInteractionResponseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2IsInteractionResponse),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2IsInteractionResponse", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_is_interaction_response_new:
+ *
+ * Creates a new #LassoIdWsf2IsInteractionResponse object.
+ *
+ * Return value: a newly created #LassoIdWsf2IsInteractionResponse object
+ **/
+LassoIdWsf2IsInteractionResponse*
+lasso_idwsf2_is_interaction_response_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_IS_INTERACTION_RESPONSE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/is_interaction_response.h b/lasso/xml/id-wsf-2.0/is_interaction_response.h
new file mode 100644
index 00000000..7d260535
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/is_interaction_response.h
@@ -0,0 +1,84 @@
+/* $Id: is_interaction_response.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_IS_INTERACTION_RESPONSE_H__
+#define __LASSO_IDWSF2_IS_INTERACTION_RESPONSE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "util_status.h"
+
+#define LASSO_TYPE_IDWSF2_IS_INTERACTION_RESPONSE (lasso_idwsf2_is_interaction_response_get_type())
+#define LASSO_IDWSF2_IS_INTERACTION_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_IS_INTERACTION_RESPONSE, \
+		LassoIdWsf2IsInteractionResponse))
+#define LASSO_IDWSF2_IS_INTERACTION_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_IS_INTERACTION_RESPONSE, \
+		LassoIdWsf2IsInteractionResponseClass))
+#define LASSO_IS_IDWSF2_IS_INTERACTION_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_IS_INTERACTION_RESPONSE))
+#define LASSO_IS_IDWSF2_IS_INTERACTION_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_IS_INTERACTION_RESPONSE))
+#define LASSO_IDWSF2_IS_INTERACTION_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_IS_INTERACTION_RESPONSE, \
+		LassoIdWsf2IsInteractionResponseClass)) 
+
+
+typedef struct _LassoIdWsf2IsInteractionResponse LassoIdWsf2IsInteractionResponse;
+typedef struct _LassoIdWsf2IsInteractionResponseClass LassoIdWsf2IsInteractionResponseClass;
+
+
+struct _LassoIdWsf2IsInteractionResponse {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	LassoIdWsf2UtilStatus *Status;
+	GList *InteractionStatement;
+	GList *Parameter;
+};
+
+
+struct _LassoIdWsf2IsInteractionResponseClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_is_interaction_response_get_type(void);
+LASSO_EXPORT LassoIdWsf2IsInteractionResponse* lasso_idwsf2_is_interaction_response_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_IS_INTERACTION_RESPONSE_H__ */
diff --git a/lasso/xml/id-wsf-2.0/is_interaction_statement.c b/lasso/xml/id-wsf-2.0/is_interaction_statement.c
new file mode 100644
index 00000000..83432940
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/is_interaction_statement.c
@@ -0,0 +1,131 @@
+/* $Id: is_interaction_statement.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+
+#include <xmlsec/xmldsig.h>
+#include <xmlsec/templates.h>
+
+#include "is_interaction_statement.h"
+
+/*
+ * Schema fragment (liberty-idwsf-interaction-svc-v2.0.xsd):
+ *
+ * <xs:complexType name="InteractionStatementType">
+ *   <xs:sequence>
+ *     <xs:element ref="Inquiry" maxOccurs="unbounded"/>
+ *     <xs:element ref="ds:Signature"/>
+ *   </xs:sequence>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Inquiry", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionStatement, Inquiry) },
+	{ "Signature", SNIPPET_SIGNATURE  },
+
+	/* hidden fields; used in lasso dumps */
+	{ "SignType", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_LASSO_DUMP,
+		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionStatement, sign_type) },
+	{ "SignMethod", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_LASSO_DUMP,
+		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionStatement, sign_method) },
+	{ "PrivateKeyFile", SNIPPET_CONTENT | SNIPPET_LASSO_DUMP,
+		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionStatement, private_key_file) },
+	{ "CertificateFile", SNIPPET_CONTENT | SNIPPET_LASSO_DUMP,
+		G_STRUCT_OFFSET(LassoIdWsf2IsInteractionStatement, certificate_file) },
+
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2IsInteractionStatement *node)
+{
+	node->Inquiry = NULL;
+	node->sign_type = LASSO_SIGNATURE_TYPE_NONE;
+}
+
+static void
+class_init(LassoIdWsf2IsInteractionStatementClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "InteractionStatement");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_IS_HREF, LASSO_IDWSF2_IS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+
+	nclass->node_data->sign_type_offset = G_STRUCT_OFFSET(
+			LassoIdWsf2IsInteractionStatement, sign_type);
+	nclass->node_data->sign_method_offset = G_STRUCT_OFFSET(
+			LassoIdWsf2IsInteractionStatement, sign_method);
+}
+
+GType
+lasso_idwsf2_is_interaction_statement_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2IsInteractionStatementClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2IsInteractionStatement),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2IsInteractionStatement", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_is_interaction_statement_new:
+ *
+ * Creates a new #LassoIdWsf2IsInteractionStatement object.
+ *
+ * Return value: a newly created #LassoIdWsf2IsInteractionStatement object
+ **/
+LassoIdWsf2IsInteractionStatement*
+lasso_idwsf2_is_interaction_statement_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_IS_INTERACTION_STATEMENT, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/is_interaction_statement.h b/lasso/xml/id-wsf-2.0/is_interaction_statement.h
new file mode 100644
index 00000000..ff73d179
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/is_interaction_statement.h
@@ -0,0 +1,88 @@
+/* $Id: is_interaction_statement.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_IS_INTERACTION_STATEMENT_H__
+#define __LASSO_IDWSF2_IS_INTERACTION_STATEMENT_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_IS_INTERACTION_STATEMENT (lasso_idwsf2_is_interaction_statement_get_type())
+#define LASSO_IDWSF2_IS_INTERACTION_STATEMENT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_IS_INTERACTION_STATEMENT, \
+		LassoIdWsf2IsInteractionStatement))
+#define LASSO_IDWSF2_IS_INTERACTION_STATEMENT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_IS_INTERACTION_STATEMENT, \
+		LassoIdWsf2IsInteractionStatementClass))
+#define LASSO_IS_IDWSF2_IS_INTERACTION_STATEMENT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_IS_INTERACTION_STATEMENT))
+#define LASSO_IS_IDWSF2_IS_INTERACTION_STATEMENT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_IS_INTERACTION_STATEMENT))
+#define LASSO_IDWSF2_IS_INTERACTION_STATEMENT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_IS_INTERACTION_STATEMENT, \
+		LassoIdWsf2IsInteractionStatementClass)) 
+
+
+typedef struct _LassoIdWsf2IsInteractionStatement LassoIdWsf2IsInteractionStatement;
+typedef struct _LassoIdWsf2IsInteractionStatementClass LassoIdWsf2IsInteractionStatementClass;
+
+
+struct _LassoIdWsf2IsInteractionStatement {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	GList *Inquiry;
+	/*< private >*/
+	/* ds:Signature stuffs */
+	LassoSignatureType sign_type;
+	LassoSignatureMethod sign_method;
+	char *private_key_file;
+	char *certificate_file;
+
+};
+
+
+struct _LassoIdWsf2IsInteractionStatementClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_is_interaction_statement_get_type(void);
+LASSO_EXPORT LassoIdWsf2IsInteractionStatement* lasso_idwsf2_is_interaction_statement_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_IS_INTERACTION_STATEMENT_H__ */
diff --git a/lasso/xml/id-wsf-2.0/is_item.c b/lasso/xml/id-wsf-2.0/is_item.c
new file mode 100644
index 00000000..cf4075a9
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/is_item.c
@@ -0,0 +1,118 @@
+/* $Id: is_item.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "is_item.h"
+
+/*
+ * Schema fragment (liberty-idwsf-interaction-svc-v2.0.xsd):
+ *
+ * <xs:element name="Item" minOccurs="2" maxOccurs="unbounded">
+ *   <xs:complexType>
+ *     <xs:sequence>
+ *       <xs:element ref="Hint" minOccurs="0"/>
+ *     </xs:sequence>
+ *     <xs:attribute name="label" type="xs:string" use="optional"/>
+ *     <xs:attribute name="value" type="xs:NMTOKEN" use="required"/>
+ *   </xs:complexType>
+ * </xs:element>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Hint", SNIPPET_CONTENT,
+		G_STRUCT_OFFSET(LassoIdWsf2IsItem, Hint) },
+	{ "label", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2IsItem, label) },
+	{ "value", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoIdWsf2IsItem, value) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2IsItem *node)
+{
+	node->Hint = NULL;
+	node->label = NULL;
+	node->value = NULL;
+}
+
+static void
+class_init(LassoIdWsf2IsItemClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Item");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_IS_HREF, LASSO_IDWSF2_IS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_is_item_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2IsItemClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2IsItem),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2IsItem", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_is_item_new:
+ *
+ * Creates a new #LassoIdWsf2IsItem object.
+ *
+ * Return value: a newly created #LassoIdWsf2IsItem object
+ **/
+LassoIdWsf2IsItem*
+lasso_idwsf2_is_item_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_IS_ITEM, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/is_item.h b/lasso/xml/id-wsf-2.0/is_item.h
new file mode 100644
index 00000000..d6a0e86c
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/is_item.h
@@ -0,0 +1,84 @@
+/* $Id: is_item.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_IS_ITEM_H__
+#define __LASSO_IDWSF2_IS_ITEM_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_IS_ITEM (lasso_idwsf2_is_item_get_type())
+#define LASSO_IDWSF2_IS_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_IS_ITEM, \
+		LassoIdWsf2IsItem))
+#define LASSO_IDWSF2_IS_ITEM_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_IS_ITEM, \
+		LassoIdWsf2IsItemClass))
+#define LASSO_IS_IDWSF2_IS_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_IS_ITEM))
+#define LASSO_IS_IDWSF2_IS_ITEM_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_IS_ITEM))
+#define LASSO_IDWSF2_IS_ITEM_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_IS_ITEM, \
+		LassoIdWsf2IsItemClass)) 
+
+
+typedef struct _LassoIdWsf2IsItem LassoIdWsf2IsItem;
+typedef struct _LassoIdWsf2IsItemClass LassoIdWsf2IsItemClass;
+
+
+struct _LassoIdWsf2IsItem {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	char *Hint;
+	/* attributes */
+	char *label;
+	char *value;
+};
+
+
+struct _LassoIdWsf2IsItemClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_is_item_get_type(void);
+LASSO_EXPORT LassoIdWsf2IsItem* lasso_idwsf2_is_item_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_IS_ITEM_H__ */
diff --git a/lasso/xml/id-wsf-2.0/is_parameter.c b/lasso/xml/id-wsf-2.0/is_parameter.c
new file mode 100644
index 00000000..6bb0f925
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/is_parameter.c
@@ -0,0 +1,110 @@
+/* $Id: is_parameter.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "is_parameter.h"
+
+/*
+ * Schema fragment (liberty-idwsf-interaction-svc-v2.0.xsd):
+ *
+ * <xs:complexType name="ParameterType">
+ *   <xs:attribute name="name" type="xs:ID" use="required"/>
+ *   <xs:attribute name="value" type="xs:string" use="required"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "name", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoIdWsf2IsParameter, name) },
+	{ "value", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoIdWsf2IsParameter, value) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2IsParameter *node)
+{
+	node->name = NULL;
+	node->value = NULL;
+}
+
+static void
+class_init(LassoIdWsf2IsParameterClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Parameter");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_IS_HREF, LASSO_IDWSF2_IS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_is_parameter_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2IsParameterClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2IsParameter),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2IsParameter", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_is_parameter_new:
+ *
+ * Creates a new #LassoIdWsf2IsParameter object.
+ *
+ * Return value: a newly created #LassoIdWsf2IsParameter object
+ **/
+LassoIdWsf2IsParameter*
+lasso_idwsf2_is_parameter_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_IS_PARAMETER, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/is_parameter.h b/lasso/xml/id-wsf-2.0/is_parameter.h
new file mode 100644
index 00000000..08299cbd
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/is_parameter.h
@@ -0,0 +1,82 @@
+/* $Id: is_parameter.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_IS_PARAMETER_H__
+#define __LASSO_IDWSF2_IS_PARAMETER_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_IS_PARAMETER (lasso_idwsf2_is_parameter_get_type())
+#define LASSO_IDWSF2_IS_PARAMETER(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_IS_PARAMETER, \
+		LassoIdWsf2IsParameter))
+#define LASSO_IDWSF2_IS_PARAMETER_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_IS_PARAMETER, \
+		LassoIdWsf2IsParameterClass))
+#define LASSO_IS_IDWSF2_IS_PARAMETER(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_IS_PARAMETER))
+#define LASSO_IS_IDWSF2_IS_PARAMETER_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_IS_PARAMETER))
+#define LASSO_IDWSF2_IS_PARAMETER_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_IS_PARAMETER, \
+		LassoIdWsf2IsParameterClass)) 
+
+
+typedef struct _LassoIdWsf2IsParameter LassoIdWsf2IsParameter;
+typedef struct _LassoIdWsf2IsParameterClass LassoIdWsf2IsParameterClass;
+
+
+struct _LassoIdWsf2IsParameter {
+	LassoNode parent;
+
+	/*< public >*/
+	/* attributes */
+	char *name;
+	char *value;
+};
+
+
+struct _LassoIdWsf2IsParameterClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_is_parameter_get_type(void);
+LASSO_EXPORT LassoIdWsf2IsParameter* lasso_idwsf2_is_parameter_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_IS_PARAMETER_H__ */
diff --git a/lasso/xml/id-wsf-2.0/is_select.c b/lasso/xml/id-wsf-2.0/is_select.c
new file mode 100644
index 00000000..936bf263
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/is_select.c
@@ -0,0 +1,115 @@
+/* $Id: is_select.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "is_select.h"
+
+/*
+ * Schema fragment (liberty-idwsf-interaction-svc-v2.0.xsd):
+ *
+ * <xs:complexType name="SelectType">
+ *   <xs:complexContent>
+ *     <xs:extension base="InquiryElementType">
+ *       <xs:sequence>
+ *         <xs:element name="Item" minOccurs="2" maxOccurs="unbounded">
+ *           <xs:complexType>
+ *             <xs:sequence>
+ *               <xs:element ref="Hint" minOccurs="0"/>
+ *             </xs:sequence>
+ *             <xs:attribute name="label" type="xs:string" use="optional"/>
+ *             <xs:attribute name="value" type="xs:NMTOKEN" use="required"/>
+ *           </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Item", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2IsSelect, Item) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2IsSelect *node)
+{
+	node->Item = NULL;
+}
+
+static void
+class_init(LassoIdWsf2IsSelectClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Select");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_IS_HREF, LASSO_IDWSF2_IS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_is_select_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2IsSelectClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2IsSelect),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_IS_INQUIRY_ELEMENT,
+				"LassoIdWsf2IsSelect", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_is_select_new:
+ *
+ * Creates a new #LassoIdWsf2IsSelect object.
+ *
+ * Return value: a newly created #LassoIdWsf2IsSelect object
+ **/
+LassoIdWsf2IsSelect*
+lasso_idwsf2_is_select_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_IS_SELECT, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/is_select.h b/lasso/xml/id-wsf-2.0/is_select.h
new file mode 100644
index 00000000..9551c111
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/is_select.h
@@ -0,0 +1,82 @@
+/* $Id: is_select.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_IS_SELECT_H__
+#define __LASSO_IDWSF2_IS_SELECT_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "is_inquiry_element.h"
+
+#define LASSO_TYPE_IDWSF2_IS_SELECT (lasso_idwsf2_is_select_get_type())
+#define LASSO_IDWSF2_IS_SELECT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_IS_SELECT, \
+		LassoIdWsf2IsSelect))
+#define LASSO_IDWSF2_IS_SELECT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_IS_SELECT, \
+		LassoIdWsf2IsSelectClass))
+#define LASSO_IS_IDWSF2_IS_SELECT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_IS_SELECT))
+#define LASSO_IS_IDWSF2_IS_SELECT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_IS_SELECT))
+#define LASSO_IDWSF2_IS_SELECT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_IS_SELECT, \
+		LassoIdWsf2IsSelectClass)) 
+
+
+typedef struct _LassoIdWsf2IsSelect LassoIdWsf2IsSelect;
+typedef struct _LassoIdWsf2IsSelectClass LassoIdWsf2IsSelectClass;
+
+
+struct _LassoIdWsf2IsSelect {
+	LassoIdWsf2IsInquiryElement parent;
+
+	/*< public >*/
+	/* elements */
+	GList *Item;
+};
+
+
+struct _LassoIdWsf2IsSelectClass {
+	LassoIdWsf2IsInquiryElementClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_is_select_get_type(void);
+LASSO_EXPORT LassoIdWsf2IsSelect* lasso_idwsf2_is_select_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_IS_SELECT_H__ */
diff --git a/lasso/xml/id-wsf-2.0/is_text.c b/lasso/xml/id-wsf-2.0/is_text.c
new file mode 100644
index 00000000..b194c68c
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/is_text.c
@@ -0,0 +1,118 @@
+/* $Id: is_text.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "is_text.h"
+
+/*
+ * Schema fragment (liberty-idwsf-interaction-svc-v2.0.xsd):
+ *
+ * <xs:complexType name="TextType">
+ *   <xs:complexContent>
+ *     <xs:extension base="InquiryElementType">
+ *       <xs:attribute name="minChars" type="xs:integer" use="optional"/>
+ *       <xs:attribute name="maxChars" type="xs:integer" use="optional"/>
+ *       <xs:attribute name="format" type="xs:string" use="optional"/>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "minChars", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2IsText, minChars) },
+	{ "maxChars", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2IsText, maxChars) },
+	{ "format", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2IsText, format) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2IsText *node)
+{
+	node->minChars = 0;
+	node->maxChars = 0;
+	node->format = NULL;
+}
+
+static void
+class_init(LassoIdWsf2IsTextClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Text");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_IS_HREF, LASSO_IDWSF2_IS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_is_text_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2IsTextClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2IsText),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_IS_INQUIRY_ELEMENT,
+				"LassoIdWsf2IsText", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_is_text_new:
+ *
+ * Creates a new #LassoIdWsf2IsText object.
+ *
+ * Return value: a newly created #LassoIdWsf2IsText object
+ **/
+LassoIdWsf2IsText*
+lasso_idwsf2_is_text_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_IS_TEXT, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/is_text.h b/lasso/xml/id-wsf-2.0/is_text.h
new file mode 100644
index 00000000..4f57182f
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/is_text.h
@@ -0,0 +1,84 @@
+/* $Id: is_text.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_IS_TEXT_H__
+#define __LASSO_IDWSF2_IS_TEXT_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "is_inquiry_element.h"
+
+#define LASSO_TYPE_IDWSF2_IS_TEXT (lasso_idwsf2_is_text_get_type())
+#define LASSO_IDWSF2_IS_TEXT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_IS_TEXT, \
+		LassoIdWsf2IsText))
+#define LASSO_IDWSF2_IS_TEXT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_IS_TEXT, \
+		LassoIdWsf2IsTextClass))
+#define LASSO_IS_IDWSF2_IS_TEXT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_IS_TEXT))
+#define LASSO_IS_IDWSF2_IS_TEXT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_IS_TEXT))
+#define LASSO_IDWSF2_IS_TEXT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_IS_TEXT, \
+		LassoIdWsf2IsTextClass)) 
+
+
+typedef struct _LassoIdWsf2IsText LassoIdWsf2IsText;
+typedef struct _LassoIdWsf2IsTextClass LassoIdWsf2IsTextClass;
+
+
+struct _LassoIdWsf2IsText {
+	LassoIdWsf2IsInquiryElement parent;
+
+	/*< public >*/
+	/* attributes */
+	int minChars;
+	int maxChars;
+	char *format;
+};
+
+
+struct _LassoIdWsf2IsTextClass {
+	LassoIdWsf2IsInquiryElementClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_is_text_get_type(void);
+LASSO_EXPORT LassoIdWsf2IsText* lasso_idwsf2_is_text_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_IS_TEXT_H__ */
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
new file mode 100644
index 00000000..40e0a4d5
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_add_collection_request.c
@@ -0,0 +1,116 @@
+/* $Id: ps_add_collection_request.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_add_collection_request.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="AddCollectionRequestType">
+ *   <xs:complexContent>
+ *     <xs:extension base="RequestAbstractType">
+ *       <xs:sequence>
+ *         <xs:element ref="Object"/>
+ *         <xs:element ref="Subscription" minOccurs="0"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Object", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddCollectionRequest, Object) },
+	{ "Subscription", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddCollectionRequest, Subscription) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsAddCollectionRequest *node)
+{
+	node->Object = NULL;
+	node->Subscription = NULL;
+}
+
+static void
+class_init(LassoIdWsf2PsAddCollectionRequestClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "AddCollectionRequest");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_add_collection_request_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsAddCollectionRequestClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsAddCollectionRequest),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
+				"LassoIdWsf2PsAddCollectionRequest", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_add_collection_request_new:
+ *
+ * Creates a new #LassoIdWsf2PsAddCollectionRequest object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsAddCollectionRequest object
+ **/
+LassoIdWsf2PsAddCollectionRequest*
+lasso_idwsf2_ps_add_collection_request_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_ADD_COLLECTION_REQUEST, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ps_add_collection_request.h b/lasso/xml/id-wsf-2.0/ps_add_collection_request.h
new file mode 100644
index 00000000..bb989226
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_add_collection_request.h
@@ -0,0 +1,86 @@
+/* $Id: ps_add_collection_request.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_PS_ADD_COLLECTION_REQUEST_H__
+#define __LASSO_IDWSF2_PS_ADD_COLLECTION_REQUEST_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "ps_object.h"
+#include "ps_request_abstract.h"
+#include "subs_subscription.h"
+
+#define LASSO_TYPE_IDWSF2_PS_ADD_COLLECTION_REQUEST \
+	(lasso_idwsf2_ps_add_collection_request_get_type())
+#define LASSO_IDWSF2_PS_ADD_COLLECTION_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_PS_ADD_COLLECTION_REQUEST, \
+		LassoIdWsf2PsAddCollectionRequest))
+#define LASSO_IDWSF2_PS_ADD_COLLECTION_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_PS_ADD_COLLECTION_REQUEST, \
+		LassoIdWsf2PsAddCollectionRequestClass))
+#define LASSO_IS_IDWSF2_PS_ADD_COLLECTION_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_PS_ADD_COLLECTION_REQUEST))
+#define LASSO_IS_IDWSF2_PS_ADD_COLLECTION_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_PS_ADD_COLLECTION_REQUEST))
+#define LASSO_IDWSF2_PS_ADD_COLLECTION_REQUEST_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_PS_ADD_COLLECTION_REQUEST, \
+		LassoIdWsf2PsAddCollectionRequestClass)) 
+
+
+typedef struct _LassoIdWsf2PsAddCollectionRequest LassoIdWsf2PsAddCollectionRequest;
+typedef struct _LassoIdWsf2PsAddCollectionRequestClass LassoIdWsf2PsAddCollectionRequestClass;
+
+
+struct _LassoIdWsf2PsAddCollectionRequest {
+	LassoIdWsf2PsRequestAbstract parent;
+
+	/*< public >*/
+	/* elements */
+	/* XXX */ void *Object;
+	/* XXX */ void *Subscription;
+};
+
+
+struct _LassoIdWsf2PsAddCollectionRequestClass {
+	LassoIdWsf2PsRequestAbstractClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ps_add_collection_request_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsAddCollectionRequest* lasso_idwsf2_ps_add_collection_request_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_PS_ADD_COLLECTION_REQUEST_H__ */
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
new file mode 100644
index 00000000..25f58e0d
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_add_collection_response.c
@@ -0,0 +1,112 @@
+/* $Id: ps_add_collection_response.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_add_collection_response.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="AddCollectionResponseType">
+ *   <xs:complexContent>
+ *     <xs:extension base="ResponseAbstractType">
+ *       <xs:sequence>
+ *         <xs:element ref="Object" minOccurs="0"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Object", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddCollectionResponse, Object) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsAddCollectionResponse *node)
+{
+	node->Object = NULL;
+}
+
+static void
+class_init(LassoIdWsf2PsAddCollectionResponseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "AddCollectionResponse");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_add_collection_response_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsAddCollectionResponseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsAddCollectionResponse),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_RESPONSE_ABSTRACT,
+				"LassoIdWsf2PsAddCollectionResponse", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_add_collection_response_new:
+ *
+ * Creates a new #LassoIdWsf2PsAddCollectionResponse object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsAddCollectionResponse object
+ **/
+LassoIdWsf2PsAddCollectionResponse*
+lasso_idwsf2_ps_add_collection_response_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_ADD_COLLECTION_RESPONSE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ps_add_collection_response.h b/lasso/xml/id-wsf-2.0/ps_add_collection_response.h
new file mode 100644
index 00000000..9495dfcb
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_add_collection_response.h
@@ -0,0 +1,84 @@
+/* $Id: ps_add_collection_response.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_PS_ADD_COLLECTION_RESPONSE_H__
+#define __LASSO_IDWSF2_PS_ADD_COLLECTION_RESPONSE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "ps_response_abstract.h"
+#include "ps_object.h"
+
+#define LASSO_TYPE_IDWSF2_PS_ADD_COLLECTION_RESPONSE \
+	(lasso_idwsf2_ps_add_collection_response_get_type())
+#define LASSO_IDWSF2_PS_ADD_COLLECTION_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_PS_ADD_COLLECTION_RESPONSE, \
+		LassoIdWsf2PsAddCollectionResponse))
+#define LASSO_IDWSF2_PS_ADD_COLLECTION_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_PS_ADD_COLLECTION_RESPONSE, \
+		LassoIdWsf2PsAddCollectionResponseClass))
+#define LASSO_IS_IDWSF2_PS_ADD_COLLECTION_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_PS_ADD_COLLECTION_RESPONSE))
+#define LASSO_IS_IDWSF2_PS_ADD_COLLECTION_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_PS_ADD_COLLECTION_RESPONSE))
+#define LASSO_IDWSF2_PS_ADD_COLLECTION_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_PS_ADD_COLLECTION_RESPONSE, \
+		LassoIdWsf2PsAddCollectionResponseClass)) 
+
+
+typedef struct _LassoIdWsf2PsAddCollectionResponse LassoIdWsf2PsAddCollectionResponse;
+typedef struct _LassoIdWsf2PsAddCollectionResponseClass LassoIdWsf2PsAddCollectionResponseClass;
+
+
+struct _LassoIdWsf2PsAddCollectionResponse {
+	LassoIdWsf2PsResponseAbstract parent;
+
+	/*< public >*/
+	/* elements */
+	/* XXX */ void *Object;
+};
+
+
+struct _LassoIdWsf2PsAddCollectionResponseClass {
+	LassoIdWsf2PsResponseAbstractClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ps_add_collection_response_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsAddCollectionResponse* lasso_idwsf2_ps_add_collection_response_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_PS_ADD_COLLECTION_RESPONSE_H__ */
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
new file mode 100644
index 00000000..f5aa3888
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_add_entity_request.c
@@ -0,0 +1,128 @@
+/* $Id: ps_add_entity_request.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_add_entity_request.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="AddEntityRequestType">
+ *   <xs:complexContent>
+ *     <xs:extension base="RequestAbstractType">
+ *       <xs:sequence>
+ *         <xs:element ref="Object"/>
+ *         <xs:element ref="PStoSPRedirectURL" minOccurs="0"/>
+ *         <xs:element ref="CreatePSObject" minOccurs="0"/>
+ *         <xs:element ref="Subscription" minOccurs="0"/>
+ *         <xs:element ref="sec:TokenPolicy" minOccurs="0"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Object", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddEntityRequest, Object) },
+	{ "PStoSPRedirectURL", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddEntityRequest, PStoSPRedirectURL) },
+	{ "CreatePSObject", SNIPPET_CONTENT,
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddEntityRequest, CreatePSObject) },
+	{ "Subscription", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddEntityRequest, Subscription) },
+	{ "TokenPolicy", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddEntityRequest, TokenPolicy) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsAddEntityRequest *node)
+{
+	node->Object = NULL;
+	node->PStoSPRedirectURL = NULL;
+	node->CreatePSObject = NULL;
+	node->Subscription = NULL;
+	node->TokenPolicy = NULL;
+}
+
+static void
+class_init(LassoIdWsf2PsAddEntityRequestClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "AddEntityRequest");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_add_entity_request_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsAddEntityRequestClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsAddEntityRequest),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
+				"LassoIdWsf2PsAddEntityRequest", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_add_entity_request_new:
+ *
+ * Creates a new #LassoIdWsf2PsAddEntityRequest object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsAddEntityRequest object
+ **/
+LassoIdWsf2PsAddEntityRequest*
+lasso_idwsf2_ps_add_entity_request_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_ADD_ENTITY_REQUEST, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ps_add_entity_request.h b/lasso/xml/id-wsf-2.0/ps_add_entity_request.h
new file mode 100644
index 00000000..a20e0adf
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_add_entity_request.h
@@ -0,0 +1,89 @@
+/* $Id: ps_add_entity_request.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_PS_ADD_ENTITY_REQUEST_H__
+#define __LASSO_IDWSF2_PS_ADD_ENTITY_REQUEST_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "sec_token_policy.h"
+#include "ps_object.h"
+#include "ps_request_abstract.h"
+#include "subs_subscription.h"
+
+#define LASSO_TYPE_IDWSF2_PS_ADD_ENTITY_REQUEST (lasso_idwsf2_ps_add_entity_request_get_type())
+#define LASSO_IDWSF2_PS_ADD_ENTITY_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_PS_ADD_ENTITY_REQUEST, \
+		LassoIdWsf2PsAddEntityRequest))
+#define LASSO_IDWSF2_PS_ADD_ENTITY_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_PS_ADD_ENTITY_REQUEST, \
+		LassoIdWsf2PsAddEntityRequestClass))
+#define LASSO_IS_IDWSF2_PS_ADD_ENTITY_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_PS_ADD_ENTITY_REQUEST))
+#define LASSO_IS_IDWSF2_PS_ADD_ENTITY_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_PS_ADD_ENTITY_REQUEST))
+#define LASSO_IDWSF2_PS_ADD_ENTITY_REQUEST_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_PS_ADD_ENTITY_REQUEST, \
+		LassoIdWsf2PsAddEntityRequestClass)) 
+
+
+typedef struct _LassoIdWsf2PsAddEntityRequest LassoIdWsf2PsAddEntityRequest;
+typedef struct _LassoIdWsf2PsAddEntityRequestClass LassoIdWsf2PsAddEntityRequestClass;
+
+
+struct _LassoIdWsf2PsAddEntityRequest {
+	LassoIdWsf2PsRequestAbstract parent;
+
+	/*< public >*/
+	/* elements */
+	/* XXX */ void *Object;
+	/* XXX */ void *PStoSPRedirectURL;
+	char *CreatePSObject;
+	/* XXX */ void *Subscription;
+	/* XXX */ void *TokenPolicy;
+};
+
+
+struct _LassoIdWsf2PsAddEntityRequestClass {
+	LassoIdWsf2PsRequestAbstractClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ps_add_entity_request_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsAddEntityRequest* lasso_idwsf2_ps_add_entity_request_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_PS_ADD_ENTITY_REQUEST_H__ */
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
new file mode 100644
index 00000000..e51faef5
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_add_entity_response.c
@@ -0,0 +1,120 @@
+/* $Id: ps_add_entity_response.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_add_entity_response.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="AddEntityResponseType">
+ *   <xs:complexContent>
+ *     <xs:extension base="ResponseAbstractType">
+ *       <xs:sequence>
+ *         <xs:element ref="Object" minOccurs="0"/>
+ *         <xs:element ref="SPtoPSRedirectURL" minOccurs="0" maxOccurs="1"/>
+ *         <xs:element ref="QueryString" minOccurs="0" maxOccurs="1"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Object", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddEntityResponse, Object) },
+	{ "SPtoPSRedirectURL", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddEntityResponse, SPtoPSRedirectURL) },
+	{ "QueryString", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddEntityResponse, QueryString) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsAddEntityResponse *node)
+{
+	node->Object = NULL;
+	node->SPtoPSRedirectURL = NULL;
+	node->QueryString = NULL;
+}
+
+static void
+class_init(LassoIdWsf2PsAddEntityResponseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "AddEntityResponse");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_add_entity_response_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsAddEntityResponseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsAddEntityResponse),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_RESPONSE_ABSTRACT,
+				"LassoIdWsf2PsAddEntityResponse", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_add_entity_response_new:
+ *
+ * Creates a new #LassoIdWsf2PsAddEntityResponse object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsAddEntityResponse object
+ **/
+LassoIdWsf2PsAddEntityResponse*
+lasso_idwsf2_ps_add_entity_response_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_ADD_ENTITY_RESPONSE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ps_add_entity_response.h b/lasso/xml/id-wsf-2.0/ps_add_entity_response.h
new file mode 100644
index 00000000..7d0377bc
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_add_entity_response.h
@@ -0,0 +1,85 @@
+/* $Id: ps_add_entity_response.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_PS_ADD_ENTITY_RESPONSE_H__
+#define __LASSO_IDWSF2_PS_ADD_ENTITY_RESPONSE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "ps_response_abstract.h"
+#include "ps_object.h"
+
+#define LASSO_TYPE_IDWSF2_PS_ADD_ENTITY_RESPONSE (lasso_idwsf2_ps_add_entity_response_get_type())
+#define LASSO_IDWSF2_PS_ADD_ENTITY_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_PS_ADD_ENTITY_RESPONSE, \
+		LassoIdWsf2PsAddEntityResponse))
+#define LASSO_IDWSF2_PS_ADD_ENTITY_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_PS_ADD_ENTITY_RESPONSE, \
+		LassoIdWsf2PsAddEntityResponseClass))
+#define LASSO_IS_IDWSF2_PS_ADD_ENTITY_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_PS_ADD_ENTITY_RESPONSE))
+#define LASSO_IS_IDWSF2_PS_ADD_ENTITY_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_PS_ADD_ENTITY_RESPONSE))
+#define LASSO_IDWSF2_PS_ADD_ENTITY_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_PS_ADD_ENTITY_RESPONSE, \
+		LassoIdWsf2PsAddEntityResponseClass)) 
+
+
+typedef struct _LassoIdWsf2PsAddEntityResponse LassoIdWsf2PsAddEntityResponse;
+typedef struct _LassoIdWsf2PsAddEntityResponseClass LassoIdWsf2PsAddEntityResponseClass;
+
+
+struct _LassoIdWsf2PsAddEntityResponse {
+	LassoIdWsf2PsResponseAbstract parent;
+
+	/*< public >*/
+	/* elements */
+	/* XXX */ void *Object;
+	/* XXX */ void *SPtoPSRedirectURL;
+	/* XXX */ void *QueryString;
+};
+
+
+struct _LassoIdWsf2PsAddEntityResponseClass {
+	LassoIdWsf2PsResponseAbstractClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ps_add_entity_response_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsAddEntityResponse* lasso_idwsf2_ps_add_entity_response_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_PS_ADD_ENTITY_RESPONSE_H__ */
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
new file mode 100644
index 00000000..6752264e
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.c
@@ -0,0 +1,128 @@
+/* $Id: ps_add_known_entity_request.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_add_known_entity_request.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="AddKnownEntityRequestType">
+ *   <xs:complexContent>
+ *     <xs:extension base="RequestAbstractType">
+ *       <xs:sequence>
+ *         <xs:element ref="Object"/>
+ *         <xs:element ref="sec:Token"/>
+ *         <xs:element ref="CreatePSObject" minOccurs="0"/>
+ *         <xs:element ref="Subscription" minOccurs="0"/>
+ *         <xs:element ref="sec:TokenPolicy" minOccurs="0"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Object", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityRequest, Object) },
+	{ "Token", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityRequest, Token) },
+	{ "CreatePSObject", SNIPPET_CONTENT,
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityRequest, CreatePSObject) },
+	{ "Subscription", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityRequest, Subscription) },
+	{ "TokenPolicy", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityRequest, TokenPolicy) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsAddKnownEntityRequest *node)
+{
+	node->Object = NULL;
+	node->Token = NULL;
+	node->CreatePSObject = NULL;
+	node->Subscription = NULL;
+	node->TokenPolicy = NULL;
+}
+
+static void
+class_init(LassoIdWsf2PsAddKnownEntityRequestClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "AddKnownEntityRequest");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_add_known_entity_request_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsAddKnownEntityRequestClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsAddKnownEntityRequest),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
+				"LassoIdWsf2PsAddKnownEntityRequest", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_add_known_entity_request_new:
+ *
+ * Creates a new #LassoIdWsf2PsAddKnownEntityRequest object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsAddKnownEntityRequest object
+ **/
+LassoIdWsf2PsAddKnownEntityRequest*
+lasso_idwsf2_ps_add_known_entity_request_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_ADD_KNOWN_ENTITY_REQUEST, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.h b/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.h
new file mode 100644
index 00000000..1f184c73
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.h
@@ -0,0 +1,91 @@
+/* $Id: ps_add_known_entity_request.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_PS_ADD_KNOWN_ENTITY_REQUEST_H__
+#define __LASSO_IDWSF2_PS_ADD_KNOWN_ENTITY_REQUEST_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "sec_token_policy.h"
+#include "sec_token.h"
+#include "ps_object.h"
+#include "ps_request_abstract.h"
+#include "subs_subscription.h"
+
+#define LASSO_TYPE_IDWSF2_PS_ADD_KNOWN_ENTITY_REQUEST \
+	(lasso_idwsf2_ps_add_known_entity_request_get_type())
+#define LASSO_IDWSF2_PS_ADD_KNOWN_ENTITY_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_PS_ADD_KNOWN_ENTITY_REQUEST, \
+		LassoIdWsf2PsAddKnownEntityRequest))
+#define LASSO_IDWSF2_PS_ADD_KNOWN_ENTITY_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_PS_ADD_KNOWN_ENTITY_REQUEST, \
+		LassoIdWsf2PsAddKnownEntityRequestClass))
+#define LASSO_IS_IDWSF2_PS_ADD_KNOWN_ENTITY_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_PS_ADD_KNOWN_ENTITY_REQUEST))
+#define LASSO_IS_IDWSF2_PS_ADD_KNOWN_ENTITY_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_PS_ADD_KNOWN_ENTITY_REQUEST))
+#define LASSO_IDWSF2_PS_ADD_KNOWN_ENTITY_REQUEST_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_PS_ADD_KNOWN_ENTITY_REQUEST, \
+		LassoIdWsf2PsAddKnownEntityRequestClass)) 
+
+
+typedef struct _LassoIdWsf2PsAddKnownEntityRequest LassoIdWsf2PsAddKnownEntityRequest;
+typedef struct _LassoIdWsf2PsAddKnownEntityRequestClass LassoIdWsf2PsAddKnownEntityRequestClass;
+
+
+struct _LassoIdWsf2PsAddKnownEntityRequest {
+	LassoIdWsf2PsRequestAbstract parent;
+
+	/*< public >*/
+	/* elements */
+	/* XXX */ void *Object;
+	/* XXX */ void *Token;
+	char *CreatePSObject;
+	/* XXX */ void *Subscription;
+	/* XXX */ void *TokenPolicy;
+};
+
+
+struct _LassoIdWsf2PsAddKnownEntityRequestClass {
+	LassoIdWsf2PsRequestAbstractClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ps_add_known_entity_request_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsAddKnownEntityRequest* lasso_idwsf2_ps_add_known_entity_request_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_PS_ADD_KNOWN_ENTITY_REQUEST_H__ */
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
new file mode 100644
index 00000000..bd2b2434
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_add_known_entity_response.c
@@ -0,0 +1,120 @@
+/* $Id: ps_add_known_entity_response.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_add_known_entity_response.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="AddKnownEntityResponseType">
+ *   <xs:complexContent>
+ *     <xs:extension base="ResponseAbstractType">
+ *       <xs:sequence>
+ *         <xs:element ref="Object" minOccurs="0"/>
+ *         <xs:element ref="SPtoPSRedirectURL" minOccurs="0" maxOccurs="1"/>
+ *         <xs:element ref="QueryString" minOccurs="0" maxOccurs="1"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Object", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityResponse, Object) },
+	{ "SPtoPSRedirectURL", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityResponse, SPtoPSRedirectURL) },
+	{ "QueryString", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddKnownEntityResponse, QueryString) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsAddKnownEntityResponse *node)
+{
+	node->Object = NULL;
+	node->SPtoPSRedirectURL = NULL;
+	node->QueryString = NULL;
+}
+
+static void
+class_init(LassoIdWsf2PsAddKnownEntityResponseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "AddKnownEntityResponse");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_add_known_entity_response_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsAddKnownEntityResponseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsAddKnownEntityResponse),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_RESPONSE_ABSTRACT,
+				"LassoIdWsf2PsAddKnownEntityResponse", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_add_known_entity_response_new:
+ *
+ * Creates a new #LassoIdWsf2PsAddKnownEntityResponse object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsAddKnownEntityResponse object
+ **/
+LassoIdWsf2PsAddKnownEntityResponse*
+lasso_idwsf2_ps_add_known_entity_response_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_ADD_KNOWN_ENTITY_RESPONSE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ps_add_known_entity_response.h b/lasso/xml/id-wsf-2.0/ps_add_known_entity_response.h
new file mode 100644
index 00000000..c0baf326
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_add_known_entity_response.h
@@ -0,0 +1,86 @@
+/* $Id: ps_add_known_entity_response.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_PS_ADD_KNOWN_ENTITY_RESPONSE_H__
+#define __LASSO_IDWSF2_PS_ADD_KNOWN_ENTITY_RESPONSE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "ps_response_abstract.h"
+#include "ps_object.h"
+
+#define LASSO_TYPE_IDWSF2_PS_ADD_KNOWN_ENTITY_RESPONSE \
+	(lasso_idwsf2_ps_add_known_entity_response_get_type())
+#define LASSO_IDWSF2_PS_ADD_KNOWN_ENTITY_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_PS_ADD_KNOWN_ENTITY_RESPONSE, \
+		LassoIdWsf2PsAddKnownEntityResponse))
+#define LASSO_IDWSF2_PS_ADD_KNOWN_ENTITY_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_PS_ADD_KNOWN_ENTITY_RESPONSE, \
+		LassoIdWsf2PsAddKnownEntityResponseClass))
+#define LASSO_IS_IDWSF2_PS_ADD_KNOWN_ENTITY_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_PS_ADD_KNOWN_ENTITY_RESPONSE))
+#define LASSO_IS_IDWSF2_PS_ADD_KNOWN_ENTITY_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_PS_ADD_KNOWN_ENTITY_RESPONSE))
+#define LASSO_IDWSF2_PS_ADD_KNOWN_ENTITY_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_PS_ADD_KNOWN_ENTITY_RESPONSE, \
+		LassoIdWsf2PsAddKnownEntityResponseClass)) 
+
+
+typedef struct _LassoIdWsf2PsAddKnownEntityResponse LassoIdWsf2PsAddKnownEntityResponse;
+typedef struct _LassoIdWsf2PsAddKnownEntityResponseClass LassoIdWsf2PsAddKnownEntityResponseClass;
+
+
+struct _LassoIdWsf2PsAddKnownEntityResponse {
+	LassoIdWsf2PsResponseAbstract parent;
+
+	/*< public >*/
+	/* elements */
+	/* XXX */ void *Object;
+	/* XXX */ void *SPtoPSRedirectURL;
+	/* XXX */ void *QueryString;
+};
+
+
+struct _LassoIdWsf2PsAddKnownEntityResponseClass {
+	LassoIdWsf2PsResponseAbstractClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ps_add_known_entity_response_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsAddKnownEntityResponse* lasso_idwsf2_ps_add_known_entity_response_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_PS_ADD_KNOWN_ENTITY_RESPONSE_H__ */
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
new file mode 100644
index 00000000..6b82d22d
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_add_to_collection_request.c
@@ -0,0 +1,120 @@
+/* $Id: ps_add_to_collection_request.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_add_to_collection_request.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="AddToCollectionRequestType">
+ *   <xs:complexContent>
+ *     <xs:extension base="RequestAbstractType">
+ *       <xs:sequence>
+ *         <xs:element ref="TargetObjectID"/>
+ *         <xs:element ref="ObjectID" minOccurs="1" maxOccurs="unbounded"/>
+ *         <xs:element ref="Subscription" minOccurs="0"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "TargetObjectID", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddToCollectionRequest, TargetObjectID) },
+	{ "ObjectID", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddToCollectionRequest, ObjectID) },
+	{ "Subscription", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsAddToCollectionRequest, Subscription) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsAddToCollectionRequest *node)
+{
+	node->TargetObjectID = NULL;
+	node->ObjectID = NULL;
+	node->Subscription = NULL;
+}
+
+static void
+class_init(LassoIdWsf2PsAddToCollectionRequestClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "AddToCollectionRequest");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_add_to_collection_request_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsAddToCollectionRequestClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsAddToCollectionRequest),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
+				"LassoIdWsf2PsAddToCollectionRequest", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_add_to_collection_request_new:
+ *
+ * Creates a new #LassoIdWsf2PsAddToCollectionRequest object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsAddToCollectionRequest object
+ **/
+LassoIdWsf2PsAddToCollectionRequest*
+lasso_idwsf2_ps_add_to_collection_request_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_ADD_TO_COLLECTION_REQUEST, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ps_add_to_collection_request.h b/lasso/xml/id-wsf-2.0/ps_add_to_collection_request.h
new file mode 100644
index 00000000..8ee648ed
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_add_to_collection_request.h
@@ -0,0 +1,86 @@
+/* $Id: ps_add_to_collection_request.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_PS_ADD_TO_COLLECTION_REQUEST_H__
+#define __LASSO_IDWSF2_PS_ADD_TO_COLLECTION_REQUEST_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "subs_subscription.h"
+#include "ps_request_abstract.h"
+
+#define LASSO_TYPE_IDWSF2_PS_ADD_TO_COLLECTION_REQUEST \
+	(lasso_idwsf2_ps_add_to_collection_request_get_type())
+#define LASSO_IDWSF2_PS_ADD_TO_COLLECTION_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_PS_ADD_TO_COLLECTION_REQUEST, \
+		LassoIdWsf2PsAddToCollectionRequest))
+#define LASSO_IDWSF2_PS_ADD_TO_COLLECTION_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_PS_ADD_TO_COLLECTION_REQUEST, \
+		LassoIdWsf2PsAddToCollectionRequestClass))
+#define LASSO_IS_IDWSF2_PS_ADD_TO_COLLECTION_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_PS_ADD_TO_COLLECTION_REQUEST))
+#define LASSO_IS_IDWSF2_PS_ADD_TO_COLLECTION_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_PS_ADD_TO_COLLECTION_REQUEST))
+#define LASSO_IDWSF2_PS_ADD_TO_COLLECTION_REQUEST_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_PS_ADD_TO_COLLECTION_REQUEST, \
+		LassoIdWsf2PsAddToCollectionRequestClass)) 
+
+
+typedef struct _LassoIdWsf2PsAddToCollectionRequest LassoIdWsf2PsAddToCollectionRequest;
+typedef struct _LassoIdWsf2PsAddToCollectionRequestClass LassoIdWsf2PsAddToCollectionRequestClass;
+
+
+struct _LassoIdWsf2PsAddToCollectionRequest {
+	LassoIdWsf2PsRequestAbstract parent;
+
+	/*< public >*/
+	/* elements */
+	/* XXX */ void *TargetObjectID;
+	GList *ObjectID;
+	/* XXX */ void *Subscription;
+};
+
+
+struct _LassoIdWsf2PsAddToCollectionRequestClass {
+	LassoIdWsf2PsRequestAbstractClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ps_add_to_collection_request_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsAddToCollectionRequest* lasso_idwsf2_ps_add_to_collection_request_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_PS_ADD_TO_COLLECTION_REQUEST_H__ */
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
new file mode 100644
index 00000000..9db8d116
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_get_object_info_request.c
@@ -0,0 +1,116 @@
+/* $Id: ps_get_object_info_request.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_get_object_info_request.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="GetObjectInfoRequestType">
+ *   <xs:complexContent>
+ *     <xs:extension base="RequestAbstractType">
+ *       <xs:sequence>
+ *         <xs:element ref="TargetObjectID" minOccurs="0"/>
+ *         <xs:element ref="Subscription" minOccurs="0"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "TargetObjectID", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsGetObjectInfoRequest, TargetObjectID) },
+	{ "Subscription", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsGetObjectInfoRequest, Subscription) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsGetObjectInfoRequest *node)
+{
+	node->TargetObjectID = NULL;
+	node->Subscription = NULL;
+}
+
+static void
+class_init(LassoIdWsf2PsGetObjectInfoRequestClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "GetObjectInfoRequest");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_get_object_info_request_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsGetObjectInfoRequestClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsGetObjectInfoRequest),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
+				"LassoIdWsf2PsGetObjectInfoRequest", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_get_object_info_request_new:
+ *
+ * Creates a new #LassoIdWsf2PsGetObjectInfoRequest object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsGetObjectInfoRequest object
+ **/
+LassoIdWsf2PsGetObjectInfoRequest*
+lasso_idwsf2_ps_get_object_info_request_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_GET_OBJECT_INFO_REQUEST, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ps_get_object_info_request.h b/lasso/xml/id-wsf-2.0/ps_get_object_info_request.h
new file mode 100644
index 00000000..c84bf660
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_get_object_info_request.h
@@ -0,0 +1,85 @@
+/* $Id: ps_get_object_info_request.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_PS_GET_OBJECT_INFO_REQUEST_H__
+#define __LASSO_IDWSF2_PS_GET_OBJECT_INFO_REQUEST_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "subs_subscription.h"
+#include "ps_request_abstract.h"
+
+#define LASSO_TYPE_IDWSF2_PS_GET_OBJECT_INFO_REQUEST \
+	(lasso_idwsf2_ps_get_object_info_request_get_type())
+#define LASSO_IDWSF2_PS_GET_OBJECT_INFO_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_PS_GET_OBJECT_INFO_REQUEST, \
+		LassoIdWsf2PsGetObjectInfoRequest))
+#define LASSO_IDWSF2_PS_GET_OBJECT_INFO_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_PS_GET_OBJECT_INFO_REQUEST, \
+		LassoIdWsf2PsGetObjectInfoRequestClass))
+#define LASSO_IS_IDWSF2_PS_GET_OBJECT_INFO_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_PS_GET_OBJECT_INFO_REQUEST))
+#define LASSO_IS_IDWSF2_PS_GET_OBJECT_INFO_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_PS_GET_OBJECT_INFO_REQUEST))
+#define LASSO_IDWSF2_PS_GET_OBJECT_INFO_REQUEST_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_PS_GET_OBJECT_INFO_REQUEST, \
+		LassoIdWsf2PsGetObjectInfoRequestClass)) 
+
+
+typedef struct _LassoIdWsf2PsGetObjectInfoRequest LassoIdWsf2PsGetObjectInfoRequest;
+typedef struct _LassoIdWsf2PsGetObjectInfoRequestClass LassoIdWsf2PsGetObjectInfoRequestClass;
+
+
+struct _LassoIdWsf2PsGetObjectInfoRequest {
+	LassoIdWsf2PsRequestAbstract parent;
+
+	/*< public >*/
+	/* elements */
+	/* XXX */ void *TargetObjectID;
+	/* XXX */ void *Subscription;
+};
+
+
+struct _LassoIdWsf2PsGetObjectInfoRequestClass {
+	LassoIdWsf2PsRequestAbstractClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ps_get_object_info_request_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsGetObjectInfoRequest* lasso_idwsf2_ps_get_object_info_request_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_PS_GET_OBJECT_INFO_REQUEST_H__ */
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
new file mode 100644
index 00000000..45385571
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_get_object_info_response.c
@@ -0,0 +1,112 @@
+/* $Id: ps_get_object_info_response.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_get_object_info_response.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="GetObjectInfoResponseType">
+ *   <xs:complexContent>
+ *     <xs:extension base="ResponseAbstractType">
+ *       <xs:sequence>
+ *         <xs:element ref="Object" minOccurs="0"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Object", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsGetObjectInfoResponse, Object) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsGetObjectInfoResponse *node)
+{
+	node->Object = NULL;
+}
+
+static void
+class_init(LassoIdWsf2PsGetObjectInfoResponseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "GetObjectInfoResponse");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_get_object_info_response_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsGetObjectInfoResponseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsGetObjectInfoResponse),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_RESPONSE_ABSTRACT,
+				"LassoIdWsf2PsGetObjectInfoResponse", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_get_object_info_response_new:
+ *
+ * Creates a new #LassoIdWsf2PsGetObjectInfoResponse object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsGetObjectInfoResponse object
+ **/
+LassoIdWsf2PsGetObjectInfoResponse*
+lasso_idwsf2_ps_get_object_info_response_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_GET_OBJECT_INFO_RESPONSE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ps_get_object_info_response.h b/lasso/xml/id-wsf-2.0/ps_get_object_info_response.h
new file mode 100644
index 00000000..3b0b042f
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_get_object_info_response.h
@@ -0,0 +1,84 @@
+/* $Id: ps_get_object_info_response.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_PS_GET_OBJECT_INFO_RESPONSE_H__
+#define __LASSO_IDWSF2_PS_GET_OBJECT_INFO_RESPONSE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "ps_response_abstract.h"
+#include "ps_object.h"
+
+#define LASSO_TYPE_IDWSF2_PS_GET_OBJECT_INFO_RESPONSE \
+	(lasso_idwsf2_ps_get_object_info_response_get_type())
+#define LASSO_IDWSF2_PS_GET_OBJECT_INFO_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_PS_GET_OBJECT_INFO_RESPONSE, \
+		LassoIdWsf2PsGetObjectInfoResponse))
+#define LASSO_IDWSF2_PS_GET_OBJECT_INFO_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_PS_GET_OBJECT_INFO_RESPONSE, \
+		LassoIdWsf2PsGetObjectInfoResponseClass))
+#define LASSO_IS_IDWSF2_PS_GET_OBJECT_INFO_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_PS_GET_OBJECT_INFO_RESPONSE))
+#define LASSO_IS_IDWSF2_PS_GET_OBJECT_INFO_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_PS_GET_OBJECT_INFO_RESPONSE))
+#define LASSO_IDWSF2_PS_GET_OBJECT_INFO_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_PS_GET_OBJECT_INFO_RESPONSE, \
+		LassoIdWsf2PsGetObjectInfoResponseClass)) 
+
+
+typedef struct _LassoIdWsf2PsGetObjectInfoResponse LassoIdWsf2PsGetObjectInfoResponse;
+typedef struct _LassoIdWsf2PsGetObjectInfoResponseClass LassoIdWsf2PsGetObjectInfoResponseClass;
+
+
+struct _LassoIdWsf2PsGetObjectInfoResponse {
+	LassoIdWsf2PsResponseAbstract parent;
+
+	/*< public >*/
+	/* elements */
+	/* XXX */ void *Object;
+};
+
+
+struct _LassoIdWsf2PsGetObjectInfoResponseClass {
+	LassoIdWsf2PsResponseAbstractClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ps_get_object_info_response_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsGetObjectInfoResponse* lasso_idwsf2_ps_get_object_info_response_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_PS_GET_OBJECT_INFO_RESPONSE_H__ */
diff --git a/lasso/xml/id-wsf-2.0/ps_item_data.c b/lasso/xml/id-wsf-2.0/ps_item_data.c
new file mode 100644
index 00000000..3c10ebc4
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_item_data.c
@@ -0,0 +1,108 @@
+/* $Id: ps_item_data.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_item_data.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="ItemDataType">
+ *   <xs:sequence>
+ *     <xs:element ref="Object"/>
+ *   </xs:sequence>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Object", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsItemData, Object) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsItemData *node)
+{
+	node->Object = NULL;
+}
+
+static void
+class_init(LassoIdWsf2PsItemDataClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "ItemData");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_item_data_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsItemDataClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsItemData),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2PsItemData", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_item_data_new:
+ *
+ * Creates a new #LassoIdWsf2PsItemData object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsItemData object
+ **/
+LassoIdWsf2PsItemData*
+lasso_idwsf2_ps_item_data_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_ITEM_DATA, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/dstref_sort.h b/lasso/xml/id-wsf-2.0/ps_item_data.h
index 19c5d81a..b48ac4a7 100644
--- a/lasso/xml/id-wsf-2.0/dstref_sort.h
+++ b/lasso/xml/id-wsf-2.0/ps_item_data.h
@@ -1,4 +1,4 @@
-/* $Id: dstref_sort.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+/* $Id: ps_item_data.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
  *
  * Lasso - A free implementation of the Liberty Alliance specifications.
  *
@@ -22,61 +22,61 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __LASSO_IDWSF2_DSTREF_SORT_H__
-#define __LASSO_IDWSF2_DSTREF_SORT_H__
+#ifndef __LASSO_IDWSF2_PS_ITEM_DATA_H__
+#define __LASSO_IDWSF2_PS_ITEM_DATA_H__
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
 #include <lasso/xml/xml.h>
+#include "ps_object.h"
 
-#define LASSO_TYPE_IDWSF2_DSTREF_SORT (lasso_idwsf2_dstref_sort_get_type())
-#define LASSO_IDWSF2_DSTREF_SORT(obj) \
+#define LASSO_TYPE_IDWSF2_PS_ITEM_DATA (lasso_idwsf2_ps_item_data_get_type())
+#define LASSO_IDWSF2_PS_ITEM_DATA(obj) \
 	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
-		LASSO_TYPE_IDWSF2_DSTREF_SORT, \
-		LassoIdWsf2DstRefSort))
-#define LASSO_IDWSF2_DSTREF_SORT_CLASS(klass) \
+		LASSO_TYPE_IDWSF2_PS_ITEM_DATA, \
+		LassoIdWsf2PsItemData))
+#define LASSO_IDWSF2_PS_ITEM_DATA_CLASS(klass) \
 	(G_TYPE_CHECK_CLASS_CAST((klass), \
-		LASSO_TYPE_IDWSF2_DSTREF_SORT, \
-		LassoIdWsf2DstRefSortClass))
-#define LASSO_IS_IDWSF2_DSTREF_SORT(obj) \
+		LASSO_TYPE_IDWSF2_PS_ITEM_DATA, \
+		LassoIdWsf2PsItemDataClass))
+#define LASSO_IS_IDWSF2_PS_ITEM_DATA(obj) \
 	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
-		LASSO_TYPE_IDWSF2_DSTREF_SORT))
-#define LASSO_IS_IDWSF2_DSTREF_SORT_CLASS(klass) \
+		LASSO_TYPE_IDWSF2_PS_ITEM_DATA))
+#define LASSO_IS_IDWSF2_PS_ITEM_DATA_CLASS(klass) \
 	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
-		LASSO_TYPE_IDWSF2_DSTREF_SORT))
-#define LASSO_IDWSF2_DSTREF_SORT_GET_CLASS(o) \
+		LASSO_TYPE_IDWSF2_PS_ITEM_DATA))
+#define LASSO_IDWSF2_PS_ITEM_DATA_GET_CLASS(o) \
 	(G_TYPE_INSTANCE_GET_CLASS ((o), \
-		LASSO_TYPE_IDWSF2_DSTREF_SORT, \
-		LassoIdWsf2DstRefSortClass)) 
+		LASSO_TYPE_IDWSF2_PS_ITEM_DATA, \
+		LassoIdWsf2PsItemDataClass)) 
 
 
-typedef struct _LassoIdWsf2DstRefSort LassoIdWsf2DstRefSort;
-typedef struct _LassoIdWsf2DstRefSortClass LassoIdWsf2DstRefSortClass;
+typedef struct _LassoIdWsf2PsItemData LassoIdWsf2PsItemData;
+typedef struct _LassoIdWsf2PsItemDataClass LassoIdWsf2PsItemDataClass;
 
 
-struct _LassoIdWsf2DstRefSort {
+struct _LassoIdWsf2PsItemData {
 	LassoNode parent;
 
 	/*< public >*/
 	/* elements */
-	char *content;
+	/* XXX */ void *Object;
 };
 
 
-struct _LassoIdWsf2DstRefSortClass {
+struct _LassoIdWsf2PsItemDataClass {
 	LassoNodeClass parent;
 };
 
-LASSO_EXPORT GType lasso_idwsf2_dstref_sort_get_type(void);
-LASSO_EXPORT LassoNode* lasso_idwsf2_dstref_sort_new(void);
+LASSO_EXPORT GType lasso_idwsf2_ps_item_data_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsItemData* lasso_idwsf2_ps_item_data_new(void);
 
-LASSO_EXPORT LassoNode* lasso_idwsf2_dstref_sort_new_with_string(char *content);
 
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* __LASSO_IDWSF2_DSTREF_SORT_H__ */
+#endif /* __LASSO_IDWSF2_PS_ITEM_DATA_H__ */
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
new file mode 100644
index 00000000..ed903a46
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_list_members_request.c
@@ -0,0 +1,128 @@
+/* $Id: ps_list_members_request.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_list_members_request.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="ListMembersRequestType">
+ *   <xs:complexContent>
+ *     <xs:extension base="RequestAbstractType">
+ *       <xs:sequence>
+ *         <xs:element ref="TargetObjectID" minOccurs="0"/>
+ *         <xs:element ref="Subscription" minOccurs="0"/>
+ *       </xs:sequence>
+ *       <xs:attribute name="Structured" type="xs:anyURI" use="optional"/>
+ *       <xs:attribute name="Count" type="xs:nonNegativeInteger" use="optional"/>
+ *       <xs:attribute name="Offset" type="xs:nonNegativeInteger" default="0" use="optional"/>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "TargetObjectID", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsListMembersRequest, TargetObjectID) },
+	{ "Subscription", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsListMembersRequest, Subscription) },
+	{ "Structured", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2PsListMembersRequest, Structured) },
+	{ "Count", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL_NEG,
+		G_STRUCT_OFFSET(LassoIdWsf2PsListMembersRequest, Count) },
+	{ "Offset", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL_NEG,
+		G_STRUCT_OFFSET(LassoIdWsf2PsListMembersRequest, Offset) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsListMembersRequest *node)
+{
+	node->TargetObjectID = NULL;
+	node->Subscription = NULL;
+	node->Structured = NULL;
+	node->Count = -1;
+	node->Offset = -1;
+}
+
+static void
+class_init(LassoIdWsf2PsListMembersRequestClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "ListMembersRequest");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_list_members_request_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsListMembersRequestClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsListMembersRequest),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
+				"LassoIdWsf2PsListMembersRequest", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_list_members_request_new:
+ *
+ * Creates a new #LassoIdWsf2PsListMembersRequest object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsListMembersRequest object
+ **/
+LassoIdWsf2PsListMembersRequest*
+lasso_idwsf2_ps_list_members_request_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_LIST_MEMBERS_REQUEST, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ps_list_members_request.h b/lasso/xml/id-wsf-2.0/ps_list_members_request.h
new file mode 100644
index 00000000..e21af0b8
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_list_members_request.h
@@ -0,0 +1,88 @@
+/* $Id: ps_list_members_request.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_PS_LIST_MEMBERS_REQUEST_H__
+#define __LASSO_IDWSF2_PS_LIST_MEMBERS_REQUEST_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "subs_subscription.h"
+#include "ps_request_abstract.h"
+
+#define LASSO_TYPE_IDWSF2_PS_LIST_MEMBERS_REQUEST (lasso_idwsf2_ps_list_members_request_get_type())
+#define LASSO_IDWSF2_PS_LIST_MEMBERS_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_PS_LIST_MEMBERS_REQUEST, \
+		LassoIdWsf2PsListMembersRequest))
+#define LASSO_IDWSF2_PS_LIST_MEMBERS_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_PS_LIST_MEMBERS_REQUEST, \
+		LassoIdWsf2PsListMembersRequestClass))
+#define LASSO_IS_IDWSF2_PS_LIST_MEMBERS_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_PS_LIST_MEMBERS_REQUEST))
+#define LASSO_IS_IDWSF2_PS_LIST_MEMBERS_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_PS_LIST_MEMBERS_REQUEST))
+#define LASSO_IDWSF2_PS_LIST_MEMBERS_REQUEST_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_PS_LIST_MEMBERS_REQUEST, \
+		LassoIdWsf2PsListMembersRequestClass)) 
+
+
+typedef struct _LassoIdWsf2PsListMembersRequest LassoIdWsf2PsListMembersRequest;
+typedef struct _LassoIdWsf2PsListMembersRequestClass LassoIdWsf2PsListMembersRequestClass;
+
+
+struct _LassoIdWsf2PsListMembersRequest {
+	LassoIdWsf2PsRequestAbstract parent;
+
+	/*< public >*/
+	/* elements */
+	/* XXX */ void *TargetObjectID;
+	/* XXX */ void *Subscription;
+	/* attributes */
+	char *Structured;
+	int Count;
+	int Offset;
+};
+
+
+struct _LassoIdWsf2PsListMembersRequestClass {
+	LassoIdWsf2PsRequestAbstractClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ps_list_members_request_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsListMembersRequest* lasso_idwsf2_ps_list_members_request_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_PS_LIST_MEMBERS_REQUEST_H__ */
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
new file mode 100644
index 00000000..87a1ed8b
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_list_members_response.c
@@ -0,0 +1,112 @@
+/* $Id: ps_list_members_response.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_list_members_response.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="ListMembersResponseType">
+ *   <xs:complexContent>
+ *     <xs:extension base="ResponseAbstractType">
+ *       <xs:sequence>
+ *         <xs:element ref="Object" minOccurs="0" maxOccurs="unbounded"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Object", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2PsListMembersResponse, Object) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsListMembersResponse *node)
+{
+	node->Object = NULL;
+}
+
+static void
+class_init(LassoIdWsf2PsListMembersResponseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "ListMembersResponse");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_list_members_response_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsListMembersResponseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsListMembersResponse),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_RESPONSE_ABSTRACT,
+				"LassoIdWsf2PsListMembersResponse", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_list_members_response_new:
+ *
+ * Creates a new #LassoIdWsf2PsListMembersResponse object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsListMembersResponse object
+ **/
+LassoIdWsf2PsListMembersResponse*
+lasso_idwsf2_ps_list_members_response_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_LIST_MEMBERS_RESPONSE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ps_list_members_response.h b/lasso/xml/id-wsf-2.0/ps_list_members_response.h
new file mode 100644
index 00000000..d985404e
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_list_members_response.h
@@ -0,0 +1,82 @@
+/* $Id: ps_list_members_response.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_PS_LIST_MEMBERS_RESPONSE_H__
+#define __LASSO_IDWSF2_PS_LIST_MEMBERS_RESPONSE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "ps_response_abstract.h"
+
+#define LASSO_TYPE_IDWSF2_PS_LIST_MEMBERS_RESPONSE (lasso_idwsf2_ps_list_members_response_get_type())
+#define LASSO_IDWSF2_PS_LIST_MEMBERS_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_PS_LIST_MEMBERS_RESPONSE, \
+		LassoIdWsf2PsListMembersResponse))
+#define LASSO_IDWSF2_PS_LIST_MEMBERS_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_PS_LIST_MEMBERS_RESPONSE, \
+		LassoIdWsf2PsListMembersResponseClass))
+#define LASSO_IS_IDWSF2_PS_LIST_MEMBERS_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_PS_LIST_MEMBERS_RESPONSE))
+#define LASSO_IS_IDWSF2_PS_LIST_MEMBERS_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_PS_LIST_MEMBERS_RESPONSE))
+#define LASSO_IDWSF2_PS_LIST_MEMBERS_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_PS_LIST_MEMBERS_RESPONSE, \
+		LassoIdWsf2PsListMembersResponseClass)) 
+
+
+typedef struct _LassoIdWsf2PsListMembersResponse LassoIdWsf2PsListMembersResponse;
+typedef struct _LassoIdWsf2PsListMembersResponseClass LassoIdWsf2PsListMembersResponseClass;
+
+
+struct _LassoIdWsf2PsListMembersResponse {
+	LassoIdWsf2PsResponseAbstract parent;
+
+	/*< public >*/
+	/* elements */
+	GList *Object;
+};
+
+
+struct _LassoIdWsf2PsListMembersResponseClass {
+	LassoIdWsf2PsResponseAbstractClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ps_list_members_response_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsListMembersResponse* lasso_idwsf2_ps_list_members_response_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_PS_LIST_MEMBERS_RESPONSE_H__ */
diff --git a/lasso/xml/id-wsf-2.0/ps_notification.c b/lasso/xml/id-wsf-2.0/ps_notification.c
new file mode 100644
index 00000000..904957e7
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_notification.c
@@ -0,0 +1,112 @@
+/* $Id: ps_notification.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_notification.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="NotificationType">
+ *   <xs:complexContent>
+ *     <xs:extension base="subs:NotificationType">
+ *       <xs:sequence>
+ *         <xs:element ref="ItemData" minOccurs="0" maxOccurs="unbounded"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "ItemData", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2PsNotification, ItemData) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsNotification *node)
+{
+	node->ItemData = NULL;
+}
+
+static void
+class_init(LassoIdWsf2PsNotificationClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Notification");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_notification_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsNotificationClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsNotification),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_SUBS_NOTIFICATION,
+				"LassoIdWsf2PsNotification", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_notification_new:
+ *
+ * Creates a new #LassoIdWsf2PsNotification object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsNotification object
+ **/
+LassoIdWsf2PsNotification*
+lasso_idwsf2_ps_notification_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_NOTIFICATION, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ps_notification.h b/lasso/xml/id-wsf-2.0/ps_notification.h
new file mode 100644
index 00000000..36ded648
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_notification.h
@@ -0,0 +1,82 @@
+/* $Id: ps_notification.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_PS_NOTIFICATION_H__
+#define __LASSO_IDWSF2_PS_NOTIFICATION_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "subs_notification.h"
+
+#define LASSO_TYPE_IDWSF2_PS_NOTIFICATION (lasso_idwsf2_ps_notification_get_type())
+#define LASSO_IDWSF2_PS_NOTIFICATION(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_PS_NOTIFICATION, \
+		LassoIdWsf2PsNotification))
+#define LASSO_IDWSF2_PS_NOTIFICATION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_PS_NOTIFICATION, \
+		LassoIdWsf2PsNotificationClass))
+#define LASSO_IS_IDWSF2_PS_NOTIFICATION(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_PS_NOTIFICATION))
+#define LASSO_IS_IDWSF2_PS_NOTIFICATION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_PS_NOTIFICATION))
+#define LASSO_IDWSF2_PS_NOTIFICATION_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_PS_NOTIFICATION, \
+		LassoIdWsf2PsNotificationClass)) 
+
+
+typedef struct _LassoIdWsf2PsNotification LassoIdWsf2PsNotification;
+typedef struct _LassoIdWsf2PsNotificationClass LassoIdWsf2PsNotificationClass;
+
+
+struct _LassoIdWsf2PsNotification {
+	LassoIdWsf2SubsNotification parent;
+
+	/*< public >*/
+	/* elements */
+	GList *ItemData;
+};
+
+
+struct _LassoIdWsf2PsNotificationClass {
+	LassoIdWsf2SubsNotificationClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ps_notification_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsNotification* lasso_idwsf2_ps_notification_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_PS_NOTIFICATION_H__ */
diff --git a/lasso/xml/id-wsf-2.0/ps_notify.c b/lasso/xml/id-wsf-2.0/ps_notify.c
new file mode 100644
index 00000000..7ceea243
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_notify.c
@@ -0,0 +1,116 @@
+/* $Id: ps_notify.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_notify.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="NotifyType">
+ *   <xs:complexContent>
+ *     <xs:extension base="RequestAbstractType">
+ *       <xs:sequence>
+ *         <xs:element ref="Notification" minOccurs="0" maxOccurs="unbounded"/>
+ *       </xs:sequence>
+ *       <xs:attributeGroup ref="subs:NotifyAttributeGroup"/>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Notification", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2PsNotify, Notification) },
+	{ "timeStamp", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2PsNotify, timeStamp) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsNotify *node)
+{
+	node->Notification = NULL;
+	node->timeStamp = NULL;
+}
+
+static void
+class_init(LassoIdWsf2PsNotifyClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Notify");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_notify_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsNotifyClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsNotify),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
+				"LassoIdWsf2PsNotify", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_notify_new:
+ *
+ * Creates a new #LassoIdWsf2PsNotify object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsNotify object
+ **/
+LassoIdWsf2PsNotify*
+lasso_idwsf2_ps_notify_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_NOTIFY, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ps_notify.h b/lasso/xml/id-wsf-2.0/ps_notify.h
new file mode 100644
index 00000000..c10abc56
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_notify.h
@@ -0,0 +1,84 @@
+/* $Id: ps_notify.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_PS_NOTIFY_H__
+#define __LASSO_IDWSF2_PS_NOTIFY_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "ps_request_abstract.h"
+
+#define LASSO_TYPE_IDWSF2_PS_NOTIFY (lasso_idwsf2_ps_notify_get_type())
+#define LASSO_IDWSF2_PS_NOTIFY(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_PS_NOTIFY, \
+		LassoIdWsf2PsNotify))
+#define LASSO_IDWSF2_PS_NOTIFY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_PS_NOTIFY, \
+		LassoIdWsf2PsNotifyClass))
+#define LASSO_IS_IDWSF2_PS_NOTIFY(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_PS_NOTIFY))
+#define LASSO_IS_IDWSF2_PS_NOTIFY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_PS_NOTIFY))
+#define LASSO_IDWSF2_PS_NOTIFY_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_PS_NOTIFY, \
+		LassoIdWsf2PsNotifyClass)) 
+
+
+typedef struct _LassoIdWsf2PsNotify LassoIdWsf2PsNotify;
+typedef struct _LassoIdWsf2PsNotifyClass LassoIdWsf2PsNotifyClass;
+
+
+struct _LassoIdWsf2PsNotify {
+	LassoIdWsf2PsRequestAbstract parent;
+
+	/*< public >*/
+	/* elements */
+	GList *Notification;
+	/* attributes */
+	char *timeStamp;
+};
+
+
+struct _LassoIdWsf2PsNotifyClass {
+	LassoIdWsf2PsRequestAbstractClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ps_notify_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsNotify* lasso_idwsf2_ps_notify_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_PS_NOTIFY_H__ */
diff --git a/lasso/xml/id-wsf-2.0/ps_object.c b/lasso/xml/id-wsf-2.0/ps_object.c
new file mode 100644
index 00000000..f44c4cda
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_object.c
@@ -0,0 +1,137 @@
+/* $Id: ps_object.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_object.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="ObjectType">
+ *   <xs:sequence>
+ *     <xs:element ref="ObjectID" minOccurs="0"/>
+ *     <xs:element name="DisplayName" type="LocalizedDisplayNameType" minOccurs="1"
+ *             maxOccurs="unbounded"/>
+ *     <xs:element name="Tag" type="TagType" minOccurs="0"/>
+ *     <xs:element ref="Object" minOccurs="0" maxOccurs="unbounded"/>
+ *     <xs:element name="ObjectRef" type="ObjectIDType" minOccurs="0" maxOccurs="unbounded"/>
+ *   </xs:sequence>
+ *   <xs:attribute name="NodeType" type="xs:anyURI" use="required"/>
+ *   <xs:attribute name="CreatedDateTime" type="xs:dateTime" use="optional"/>
+ *   <xs:attribute name="ModifiedDateTime" type="xs:dateTime" use="optional"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "ObjectID", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsObject, ObjectID) },
+	{ "DisplayName", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2PsObject, DisplayName) },
+	{ "Tag", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsObject, Tag) },
+	{ "Object", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2PsObject, Object) },
+	{ "ObjectRef", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2PsObject, ObjectRef) },
+	{ "NodeType", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsObject, NodeType) },
+	{ "CreatedDateTime", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2PsObject, CreatedDateTime) },
+	{ "ModifiedDateTime", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2PsObject, ModifiedDateTime) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsObject *node)
+{
+	node->ObjectID = NULL;
+	node->DisplayName = NULL;
+	node->Tag = NULL;
+	node->Object = NULL;
+	node->ObjectRef = NULL;
+	node->NodeType = NULL;
+	node->CreatedDateTime = NULL;
+	node->ModifiedDateTime = NULL;
+}
+
+static void
+class_init(LassoIdWsf2PsObjectClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Object");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_object_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsObjectClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsObject),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2PsObject", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_object_new:
+ *
+ * Creates a new #LassoIdWsf2PsObject object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsObject object
+ **/
+LassoIdWsf2PsObject*
+lasso_idwsf2_ps_object_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_OBJECT, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ps_object.h b/lasso/xml/id-wsf-2.0/ps_object.h
new file mode 100644
index 00000000..5177d571
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_object.h
@@ -0,0 +1,89 @@
+/* $Id: ps_object.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_PS_OBJECT_H__
+#define __LASSO_IDWSF2_PS_OBJECT_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_PS_OBJECT (lasso_idwsf2_ps_object_get_type())
+#define LASSO_IDWSF2_PS_OBJECT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_PS_OBJECT, \
+		LassoIdWsf2PsObject))
+#define LASSO_IDWSF2_PS_OBJECT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_PS_OBJECT, \
+		LassoIdWsf2PsObjectClass))
+#define LASSO_IS_IDWSF2_PS_OBJECT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_PS_OBJECT))
+#define LASSO_IS_IDWSF2_PS_OBJECT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_PS_OBJECT))
+#define LASSO_IDWSF2_PS_OBJECT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_PS_OBJECT, \
+		LassoIdWsf2PsObjectClass)) 
+
+
+typedef struct _LassoIdWsf2PsObject LassoIdWsf2PsObject;
+typedef struct _LassoIdWsf2PsObjectClass LassoIdWsf2PsObjectClass;
+
+
+struct _LassoIdWsf2PsObject {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	/* XXX */ void *ObjectID;
+	GList *DisplayName;
+	/* XXX */ void *Tag;
+	GList *Object;
+	GList *ObjectRef;
+	/* attributes */
+	char *NodeType;
+	char *CreatedDateTime;
+	char *ModifiedDateTime;
+};
+
+
+struct _LassoIdWsf2PsObjectClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ps_object_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsObject* lasso_idwsf2_ps_object_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_PS_OBJECT_H__ */
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
new file mode 100644
index 00000000..26979d11
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_query_objects_request.c
@@ -0,0 +1,124 @@
+/* $Id: ps_query_objects_request.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_query_objects_request.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="QueryObjectsRequestType">
+ *   <xs:complexContent>
+ *     <xs:extension base="RequestAbstractType">
+ *       <xs:sequence>
+ *         <xs:element name="Filter" type="xs:string"/>
+ *         <xs:element ref="Subscription" minOccurs="0"/>
+ *       </xs:sequence>
+ *       <xs:attribute name="Count" type="xs:nonNegativeInteger" use="optional"/>
+ *       <xs:attribute name="Offset" type="xs:nonNegativeInteger" default="0" use="optional"/>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Filter", SNIPPET_CONTENT,
+		G_STRUCT_OFFSET(LassoIdWsf2PsQueryObjectsRequest, Filter) },
+	{ "Subscription", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsQueryObjectsRequest, Subscription) },
+	{ "Count", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL_NEG,
+		G_STRUCT_OFFSET(LassoIdWsf2PsQueryObjectsRequest, Count) },
+	{ "Offset", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL_NEG,
+		G_STRUCT_OFFSET(LassoIdWsf2PsQueryObjectsRequest, Offset) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsQueryObjectsRequest *node)
+{
+	node->Filter = NULL;
+	node->Subscription = NULL;
+	node->Count = -1;
+	node->Offset = -1;
+}
+
+static void
+class_init(LassoIdWsf2PsQueryObjectsRequestClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "QueryObjectsRequest");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_query_objects_request_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsQueryObjectsRequestClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsQueryObjectsRequest),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
+				"LassoIdWsf2PsQueryObjectsRequest", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_query_objects_request_new:
+ *
+ * Creates a new #LassoIdWsf2PsQueryObjectsRequest object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsQueryObjectsRequest object
+ **/
+LassoIdWsf2PsQueryObjectsRequest*
+lasso_idwsf2_ps_query_objects_request_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_QUERY_OBJECTS_REQUEST, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ps_query_objects_request.h b/lasso/xml/id-wsf-2.0/ps_query_objects_request.h
new file mode 100644
index 00000000..973f71fc
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_query_objects_request.h
@@ -0,0 +1,87 @@
+/* $Id: ps_query_objects_request.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_PS_QUERY_OBJECTS_REQUEST_H__
+#define __LASSO_IDWSF2_PS_QUERY_OBJECTS_REQUEST_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "subs_subscription.h"
+#include "ps_request_abstract.h"
+
+#define LASSO_TYPE_IDWSF2_PS_QUERY_OBJECTS_REQUEST (lasso_idwsf2_ps_query_objects_request_get_type())
+#define LASSO_IDWSF2_PS_QUERY_OBJECTS_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_PS_QUERY_OBJECTS_REQUEST, \
+		LassoIdWsf2PsQueryObjectsRequest))
+#define LASSO_IDWSF2_PS_QUERY_OBJECTS_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_PS_QUERY_OBJECTS_REQUEST, \
+		LassoIdWsf2PsQueryObjectsRequestClass))
+#define LASSO_IS_IDWSF2_PS_QUERY_OBJECTS_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_PS_QUERY_OBJECTS_REQUEST))
+#define LASSO_IS_IDWSF2_PS_QUERY_OBJECTS_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_PS_QUERY_OBJECTS_REQUEST))
+#define LASSO_IDWSF2_PS_QUERY_OBJECTS_REQUEST_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_PS_QUERY_OBJECTS_REQUEST, \
+		LassoIdWsf2PsQueryObjectsRequestClass)) 
+
+
+typedef struct _LassoIdWsf2PsQueryObjectsRequest LassoIdWsf2PsQueryObjectsRequest;
+typedef struct _LassoIdWsf2PsQueryObjectsRequestClass LassoIdWsf2PsQueryObjectsRequestClass;
+
+
+struct _LassoIdWsf2PsQueryObjectsRequest {
+	LassoIdWsf2PsRequestAbstract parent;
+
+	/*< public >*/
+	/* elements */
+	char *Filter;
+	/* XXX */ void *Subscription;
+	/* attributes */
+	int Count;
+	int Offset;
+};
+
+
+struct _LassoIdWsf2PsQueryObjectsRequestClass {
+	LassoIdWsf2PsRequestAbstractClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ps_query_objects_request_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsQueryObjectsRequest* lasso_idwsf2_ps_query_objects_request_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_PS_QUERY_OBJECTS_REQUEST_H__ */
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
new file mode 100644
index 00000000..5377dcc9
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_query_objects_response.c
@@ -0,0 +1,112 @@
+/* $Id: ps_query_objects_response.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_query_objects_response.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="QueryObjectsResponseType">
+ *   <xs:complexContent>
+ *     <xs:extension base="ResponseAbstractType">
+ *       <xs:sequence>
+ *         <xs:element ref="Object" minOccurs="0" maxOccurs="unbounded"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Object", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2PsQueryObjectsResponse, Object) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsQueryObjectsResponse *node)
+{
+	node->Object = NULL;
+}
+
+static void
+class_init(LassoIdWsf2PsQueryObjectsResponseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "QueryObjectsResponse");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_query_objects_response_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsQueryObjectsResponseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsQueryObjectsResponse),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_RESPONSE_ABSTRACT,
+				"LassoIdWsf2PsQueryObjectsResponse", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_query_objects_response_new:
+ *
+ * Creates a new #LassoIdWsf2PsQueryObjectsResponse object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsQueryObjectsResponse object
+ **/
+LassoIdWsf2PsQueryObjectsResponse*
+lasso_idwsf2_ps_query_objects_response_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_QUERY_OBJECTS_RESPONSE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ps_query_objects_response.h b/lasso/xml/id-wsf-2.0/ps_query_objects_response.h
new file mode 100644
index 00000000..73e553a6
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_query_objects_response.h
@@ -0,0 +1,83 @@
+/* $Id: ps_query_objects_response.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_PS_QUERY_OBJECTS_RESPONSE_H__
+#define __LASSO_IDWSF2_PS_QUERY_OBJECTS_RESPONSE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "ps_response_abstract.h"
+
+#define LASSO_TYPE_IDWSF2_PS_QUERY_OBJECTS_RESPONSE \
+	(lasso_idwsf2_ps_query_objects_response_get_type())
+#define LASSO_IDWSF2_PS_QUERY_OBJECTS_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_PS_QUERY_OBJECTS_RESPONSE, \
+		LassoIdWsf2PsQueryObjectsResponse))
+#define LASSO_IDWSF2_PS_QUERY_OBJECTS_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_PS_QUERY_OBJECTS_RESPONSE, \
+		LassoIdWsf2PsQueryObjectsResponseClass))
+#define LASSO_IS_IDWSF2_PS_QUERY_OBJECTS_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_PS_QUERY_OBJECTS_RESPONSE))
+#define LASSO_IS_IDWSF2_PS_QUERY_OBJECTS_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_PS_QUERY_OBJECTS_RESPONSE))
+#define LASSO_IDWSF2_PS_QUERY_OBJECTS_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_PS_QUERY_OBJECTS_RESPONSE, \
+		LassoIdWsf2PsQueryObjectsResponseClass)) 
+
+
+typedef struct _LassoIdWsf2PsQueryObjectsResponse LassoIdWsf2PsQueryObjectsResponse;
+typedef struct _LassoIdWsf2PsQueryObjectsResponseClass LassoIdWsf2PsQueryObjectsResponseClass;
+
+
+struct _LassoIdWsf2PsQueryObjectsResponse {
+	LassoIdWsf2PsResponseAbstract parent;
+
+	/*< public >*/
+	/* elements */
+	GList *Object;
+};
+
+
+struct _LassoIdWsf2PsQueryObjectsResponseClass {
+	LassoIdWsf2PsResponseAbstractClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ps_query_objects_response_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsQueryObjectsResponse* lasso_idwsf2_ps_query_objects_response_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_PS_QUERY_OBJECTS_RESPONSE_H__ */
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
new file mode 100644
index 00000000..02f51338
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_remove_collection_request.c
@@ -0,0 +1,112 @@
+/* $Id: ps_remove_collection_request.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_remove_collection_request.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="RemoveCollectionRequestType">
+ *   <xs:complexContent>
+ *     <xs:extension base="RequestAbstractType">
+ *       <xs:sequence>
+ *         <xs:element ref="TargetObjectID" maxOccurs="unbounded"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "TargetObjectID", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2PsRemoveCollectionRequest, TargetObjectID) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsRemoveCollectionRequest *node)
+{
+	node->TargetObjectID = NULL;
+}
+
+static void
+class_init(LassoIdWsf2PsRemoveCollectionRequestClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "RemoveCollectionRequest");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_remove_collection_request_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsRemoveCollectionRequestClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsRemoveCollectionRequest),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
+				"LassoIdWsf2PsRemoveCollectionRequest", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_remove_collection_request_new:
+ *
+ * Creates a new #LassoIdWsf2PsRemoveCollectionRequest object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsRemoveCollectionRequest object
+ **/
+LassoIdWsf2PsRemoveCollectionRequest*
+lasso_idwsf2_ps_remove_collection_request_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_REMOVE_COLLECTION_REQUEST, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ps_remove_collection_request.h b/lasso/xml/id-wsf-2.0/ps_remove_collection_request.h
new file mode 100644
index 00000000..89840c84
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_remove_collection_request.h
@@ -0,0 +1,85 @@
+/* $Id: ps_remove_collection_request.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_PS_REMOVE_COLLECTION_REQUEST_H__
+#define __LASSO_IDWSF2_PS_REMOVE_COLLECTION_REQUEST_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "ps_request_abstract.h"
+
+#define LASSO_TYPE_IDWSF2_PS_REMOVE_COLLECTION_REQUEST \
+	(lasso_idwsf2_ps_remove_collection_request_get_type())
+#define LASSO_IDWSF2_PS_REMOVE_COLLECTION_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_PS_REMOVE_COLLECTION_REQUEST, \
+		LassoIdWsf2PsRemoveCollectionRequest))
+#define LASSO_IDWSF2_PS_REMOVE_COLLECTION_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_PS_REMOVE_COLLECTION_REQUEST, \
+		LassoIdWsf2PsRemoveCollectionRequestClass))
+#define LASSO_IS_IDWSF2_PS_REMOVE_COLLECTION_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_PS_REMOVE_COLLECTION_REQUEST))
+#define LASSO_IS_IDWSF2_PS_REMOVE_COLLECTION_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_PS_REMOVE_COLLECTION_REQUEST))
+#define LASSO_IDWSF2_PS_REMOVE_COLLECTION_REQUEST_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_PS_REMOVE_COLLECTION_REQUEST, \
+		LassoIdWsf2PsRemoveCollectionRequestClass)) 
+
+
+typedef struct _LassoIdWsf2PsRemoveCollectionRequest \
+	LassoIdWsf2PsRemoveCollectionRequest;
+typedef struct _LassoIdWsf2PsRemoveCollectionRequestClass \
+	LassoIdWsf2PsRemoveCollectionRequestClass;
+
+
+struct _LassoIdWsf2PsRemoveCollectionRequest {
+	LassoIdWsf2PsRequestAbstract parent;
+
+	/*< public >*/
+	/* elements */
+	GList *TargetObjectID;
+};
+
+
+struct _LassoIdWsf2PsRemoveCollectionRequestClass {
+	LassoIdWsf2PsRequestAbstractClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ps_remove_collection_request_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsRemoveCollectionRequest* lasso_idwsf2_ps_remove_collection_request_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_PS_REMOVE_COLLECTION_REQUEST_H__ */
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
new file mode 100644
index 00000000..9ba3af92
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_remove_entity_request.c
@@ -0,0 +1,112 @@
+/* $Id: ps_remove_entity_request.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_remove_entity_request.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="RemoveEntityRequestType">
+ *   <xs:complexContent>
+ *     <xs:extension base="RequestAbstractType">
+ *       <xs:sequence>
+ *         <xs:element ref="TargetObjectID" maxOccurs="unbounded"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "TargetObjectID", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2PsRemoveEntityRequest, TargetObjectID) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsRemoveEntityRequest *node)
+{
+	node->TargetObjectID = NULL;
+}
+
+static void
+class_init(LassoIdWsf2PsRemoveEntityRequestClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "RemoveEntityRequest");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_remove_entity_request_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsRemoveEntityRequestClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsRemoveEntityRequest),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
+				"LassoIdWsf2PsRemoveEntityRequest", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_remove_entity_request_new:
+ *
+ * Creates a new #LassoIdWsf2PsRemoveEntityRequest object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsRemoveEntityRequest object
+ **/
+LassoIdWsf2PsRemoveEntityRequest*
+lasso_idwsf2_ps_remove_entity_request_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_REMOVE_ENTITY_REQUEST, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ps_remove_entity_request.h b/lasso/xml/id-wsf-2.0/ps_remove_entity_request.h
new file mode 100644
index 00000000..3ab42ec5
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_remove_entity_request.h
@@ -0,0 +1,82 @@
+/* $Id: ps_remove_entity_request.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_PS_REMOVE_ENTITY_REQUEST_H__
+#define __LASSO_IDWSF2_PS_REMOVE_ENTITY_REQUEST_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "ps_request_abstract.h"
+
+#define LASSO_TYPE_IDWSF2_PS_REMOVE_ENTITY_REQUEST (lasso_idwsf2_ps_remove_entity_request_get_type())
+#define LASSO_IDWSF2_PS_REMOVE_ENTITY_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_PS_REMOVE_ENTITY_REQUEST, \
+		LassoIdWsf2PsRemoveEntityRequest))
+#define LASSO_IDWSF2_PS_REMOVE_ENTITY_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_PS_REMOVE_ENTITY_REQUEST, \
+		LassoIdWsf2PsRemoveEntityRequestClass))
+#define LASSO_IS_IDWSF2_PS_REMOVE_ENTITY_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_PS_REMOVE_ENTITY_REQUEST))
+#define LASSO_IS_IDWSF2_PS_REMOVE_ENTITY_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_PS_REMOVE_ENTITY_REQUEST))
+#define LASSO_IDWSF2_PS_REMOVE_ENTITY_REQUEST_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_PS_REMOVE_ENTITY_REQUEST, \
+		LassoIdWsf2PsRemoveEntityRequestClass)) 
+
+
+typedef struct _LassoIdWsf2PsRemoveEntityRequest LassoIdWsf2PsRemoveEntityRequest;
+typedef struct _LassoIdWsf2PsRemoveEntityRequestClass LassoIdWsf2PsRemoveEntityRequestClass;
+
+
+struct _LassoIdWsf2PsRemoveEntityRequest {
+	LassoIdWsf2PsRequestAbstract parent;
+
+	/*< public >*/
+	/* elements */
+	GList *TargetObjectID;
+};
+
+
+struct _LassoIdWsf2PsRemoveEntityRequestClass {
+	LassoIdWsf2PsRequestAbstractClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ps_remove_entity_request_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsRemoveEntityRequest* lasso_idwsf2_ps_remove_entity_request_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_PS_REMOVE_ENTITY_REQUEST_H__ */
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
new file mode 100644
index 00000000..7727cd7d
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.c
@@ -0,0 +1,120 @@
+/* $Id: ps_remove_from_collection_request.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_remove_from_collection_request.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="RemoveFromCollectionRequestType">
+ *   <xs:complexContent>
+ *     <xs:extension base="RequestAbstractType">
+ *       <xs:sequence>
+ *         <xs:element ref="TargetObjectID"/>
+ *         <xs:element ref="ObjectID" maxOccurs="unbounded"/>
+ *         <xs:element ref="Subscription" minOccurs="0"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "TargetObjectID", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsRemoveFromCollectionRequest, TargetObjectID) },
+	{ "ObjectID", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2PsRemoveFromCollectionRequest, ObjectID) },
+	{ "Subscription", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsRemoveFromCollectionRequest, Subscription) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsRemoveFromCollectionRequest *node)
+{
+	node->TargetObjectID = NULL;
+	node->ObjectID = NULL;
+	node->Subscription = NULL;
+}
+
+static void
+class_init(LassoIdWsf2PsRemoveFromCollectionRequestClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "RemoveFromCollectionRequest");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_remove_from_collection_request_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsRemoveFromCollectionRequestClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsRemoveFromCollectionRequest),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
+				"LassoIdWsf2PsRemoveFromCollectionRequest", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_remove_from_collection_request_new:
+ *
+ * Creates a new #LassoIdWsf2PsRemoveFromCollectionRequest object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsRemoveFromCollectionRequest object
+ **/
+LassoIdWsf2PsRemoveFromCollectionRequest*
+lasso_idwsf2_ps_remove_from_collection_request_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_REMOVE_FROM_COLLECTION_REQUEST, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.h b/lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.h
new file mode 100644
index 00000000..3bb42345
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.h
@@ -0,0 +1,88 @@
+/* $Id: ps_remove_from_collection_request.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_PS_REMOVE_FROM_COLLECTION_REQUEST_H__
+#define __LASSO_IDWSF2_PS_REMOVE_FROM_COLLECTION_REQUEST_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "subs_subscription.h"
+#include "ps_request_abstract.h"
+
+#define LASSO_TYPE_IDWSF2_PS_REMOVE_FROM_COLLECTION_REQUEST \
+	(lasso_idwsf2_ps_remove_from_collection_request_get_type())
+#define LASSO_IDWSF2_PS_REMOVE_FROM_COLLECTION_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_PS_REMOVE_FROM_COLLECTION_REQUEST, \
+		LassoIdWsf2PsRemoveFromCollectionRequest))
+#define LASSO_IDWSF2_PS_REMOVE_FROM_COLLECTION_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_PS_REMOVE_FROM_COLLECTION_REQUEST, \
+		LassoIdWsf2PsRemoveFromCollectionRequestClass))
+#define LASSO_IS_IDWSF2_PS_REMOVE_FROM_COLLECTION_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_PS_REMOVE_FROM_COLLECTION_REQUEST))
+#define LASSO_IS_IDWSF2_PS_REMOVE_FROM_COLLECTION_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_PS_REMOVE_FROM_COLLECTION_REQUEST))
+#define LASSO_IDWSF2_PS_REMOVE_FROM_COLLECTION_REQUEST_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_PS_REMOVE_FROM_COLLECTION_REQUEST, \
+		LassoIdWsf2PsRemoveFromCollectionRequestClass)) 
+
+
+typedef struct _LassoIdWsf2PsRemoveFromCollectionRequest \
+	LassoIdWsf2PsRemoveFromCollectionRequest;
+typedef struct _LassoIdWsf2PsRemoveFromCollectionRequestClass \
+	LassoIdWsf2PsRemoveFromCollectionRequestClass;
+
+
+struct _LassoIdWsf2PsRemoveFromCollectionRequest {
+	LassoIdWsf2PsRequestAbstract parent;
+
+	/*< public >*/
+	/* elements */
+	/* XXX */ void *TargetObjectID;
+	GList *ObjectID;
+	/* XXX */ void *Subscription;
+};
+
+
+struct _LassoIdWsf2PsRemoveFromCollectionRequestClass {
+	LassoIdWsf2PsRequestAbstractClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ps_remove_from_collection_request_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsRemoveFromCollectionRequest* lasso_idwsf2_ps_remove_from_collection_request_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_PS_REMOVE_FROM_COLLECTION_REQUEST_H__ */
diff --git a/lasso/xml/id-wsf-2.0/ps_request_abstract.c b/lasso/xml/id-wsf-2.0/ps_request_abstract.c
new file mode 100644
index 00000000..3f0959f0
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_request_abstract.c
@@ -0,0 +1,107 @@
+/* $Id: ps_request_abstract.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_request_abstract.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="RequestAbstractType" abstract="true">
+ *   <xs:anyAttribute namespace="##other" processContents="lax"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoIdWsf2PsRequestAbstract, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsRequestAbstract *node)
+{
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoIdWsf2PsRequestAbstractClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "RequestAbstract");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_request_abstract_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsRequestAbstractClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsRequestAbstract),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2PsRequestAbstract", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_request_abstract_new:
+ *
+ * Creates a new #LassoIdWsf2PsRequestAbstract object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsRequestAbstract object
+ **/
+LassoIdWsf2PsRequestAbstract*
+lasso_idwsf2_ps_request_abstract_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ps_request_abstract.h b/lasso/xml/id-wsf-2.0/ps_request_abstract.h
new file mode 100644
index 00000000..b0b033f5
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_request_abstract.h
@@ -0,0 +1,81 @@
+/* $Id: ps_request_abstract.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_PS_REQUEST_ABSTRACT_H__
+#define __LASSO_IDWSF2_PS_REQUEST_ABSTRACT_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT (lasso_idwsf2_ps_request_abstract_get_type())
+#define LASSO_IDWSF2_PS_REQUEST_ABSTRACT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT, \
+		LassoIdWsf2PsRequestAbstract))
+#define LASSO_IDWSF2_PS_REQUEST_ABSTRACT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT, \
+		LassoIdWsf2PsRequestAbstractClass))
+#define LASSO_IS_IDWSF2_PS_REQUEST_ABSTRACT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT))
+#define LASSO_IS_IDWSF2_PS_REQUEST_ABSTRACT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT))
+#define LASSO_IDWSF2_PS_REQUEST_ABSTRACT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT, \
+		LassoIdWsf2PsRequestAbstractClass)) 
+
+
+typedef struct _LassoIdWsf2PsRequestAbstract LassoIdWsf2PsRequestAbstract;
+typedef struct _LassoIdWsf2PsRequestAbstractClass LassoIdWsf2PsRequestAbstractClass;
+
+
+struct _LassoIdWsf2PsRequestAbstract {
+	LassoNode parent;
+
+	/*< public >*/
+	/* attributes */
+	GHashTable *attributes;
+};
+
+
+struct _LassoIdWsf2PsRequestAbstractClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ps_request_abstract_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsRequestAbstract* lasso_idwsf2_ps_request_abstract_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_PS_REQUEST_ABSTRACT_H__ */
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
new file mode 100644
index 00000000..6b90fb53
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.c
@@ -0,0 +1,112 @@
+/* $Id: ps_resolve_identifier_request.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_resolve_identifier_request.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="ResolveIdentifierRequestType">
+ *   <xs:complexContent>
+ *     <xs:extension base="RequestAbstractType">
+ *       <xs:sequence>
+ *         <xs:element ref="ResolveInput" maxOccurs="unbounded"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "ResolveInput", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2PsResolveIdentifierRequest, ResolveInput) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsResolveIdentifierRequest *node)
+{
+	node->ResolveInput = NULL;
+}
+
+static void
+class_init(LassoIdWsf2PsResolveIdentifierRequestClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "ResolveIdentifierRequest");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_resolve_identifier_request_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsResolveIdentifierRequestClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsResolveIdentifierRequest),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
+				"LassoIdWsf2PsResolveIdentifierRequest", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_resolve_identifier_request_new:
+ *
+ * Creates a new #LassoIdWsf2PsResolveIdentifierRequest object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsResolveIdentifierRequest object
+ **/
+LassoIdWsf2PsResolveIdentifierRequest*
+lasso_idwsf2_ps_resolve_identifier_request_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_RESOLVE_IDENTIFIER_REQUEST, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.h b/lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.h
new file mode 100644
index 00000000..92576ca9
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.h
@@ -0,0 +1,85 @@
+/* $Id: ps_resolve_identifier_request.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_PS_RESOLVE_IDENTIFIER_REQUEST_H__
+#define __LASSO_IDWSF2_PS_RESOLVE_IDENTIFIER_REQUEST_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "ps_request_abstract.h"
+
+#define LASSO_TYPE_IDWSF2_PS_RESOLVE_IDENTIFIER_REQUEST \
+	(lasso_idwsf2_ps_resolve_identifier_request_get_type())
+#define LASSO_IDWSF2_PS_RESOLVE_IDENTIFIER_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_PS_RESOLVE_IDENTIFIER_REQUEST, \
+		LassoIdWsf2PsResolveIdentifierRequest))
+#define LASSO_IDWSF2_PS_RESOLVE_IDENTIFIER_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_PS_RESOLVE_IDENTIFIER_REQUEST, \
+		LassoIdWsf2PsResolveIdentifierRequestClass))
+#define LASSO_IS_IDWSF2_PS_RESOLVE_IDENTIFIER_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_PS_RESOLVE_IDENTIFIER_REQUEST))
+#define LASSO_IS_IDWSF2_PS_RESOLVE_IDENTIFIER_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_PS_RESOLVE_IDENTIFIER_REQUEST))
+#define LASSO_IDWSF2_PS_RESOLVE_IDENTIFIER_REQUEST_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_PS_RESOLVE_IDENTIFIER_REQUEST, \
+		LassoIdWsf2PsResolveIdentifierRequestClass)) 
+
+
+typedef struct _LassoIdWsf2PsResolveIdentifierRequest \
+	LassoIdWsf2PsResolveIdentifierRequest;
+typedef struct _LassoIdWsf2PsResolveIdentifierRequestClass \
+	LassoIdWsf2PsResolveIdentifierRequestClass;
+
+
+struct _LassoIdWsf2PsResolveIdentifierRequest {
+	LassoIdWsf2PsRequestAbstract parent;
+
+	/*< public >*/
+	/* elements */
+	GList *ResolveInput;
+};
+
+
+struct _LassoIdWsf2PsResolveIdentifierRequestClass {
+	LassoIdWsf2PsRequestAbstractClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ps_resolve_identifier_request_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsResolveIdentifierRequest* lasso_idwsf2_ps_resolve_identifier_request_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_PS_RESOLVE_IDENTIFIER_REQUEST_H__ */
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
new file mode 100644
index 00000000..c7b06796
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.c
@@ -0,0 +1,112 @@
+/* $Id: ps_resolve_identifier_response.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_resolve_identifier_response.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="ResolveIdentifierResponseType">
+ *   <xs:complexContent>
+ *     <xs:extension base="ResponseAbstractType">
+ *       <xs:sequence>
+ *         <xs:element ref="ResolveOutput" maxOccurs="unbounded"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "ResolveOutput", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2PsResolveIdentifierResponse, ResolveOutput) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsResolveIdentifierResponse *node)
+{
+	node->ResolveOutput = NULL;
+}
+
+static void
+class_init(LassoIdWsf2PsResolveIdentifierResponseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "ResolveIdentifierResponse");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_resolve_identifier_response_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsResolveIdentifierResponseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsResolveIdentifierResponse),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_RESPONSE_ABSTRACT,
+				"LassoIdWsf2PsResolveIdentifierResponse", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_resolve_identifier_response_new:
+ *
+ * Creates a new #LassoIdWsf2PsResolveIdentifierResponse object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsResolveIdentifierResponse object
+ **/
+LassoIdWsf2PsResolveIdentifierResponse*
+lasso_idwsf2_ps_resolve_identifier_response_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_RESOLVE_IDENTIFIER_RESPONSE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.h b/lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.h
new file mode 100644
index 00000000..19a0fe44
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.h
@@ -0,0 +1,85 @@
+/* $Id: ps_resolve_identifier_response.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_PS_RESOLVE_IDENTIFIER_RESPONSE_H__
+#define __LASSO_IDWSF2_PS_RESOLVE_IDENTIFIER_RESPONSE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "ps_response_abstract.h"
+
+#define LASSO_TYPE_IDWSF2_PS_RESOLVE_IDENTIFIER_RESPONSE \
+	(lasso_idwsf2_ps_resolve_identifier_response_get_type())
+#define LASSO_IDWSF2_PS_RESOLVE_IDENTIFIER_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_PS_RESOLVE_IDENTIFIER_RESPONSE, \
+		LassoIdWsf2PsResolveIdentifierResponse))
+#define LASSO_IDWSF2_PS_RESOLVE_IDENTIFIER_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_PS_RESOLVE_IDENTIFIER_RESPONSE, \
+		LassoIdWsf2PsResolveIdentifierResponseClass))
+#define LASSO_IS_IDWSF2_PS_RESOLVE_IDENTIFIER_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_PS_RESOLVE_IDENTIFIER_RESPONSE))
+#define LASSO_IS_IDWSF2_PS_RESOLVE_IDENTIFIER_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_PS_RESOLVE_IDENTIFIER_RESPONSE))
+#define LASSO_IDWSF2_PS_RESOLVE_IDENTIFIER_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_PS_RESOLVE_IDENTIFIER_RESPONSE, \
+		LassoIdWsf2PsResolveIdentifierResponseClass)) 
+
+
+typedef struct _LassoIdWsf2PsResolveIdentifierResponse \
+	LassoIdWsf2PsResolveIdentifierResponse;
+typedef struct _LassoIdWsf2PsResolveIdentifierResponseClass \
+	LassoIdWsf2PsResolveIdentifierResponseClass;
+
+
+struct _LassoIdWsf2PsResolveIdentifierResponse {
+	LassoIdWsf2PsResponseAbstract parent;
+
+	/*< public >*/
+	/* elements */
+	GList *ResolveOutput;
+};
+
+
+struct _LassoIdWsf2PsResolveIdentifierResponseClass {
+	LassoIdWsf2PsResponseAbstractClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ps_resolve_identifier_response_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsResolveIdentifierResponse* lasso_idwsf2_ps_resolve_identifier_response_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_PS_RESOLVE_IDENTIFIER_RESPONSE_H__ */
diff --git a/lasso/xml/id-wsf-2.0/ps_resolve_input.c b/lasso/xml/id-wsf-2.0/ps_resolve_input.c
new file mode 100644
index 00000000..596a6de9
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_resolve_input.c
@@ -0,0 +1,112 @@
+/* $Id: ps_resolve_input.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_resolve_input.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="ResolveInputType">
+ *   <xs:complexContent>
+ *     <xs:extension base="ims:MappingInputType">
+ *       <xs:sequence>
+ *         <xs:element ref="TargetObjectID" minOccurs="0"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "TargetObjectID", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsResolveInput, TargetObjectID) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsResolveInput *node)
+{
+	node->TargetObjectID = NULL;
+}
+
+static void
+class_init(LassoIdWsf2PsResolveInputClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "ResolveInput");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_resolve_input_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsResolveInputClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsResolveInput),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_IMS_MAPPING_INPUT,
+				"LassoIdWsf2PsResolveInput", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_resolve_input_new:
+ *
+ * Creates a new #LassoIdWsf2PsResolveInput object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsResolveInput object
+ **/
+LassoIdWsf2PsResolveInput*
+lasso_idwsf2_ps_resolve_input_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_RESOLVE_INPUT, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ps_resolve_input.h b/lasso/xml/id-wsf-2.0/ps_resolve_input.h
new file mode 100644
index 00000000..1c1c486f
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_resolve_input.h
@@ -0,0 +1,82 @@
+/* $Id: ps_resolve_input.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_PS_RESOLVE_INPUT_H__
+#define __LASSO_IDWSF2_PS_RESOLVE_INPUT_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "ims_mapping_input.h"
+
+#define LASSO_TYPE_IDWSF2_PS_RESOLVE_INPUT (lasso_idwsf2_ps_resolve_input_get_type())
+#define LASSO_IDWSF2_PS_RESOLVE_INPUT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_PS_RESOLVE_INPUT, \
+		LassoIdWsf2PsResolveInput))
+#define LASSO_IDWSF2_PS_RESOLVE_INPUT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_PS_RESOLVE_INPUT, \
+		LassoIdWsf2PsResolveInputClass))
+#define LASSO_IS_IDWSF2_PS_RESOLVE_INPUT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_PS_RESOLVE_INPUT))
+#define LASSO_IS_IDWSF2_PS_RESOLVE_INPUT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_PS_RESOLVE_INPUT))
+#define LASSO_IDWSF2_PS_RESOLVE_INPUT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_PS_RESOLVE_INPUT, \
+		LassoIdWsf2PsResolveInputClass)) 
+
+
+typedef struct _LassoIdWsf2PsResolveInput LassoIdWsf2PsResolveInput;
+typedef struct _LassoIdWsf2PsResolveInputClass LassoIdWsf2PsResolveInputClass;
+
+
+struct _LassoIdWsf2PsResolveInput {
+	LassoIdWsf2ImsMappingInput parent;
+
+	/*< public >*/
+	/* elements */
+	/* XXX */ void *TargetObjectID;
+};
+
+
+struct _LassoIdWsf2PsResolveInputClass {
+	LassoIdWsf2ImsMappingInputClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ps_resolve_input_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsResolveInput* lasso_idwsf2_ps_resolve_input_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_PS_RESOLVE_INPUT_H__ */
diff --git a/lasso/xml/id-wsf-2.0/ps_response_abstract.c b/lasso/xml/id-wsf-2.0/ps_response_abstract.c
new file mode 100644
index 00000000..c3ae2632
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_response_abstract.c
@@ -0,0 +1,114 @@
+/* $Id: ps_response_abstract.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_response_abstract.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="ResponseAbstractType" abstract="true">
+ *   <xs:sequence>
+ *     <xs:element ref="lu:Status"/>
+ *   </xs:sequence>
+ *   <xs:anyAttribute namespace="##other" processContents="lax"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Status", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsResponseAbstract, Status),
+		"LassoIdWsf2UtilStatus" },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoIdWsf2PsResponseAbstract, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsResponseAbstract *node)
+{
+	node->Status = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoIdWsf2PsResponseAbstractClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "ResponseAbstract");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_response_abstract_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsResponseAbstractClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsResponseAbstract),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2PsResponseAbstract", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_response_abstract_new:
+ *
+ * Creates a new #LassoIdWsf2PsResponseAbstract object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsResponseAbstract object
+ **/
+LassoIdWsf2PsResponseAbstract*
+lasso_idwsf2_ps_response_abstract_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_RESPONSE_ABSTRACT, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ps_response_abstract.h b/lasso/xml/id-wsf-2.0/ps_response_abstract.h
new file mode 100644
index 00000000..00b4893b
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_response_abstract.h
@@ -0,0 +1,84 @@
+/* $Id: ps_response_abstract.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_PS_RESPONSE_ABSTRACT_H__
+#define __LASSO_IDWSF2_PS_RESPONSE_ABSTRACT_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "util_status.h"
+
+#define LASSO_TYPE_IDWSF2_PS_RESPONSE_ABSTRACT (lasso_idwsf2_ps_response_abstract_get_type())
+#define LASSO_IDWSF2_PS_RESPONSE_ABSTRACT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_PS_RESPONSE_ABSTRACT, \
+		LassoIdWsf2PsResponseAbstract))
+#define LASSO_IDWSF2_PS_RESPONSE_ABSTRACT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_PS_RESPONSE_ABSTRACT, \
+		LassoIdWsf2PsResponseAbstractClass))
+#define LASSO_IS_IDWSF2_PS_RESPONSE_ABSTRACT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_PS_RESPONSE_ABSTRACT))
+#define LASSO_IS_IDWSF2_PS_RESPONSE_ABSTRACT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_PS_RESPONSE_ABSTRACT))
+#define LASSO_IDWSF2_PS_RESPONSE_ABSTRACT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_PS_RESPONSE_ABSTRACT, \
+		LassoIdWsf2PsResponseAbstractClass)) 
+
+
+typedef struct _LassoIdWsf2PsResponseAbstract LassoIdWsf2PsResponseAbstract;
+typedef struct _LassoIdWsf2PsResponseAbstractClass LassoIdWsf2PsResponseAbstractClass;
+
+
+struct _LassoIdWsf2PsResponseAbstract {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	LassoIdWsf2UtilStatus *Status;
+	/* attributes */
+	GHashTable *attributes;
+};
+
+
+struct _LassoIdWsf2PsResponseAbstractClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ps_response_abstract_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsResponseAbstract* lasso_idwsf2_ps_response_abstract_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_PS_RESPONSE_ABSTRACT_H__ */
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
new file mode 100644
index 00000000..a248b85f
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_set_object_info_request.c
@@ -0,0 +1,116 @@
+/* $Id: ps_set_object_info_request.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_set_object_info_request.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="SetObjectInfoRequestType">
+ *   <xs:complexContent>
+ *     <xs:extension base="RequestAbstractType">
+ *       <xs:sequence>
+ *         <xs:element ref="Object" maxOccurs="unbounded"/>
+ *         <xs:element ref="Subscription" minOccurs="0"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Object", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2PsSetObjectInfoRequest, Object) },
+	{ "Subscription", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsSetObjectInfoRequest, Subscription) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsSetObjectInfoRequest *node)
+{
+	node->Object = NULL;
+	node->Subscription = NULL;
+}
+
+static void
+class_init(LassoIdWsf2PsSetObjectInfoRequestClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "SetObjectInfoRequest");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_set_object_info_request_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsSetObjectInfoRequestClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsSetObjectInfoRequest),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
+				"LassoIdWsf2PsSetObjectInfoRequest", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_set_object_info_request_new:
+ *
+ * Creates a new #LassoIdWsf2PsSetObjectInfoRequest object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsSetObjectInfoRequest object
+ **/
+LassoIdWsf2PsSetObjectInfoRequest*
+lasso_idwsf2_ps_set_object_info_request_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_SET_OBJECT_INFO_REQUEST, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ps_set_object_info_request.h b/lasso/xml/id-wsf-2.0/ps_set_object_info_request.h
new file mode 100644
index 00000000..a1465190
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_set_object_info_request.h
@@ -0,0 +1,85 @@
+/* $Id: ps_set_object_info_request.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_PS_SET_OBJECT_INFO_REQUEST_H__
+#define __LASSO_IDWSF2_PS_SET_OBJECT_INFO_REQUEST_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "subs_subscription.h"
+#include "ps_request_abstract.h"
+
+#define LASSO_TYPE_IDWSF2_PS_SET_OBJECT_INFO_REQUEST \
+	(lasso_idwsf2_ps_set_object_info_request_get_type())
+#define LASSO_IDWSF2_PS_SET_OBJECT_INFO_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_PS_SET_OBJECT_INFO_REQUEST, \
+		LassoIdWsf2PsSetObjectInfoRequest))
+#define LASSO_IDWSF2_PS_SET_OBJECT_INFO_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_PS_SET_OBJECT_INFO_REQUEST, \
+		LassoIdWsf2PsSetObjectInfoRequestClass))
+#define LASSO_IS_IDWSF2_PS_SET_OBJECT_INFO_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_PS_SET_OBJECT_INFO_REQUEST))
+#define LASSO_IS_IDWSF2_PS_SET_OBJECT_INFO_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_PS_SET_OBJECT_INFO_REQUEST))
+#define LASSO_IDWSF2_PS_SET_OBJECT_INFO_REQUEST_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_PS_SET_OBJECT_INFO_REQUEST, \
+		LassoIdWsf2PsSetObjectInfoRequestClass)) 
+
+
+typedef struct _LassoIdWsf2PsSetObjectInfoRequest LassoIdWsf2PsSetObjectInfoRequest;
+typedef struct _LassoIdWsf2PsSetObjectInfoRequestClass LassoIdWsf2PsSetObjectInfoRequestClass;
+
+
+struct _LassoIdWsf2PsSetObjectInfoRequest {
+	LassoIdWsf2PsRequestAbstract parent;
+
+	/*< public >*/
+	/* elements */
+	GList *Object;
+	/* XXX */ void *Subscription;
+};
+
+
+struct _LassoIdWsf2PsSetObjectInfoRequestClass {
+	LassoIdWsf2PsRequestAbstractClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ps_set_object_info_request_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsSetObjectInfoRequest* lasso_idwsf2_ps_set_object_info_request_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_PS_SET_OBJECT_INFO_REQUEST_H__ */
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
new file mode 100644
index 00000000..6dc3bfb3
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_test_membership_request.c
@@ -0,0 +1,120 @@
+/* $Id: ps_test_membership_request.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_test_membership_request.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="TestMembershipRequestType">
+ *   <xs:complexContent>
+ *     <xs:extension base="RequestAbstractType">
+ *       <xs:sequence>
+ *         <xs:element ref="TargetObjectID" minOccurs="0"/>
+ *         <xs:element ref="sec:Token"/>
+ *         <xs:element ref="Subscription" minOccurs="0"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "TargetObjectID", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsTestMembershipRequest, TargetObjectID) },
+	{ "Token", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsTestMembershipRequest, Token) },
+	{ "Subscription", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsTestMembershipRequest, Subscription) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsTestMembershipRequest *node)
+{
+	node->TargetObjectID = NULL;
+	node->Token = NULL;
+	node->Subscription = NULL;
+}
+
+static void
+class_init(LassoIdWsf2PsTestMembershipRequestClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "TestMembershipRequest");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_test_membership_request_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsTestMembershipRequestClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsTestMembershipRequest),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_REQUEST_ABSTRACT,
+				"LassoIdWsf2PsTestMembershipRequest", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_test_membership_request_new:
+ *
+ * Creates a new #LassoIdWsf2PsTestMembershipRequest object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsTestMembershipRequest object
+ **/
+LassoIdWsf2PsTestMembershipRequest*
+lasso_idwsf2_ps_test_membership_request_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_TEST_MEMBERSHIP_REQUEST, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ps_test_membership_request.h b/lasso/xml/id-wsf-2.0/ps_test_membership_request.h
new file mode 100644
index 00000000..e23f08d2
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_test_membership_request.h
@@ -0,0 +1,87 @@
+/* $Id: ps_test_membership_request.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_PS_TEST_MEMBERSHIP_REQUEST_H__
+#define __LASSO_IDWSF2_PS_TEST_MEMBERSHIP_REQUEST_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "subs_subscription.h"
+#include "ps_request_abstract.h"
+#include "sec_token.h"
+
+#define LASSO_TYPE_IDWSF2_PS_TEST_MEMBERSHIP_REQUEST \
+	(lasso_idwsf2_ps_test_membership_request_get_type())
+#define LASSO_IDWSF2_PS_TEST_MEMBERSHIP_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_PS_TEST_MEMBERSHIP_REQUEST, \
+		LassoIdWsf2PsTestMembershipRequest))
+#define LASSO_IDWSF2_PS_TEST_MEMBERSHIP_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_PS_TEST_MEMBERSHIP_REQUEST, \
+		LassoIdWsf2PsTestMembershipRequestClass))
+#define LASSO_IS_IDWSF2_PS_TEST_MEMBERSHIP_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_PS_TEST_MEMBERSHIP_REQUEST))
+#define LASSO_IS_IDWSF2_PS_TEST_MEMBERSHIP_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_PS_TEST_MEMBERSHIP_REQUEST))
+#define LASSO_IDWSF2_PS_TEST_MEMBERSHIP_REQUEST_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_PS_TEST_MEMBERSHIP_REQUEST, \
+		LassoIdWsf2PsTestMembershipRequestClass)) 
+
+
+typedef struct _LassoIdWsf2PsTestMembershipRequest LassoIdWsf2PsTestMembershipRequest;
+typedef struct _LassoIdWsf2PsTestMembershipRequestClass LassoIdWsf2PsTestMembershipRequestClass;
+
+
+struct _LassoIdWsf2PsTestMembershipRequest {
+	LassoIdWsf2PsRequestAbstract parent;
+
+	/*< public >*/
+	/* elements */
+	/* XXX */ void *TargetObjectID;
+	/* XXX */ void *Token;
+	/* XXX */ void *Subscription;
+};
+
+
+struct _LassoIdWsf2PsTestMembershipRequestClass {
+	LassoIdWsf2PsRequestAbstractClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ps_test_membership_request_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsTestMembershipRequest* lasso_idwsf2_ps_test_membership_request_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_PS_TEST_MEMBERSHIP_REQUEST_H__ */
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
new file mode 100644
index 00000000..ce5dd28e
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_test_membership_response.c
@@ -0,0 +1,112 @@
+/* $Id: ps_test_membership_response.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "ps_test_membership_response.h"
+
+/*
+ * Schema fragment (liberty-idwsf-people-service-v1.0.xsd):
+ *
+ * <xs:complexType name="TestMembershipResponseType">
+ *   <xs:complexContent>
+ *     <xs:extension base="ResponseAbstractType">
+ *       <xs:sequence>
+ *         <xs:element name="Result" type="ResultType" minOccurs="0"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Result", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2PsTestMembershipResponse, Result) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2PsTestMembershipResponse *node)
+{
+	node->Result = NULL;
+}
+
+static void
+class_init(LassoIdWsf2PsTestMembershipResponseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "TestMembershipResponse");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_PS_HREF, LASSO_IDWSF2_PS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_ps_test_membership_response_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2PsTestMembershipResponseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2PsTestMembershipResponse),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_PS_RESPONSE_ABSTRACT,
+				"LassoIdWsf2PsTestMembershipResponse", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_ps_test_membership_response_new:
+ *
+ * Creates a new #LassoIdWsf2PsTestMembershipResponse object.
+ *
+ * Return value: a newly created #LassoIdWsf2PsTestMembershipResponse object
+ **/
+LassoIdWsf2PsTestMembershipResponse*
+lasso_idwsf2_ps_test_membership_response_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_PS_TEST_MEMBERSHIP_RESPONSE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/ps_test_membership_response.h b/lasso/xml/id-wsf-2.0/ps_test_membership_response.h
new file mode 100644
index 00000000..8f0e0b3f
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/ps_test_membership_response.h
@@ -0,0 +1,83 @@
+/* $Id: ps_test_membership_response.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_PS_TEST_MEMBERSHIP_RESPONSE_H__
+#define __LASSO_IDWSF2_PS_TEST_MEMBERSHIP_RESPONSE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "ps_response_abstract.h"
+
+#define LASSO_TYPE_IDWSF2_PS_TEST_MEMBERSHIP_RESPONSE \
+	(lasso_idwsf2_ps_test_membership_response_get_type())
+#define LASSO_IDWSF2_PS_TEST_MEMBERSHIP_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_PS_TEST_MEMBERSHIP_RESPONSE, \
+		LassoIdWsf2PsTestMembershipResponse))
+#define LASSO_IDWSF2_PS_TEST_MEMBERSHIP_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_PS_TEST_MEMBERSHIP_RESPONSE, \
+		LassoIdWsf2PsTestMembershipResponseClass))
+#define LASSO_IS_IDWSF2_PS_TEST_MEMBERSHIP_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_PS_TEST_MEMBERSHIP_RESPONSE))
+#define LASSO_IS_IDWSF2_PS_TEST_MEMBERSHIP_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_PS_TEST_MEMBERSHIP_RESPONSE))
+#define LASSO_IDWSF2_PS_TEST_MEMBERSHIP_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_PS_TEST_MEMBERSHIP_RESPONSE, \
+		LassoIdWsf2PsTestMembershipResponseClass)) 
+
+
+typedef struct _LassoIdWsf2PsTestMembershipResponse LassoIdWsf2PsTestMembershipResponse;
+typedef struct _LassoIdWsf2PsTestMembershipResponseClass LassoIdWsf2PsTestMembershipResponseClass;
+
+
+struct _LassoIdWsf2PsTestMembershipResponse {
+	LassoIdWsf2PsResponseAbstract parent;
+
+	/*< public >*/
+	/* elements */
+	/* XXX */ void *Result;
+};
+
+
+struct _LassoIdWsf2PsTestMembershipResponseClass {
+	LassoIdWsf2PsResponseAbstractClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_ps_test_membership_response_get_type(void);
+LASSO_EXPORT LassoIdWsf2PsTestMembershipResponse* lasso_idwsf2_ps_test_membership_response_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_PS_TEST_MEMBERSHIP_RESPONSE_H__ */
diff --git a/lasso/xml/id-wsf-2.0/sb2_consent.c b/lasso/xml/id-wsf-2.0/sb2_consent.c
new file mode 100644
index 00000000..ed658fb7
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/sb2_consent.c
@@ -0,0 +1,115 @@
+/* $Id: sb2_consent.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "sb2_consent.h"
+
+/*
+ * Schema fragment (liberty-idwsf-soap-binding-v2.0.xsd):
+ *
+ * <xs:complexType name="ConsentType">
+ *   <xs:attribute name="uri" type="xs:anyURI" use="required"/>
+ *   <xs:attribute name="timestamp" type="xs:dateTime" use="optional"/>
+ *   <xs:anyAttribute namespace="##other" processContents="lax"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "uri", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2Consent, uri) },
+	{ "timestamp", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2Consent, timestamp) },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2Consent, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2Sb2Consent *node)
+{
+	node->uri = NULL;
+	node->timestamp = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoIdWsf2Sb2ConsentClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Consent");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SB2_HREF, LASSO_IDWSF2_SB2_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_sb2_consent_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2Sb2ConsentClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2Sb2Consent),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2Sb2Consent", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_sb2_consent_new:
+ *
+ * Creates a new #LassoIdWsf2Sb2Consent object.
+ *
+ * Return value: a newly created #LassoIdWsf2Sb2Consent object
+ **/
+LassoIdWsf2Sb2Consent*
+lasso_idwsf2_sb2_consent_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SB2_CONSENT, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/sb2_consent.h b/lasso/xml/id-wsf-2.0/sb2_consent.h
new file mode 100644
index 00000000..65fbf07f
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/sb2_consent.h
@@ -0,0 +1,83 @@
+/* $Id: sb2_consent.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SB2_CONSENT_H__
+#define __LASSO_IDWSF2_SB2_CONSENT_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_SB2_CONSENT (lasso_idwsf2_sb2_consent_get_type())
+#define LASSO_IDWSF2_SB2_CONSENT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SB2_CONSENT, \
+		LassoIdWsf2Sb2Consent))
+#define LASSO_IDWSF2_SB2_CONSENT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SB2_CONSENT, \
+		LassoIdWsf2Sb2ConsentClass))
+#define LASSO_IS_IDWSF2_SB2_CONSENT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SB2_CONSENT))
+#define LASSO_IS_IDWSF2_SB2_CONSENT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SB2_CONSENT))
+#define LASSO_IDWSF2_SB2_CONSENT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SB2_CONSENT, \
+		LassoIdWsf2Sb2ConsentClass)) 
+
+
+typedef struct _LassoIdWsf2Sb2Consent LassoIdWsf2Sb2Consent;
+typedef struct _LassoIdWsf2Sb2ConsentClass LassoIdWsf2Sb2ConsentClass;
+
+
+struct _LassoIdWsf2Sb2Consent {
+	LassoNode parent;
+
+	/*< public >*/
+	/* attributes */
+	char *uri;
+	char *timestamp;
+	GHashTable *attributes;
+};
+
+
+struct _LassoIdWsf2Sb2ConsentClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_sb2_consent_get_type(void);
+LASSO_EXPORT LassoIdWsf2Sb2Consent* lasso_idwsf2_sb2_consent_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SB2_CONSENT_H__ */
diff --git a/lasso/xml/id-wsf-2.0/sb2_credentials_context.c b/lasso/xml/id-wsf-2.0/sb2_credentials_context.c
new file mode 100644
index 00000000..d07b9720
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/sb2_credentials_context.c
@@ -0,0 +1,118 @@
+/* $Id: sb2_credentials_context.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "sb2_credentials_context.h"
+
+/*
+ * Schema fragment (liberty-idwsf-soap-binding-v2.0.xsd):
+ *
+ * <xs:complexType name="CredentialsContextType">
+ *   <xs:sequence>
+ *     <xs:element ref="samlp:RequestedAuthnContext" minOccurs="0"/>
+ *     <xs:element name="SecurityMechID" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/>
+ *   </xs:sequence>
+ *   <xs:anyAttribute namespace="##other" processContents="lax"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "RequestedAuthnContext", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2CredentialsContext, RequestedAuthnContext),
+		"LassoSamlp2RequestedAuthnContext" },
+	{ "SecurityMechID", SNIPPET_LIST_CONTENT,
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2CredentialsContext, SecurityMechID) },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2CredentialsContext, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2Sb2CredentialsContext *node)
+{
+	node->RequestedAuthnContext = NULL;
+	node->SecurityMechID = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoIdWsf2Sb2CredentialsContextClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "CredentialsContext");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SB2_HREF, LASSO_IDWSF2_SB2_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_sb2_credentials_context_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2Sb2CredentialsContextClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2Sb2CredentialsContext),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2Sb2CredentialsContext", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_sb2_credentials_context_new:
+ *
+ * Creates a new #LassoIdWsf2Sb2CredentialsContext object.
+ *
+ * Return value: a newly created #LassoIdWsf2Sb2CredentialsContext object
+ **/
+LassoIdWsf2Sb2CredentialsContext*
+lasso_idwsf2_sb2_credentials_context_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SB2_CREDENTIALS_CONTEXT, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/sb2_credentials_context.h b/lasso/xml/id-wsf-2.0/sb2_credentials_context.h
new file mode 100644
index 00000000..a38c191f
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/sb2_credentials_context.h
@@ -0,0 +1,85 @@
+/* $Id: sb2_credentials_context.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SB2_CREDENTIALS_CONTEXT_H__
+#define __LASSO_IDWSF2_SB2_CREDENTIALS_CONTEXT_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include <lasso/xml/saml-2.0/samlp2_requested_authn_context.h>
+
+#define LASSO_TYPE_IDWSF2_SB2_CREDENTIALS_CONTEXT (lasso_idwsf2_sb2_credentials_context_get_type())
+#define LASSO_IDWSF2_SB2_CREDENTIALS_CONTEXT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SB2_CREDENTIALS_CONTEXT, \
+		LassoIdWsf2Sb2CredentialsContext))
+#define LASSO_IDWSF2_SB2_CREDENTIALS_CONTEXT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SB2_CREDENTIALS_CONTEXT, \
+		LassoIdWsf2Sb2CredentialsContextClass))
+#define LASSO_IS_IDWSF2_SB2_CREDENTIALS_CONTEXT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SB2_CREDENTIALS_CONTEXT))
+#define LASSO_IS_IDWSF2_SB2_CREDENTIALS_CONTEXT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SB2_CREDENTIALS_CONTEXT))
+#define LASSO_IDWSF2_SB2_CREDENTIALS_CONTEXT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SB2_CREDENTIALS_CONTEXT, \
+		LassoIdWsf2Sb2CredentialsContextClass)) 
+
+
+typedef struct _LassoIdWsf2Sb2CredentialsContext LassoIdWsf2Sb2CredentialsContext;
+typedef struct _LassoIdWsf2Sb2CredentialsContextClass LassoIdWsf2Sb2CredentialsContextClass;
+
+
+struct _LassoIdWsf2Sb2CredentialsContext {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	LassoSamlp2RequestedAuthnContext *RequestedAuthnContext;
+	GList *SecurityMechID;
+	/* attributes */
+	GHashTable *attributes;
+};
+
+
+struct _LassoIdWsf2Sb2CredentialsContextClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_sb2_credentials_context_get_type(void);
+LASSO_EXPORT LassoIdWsf2Sb2CredentialsContext* lasso_idwsf2_sb2_credentials_context_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SB2_CREDENTIALS_CONTEXT_H__ */
diff --git a/lasso/xml/id-wsf-2.0/sb2_endpoint_update.c b/lasso/xml/id-wsf-2.0/sb2_endpoint_update.c
new file mode 100644
index 00000000..5100c61e
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/sb2_endpoint_update.c
@@ -0,0 +1,110 @@
+/* $Id: sb2_endpoint_update.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "sb2_endpoint_update.h"
+
+/*
+ * Schema fragment (liberty-idwsf-soap-binding-v2.0.xsd):
+ *
+ * <xs:complexType name="EndpointUpdateType">
+ *   <xs:complexContent>
+ *     <xs:extension base="wsa:EndpointReferenceType">
+ *       <xs:attribute name="updateType" type="xs:anyURI" use="optional"/>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "updateType", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2EndpointUpdate, updateType) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2Sb2EndpointUpdate *node)
+{
+	node->updateType = NULL;
+}
+
+static void
+class_init(LassoIdWsf2Sb2EndpointUpdateClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "EndpointUpdate");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SB2_HREF, LASSO_IDWSF2_SB2_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_sb2_endpoint_update_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2Sb2EndpointUpdateClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2Sb2EndpointUpdate),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_WSA_ENDPOINT_REFERENCE,
+				"LassoIdWsf2Sb2EndpointUpdate", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_sb2_endpoint_update_new:
+ *
+ * Creates a new #LassoIdWsf2Sb2EndpointUpdate object.
+ *
+ * Return value: a newly created #LassoIdWsf2Sb2EndpointUpdate object
+ **/
+LassoIdWsf2Sb2EndpointUpdate*
+lasso_idwsf2_sb2_endpoint_update_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SB2_ENDPOINT_UPDATE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/sb2_endpoint_update.h b/lasso/xml/id-wsf-2.0/sb2_endpoint_update.h
new file mode 100644
index 00000000..a9787cdd
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/sb2_endpoint_update.h
@@ -0,0 +1,82 @@
+/* $Id: sb2_endpoint_update.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SB2_ENDPOINT_UPDATE_H__
+#define __LASSO_IDWSF2_SB2_ENDPOINT_UPDATE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include <lasso/xml/ws/wsa_endpoint_reference.h>
+
+#define LASSO_TYPE_IDWSF2_SB2_ENDPOINT_UPDATE (lasso_idwsf2_sb2_endpoint_update_get_type())
+#define LASSO_IDWSF2_SB2_ENDPOINT_UPDATE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SB2_ENDPOINT_UPDATE, \
+		LassoIdWsf2Sb2EndpointUpdate))
+#define LASSO_IDWSF2_SB2_ENDPOINT_UPDATE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SB2_ENDPOINT_UPDATE, \
+		LassoIdWsf2Sb2EndpointUpdateClass))
+#define LASSO_IS_IDWSF2_SB2_ENDPOINT_UPDATE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SB2_ENDPOINT_UPDATE))
+#define LASSO_IS_IDWSF2_SB2_ENDPOINT_UPDATE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SB2_ENDPOINT_UPDATE))
+#define LASSO_IDWSF2_SB2_ENDPOINT_UPDATE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SB2_ENDPOINT_UPDATE, \
+		LassoIdWsf2Sb2EndpointUpdateClass)) 
+
+
+typedef struct _LassoIdWsf2Sb2EndpointUpdate LassoIdWsf2Sb2EndpointUpdate;
+typedef struct _LassoIdWsf2Sb2EndpointUpdateClass LassoIdWsf2Sb2EndpointUpdateClass;
+
+
+struct _LassoIdWsf2Sb2EndpointUpdate {
+	LassoWsAddrEndpointReference parent;
+
+	/*< public >*/
+	/* attributes */
+	char *updateType;
+};
+
+
+struct _LassoIdWsf2Sb2EndpointUpdateClass {
+	LassoWsAddrEndpointReferenceClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_sb2_endpoint_update_get_type(void);
+LASSO_EXPORT LassoIdWsf2Sb2EndpointUpdate* lasso_idwsf2_sb2_endpoint_update_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SB2_ENDPOINT_UPDATE_H__ */
diff --git a/lasso/xml/id-wsf-2.0/soap_binding2_redirect_request.c b/lasso/xml/id-wsf-2.0/sb2_redirect_request.c
index 5761f038..8a1ed9b7 100644
--- a/lasso/xml/id-wsf-2.0/soap_binding2_redirect_request.c
+++ b/lasso/xml/id-wsf-2.0/sb2_redirect_request.c
@@ -1,4 +1,4 @@
-/* $Id: soap_binding2_redirect_request.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+/* $Id: sb2_redirect_request.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
  *
  * Lasso - A free implementation of the Liberty Alliance specifications.
  *
@@ -22,7 +22,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "soap_binding2_redirect_request.h"
+#include "sb2_redirect_request.h"
 
 /*
  * Schema fragment (liberty-idwsf-soap-binding-v2.0.xsd):
@@ -39,7 +39,7 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "redirectURL", SNIPPET_ATTRIBUTE,
-		G_STRUCT_OFFSET(LassoIdWsf2SoapBinding2RedirectRequest, redirectURL) },
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2RedirectRequest, redirectURL) },
 	{NULL, 0, 0}
 };
 
@@ -51,69 +51,68 @@ static LassoNodeClass *parent_class = NULL;
 /*****************************************************************************/
 
 static void
-instance_init(LassoIdWsf2SoapBinding2RedirectRequest *node)
+instance_init(LassoIdWsf2Sb2RedirectRequest *node)
 {
 	node->redirectURL = NULL;
 }
 
 static void
-class_init(LassoIdWsf2SoapBinding2RedirectRequestClass *klass)
+class_init(LassoIdWsf2Sb2RedirectRequestClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
 
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "RedirectRequest");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SOAP_BINDING2_HREF, LASSO_IDWSF2_SOAP_BINDING2_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SB2_HREF, LASSO_IDWSF2_SB2_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
 GType
-lasso_idwsf2_soap_binding2_redirect_request_get_type()
+lasso_idwsf2_sb2_redirect_request_get_type()
 {
 	static GType this_type = 0;
 
 	if (!this_type) {
 		static const GTypeInfo this_info = {
-			sizeof (LassoIdWsf2SoapBinding2RedirectRequestClass),
+			sizeof (LassoIdWsf2Sb2RedirectRequestClass),
 			NULL,
 			NULL,
 			(GClassInitFunc) class_init,
 			NULL,
 			NULL,
-			sizeof(LassoIdWsf2SoapBinding2RedirectRequest),
+			sizeof(LassoIdWsf2Sb2RedirectRequest),
 			0,
 			(GInstanceInitFunc) instance_init,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
-				"LassoIdWsf2SoapBinding2RedirectRequest", &this_info, 0);
+				"LassoIdWsf2Sb2RedirectRequest", &this_info, 0);
 	}
 	return this_type;
 }
 
 /**
- * lasso_idwsf2_soap_binding2_redirect_request_new:
+ * lasso_idwsf2_sb2_redirect_request_new:
  *
- * Creates a new #LassoIdWsf2SoapBinding2RedirectRequest object.
+ * Creates a new #LassoIdWsf2Sb2RedirectRequest object.
  *
- * Return value: a newly created #LassoIdWsf2SoapBinding2RedirectRequest object
+ * Return value: a newly created #LassoIdWsf2Sb2RedirectRequest object
  **/
-LassoNode*
-lasso_idwsf2_soap_binding2_redirect_request_new()
+LassoIdWsf2Sb2RedirectRequest*
+lasso_idwsf2_sb2_redirect_request_new()
 {
-	return g_object_new(LASSO_TYPE_IDWSF2_SOAP_BINDING2_REDIRECT_REQUEST, NULL);
+	return g_object_new(LASSO_TYPE_IDWSF2_SB2_REDIRECT_REQUEST, NULL);
 }
 
-LassoNode*
-lasso_idwsf2_soap_binding2_redirect_request_new_full(const gchar *redirect_url)
+
+LassoIdWsf2Sb2RedirectRequest*
+lasso_idwsf2_sb2_redirect_request_new_full(const gchar *redirect_url)
 {
-	LassoIdWsf2SoapBinding2RedirectRequest *request;
+	LassoIdWsf2Sb2RedirectRequest *request;
 
-	request = LASSO_IDWSF2_SOAP_BINDING2_REDIRECT_REQUEST(
-		g_object_new(LASSO_TYPE_IDWSF2_SOAP_BINDING2_REDIRECT_REQUEST, NULL));
+	request = lasso_idwsf2_sb2_redirect_request_new();
 	request->redirectURL = g_strdup(redirect_url);
 
-	return LASSO_NODE(request);
+	return request;
 }
-
diff --git a/lasso/xml/id-wsf-2.0/sb2_redirect_request.h b/lasso/xml/id-wsf-2.0/sb2_redirect_request.h
new file mode 100644
index 00000000..a2f6d978
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/sb2_redirect_request.h
@@ -0,0 +1,83 @@
+/* $Id: sb2_redirect_request.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SB2_REDIRECT_REQUEST_H__
+#define __LASSO_IDWSF2_SB2_REDIRECT_REQUEST_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_SB2_REDIRECT_REQUEST (lasso_idwsf2_sb2_redirect_request_get_type())
+#define LASSO_IDWSF2_SB2_REDIRECT_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SB2_REDIRECT_REQUEST, \
+		LassoIdWsf2Sb2RedirectRequest))
+#define LASSO_IDWSF2_SB2_REDIRECT_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SB2_REDIRECT_REQUEST, \
+		LassoIdWsf2Sb2RedirectRequestClass))
+#define LASSO_IS_IDWSF2_SB2_REDIRECT_REQUEST(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SB2_REDIRECT_REQUEST))
+#define LASSO_IS_IDWSF2_SB2_REDIRECT_REQUEST_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SB2_REDIRECT_REQUEST))
+#define LASSO_IDWSF2_SB2_REDIRECT_REQUEST_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SB2_REDIRECT_REQUEST, \
+		LassoIdWsf2Sb2RedirectRequestClass)) 
+
+
+typedef struct _LassoIdWsf2Sb2RedirectRequest LassoIdWsf2Sb2RedirectRequest;
+typedef struct _LassoIdWsf2Sb2RedirectRequestClass LassoIdWsf2Sb2RedirectRequestClass;
+
+
+struct _LassoIdWsf2Sb2RedirectRequest {
+	LassoNode parent;
+
+	/*< public >*/
+	/* attributes */
+	char *redirectURL;
+};
+
+
+struct _LassoIdWsf2Sb2RedirectRequestClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_sb2_redirect_request_get_type(void);
+LASSO_EXPORT LassoIdWsf2Sb2RedirectRequest* lasso_idwsf2_sb2_redirect_request_new(void);
+
+LASSO_EXPORT LassoIdWsf2Sb2RedirectRequest* lasso_idwsf2_sb2_redirect_request_new_full(
+		const gchar *redirect_url);
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SB2_REDIRECT_REQUEST_H__ */
diff --git a/lasso/xml/id-wsf-2.0/sb2_sender.c b/lasso/xml/id-wsf-2.0/sb2_sender.c
new file mode 100644
index 00000000..2720df14
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/sb2_sender.c
@@ -0,0 +1,115 @@
+/* $Id: sb2_sender.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "sb2_sender.h"
+
+/*
+ * Schema fragment (liberty-idwsf-soap-binding-v2.0.xsd):
+ *
+ * <xs:complexType name="SenderType">
+ *   <xs:attribute name="providerID" type="xs:anyURI" use="required"/>
+ *   <xs:attribute name="affiliationID" type="xs:anyURI" use="optional"/>
+ *   <xs:anyAttribute namespace="##other" processContents="lax"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "providerID", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2Sender, providerID) },
+	{ "affiliationID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2Sender, affiliationID) },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2Sender, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2Sb2Sender *node)
+{
+	node->providerID = NULL;
+	node->affiliationID = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoIdWsf2Sb2SenderClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Sender");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SB2_HREF, LASSO_IDWSF2_SB2_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_sb2_sender_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2Sb2SenderClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2Sb2Sender),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2Sb2Sender", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_sb2_sender_new:
+ *
+ * Creates a new #LassoIdWsf2Sb2Sender object.
+ *
+ * Return value: a newly created #LassoIdWsf2Sb2Sender object
+ **/
+LassoIdWsf2Sb2Sender*
+lasso_idwsf2_sb2_sender_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SB2_SENDER, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/sb2_sender.h b/lasso/xml/id-wsf-2.0/sb2_sender.h
new file mode 100644
index 00000000..883276c2
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/sb2_sender.h
@@ -0,0 +1,83 @@
+/* $Id: sb2_sender.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SB2_SENDER_H__
+#define __LASSO_IDWSF2_SB2_SENDER_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_SB2_SENDER (lasso_idwsf2_sb2_sender_get_type())
+#define LASSO_IDWSF2_SB2_SENDER(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SB2_SENDER, \
+		LassoIdWsf2Sb2Sender))
+#define LASSO_IDWSF2_SB2_SENDER_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SB2_SENDER, \
+		LassoIdWsf2Sb2SenderClass))
+#define LASSO_IS_IDWSF2_SB2_SENDER(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SB2_SENDER))
+#define LASSO_IS_IDWSF2_SB2_SENDER_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SB2_SENDER))
+#define LASSO_IDWSF2_SB2_SENDER_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SB2_SENDER, \
+		LassoIdWsf2Sb2SenderClass)) 
+
+
+typedef struct _LassoIdWsf2Sb2Sender LassoIdWsf2Sb2Sender;
+typedef struct _LassoIdWsf2Sb2SenderClass LassoIdWsf2Sb2SenderClass;
+
+
+struct _LassoIdWsf2Sb2Sender {
+	LassoNode parent;
+
+	/*< public >*/
+	/* attributes */
+	char *providerID;
+	char *affiliationID;
+	GHashTable *attributes;
+};
+
+
+struct _LassoIdWsf2Sb2SenderClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_sb2_sender_get_type(void);
+LASSO_EXPORT LassoIdWsf2Sb2Sender* lasso_idwsf2_sb2_sender_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SB2_SENDER_H__ */
diff --git a/lasso/xml/id-wsf-2.0/sb2_target_identity.c b/lasso/xml/id-wsf-2.0/sb2_target_identity.c
new file mode 100644
index 00000000..4f094b19
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/sb2_target_identity.c
@@ -0,0 +1,110 @@
+/* $Id: sb2_target_identity.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "sb2_target_identity.h"
+
+/*
+ * Schema fragment (liberty-idwsf-soap-binding-v2.0.xsd):
+ *
+ * <xs:complexType name="TargetIdentityType">
+ *   <xs:sequence>
+ *     <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ *   </xs:sequence>
+ *   <xs:anyAttribute namespace="##other" processContents="lax"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2TargetIdentity, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2Sb2TargetIdentity *node)
+{
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoIdWsf2Sb2TargetIdentityClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "TargetIdentity");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SB2_HREF, LASSO_IDWSF2_SB2_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_sb2_target_identity_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2Sb2TargetIdentityClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2Sb2TargetIdentity),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2Sb2TargetIdentity", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_sb2_target_identity_new:
+ *
+ * Creates a new #LassoIdWsf2Sb2TargetIdentity object.
+ *
+ * Return value: a newly created #LassoIdWsf2Sb2TargetIdentity object
+ **/
+LassoIdWsf2Sb2TargetIdentity*
+lasso_idwsf2_sb2_target_identity_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SB2_TARGET_IDENTITY, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/sb2_target_identity.h b/lasso/xml/id-wsf-2.0/sb2_target_identity.h
new file mode 100644
index 00000000..be70fc17
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/sb2_target_identity.h
@@ -0,0 +1,81 @@
+/* $Id: sb2_target_identity.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SB2_TARGET_IDENTITY_H__
+#define __LASSO_IDWSF2_SB2_TARGET_IDENTITY_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_SB2_TARGET_IDENTITY (lasso_idwsf2_sb2_target_identity_get_type())
+#define LASSO_IDWSF2_SB2_TARGET_IDENTITY(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SB2_TARGET_IDENTITY, \
+		LassoIdWsf2Sb2TargetIdentity))
+#define LASSO_IDWSF2_SB2_TARGET_IDENTITY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SB2_TARGET_IDENTITY, \
+		LassoIdWsf2Sb2TargetIdentityClass))
+#define LASSO_IS_IDWSF2_SB2_TARGET_IDENTITY(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SB2_TARGET_IDENTITY))
+#define LASSO_IS_IDWSF2_SB2_TARGET_IDENTITY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SB2_TARGET_IDENTITY))
+#define LASSO_IDWSF2_SB2_TARGET_IDENTITY_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SB2_TARGET_IDENTITY, \
+		LassoIdWsf2Sb2TargetIdentityClass)) 
+
+
+typedef struct _LassoIdWsf2Sb2TargetIdentity LassoIdWsf2Sb2TargetIdentity;
+typedef struct _LassoIdWsf2Sb2TargetIdentityClass LassoIdWsf2Sb2TargetIdentityClass;
+
+
+struct _LassoIdWsf2Sb2TargetIdentity {
+	LassoNode parent;
+
+	/*< public >*/
+	/* attributes */
+	GHashTable *attributes;
+};
+
+
+struct _LassoIdWsf2Sb2TargetIdentityClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_sb2_target_identity_get_type(void);
+LASSO_EXPORT LassoIdWsf2Sb2TargetIdentity* lasso_idwsf2_sb2_target_identity_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SB2_TARGET_IDENTITY_H__ */
diff --git a/lasso/xml/id-wsf-2.0/sb2_timeout.c b/lasso/xml/id-wsf-2.0/sb2_timeout.c
new file mode 100644
index 00000000..cad537ce
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/sb2_timeout.c
@@ -0,0 +1,111 @@
+/* $Id: sb2_timeout.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "sb2_timeout.h"
+
+/*
+ * Schema fragment (liberty-idwsf-soap-binding-v2.0.xsd):
+ *
+ * <xs:complexType name="TimeoutType">
+ *   <xs:attribute name="maxProcessingTime" type="xs:integer" use="required"/>
+ *   <xs:anyAttribute namespace="##other" processContents="lax"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "maxProcessingTime", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER,
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2Timeout, maxProcessingTime) },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2Timeout, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2Sb2Timeout *node)
+{
+	node->maxProcessingTime = 0;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoIdWsf2Sb2TimeoutClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Timeout");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SB2_HREF, LASSO_IDWSF2_SB2_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_sb2_timeout_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2Sb2TimeoutClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2Sb2Timeout),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2Sb2Timeout", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_sb2_timeout_new:
+ *
+ * Creates a new #LassoIdWsf2Sb2Timeout object.
+ *
+ * Return value: a newly created #LassoIdWsf2Sb2Timeout object
+ **/
+LassoIdWsf2Sb2Timeout*
+lasso_idwsf2_sb2_timeout_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SB2_TIMEOUT, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/sb2_timeout.h b/lasso/xml/id-wsf-2.0/sb2_timeout.h
new file mode 100644
index 00000000..86503409
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/sb2_timeout.h
@@ -0,0 +1,82 @@
+/* $Id: sb2_timeout.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SB2_TIMEOUT_H__
+#define __LASSO_IDWSF2_SB2_TIMEOUT_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_SB2_TIMEOUT (lasso_idwsf2_sb2_timeout_get_type())
+#define LASSO_IDWSF2_SB2_TIMEOUT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SB2_TIMEOUT, \
+		LassoIdWsf2Sb2Timeout))
+#define LASSO_IDWSF2_SB2_TIMEOUT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SB2_TIMEOUT, \
+		LassoIdWsf2Sb2TimeoutClass))
+#define LASSO_IS_IDWSF2_SB2_TIMEOUT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SB2_TIMEOUT))
+#define LASSO_IS_IDWSF2_SB2_TIMEOUT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SB2_TIMEOUT))
+#define LASSO_IDWSF2_SB2_TIMEOUT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SB2_TIMEOUT, \
+		LassoIdWsf2Sb2TimeoutClass)) 
+
+
+typedef struct _LassoIdWsf2Sb2Timeout LassoIdWsf2Sb2Timeout;
+typedef struct _LassoIdWsf2Sb2TimeoutClass LassoIdWsf2Sb2TimeoutClass;
+
+
+struct _LassoIdWsf2Sb2Timeout {
+	LassoNode parent;
+
+	/*< public >*/
+	/* attributes */
+	int maxProcessingTime;
+	GHashTable *attributes;
+};
+
+
+struct _LassoIdWsf2Sb2TimeoutClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_sb2_timeout_get_type(void);
+LASSO_EXPORT LassoIdWsf2Sb2Timeout* lasso_idwsf2_sb2_timeout_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SB2_TIMEOUT_H__ */
diff --git a/lasso/xml/id-wsf-2.0/sb2_usage_directive.c b/lasso/xml/id-wsf-2.0/sb2_usage_directive.c
new file mode 100644
index 00000000..8e43780e
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/sb2_usage_directive.c
@@ -0,0 +1,115 @@
+/* $Id: sb2_usage_directive.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "sb2_usage_directive.h"
+
+/*
+ * Schema fragment (liberty-idwsf-soap-binding-v2.0.xsd):
+ *
+ * <xs:complexType name="UsageDirectiveType">
+ *   <xs:sequence>
+ *     <xs:any namespace="##other" processContents="lax"
+ *       maxOccurs="unbounded"/>
+ *     </xs:sequence>
+ *     <xs:attribute name="ref" type="xs:IDREF" use="required"/>
+ *     <xs:anyAttribute namespace="##other" processContents="lax"/>
+ *   </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "ref", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2UsageDirective, ref) },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2UsageDirective, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2Sb2UsageDirective *node)
+{
+	node->ref = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoIdWsf2Sb2UsageDirectiveClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "UsageDirective");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SB2_HREF, LASSO_IDWSF2_SB2_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_sb2_usage_directive_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2Sb2UsageDirectiveClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2Sb2UsageDirective),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2Sb2UsageDirective", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_sb2_usage_directive_new:
+ *
+ * Creates a new #LassoIdWsf2Sb2UsageDirective object.
+ *
+ * Return value: a newly created #LassoIdWsf2Sb2UsageDirective object
+ **/
+LassoIdWsf2Sb2UsageDirective*
+lasso_idwsf2_sb2_usage_directive_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SB2_USAGE_DIRECTIVE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/sb2_usage_directive.h b/lasso/xml/id-wsf-2.0/sb2_usage_directive.h
new file mode 100644
index 00000000..6b1125c8
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/sb2_usage_directive.h
@@ -0,0 +1,82 @@
+/* $Id: sb2_usage_directive.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SB2_USAGE_DIRECTIVE_H__
+#define __LASSO_IDWSF2_SB2_USAGE_DIRECTIVE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_SB2_USAGE_DIRECTIVE (lasso_idwsf2_sb2_usage_directive_get_type())
+#define LASSO_IDWSF2_SB2_USAGE_DIRECTIVE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SB2_USAGE_DIRECTIVE, \
+		LassoIdWsf2Sb2UsageDirective))
+#define LASSO_IDWSF2_SB2_USAGE_DIRECTIVE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SB2_USAGE_DIRECTIVE, \
+		LassoIdWsf2Sb2UsageDirectiveClass))
+#define LASSO_IS_IDWSF2_SB2_USAGE_DIRECTIVE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SB2_USAGE_DIRECTIVE))
+#define LASSO_IS_IDWSF2_SB2_USAGE_DIRECTIVE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SB2_USAGE_DIRECTIVE))
+#define LASSO_IDWSF2_SB2_USAGE_DIRECTIVE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SB2_USAGE_DIRECTIVE, \
+		LassoIdWsf2Sb2UsageDirectiveClass)) 
+
+
+typedef struct _LassoIdWsf2Sb2UsageDirective LassoIdWsf2Sb2UsageDirective;
+typedef struct _LassoIdWsf2Sb2UsageDirectiveClass LassoIdWsf2Sb2UsageDirectiveClass;
+
+
+struct _LassoIdWsf2Sb2UsageDirective {
+	LassoNode parent;
+
+	/*< public >*/
+	/* attributes */
+	char *ref;
+	GHashTable *attributes;
+};
+
+
+struct _LassoIdWsf2Sb2UsageDirectiveClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_sb2_usage_directive_get_type(void);
+LASSO_EXPORT LassoIdWsf2Sb2UsageDirective* lasso_idwsf2_sb2_usage_directive_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SB2_USAGE_DIRECTIVE_H__ */
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
new file mode 100644
index 00000000..de85b14d
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/sb2_user_interaction_header.c
@@ -0,0 +1,131 @@
+/* $Id: sb2_user_interaction_header.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "sb2_user_interaction_header.h"
+
+/*
+ * Schema fragment (liberty-idwsf-soap-binding-v2.0.xsd):
+ *
+ * <xs:complexType name="UserInteractionHeaderType">
+ *   <xs:sequence>
+ *     <xs:element name="InteractionService" type="wsa:EndpointReferenceType"
+ *             minOccurs="0" maxOccurs="unbounded"/>
+ *   </xs:sequence>
+ *   <xs:attribute name="interact" type="xs:string" use="optional"
+ *           default="interactIfNeeded"/>
+ *   <xs:attribute name="language" type="xs:NMTOKENS" use="optional"/>
+ *   <xs:attribute name="redirect" type="xs:boolean" use="optional" default="0"/>
+ *   <xs:attribute name="maxInteractTime" type="xs:integer" use="optional"/>
+ *   <xs:anyAttribute namespace="##other" processContents="lax"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "InteractionService", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2UserInteractionHeader, InteractionService) },
+	{ "interact", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2UserInteractionHeader, interact) },
+	{ "language", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2UserInteractionHeader, language) },
+	{ "redirect", SNIPPET_ATTRIBUTE | SNIPPET_BOOLEAN | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2UserInteractionHeader, redirect) },
+	{ "maxInteractTime", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2UserInteractionHeader, maxInteractTime) },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoIdWsf2Sb2UserInteractionHeader, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2Sb2UserInteractionHeader *node)
+{
+	node->InteractionService = NULL;
+	node->interact = NULL;
+	node->language = NULL;
+	node->redirect = FALSE;
+	node->maxInteractTime = 0;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoIdWsf2Sb2UserInteractionHeaderClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "UserInteraction");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SB2_HREF, LASSO_IDWSF2_SB2_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_sb2_user_interaction_header_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2Sb2UserInteractionHeaderClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2Sb2UserInteractionHeader),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2Sb2UserInteractionHeader", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_sb2_user_interaction_header_new:
+ *
+ * Creates a new #LassoIdWsf2Sb2UserInteractionHeader object.
+ *
+ * Return value: a newly created #LassoIdWsf2Sb2UserInteractionHeader object
+ **/
+LassoIdWsf2Sb2UserInteractionHeader*
+lasso_idwsf2_sb2_user_interaction_header_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SB2_USER_INTERACTION_HEADER, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/sb2_user_interaction_header.h b/lasso/xml/id-wsf-2.0/sb2_user_interaction_header.h
new file mode 100644
index 00000000..297ea86e
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/sb2_user_interaction_header.h
@@ -0,0 +1,88 @@
+/* $Id: sb2_user_interaction_header.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SB2_USER_INTERACTION_HEADER_H__
+#define __LASSO_IDWSF2_SB2_USER_INTERACTION_HEADER_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_SB2_USER_INTERACTION_HEADER \
+	(lasso_idwsf2_sb2_user_interaction_header_get_type())
+#define LASSO_IDWSF2_SB2_USER_INTERACTION_HEADER(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SB2_USER_INTERACTION_HEADER, \
+		LassoIdWsf2Sb2UserInteractionHeader))
+#define LASSO_IDWSF2_SB2_USER_INTERACTION_HEADER_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SB2_USER_INTERACTION_HEADER, \
+		LassoIdWsf2Sb2UserInteractionHeaderClass))
+#define LASSO_IS_IDWSF2_SB2_USER_INTERACTION_HEADER(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SB2_USER_INTERACTION_HEADER))
+#define LASSO_IS_IDWSF2_SB2_USER_INTERACTION_HEADER_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SB2_USER_INTERACTION_HEADER))
+#define LASSO_IDWSF2_SB2_USER_INTERACTION_HEADER_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SB2_USER_INTERACTION_HEADER, \
+		LassoIdWsf2Sb2UserInteractionHeaderClass)) 
+
+
+typedef struct _LassoIdWsf2Sb2UserInteractionHeader LassoIdWsf2Sb2UserInteractionHeader;
+typedef struct _LassoIdWsf2Sb2UserInteractionHeaderClass LassoIdWsf2Sb2UserInteractionHeaderClass;
+
+
+struct _LassoIdWsf2Sb2UserInteractionHeader {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	GList *InteractionService;
+	/* attributes */
+	char *interact;
+	char *language;
+	gboolean redirect;
+	int maxInteractTime;
+	GHashTable *attributes;
+};
+
+
+struct _LassoIdWsf2Sb2UserInteractionHeaderClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_sb2_user_interaction_header_get_type(void);
+LASSO_EXPORT LassoIdWsf2Sb2UserInteractionHeader* lasso_idwsf2_sb2_user_interaction_header_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SB2_USER_INTERACTION_HEADER_H__ */
diff --git a/lasso/xml/id-wsf-2.0/soap_binding_framework.c b/lasso/xml/id-wsf-2.0/sbf_framework.c
index 6c1088eb..36706b27 100644
--- a/lasso/xml/id-wsf-2.0/soap_binding_framework.c
+++ b/lasso/xml/id-wsf-2.0/sbf_framework.c
@@ -1,4 +1,4 @@
-/* $Id: soap_binding_framework.c 2183 2005-01-22 15:57:56 $ 
+/* $Id: sbf_framework.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
  *
  * Lasso - A free implementation of the Liberty Alliance specifications.
  *
@@ -22,91 +22,93 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <lasso/xml/id-wsf-2.0/soap_binding_framework.h>
+#include "sbf_framework.h"
 
 /*
  * Schema fragment (liberty-idwsf-soap-binding.xsd):
- * 
- * <xs:element name="Framework" type="FrameworkType"/>
+ *
  * <xs:complexType name="FrameworkType">
- *      <xs:sequence>
- *          <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- *      </xs:sequence>
- *      <xs:attribute name="version" type="xs:string" use="required"/>
- *      <xs:anyAttribute namespace="##other" processContents="lax"/>
- *  </xs:complexType> 
+ *   <xs:sequence>
+ *     <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ *   </xs:sequence>
+ *   <xs:attribute name="version" type="xs:string" use="required"/>
+ *   <xs:anyAttribute namespace="##other" processContents="lax"/>
+ * </xs:complexType>
  */
 
 /*****************************************************************************/
 /* private methods                                                           */
 /*****************************************************************************/
 
+
 static struct XmlSnippet schema_snippets[] = {
-	{ "version", SNIPPET_ATTRIBUTE,	G_STRUCT_OFFSET(LassoSoapBindingFramework, Version) },
-	{ NULL, 0, 0}
+	{ "version", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoIdWsf2SbfFramework, version) },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoIdWsf2SbfFramework, attributes) },
+	{NULL, 0, 0}
 };
 
+static LassoNodeClass *parent_class = NULL;
+
+
 /*****************************************************************************/
 /* instance and class init functions                                         */
 /*****************************************************************************/
 
 static void
-instance_init(LassoSoapBindingFramework *node)
+instance_init(LassoIdWsf2SbfFramework *node)
 {
-	node->Version = NULL;
+	node->version = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
 }
 
 static void
-class_init(LassoSoapBindingFrameworkClass *klass)
+class_init(LassoIdWsf2SbfFrameworkClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
 
+	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "Framework");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SOAP_BINDING_HREF,
-			LASSO_IDWSF2_SOAP_BINDING_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SBF_HREF, LASSO_IDWSF2_SBF_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
 GType
-lasso_soap_binding_framework_get_type()
+lasso_idwsf2_sbf_framework_get_type()
 {
 	static GType this_type = 0;
 
 	if (!this_type) {
 		static const GTypeInfo this_info = {
-			sizeof (LassoSoapBindingFrameworkClass),
+			sizeof (LassoIdWsf2SbfFrameworkClass),
 			NULL,
 			NULL,
 			(GClassInitFunc) class_init,
 			NULL,
 			NULL,
-			sizeof(LassoSoapBindingFramework),
+			sizeof(LassoIdWsf2SbfFramework),
 			0,
 			(GInstanceInitFunc) instance_init,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
-				"LassoSoapBindingFramework", &this_info, 0);
+				"LassoIdWsf2SbfFramework", &this_info, 0);
 	}
 	return this_type;
 }
 
-LassoSoapBindingFramework*
-lasso_soap_binding_framework_new()
-{
-	return g_object_new(LASSO_TYPE_SOAP_BINDING_FRAMEWORK, NULL);
-}
-
-LassoSoapBindingFramework*
-lasso_soap_binding_framework_new_full(gchar *version)
+/**
+ * lasso_idwsf2_sbf_framework_new:
+ *
+ * Creates a new #LassoIdWsf2SbfFramework object.
+ *
+ * Return value: a newly created #LassoIdWsf2SbfFramework object
+ **/
+LassoIdWsf2SbfFramework*
+lasso_idwsf2_sbf_framework_new()
 {
-	LassoSoapBindingFramework *framework;
-
-	framework = g_object_new(LASSO_TYPE_SOAP_BINDING_FRAMEWORK, NULL);
-
-	framework->Version = g_strdup(version);
-
-	return framework;
+	return g_object_new(LASSO_TYPE_IDWSF2_SBF_FRAMEWORK, NULL);
 }
-
diff --git a/lasso/xml/id-wsf-2.0/sbf_framework.h b/lasso/xml/id-wsf-2.0/sbf_framework.h
new file mode 100644
index 00000000..746471a6
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/sbf_framework.h
@@ -0,0 +1,82 @@
+/* $Id: sbf_framework.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SBF_FRAMEWORK_H__
+#define __LASSO_IDWSF2_SBF_FRAMEWORK_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_SBF_FRAMEWORK (lasso_idwsf2_sbf_framework_get_type())
+#define LASSO_IDWSF2_SBF_FRAMEWORK(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SBF_FRAMEWORK, \
+		LassoIdWsf2SbfFramework))
+#define LASSO_IDWSF2_SBF_FRAMEWORK_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SBF_FRAMEWORK, \
+		LassoIdWsf2SbfFrameworkClass))
+#define LASSO_IS_IDWSF2_SBF_FRAMEWORK(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SBF_FRAMEWORK))
+#define LASSO_IS_IDWSF2_SBF_FRAMEWORK_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SBF_FRAMEWORK))
+#define LASSO_IDWSF2_SBF_FRAMEWORK_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SBF_FRAMEWORK, \
+		LassoIdWsf2SbfFrameworkClass)) 
+
+
+typedef struct _LassoIdWsf2SbfFramework LassoIdWsf2SbfFramework;
+typedef struct _LassoIdWsf2SbfFrameworkClass LassoIdWsf2SbfFrameworkClass;
+
+
+struct _LassoIdWsf2SbfFramework {
+	LassoNode parent;
+
+	/*< public >*/
+	/* attributes */
+	char *version;
+	GHashTable *attributes;
+};
+
+
+struct _LassoIdWsf2SbfFrameworkClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_sbf_framework_get_type(void);
+LASSO_EXPORT LassoIdWsf2SbfFramework* lasso_idwsf2_sbf_framework_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SBF_FRAMEWORK_H__ */
diff --git a/lasso/xml/id-wsf-2.0/sec_token.c b/lasso/xml/id-wsf-2.0/sec_token.c
index 28559fb3..0ef10d6c 100644
--- a/lasso/xml/id-wsf-2.0/sec_token.c
+++ b/lasso/xml/id-wsf-2.0/sec_token.c
@@ -44,13 +44,13 @@
 
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "any", SNIPPET_NODE | SNIPPET_ANY,
+	{ "", SNIPPET_NODE | SNIPPET_ANY | SNIPPET_ANY,
 		G_STRUCT_OFFSET(LassoIdWsf2SecToken, any) },
-	{ "id", SNIPPET_ATTRIBUTE,
+	{ "id", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
 		G_STRUCT_OFFSET(LassoIdWsf2SecToken, id) },
-	{ "ref", SNIPPET_ATTRIBUTE,
+	{ "ref", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
 		G_STRUCT_OFFSET(LassoIdWsf2SecToken, ref) },
-	{ "usage", SNIPPET_ATTRIBUTE,
+	{ "usage", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
 		G_STRUCT_OFFSET(LassoIdWsf2SecToken, usage) },
 	{NULL, 0, 0}
 };
@@ -114,7 +114,7 @@ lasso_idwsf2_sec_token_get_type()
  *
  * Return value: a newly created #LassoIdWsf2SecToken object
  **/
-LassoNode*
+LassoIdWsf2SecToken*
 lasso_idwsf2_sec_token_new()
 {
 	return g_object_new(LASSO_TYPE_IDWSF2_SEC_TOKEN, NULL);
diff --git a/lasso/xml/id-wsf-2.0/sec_token.h b/lasso/xml/id-wsf-2.0/sec_token.h
index e7e9f5bc..f43fd33d 100644
--- a/lasso/xml/id-wsf-2.0/sec_token.h
+++ b/lasso/xml/id-wsf-2.0/sec_token.h
@@ -74,7 +74,7 @@ struct _LassoIdWsf2SecTokenClass {
 };
 
 LASSO_EXPORT GType lasso_idwsf2_sec_token_get_type(void);
-LASSO_EXPORT LassoNode* lasso_idwsf2_sec_token_new(void);
+LASSO_EXPORT LassoIdWsf2SecToken* lasso_idwsf2_sec_token_new(void);
 
 
 
diff --git a/lasso/xml/id-wsf-2.0/sec_token_policy.c b/lasso/xml/id-wsf-2.0/sec_token_policy.c
new file mode 100644
index 00000000..f0e910ba
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/sec_token_policy.c
@@ -0,0 +1,129 @@
+/* $Id: sec_token_policy.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "sec_token_policy.h"
+
+/*
+ * Schema fragment (liberty-idwsf-security-mechanisms-v2.0.xsd):
+ *
+ * <xs:complexType name="TokenPolicyType">
+ *   <xs:sequence>
+ *     <xs:any namespace="##any" processContents="lax" minOccurs="0"/>
+ *   </xs:sequence>
+ *   <xs:attribute name="validUntil" type="xs:dateTime" use="optional"/>
+ *   <xs:attribute name="issueTo" type="xs:anyURI" use="optional"/>
+ *   <xs:attribute name="type" type="xs:anyURI" use="optional"/>
+ *   <xs:attribute name="wantDSEPR" type="xs:boolean" use="optional" />
+ *   <xs:anyAttribute namespace="##other" processContents="lax" />
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "", SNIPPET_NODE | SNIPPET_ANY | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoIdWsf2SecTokenPolicy, any) },
+	{ "validUntil", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2SecTokenPolicy, validUntil) },
+	{ "issueTo", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2SecTokenPolicy, issueTo) },
+	{ "type", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2SecTokenPolicy, type) },
+	{ "wantDSEPR", SNIPPET_ATTRIBUTE | SNIPPET_BOOLEAN | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2SecTokenPolicy, wantDSEPR) },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoIdWsf2SecTokenPolicy, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2SecTokenPolicy *node)
+{
+	node->any = NULL;
+	node->validUntil = NULL;
+	node->issueTo = NULL;
+	node->type = NULL;
+	node->wantDSEPR = FALSE;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoIdWsf2SecTokenPolicyClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "TokenPolicy");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SEC_HREF, LASSO_IDWSF2_SEC_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_sec_token_policy_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2SecTokenPolicyClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2SecTokenPolicy),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2SecTokenPolicy", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_sec_token_policy_new:
+ *
+ * Creates a new #LassoIdWsf2SecTokenPolicy object.
+ *
+ * Return value: a newly created #LassoIdWsf2SecTokenPolicy object
+ **/
+LassoIdWsf2SecTokenPolicy*
+lasso_idwsf2_sec_token_policy_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SEC_TOKEN_POLICY, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/sec_token_policy.h b/lasso/xml/id-wsf-2.0/sec_token_policy.h
new file mode 100644
index 00000000..2eebb2ca
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/sec_token_policy.h
@@ -0,0 +1,87 @@
+/* $Id: sec_token_policy.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SEC_TOKEN_POLICY_H__
+#define __LASSO_IDWSF2_SEC_TOKEN_POLICY_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_SEC_TOKEN_POLICY (lasso_idwsf2_sec_token_policy_get_type())
+#define LASSO_IDWSF2_SEC_TOKEN_POLICY(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SEC_TOKEN_POLICY, \
+		LassoIdWsf2SecTokenPolicy))
+#define LASSO_IDWSF2_SEC_TOKEN_POLICY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SEC_TOKEN_POLICY, \
+		LassoIdWsf2SecTokenPolicyClass))
+#define LASSO_IS_IDWSF2_SEC_TOKEN_POLICY(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SEC_TOKEN_POLICY))
+#define LASSO_IS_IDWSF2_SEC_TOKEN_POLICY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SEC_TOKEN_POLICY))
+#define LASSO_IDWSF2_SEC_TOKEN_POLICY_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SEC_TOKEN_POLICY, \
+		LassoIdWsf2SecTokenPolicyClass)) 
+
+
+typedef struct _LassoIdWsf2SecTokenPolicy LassoIdWsf2SecTokenPolicy;
+typedef struct _LassoIdWsf2SecTokenPolicyClass LassoIdWsf2SecTokenPolicyClass;
+
+
+struct _LassoIdWsf2SecTokenPolicy {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	LassoNode *any;
+	/* attributes */
+	char *validUntil;
+	char *issueTo;
+	char *type;
+	gboolean wantDSEPR;
+	GHashTable *attributes;
+};
+
+
+struct _LassoIdWsf2SecTokenPolicyClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_sec_token_policy_get_type(void);
+LASSO_EXPORT LassoIdWsf2SecTokenPolicy* lasso_idwsf2_sec_token_policy_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SEC_TOKEN_POLICY_H__ */
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
new file mode 100644
index 00000000..13792c3e
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/sec_transited_provider_path.c
@@ -0,0 +1,109 @@
+/* $Id: sec_transited_provider_path.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "sec_transited_provider_path.h"
+
+/*
+ * Schema fragment (liberty-idwsf-security-mechanisms-v2.0.xsd):
+ *
+ * <xs:complexType name="TransitedProviderPathType">
+ *   <xs:sequence>
+ *     <xs:element ref="sec:TransitedProvider" minOccurs="1"
+ *       maxOccurs="unbounded" />
+ *     </xs:sequence>
+ *   </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "TransitedProvider", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2SecTransitedProviderPath, TransitedProvider) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2SecTransitedProviderPath *node)
+{
+	node->TransitedProvider = NULL;
+}
+
+static void
+class_init(LassoIdWsf2SecTransitedProviderPathClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "TransitedProviderPath");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SEC_HREF, LASSO_IDWSF2_SEC_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_sec_transited_provider_path_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2SecTransitedProviderPathClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2SecTransitedProviderPath),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2SecTransitedProviderPath", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_sec_transited_provider_path_new:
+ *
+ * Creates a new #LassoIdWsf2SecTransitedProviderPath object.
+ *
+ * Return value: a newly created #LassoIdWsf2SecTransitedProviderPath object
+ **/
+LassoIdWsf2SecTransitedProviderPath*
+lasso_idwsf2_sec_transited_provider_path_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SEC_TRANSITED_PROVIDER_PATH, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/sec_transited_provider_path.h b/lasso/xml/id-wsf-2.0/sec_transited_provider_path.h
new file mode 100644
index 00000000..dc04ab18
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/sec_transited_provider_path.h
@@ -0,0 +1,82 @@
+/* $Id: sec_transited_provider_path.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SEC_TRANSITED_PROVIDER_PATH_H__
+#define __LASSO_IDWSF2_SEC_TRANSITED_PROVIDER_PATH_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_SEC_TRANSITED_PROVIDER_PATH \
+	(lasso_idwsf2_sec_transited_provider_path_get_type())
+#define LASSO_IDWSF2_SEC_TRANSITED_PROVIDER_PATH(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SEC_TRANSITED_PROVIDER_PATH, \
+		LassoIdWsf2SecTransitedProviderPath))
+#define LASSO_IDWSF2_SEC_TRANSITED_PROVIDER_PATH_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SEC_TRANSITED_PROVIDER_PATH, \
+		LassoIdWsf2SecTransitedProviderPathClass))
+#define LASSO_IS_IDWSF2_SEC_TRANSITED_PROVIDER_PATH(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SEC_TRANSITED_PROVIDER_PATH))
+#define LASSO_IS_IDWSF2_SEC_TRANSITED_PROVIDER_PATH_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SEC_TRANSITED_PROVIDER_PATH))
+#define LASSO_IDWSF2_SEC_TRANSITED_PROVIDER_PATH_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SEC_TRANSITED_PROVIDER_PATH, \
+		LassoIdWsf2SecTransitedProviderPathClass)) 
+
+
+typedef struct _LassoIdWsf2SecTransitedProviderPath LassoIdWsf2SecTransitedProviderPath;
+typedef struct _LassoIdWsf2SecTransitedProviderPathClass LassoIdWsf2SecTransitedProviderPathClass;
+
+
+struct _LassoIdWsf2SecTransitedProviderPath {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	GList *TransitedProvider;
+};
+
+
+struct _LassoIdWsf2SecTransitedProviderPathClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_sec_transited_provider_path_get_type(void);
+LASSO_EXPORT LassoIdWsf2SecTransitedProviderPath* lasso_idwsf2_sec_transited_provider_path_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SEC_TRANSITED_PROVIDER_PATH_H__ */
diff --git a/lasso/xml/id-wsf-2.0/soap_binding2_redirect_request.h b/lasso/xml/id-wsf-2.0/soap_binding2_redirect_request.h
deleted file mode 100644
index 1623b657..00000000
--- a/lasso/xml/id-wsf-2.0/soap_binding2_redirect_request.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* $Id: soap_binding2_redirect_request.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
- *
- * Lasso - A free implementation of the Liberty Alliance specifications.
- *
- * Copyright (C) 2004-2007 Entr'ouvert
- * http://lasso.entrouvert.org
- * 
- * Authors: See AUTHORS file in top-level directory.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __LASSO_IDWSF2_SOAP_BINDING2_REDIRECT_REQUEST_H__
-#define __LASSO_IDWSF2_SOAP_BINDING2_REDIRECT_REQUEST_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <lasso/xml/xml.h>
-
-#define LASSO_TYPE_IDWSF2_SOAP_BINDING2_REDIRECT_REQUEST (lasso_idwsf2_soap_binding2_redirect_request_get_type())
-#define LASSO_IDWSF2_SOAP_BINDING2_REDIRECT_REQUEST(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
-		LASSO_TYPE_IDWSF2_SOAP_BINDING2_REDIRECT_REQUEST, \
-		LassoIdWsf2SoapBinding2RedirectRequest))
-#define LASSO_IDWSF2_SOAP_BINDING2_REDIRECT_REQUEST_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST((klass), \
-		LASSO_TYPE_IDWSF2_SOAP_BINDING2_REDIRECT_REQUEST, \
-		LassoIdWsf2SoapBinding2RedirectRequestClass))
-#define LASSO_IS_IDWSF2_SOAP_BINDING2_REDIRECT_REQUEST(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
-		LASSO_TYPE_IDWSF2_SOAP_BINDING2_REDIRECT_REQUEST))
-#define LASSO_IS_IDWSF2_SOAP_BINDING2_REDIRECT_REQUEST_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
-		LASSO_TYPE_IDWSF2_SOAP_BINDING2_REDIRECT_REQUEST))
-#define LASSO_IDWSF2_SOAP_BINDING2_REDIRECT_REQUEST_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), \
-		LASSO_TYPE_IDWSF2_SOAP_BINDING2_REDIRECT_REQUEST, \
-		LassoIdWsf2SoapBinding2RedirectRequestClass)) 
-
-
-typedef struct _LassoIdWsf2SoapBinding2RedirectRequest LassoIdWsf2SoapBinding2RedirectRequest;
-typedef struct _LassoIdWsf2SoapBinding2RedirectRequestClass LassoIdWsf2SoapBinding2RedirectRequestClass;
-
-
-struct _LassoIdWsf2SoapBinding2RedirectRequest {
-	LassoNode parent;
-
-	/*< public >*/
-	/* attributes */
-	char *redirectURL;
-};
-
-
-struct _LassoIdWsf2SoapBinding2RedirectRequestClass {
-	LassoNodeClass parent;
-};
-
-LASSO_EXPORT GType lasso_idwsf2_soap_binding2_redirect_request_get_type(void);
-LASSO_EXPORT LassoNode* lasso_idwsf2_soap_binding2_redirect_request_new(void);
-
-LASSO_EXPORT LassoNode* lasso_idwsf2_soap_binding2_redirect_request_new_full(
-	const gchar *redirect_url);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __LASSO_IDWSF2_SOAP_BINDING2_REDIRECT_REQUEST_H__ */
diff --git a/lasso/xml/id-wsf-2.0/soap_binding_framework.h b/lasso/xml/id-wsf-2.0/soap_binding_framework.h
deleted file mode 100644
index 7d8e5878..00000000
--- a/lasso/xml/id-wsf-2.0/soap_binding_framework.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* $Id: soap_binding_framework.h 2183 2005-01-22 15:57:56Z $ 
- *
- * Lasso - A free implementation of the Liberty Alliance specifications.
- *
- * Copyright (C) 2004-2007 Entr'ouvert
- * http://lasso.entrouvert.org
- * 
- * Authors: See AUTHORS file in top-level directory.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __LASSO_SOAP_BINDING_FRAMEWORK_H__
-#define __LASSO_SOAP_BINDING_FRAMEWORK_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */ 
-
-#include <lasso/xml/xml.h>
-
-#define LASSO_TYPE_SOAP_BINDING_FRAMEWORK (lasso_soap_binding_framework_get_type())
-#define LASSO_SOAP_BINDING_FRAMEWORK(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-	 LASSO_TYPE_SOAP_BINDING_FRAMEWORK, LassoSoapBindingFramework))
-#define LASSO_SOAP_BINDING_FRAMEWORK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
-	 LASSO_TYPE_SOAP_BINDING_FRAMEWORK, LassoSoapBindingFrameworkClass))
-#define LASSO_IS_SOAP_BINDING_FRAMEWORK(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
-	 LASSO_TYPE_SOAP_BINDING_FRAMEWORK))
-#define LASSO_IS_SOAP_BINDING_FRAMEWORK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-	 LASSO_TYPE_SOAP_BINDING_FRAMEWORK))
-#define LASSO_SOAP_BINDING_FRAMEWORK_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
-	 LASSO_TYPE_SOAP_BINDING_FRAMEWORK, LassoSoapBindingFrameworkClass)) 
-
-typedef struct _LassoSoapBindingFramework LassoSoapBindingFramework;
-typedef struct _LassoSoapBindingFrameworkClass LassoSoapBindingFrameworkClass;
-
-struct _LassoSoapBindingFramework {
-	LassoNode parent;
-
-	gchar *Version;
-};
-
-struct _LassoSoapBindingFrameworkClass {
-	LassoNodeClass parent;
-};
-
-LASSO_EXPORT GType lasso_soap_binding_framework_get_type(void);
-
-LASSO_EXPORT LassoSoapBindingFramework* lasso_soap_binding_framework_new();
-
-LASSO_EXPORT LassoSoapBindingFramework* lasso_soap_binding_framework_new_full(gchar *version);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __LASSO_SOAP_BINDING_FRAMEWORK_H__ */
diff --git a/lasso/xml/id-wsf-2.0/subs_notification.c b/lasso/xml/id-wsf-2.0/subs_notification.c
new file mode 100644
index 00000000..c857a089
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subs_notification.c
@@ -0,0 +1,125 @@
+/* $Id: subs_notification.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "subs_notification.h"
+
+/*
+ * Schema fragment (liberty-idwsf-subs-v1.0.xsd):
+ *
+ * <xs:complexType name="NotificationType">
+ *   <xs:sequence>
+ *     <xs:element ref="lu:TestResult" minOccurs="0" maxOccurs="unbounded"/>
+ *   </xs:sequence>
+ *   <xs:attribute name="id" use="optional" type="xs:ID"/>
+ *   <xs:attribute name="subscriptionID" use="required" type="lu:IDType"/>
+ *   <xs:attribute name="expires" use="optional" type="xs:dateTime"/>
+ *   <xs:attribute name="endReason" use="optional" type="xs:anyURI"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "TestResult", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsNotification, TestResult),
+		"LassoIdWsf2UtilTestResult" },
+	{ "id", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsNotification, id) },
+	{ "subscriptionID", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsNotification, subscriptionID) },
+	{ "expires", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsNotification, expires) },
+	{ "endReason", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsNotification, endReason) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2SubsNotification *node)
+{
+	node->TestResult = NULL;
+	node->id = NULL;
+	node->subscriptionID = NULL;
+	node->expires = NULL;
+	node->endReason = NULL;
+}
+
+static void
+class_init(LassoIdWsf2SubsNotificationClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Notification");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SUBS_HREF, LASSO_IDWSF2_SUBS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_subs_notification_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2SubsNotificationClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2SubsNotification),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2SubsNotification", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_subs_notification_new:
+ *
+ * Creates a new #LassoIdWsf2SubsNotification object.
+ *
+ * Return value: a newly created #LassoIdWsf2SubsNotification object
+ **/
+LassoIdWsf2SubsNotification*
+lasso_idwsf2_subs_notification_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SUBS_NOTIFICATION, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/subs_notification.h b/lasso/xml/id-wsf-2.0/subs_notification.h
new file mode 100644
index 00000000..673e8f1c
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subs_notification.h
@@ -0,0 +1,86 @@
+/* $Id: subs_notification.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SUBS_NOTIFICATION_H__
+#define __LASSO_IDWSF2_SUBS_NOTIFICATION_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_SUBS_NOTIFICATION (lasso_idwsf2_subs_notification_get_type())
+#define LASSO_IDWSF2_SUBS_NOTIFICATION(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SUBS_NOTIFICATION, \
+		LassoIdWsf2SubsNotification))
+#define LASSO_IDWSF2_SUBS_NOTIFICATION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SUBS_NOTIFICATION, \
+		LassoIdWsf2SubsNotificationClass))
+#define LASSO_IS_IDWSF2_SUBS_NOTIFICATION(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SUBS_NOTIFICATION))
+#define LASSO_IS_IDWSF2_SUBS_NOTIFICATION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SUBS_NOTIFICATION))
+#define LASSO_IDWSF2_SUBS_NOTIFICATION_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SUBS_NOTIFICATION, \
+		LassoIdWsf2SubsNotificationClass)) 
+
+
+typedef struct _LassoIdWsf2SubsNotification LassoIdWsf2SubsNotification;
+typedef struct _LassoIdWsf2SubsNotificationClass LassoIdWsf2SubsNotificationClass;
+
+
+struct _LassoIdWsf2SubsNotification {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	GList *TestResult; /* of LassoIdWsf2UtilTestResult */
+	/* attributes */
+	char *id;
+	char *subscriptionID;
+	char *expires;
+	char *endReason;
+};
+
+
+struct _LassoIdWsf2SubsNotificationClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_subs_notification_get_type(void);
+LASSO_EXPORT LassoIdWsf2SubsNotification* lasso_idwsf2_subs_notification_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SUBS_NOTIFICATION_H__ */
diff --git a/lasso/xml/id-wsf-2.0/subs_notify_response.c b/lasso/xml/id-wsf-2.0/subs_notify_response.c
new file mode 100644
index 00000000..0daff1f5
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subs_notify_response.c
@@ -0,0 +1,105 @@
+/* $Id: subs_notify_response.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "subs_notify_response.h"
+
+/*
+ * Schema fragment (liberty-idwsf-subs-v1.0.xsd):
+ *
+ * <xs:complexType name="NotifyResponseType">
+ *   <xs:complexContent>
+ *     <xs:extension base="lu:ResponseType"/>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2SubsNotifyResponse *node)
+{
+}
+
+static void
+class_init(LassoIdWsf2SubsNotifyResponseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "NotifyResponse");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SUBS_HREF, LASSO_IDWSF2_SUBS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_subs_notify_response_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2SubsNotifyResponseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2SubsNotifyResponse),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_UTIL_RESPONSE,
+				"LassoIdWsf2SubsNotifyResponse", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_subs_notify_response_new:
+ *
+ * Creates a new #LassoIdWsf2SubsNotifyResponse object.
+ *
+ * Return value: a newly created #LassoIdWsf2SubsNotifyResponse object
+ **/
+LassoIdWsf2SubsNotifyResponse*
+lasso_idwsf2_subs_notify_response_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SUBS_NOTIFY_RESPONSE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/subs_notify_response.h b/lasso/xml/id-wsf-2.0/subs_notify_response.h
new file mode 100644
index 00000000..2cdeb2ed
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subs_notify_response.h
@@ -0,0 +1,80 @@
+/* $Id: subs_notify_response.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SUBS_NOTIFY_RESPONSE_H__
+#define __LASSO_IDWSF2_SUBS_NOTIFY_RESPONSE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "util_response.h"
+
+#define LASSO_TYPE_IDWSF2_SUBS_NOTIFY_RESPONSE (lasso_idwsf2_subs_notify_response_get_type())
+#define LASSO_IDWSF2_SUBS_NOTIFY_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SUBS_NOTIFY_RESPONSE, \
+		LassoIdWsf2SubsNotifyResponse))
+#define LASSO_IDWSF2_SUBS_NOTIFY_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SUBS_NOTIFY_RESPONSE, \
+		LassoIdWsf2SubsNotifyResponseClass))
+#define LASSO_IS_IDWSF2_SUBS_NOTIFY_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SUBS_NOTIFY_RESPONSE))
+#define LASSO_IS_IDWSF2_SUBS_NOTIFY_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SUBS_NOTIFY_RESPONSE))
+#define LASSO_IDWSF2_SUBS_NOTIFY_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SUBS_NOTIFY_RESPONSE, \
+		LassoIdWsf2SubsNotifyResponseClass)) 
+
+
+typedef struct _LassoIdWsf2SubsNotifyResponse LassoIdWsf2SubsNotifyResponse;
+typedef struct _LassoIdWsf2SubsNotifyResponseClass LassoIdWsf2SubsNotifyResponseClass;
+
+
+struct _LassoIdWsf2SubsNotifyResponse {
+	LassoIdWsf2UtilResponse parent;
+
+	/*< public >*/
+};
+
+
+struct _LassoIdWsf2SubsNotifyResponseClass {
+	LassoIdWsf2UtilResponseClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_subs_notify_response_get_type(void);
+LASSO_EXPORT LassoIdWsf2SubsNotifyResponse* lasso_idwsf2_subs_notify_response_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SUBS_NOTIFY_RESPONSE_H__ */
diff --git a/lasso/xml/id-wsf-2.0/subs_ref_item.c b/lasso/xml/id-wsf-2.0/subs_ref_item.c
new file mode 100644
index 00000000..ffa0b433
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subs_ref_item.c
@@ -0,0 +1,110 @@
+/* $Id: subs_ref_item.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "subs_ref_item.h"
+
+/*
+ * Schema fragment (liberty-idwsf-subs-v1.0.xsd):
+ *
+ * <xs:complexType name="RefItemType">
+ *   <xs:attribute name="subscriptionID" use="optional" type="lu:IDType"/>
+ *   <xs:attribute ref="lu:itemIDRef" use="required"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "subscriptionID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefItem, subscriptionID) },
+	{ "itemIDRef", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefItem, itemIDRef) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2SubsRefItem *node)
+{
+	node->subscriptionID = NULL;
+	node->itemIDRef = NULL;
+}
+
+static void
+class_init(LassoIdWsf2SubsRefItemClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "RefItem");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SUBS_HREF, LASSO_IDWSF2_SUBS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_subs_ref_item_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2SubsRefItemClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2SubsRefItem),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2SubsRefItem", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_subs_ref_item_new:
+ *
+ * Creates a new #LassoIdWsf2SubsRefItem object.
+ *
+ * Return value: a newly created #LassoIdWsf2SubsRefItem object
+ **/
+LassoIdWsf2SubsRefItem*
+lasso_idwsf2_subs_ref_item_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SUBS_REF_ITEM, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/subs_ref_item.h b/lasso/xml/id-wsf-2.0/subs_ref_item.h
new file mode 100644
index 00000000..2fb24d34
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subs_ref_item.h
@@ -0,0 +1,82 @@
+/* $Id: subs_ref_item.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SUBS_REF_ITEM_H__
+#define __LASSO_IDWSF2_SUBS_REF_ITEM_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_SUBS_REF_ITEM (lasso_idwsf2_subs_ref_item_get_type())
+#define LASSO_IDWSF2_SUBS_REF_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SUBS_REF_ITEM, \
+		LassoIdWsf2SubsRefItem))
+#define LASSO_IDWSF2_SUBS_REF_ITEM_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SUBS_REF_ITEM, \
+		LassoIdWsf2SubsRefItemClass))
+#define LASSO_IS_IDWSF2_SUBS_REF_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SUBS_REF_ITEM))
+#define LASSO_IS_IDWSF2_SUBS_REF_ITEM_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SUBS_REF_ITEM))
+#define LASSO_IDWSF2_SUBS_REF_ITEM_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SUBS_REF_ITEM, \
+		LassoIdWsf2SubsRefItemClass)) 
+
+
+typedef struct _LassoIdWsf2SubsRefItem LassoIdWsf2SubsRefItem;
+typedef struct _LassoIdWsf2SubsRefItemClass LassoIdWsf2SubsRefItemClass;
+
+
+struct _LassoIdWsf2SubsRefItem {
+	LassoNode parent;
+
+	/*< public >*/
+	/* attributes */
+	char *subscriptionID;
+	char *itemIDRef;
+};
+
+
+struct _LassoIdWsf2SubsRefItemClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_subs_ref_item_get_type(void);
+LASSO_EXPORT LassoIdWsf2SubsRefItem* lasso_idwsf2_subs_ref_item_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SUBS_REF_ITEM_H__ */
diff --git a/lasso/xml/id-wsf-2.0/subs_subscription.c b/lasso/xml/id-wsf-2.0/subs_subscription.c
new file mode 100644
index 00000000..5add1af9
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subs_subscription.c
@@ -0,0 +1,149 @@
+/* $Id: subs_subscription.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "subs_subscription.h"
+
+/*
+ * Schema fragment (liberty-idwsf-subs-v1.0.xsd):
+ *
+ * <xs:complexType name="SubscriptionType">
+ *   <xs:sequence>
+ *     <xs:element ref="subs:RefItem" minOccurs="0" maxOccurs="unbounded"/>
+ *     <xs:element ref="lu:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ *   </xs:sequence>
+ *   <xs:attribute name="subscriptionID" use="required" type="lu:IDType"/>
+ *   <xs:attribute name="notifyToRef" use="required" type="xs:anyURI"/>
+ *   <xs:attribute name="adminNotifyToRef" use="optional" type="xs:anyURI"/>
+ *   <xs:attribute name="starts" use="optional" type="xs:dateTime"/>
+ *   <xs:attribute name="expires" use="optional" type="xs:dateTime"/>
+ *   <xs:attribute name="id" use="optional" type="xs:ID"/>
+ *   <xs:attribute name="includeData" use="optional">
+ *     <xs:simpleType>
+ *       <xs:restriction base="xs:string">
+ *         <xs:enumeration value="Yes"/>
+ *         <xs:enumeration value="No"/>
+ *         <xs:enumeration value="YesWithCommonAttributes"/>
+ *       </xs:restriction>
+ *     </xs:simpleType>
+ *   </xs:attribute>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "RefItem", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, RefItem) },
+	{ "Extension", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, Extension),
+		"LassoIdWsf2Utilextension" },
+	{ "subscriptionID", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, subscriptionID) },
+	{ "notifyToRef", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, notifyToRef) },
+	{ "adminNotifyToRef", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, adminNotifyToRef) },
+	{ "starts", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, starts) },
+	{ "expires", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, expires) },
+	{ "id", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, id) },
+	{ "includeData", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsSubscription, includeData) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2SubsSubscription *node)
+{
+	node->RefItem = NULL;
+	node->Extension = NULL;
+	node->subscriptionID = NULL;
+	node->notifyToRef = NULL;
+	node->adminNotifyToRef = NULL;
+	node->starts = NULL;
+	node->expires = NULL;
+	node->id = NULL;
+	node->includeData = NULL;
+}
+
+static void
+class_init(LassoIdWsf2SubsSubscriptionClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Subscription");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SUBS_HREF, LASSO_IDWSF2_SUBS_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_subs_subscription_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2SubsSubscriptionClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2SubsSubscription),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2SubsSubscription", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_subs_subscription_new:
+ *
+ * Creates a new #LassoIdWsf2SubsSubscription object.
+ *
+ * Return value: a newly created #LassoIdWsf2SubsSubscription object
+ **/
+LassoIdWsf2SubsSubscription*
+lasso_idwsf2_subs_subscription_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SUBS_SUBSCRIPTION, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/subs_subscription.h b/lasso/xml/id-wsf-2.0/subs_subscription.h
new file mode 100644
index 00000000..0f76642f
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subs_subscription.h
@@ -0,0 +1,90 @@
+/* $Id: subs_subscription.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SUBS_SUBSCRIPTION_H__
+#define __LASSO_IDWSF2_SUBS_SUBSCRIPTION_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_SUBS_SUBSCRIPTION (lasso_idwsf2_subs_subscription_get_type())
+#define LASSO_IDWSF2_SUBS_SUBSCRIPTION(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SUBS_SUBSCRIPTION, \
+		LassoIdWsf2SubsSubscription))
+#define LASSO_IDWSF2_SUBS_SUBSCRIPTION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SUBS_SUBSCRIPTION, \
+		LassoIdWsf2SubsSubscriptionClass))
+#define LASSO_IS_IDWSF2_SUBS_SUBSCRIPTION(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SUBS_SUBSCRIPTION))
+#define LASSO_IS_IDWSF2_SUBS_SUBSCRIPTION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SUBS_SUBSCRIPTION))
+#define LASSO_IDWSF2_SUBS_SUBSCRIPTION_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SUBS_SUBSCRIPTION, \
+		LassoIdWsf2SubsSubscriptionClass)) 
+
+
+typedef struct _LassoIdWsf2SubsSubscription LassoIdWsf2SubsSubscription;
+typedef struct _LassoIdWsf2SubsSubscriptionClass LassoIdWsf2SubsSubscriptionClass;
+
+
+struct _LassoIdWsf2SubsSubscription {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	GList *RefItem;
+	GList *Extension; /* of LassoIdWsf2Utilextension */
+	/* attributes */
+	char *subscriptionID;
+	char *notifyToRef;
+	char *adminNotifyToRef;
+	char *starts;
+	char *expires;
+	char *id;
+	char *includeData;
+};
+
+
+struct _LassoIdWsf2SubsSubscriptionClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_subs_subscription_get_type(void);
+LASSO_EXPORT LassoIdWsf2SubsSubscription* lasso_idwsf2_subs_subscription_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SUBS_SUBSCRIPTION_H__ */
diff --git a/lasso/xml/ws/wsse_200401_security.c b/lasso/xml/id-wsf-2.0/subsref_app_data.c
index e217894f..0e6af5bf 100644
--- a/lasso/xml/ws/wsse_200401_security.c
+++ b/lasso/xml/id-wsf-2.0/subsref_app_data.c
@@ -1,4 +1,5 @@
-/* $Id: wsse_200401_security.c 2495 2005-05-02 09:17:08Z nclapies $
+/* $Id: subsref_app_data.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
  * Lasso - A free implementation of the Liberty Alliance specifications.
  *
  * Copyright (C) 2004-2007 Entr'ouvert
@@ -21,85 +22,83 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <lasso/xml/ws/wsse_200401_security.h>
+#include "subsref_app_data.h"
 
 /*
+ * Schema fragment (liberty-idwsf-subs-ref-v1.0.xsd):
  *
- */ 
+
+ */
 
 /*****************************************************************************/
 /* private methods                                                           */
 /*****************************************************************************/
 
+
 static struct XmlSnippet schema_snippets[] = {
-	{ "", SNIPPET_LIST_NODES, G_STRUCT_OFFSET(LassoWsse200401Security, any) },
-	{ NULL, 0, 0}
+	{ "Subscription", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefAppData, Subscription) },
+	{NULL, 0, 0}
 };
 
+static LassoNodeClass *parent_class = NULL;
+
+
 /*****************************************************************************/
 /* instance and class init functions                                         */
 /*****************************************************************************/
 
 static void
-instance_init(LassoWsse200401Security *node)
+instance_init(LassoIdWsf2SubsRefAppData *node)
 {
-	node->any = NULL;
+	node->Subscription = NULL;
 }
 
 static void
-class_init(LassoWsse200401SecurityClass *klass)
+class_init(LassoIdWsf2SubsRefAppDataClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
 
+	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
-	lasso_node_class_set_nodename(nclass, "Security");
-	lasso_node_class_set_ns(nclass, LASSO_WSSE_200401_HREF, LASSO_WSSE_200401_PREFIX);
+	lasso_node_class_set_nodename(nclass, "NewData");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SUBSREF_HREF, LASSO_IDWSF2_SUBSREF_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
 GType
-lasso_wsse_200401_security_get_type()
+lasso_idwsf2_subsref_app_data_get_type()
 {
 	static GType this_type = 0;
 
 	if (!this_type) {
 		static const GTypeInfo this_info = {
-			sizeof (LassoWsse200401SecurityClass),
+			sizeof (LassoIdWsf2SubsRefAppDataClass),
 			NULL,
 			NULL,
 			(GClassInitFunc) class_init,
 			NULL,
 			NULL,
-			sizeof(LassoWsse200401Security),
+			sizeof(LassoIdWsf2SubsRefAppData),
 			0,
 			(GInstanceInitFunc) instance_init,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
-				"LassoWsse200401Security", &this_info, 0);
+				"LassoIdWsf2SubsRefAppData", &this_info, 0);
 	}
 	return this_type;
 }
 
-LassoWsse200401Security*
-lasso_wsse_200401_security_new()
-{
-	LassoWsse200401Security *node;
-
-	node = g_object_new(LASSO_TYPE_WSSE_200401_SECURITY, NULL);
-
-	return node;
-}
-
-LassoWsse200401Security*
-lasso_wsse_200401_security_new_from_message(const gchar *message)
+/**
+ * lasso_idwsf2_subsref_app_data_new:
+ *
+ * Creates a new #LassoIdWsf2SubsRefAppData object.
+ *
+ * Return value: a newly created #LassoIdWsf2SubsRefAppData object
+ **/
+LassoIdWsf2SubsRefAppData*
+lasso_idwsf2_subsref_app_data_new()
 {
-	LassoWsse200401Security *node;
-
-	g_return_val_if_fail(message != NULL, NULL);
-
-	node = g_object_new(LASSO_TYPE_WSSE_200401_SECURITY, NULL);
-	lasso_node_init_from_message(LASSO_NODE(node), message);
-
-	return node;
+	return g_object_new(LASSO_TYPE_IDWSF2_SUBSREF_APP_DATA, NULL);
 }
diff --git a/lasso/xml/id-wsf-2.0/subsref_app_data.h b/lasso/xml/id-wsf-2.0/subsref_app_data.h
new file mode 100644
index 00000000..06f0e8d6
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_app_data.h
@@ -0,0 +1,81 @@
+/* $Id: subsref_app_data.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SUBSREF_APP_DATA_H__
+#define __LASSO_IDWSF2_SUBSREF_APP_DATA_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_SUBSREF_APP_DATA (lasso_idwsf2_subsref_app_data_get_type())
+#define LASSO_IDWSF2_SUBSREF_APP_DATA(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_APP_DATA, \
+		LassoIdWsf2SubsRefAppData))
+#define LASSO_IDWSF2_SUBSREF_APP_DATA_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_APP_DATA, \
+		LassoIdWsf2SubsRefAppDataClass))
+#define LASSO_IS_IDWSF2_SUBSREF_APP_DATA(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_APP_DATA))
+#define LASSO_IS_IDWSF2_SUBSREF_APP_DATA_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_APP_DATA))
+#define LASSO_IDWSF2_SUBSREF_APP_DATA_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SUBSREF_APP_DATA, \
+		LassoIdWsf2SubsRefAppDataClass)) 
+
+
+typedef struct _LassoIdWsf2SubsRefAppData LassoIdWsf2SubsRefAppData;
+typedef struct _LassoIdWsf2SubsRefAppDataClass LassoIdWsf2SubsRefAppDataClass;
+
+
+struct _LassoIdWsf2SubsRefAppData {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	GList *Subscription;
+};
+
+
+struct _LassoIdWsf2SubsRefAppDataClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_subsref_app_data_get_type(void);
+LASSO_EXPORT LassoIdWsf2SubsRefAppData* lasso_idwsf2_subsref_app_data_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SUBSREF_APP_DATA_H__ */
diff --git a/lasso/xml/id-wsf-2.0/subsref_create.c b/lasso/xml/id-wsf-2.0/subsref_create.c
new file mode 100644
index 00000000..4a759b11
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_create.c
@@ -0,0 +1,120 @@
+/* $Id: subsref_create.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "subsref_create.h"
+
+/*
+ * Schema fragment (liberty-idwsf-subs-ref-v1.0.xsd):
+ *
+ * <xs:complexType name="CreateType">
+ *   <xs:complexContent>
+ *     <xs:extension base="dst:RequestType">
+ *       <xs:sequence>
+ *         <xs:element ref="subsref:Subscription" minOccurs="0" maxOccurs="unbounded"/>
+ *         <xs:element ref="subsref:CreateItem" minOccurs="1" maxOccurs="unbounded"/>
+ *         <xs:element ref="subsref:ResultQuery" minOccurs="0" maxOccurs="unbounded"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Subscription", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefCreate, Subscription) },
+	{ "CreateItem", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefCreate, CreateItem) },
+	{ "ResultQuery", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefCreate, ResultQuery) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2SubsRefCreate *node)
+{
+	node->Subscription = NULL;
+	node->CreateItem = NULL;
+	node->ResultQuery = NULL;
+}
+
+static void
+class_init(LassoIdWsf2SubsRefCreateClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Create");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SUBSREF_HREF, LASSO_IDWSF2_SUBSREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_subsref_create_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2SubsRefCreateClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2SubsRefCreate),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_REQUEST,
+				"LassoIdWsf2SubsRefCreate", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_subsref_create_new:
+ *
+ * Creates a new #LassoIdWsf2SubsRefCreate object.
+ *
+ * Return value: a newly created #LassoIdWsf2SubsRefCreate object
+ **/
+LassoIdWsf2SubsRefCreate*
+lasso_idwsf2_subsref_create_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SUBSREF_CREATE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/subsref_create.h b/lasso/xml/id-wsf-2.0/subsref_create.h
new file mode 100644
index 00000000..d5d9880b
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_create.h
@@ -0,0 +1,84 @@
+/* $Id: subsref_create.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SUBSREF_CREATE_H__
+#define __LASSO_IDWSF2_SUBSREF_CREATE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "dst_request.h"
+
+#define LASSO_TYPE_IDWSF2_SUBSREF_CREATE (lasso_idwsf2_subsref_create_get_type())
+#define LASSO_IDWSF2_SUBSREF_CREATE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_CREATE, \
+		LassoIdWsf2SubsRefCreate))
+#define LASSO_IDWSF2_SUBSREF_CREATE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_CREATE, \
+		LassoIdWsf2SubsRefCreateClass))
+#define LASSO_IS_IDWSF2_SUBSREF_CREATE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_CREATE))
+#define LASSO_IS_IDWSF2_SUBSREF_CREATE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_CREATE))
+#define LASSO_IDWSF2_SUBSREF_CREATE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SUBSREF_CREATE, \
+		LassoIdWsf2SubsRefCreateClass)) 
+
+
+typedef struct _LassoIdWsf2SubsRefCreate LassoIdWsf2SubsRefCreate;
+typedef struct _LassoIdWsf2SubsRefCreateClass LassoIdWsf2SubsRefCreateClass;
+
+
+struct _LassoIdWsf2SubsRefCreate {
+	LassoIdWsf2DstRequest parent;
+
+	/*< public >*/
+	/* elements */
+	GList *Subscription;
+	GList *CreateItem;
+	GList *ResultQuery;
+};
+
+
+struct _LassoIdWsf2SubsRefCreateClass {
+	LassoIdWsf2DstRequestClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_subsref_create_get_type(void);
+LASSO_EXPORT LassoIdWsf2SubsRefCreate* lasso_idwsf2_subsref_create_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SUBSREF_CREATE_H__ */
diff --git a/lasso/xml/id-wsf-2.0/subsref_create_item.c b/lasso/xml/id-wsf-2.0/subsref_create_item.c
new file mode 100644
index 00000000..c32bb327
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_create_item.c
@@ -0,0 +1,118 @@
+/* $Id: subsref_create_item.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "subsref_create_item.h"
+
+/*
+ * Schema fragment (liberty-idwsf-subs-ref-v1.0.xsd):
+ *
+ * <xs:complexType name="CreateItemType">
+ *   <xs:sequence>
+ *     <xs:element ref="subsref:NewData" minOccurs="0" maxOccurs="1"/>
+ *   </xs:sequence>
+ *   <xs:attributeGroup ref="dst:CreateItemAttributeGroup"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "NewData", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefCreateItem, NewData) },
+	{ "objectType", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefCreateItem, objectType) },
+	{ "id", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefCreateItem, id) },
+	{ "itemID", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefCreateItem, itemID) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2SubsRefCreateItem *node)
+{
+	node->NewData = NULL;
+	node->objectType = NULL;
+	node->id = NULL;
+	node->itemID = NULL;
+}
+
+static void
+class_init(LassoIdWsf2SubsRefCreateItemClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "CreateItem");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SUBSREF_HREF, LASSO_IDWSF2_SUBSREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_subsref_create_item_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2SubsRefCreateItemClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2SubsRefCreateItem),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2SubsRefCreateItem", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_subsref_create_item_new:
+ *
+ * Creates a new #LassoIdWsf2SubsRefCreateItem object.
+ *
+ * Return value: a newly created #LassoIdWsf2SubsRefCreateItem object
+ **/
+LassoIdWsf2SubsRefCreateItem*
+lasso_idwsf2_subsref_create_item_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SUBSREF_CREATE_ITEM, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/subsref_create_item.h b/lasso/xml/id-wsf-2.0/subsref_create_item.h
new file mode 100644
index 00000000..30726abb
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_create_item.h
@@ -0,0 +1,86 @@
+/* $Id: subsref_create_item.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SUBSREF_CREATE_ITEM_H__
+#define __LASSO_IDWSF2_SUBSREF_CREATE_ITEM_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "subsref_app_data.h"
+
+#define LASSO_TYPE_IDWSF2_SUBSREF_CREATE_ITEM (lasso_idwsf2_subsref_create_item_get_type())
+#define LASSO_IDWSF2_SUBSREF_CREATE_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_CREATE_ITEM, \
+		LassoIdWsf2SubsRefCreateItem))
+#define LASSO_IDWSF2_SUBSREF_CREATE_ITEM_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_CREATE_ITEM, \
+		LassoIdWsf2SubsRefCreateItemClass))
+#define LASSO_IS_IDWSF2_SUBSREF_CREATE_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_CREATE_ITEM))
+#define LASSO_IS_IDWSF2_SUBSREF_CREATE_ITEM_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_CREATE_ITEM))
+#define LASSO_IDWSF2_SUBSREF_CREATE_ITEM_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SUBSREF_CREATE_ITEM, \
+		LassoIdWsf2SubsRefCreateItemClass)) 
+
+
+typedef struct _LassoIdWsf2SubsRefCreateItem LassoIdWsf2SubsRefCreateItem;
+typedef struct _LassoIdWsf2SubsRefCreateItemClass LassoIdWsf2SubsRefCreateItemClass;
+
+
+struct _LassoIdWsf2SubsRefCreateItem {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	/* XXX */ void *NewData;
+	/* attributes */
+	char *objectType;
+	char *id;
+	char *itemID;
+};
+
+
+struct _LassoIdWsf2SubsRefCreateItemClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_subsref_create_item_get_type(void);
+LASSO_EXPORT LassoIdWsf2SubsRefCreateItem* lasso_idwsf2_subsref_create_item_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SUBSREF_CREATE_ITEM_H__ */
diff --git a/lasso/xml/id-wsf-2.0/subsref_create_response.c b/lasso/xml/id-wsf-2.0/subsref_create_response.c
new file mode 100644
index 00000000..a3564e30
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_create_response.c
@@ -0,0 +1,105 @@
+/* $Id: subsref_create_response.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "subsref_create_response.h"
+
+/*
+ * Schema fragment (liberty-idwsf-subs-ref-v1.0.xsd):
+ *
+ * <xs:complexType name="CreateResponseType">
+ *   <xs:complexContent>
+ *     <xs:extension base="subsref:DataResponseType"/>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2SubsRefCreateResponse *node)
+{
+}
+
+static void
+class_init(LassoIdWsf2SubsRefCreateResponseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "CreateResponse");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SUBSREF_HREF, LASSO_IDWSF2_SUBSREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_subsref_create_response_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2SubsRefCreateResponseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2SubsRefCreateResponse),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_SUBSREF_DATA_RESPONSE,
+				"LassoIdWsf2SubsRefCreateResponse", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_subsref_create_response_new:
+ *
+ * Creates a new #LassoIdWsf2SubsRefCreateResponse object.
+ *
+ * Return value: a newly created #LassoIdWsf2SubsRefCreateResponse object
+ **/
+LassoIdWsf2SubsRefCreateResponse*
+lasso_idwsf2_subsref_create_response_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SUBSREF_CREATE_RESPONSE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/subsref_create_response.h b/lasso/xml/id-wsf-2.0/subsref_create_response.h
new file mode 100644
index 00000000..f442f72b
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_create_response.h
@@ -0,0 +1,81 @@
+/* $Id: subsref_create_response.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SUBSREF_CREATE_RESPONSE_H__
+#define __LASSO_IDWSF2_SUBSREF_CREATE_RESPONSE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "subsref_data_response.h"
+
+#define LASSO_TYPE_IDWSF2_SUBSREF_CREATE_RESPONSE \
+	(lasso_idwsf2_subsref_create_response_get_type())
+#define LASSO_IDWSF2_SUBSREF_CREATE_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_CREATE_RESPONSE, \
+		LassoIdWsf2SubsRefCreateResponse))
+#define LASSO_IDWSF2_SUBSREF_CREATE_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_CREATE_RESPONSE, \
+		LassoIdWsf2SubsRefCreateResponseClass))
+#define LASSO_IS_IDWSF2_SUBSREF_CREATE_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_CREATE_RESPONSE))
+#define LASSO_IS_IDWSF2_SUBSREF_CREATE_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_CREATE_RESPONSE))
+#define LASSO_IDWSF2_SUBSREF_CREATE_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SUBSREF_CREATE_RESPONSE, \
+		LassoIdWsf2SubsRefCreateResponseClass)) 
+
+
+typedef struct _LassoIdWsf2SubsRefCreateResponse LassoIdWsf2SubsRefCreateResponse;
+typedef struct _LassoIdWsf2SubsRefCreateResponseClass LassoIdWsf2SubsRefCreateResponseClass;
+
+
+struct _LassoIdWsf2SubsRefCreateResponse {
+	LassoIdWsf2SubsRefDataResponse parent;
+
+	/*< public >*/
+};
+
+
+struct _LassoIdWsf2SubsRefCreateResponseClass {
+	LassoIdWsf2SubsRefDataResponseClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_subsref_create_response_get_type(void);
+LASSO_EXPORT LassoIdWsf2SubsRefCreateResponse* lasso_idwsf2_subsref_create_response_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SUBSREF_CREATE_RESPONSE_H__ */
diff --git a/lasso/xml/id-wsf-2.0/subsref_data.c b/lasso/xml/id-wsf-2.0/subsref_data.c
new file mode 100644
index 00000000..7fa69bf6
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_data.c
@@ -0,0 +1,116 @@
+/* $Id: subsref_data.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "subsref_data.h"
+
+/*
+ * Schema fragment (liberty-idwsf-subs-ref-v1.0.xsd):
+ *
+ * <xs:complexType name="DataType">
+ *   <xs:complexContent>
+ *     <xs:extension base="subsref:ItemDataType">
+ *       <xs:attributeGroup ref="dst:PaginationResponseAttributeGroup"/>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "remaining", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefData, remaining) },
+	{ "nextOffset", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL_NEG,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefData, nextOffset) },
+	{ "setID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefData, setID) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2SubsRefData *node)
+{
+	node->remaining = 0;
+	node->nextOffset = -1;
+	node->setID = NULL;
+}
+
+static void
+class_init(LassoIdWsf2SubsRefDataClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Data");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SUBSREF_HREF, LASSO_IDWSF2_SUBSREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_subsref_data_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2SubsRefDataClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2SubsRefData),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_SUBSREF_ITEM_DATA,
+				"LassoIdWsf2SubsRefData", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_subsref_data_new:
+ *
+ * Creates a new #LassoIdWsf2SubsRefData object.
+ *
+ * Return value: a newly created #LassoIdWsf2SubsRefData object
+ **/
+LassoIdWsf2SubsRefData*
+lasso_idwsf2_subsref_data_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SUBSREF_DATA, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/subsref_data.h b/lasso/xml/id-wsf-2.0/subsref_data.h
new file mode 100644
index 00000000..a1201a1c
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_data.h
@@ -0,0 +1,84 @@
+/* $Id: subsref_data.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SUBSREF_DATA_H__
+#define __LASSO_IDWSF2_SUBSREF_DATA_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "subsref_item_data.h"
+
+#define LASSO_TYPE_IDWSF2_SUBSREF_DATA (lasso_idwsf2_subsref_data_get_type())
+#define LASSO_IDWSF2_SUBSREF_DATA(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_DATA, \
+		LassoIdWsf2SubsRefData))
+#define LASSO_IDWSF2_SUBSREF_DATA_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_DATA, \
+		LassoIdWsf2SubsRefDataClass))
+#define LASSO_IS_IDWSF2_SUBSREF_DATA(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_DATA))
+#define LASSO_IS_IDWSF2_SUBSREF_DATA_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_DATA))
+#define LASSO_IDWSF2_SUBSREF_DATA_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SUBSREF_DATA, \
+		LassoIdWsf2SubsRefDataClass)) 
+
+
+typedef struct _LassoIdWsf2SubsRefData LassoIdWsf2SubsRefData;
+typedef struct _LassoIdWsf2SubsRefDataClass LassoIdWsf2SubsRefDataClass;
+
+
+struct _LassoIdWsf2SubsRefData {
+	LassoIdWsf2SubsRefItemData parent;
+
+	/*< public >*/
+	/* attributes */
+	int remaining;
+	int nextOffset;
+	char *setID;
+};
+
+
+struct _LassoIdWsf2SubsRefDataClass {
+	LassoIdWsf2SubsRefItemDataClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_subsref_data_get_type(void);
+LASSO_EXPORT LassoIdWsf2SubsRefData* lasso_idwsf2_subsref_data_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SUBSREF_DATA_H__ */
diff --git a/lasso/xml/id-wsf-2.0/subsref_data_response.c b/lasso/xml/id-wsf-2.0/subsref_data_response.c
new file mode 100644
index 00000000..f8a8f245
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_data_response.c
@@ -0,0 +1,112 @@
+/* $Id: subsref_data_response.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "subsref_data_response.h"
+
+/*
+ * Schema fragment (liberty-idwsf-subs-ref-v1.0.xsd):
+ *
+ * <xs:complexType name="DataResponseType">
+ *   <xs:complexContent>
+ *     <xs:extension base="dst:DataResponseBaseType">
+ *       <xs:sequence>
+ *         <xs:element ref="subsref:ItemData" minOccurs="0" maxOccurs="unbounded"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "ItemData", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefDataResponse, ItemData) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2SubsRefDataResponse *node)
+{
+	node->ItemData = NULL;
+}
+
+static void
+class_init(LassoIdWsf2SubsRefDataResponseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "DataResponse");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SUBSREF_HREF, LASSO_IDWSF2_SUBSREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_subsref_data_response_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2SubsRefDataResponseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2SubsRefDataResponse),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_DATA_RESPONSE_BASE,
+				"LassoIdWsf2SubsRefDataResponse", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_subsref_data_response_new:
+ *
+ * Creates a new #LassoIdWsf2SubsRefDataResponse object.
+ *
+ * Return value: a newly created #LassoIdWsf2SubsRefDataResponse object
+ **/
+LassoIdWsf2SubsRefDataResponse*
+lasso_idwsf2_subsref_data_response_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SUBSREF_DATA_RESPONSE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/subsref_data_response.h b/lasso/xml/id-wsf-2.0/subsref_data_response.h
new file mode 100644
index 00000000..f0ec5df2
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_data_response.h
@@ -0,0 +1,83 @@
+/* $Id: subsref_data_response.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SUBSREF_DATA_RESPONSE_H__
+#define __LASSO_IDWSF2_SUBSREF_DATA_RESPONSE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "dst_data_response_base.h"
+
+#define LASSO_TYPE_IDWSF2_SUBSREF_DATA_RESPONSE \
+	(lasso_idwsf2_subsref_data_response_get_type())
+#define LASSO_IDWSF2_SUBSREF_DATA_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_DATA_RESPONSE, \
+		LassoIdWsf2SubsRefDataResponse))
+#define LASSO_IDWSF2_SUBSREF_DATA_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_DATA_RESPONSE, \
+		LassoIdWsf2SubsRefDataResponseClass))
+#define LASSO_IS_IDWSF2_SUBSREF_DATA_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_DATA_RESPONSE))
+#define LASSO_IS_IDWSF2_SUBSREF_DATA_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_DATA_RESPONSE))
+#define LASSO_IDWSF2_SUBSREF_DATA_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SUBSREF_DATA_RESPONSE, \
+		LassoIdWsf2SubsRefDataResponseClass)) 
+
+
+typedef struct _LassoIdWsf2SubsRefDataResponse LassoIdWsf2SubsRefDataResponse;
+typedef struct _LassoIdWsf2SubsRefDataResponseClass LassoIdWsf2SubsRefDataResponseClass;
+
+
+struct _LassoIdWsf2SubsRefDataResponse {
+	LassoIdWsf2DstDataResponseBase parent;
+
+	/*< public >*/
+	/* elements */
+	GList *ItemData;
+};
+
+
+struct _LassoIdWsf2SubsRefDataResponseClass {
+	LassoIdWsf2DstDataResponseBaseClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_subsref_data_response_get_type(void);
+LASSO_EXPORT LassoIdWsf2SubsRefDataResponse* lasso_idwsf2_subsref_data_response_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SUBSREF_DATA_RESPONSE_H__ */
diff --git a/lasso/xml/id-wsf-2.0/subsref_delete.c b/lasso/xml/id-wsf-2.0/subsref_delete.c
new file mode 100644
index 00000000..f07eba55
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_delete.c
@@ -0,0 +1,112 @@
+/* $Id: subsref_delete.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "subsref_delete.h"
+
+/*
+ * Schema fragment (liberty-idwsf-subs-ref-v1.0.xsd):
+ *
+ * <xs:complexType name="DeleteType">
+ *   <xs:complexContent>
+ *     <xs:extension base="dst:RequestType">
+ *       <xs:sequence>
+ *         <xs:element ref="subsref:DeleteItem" minOccurs="1" maxOccurs="unbounded"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "DeleteItem", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefDelete, DeleteItem) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2SubsRefDelete *node)
+{
+	node->DeleteItem = NULL;
+}
+
+static void
+class_init(LassoIdWsf2SubsRefDeleteClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Delete");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SUBSREF_HREF, LASSO_IDWSF2_SUBSREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_subsref_delete_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2SubsRefDeleteClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2SubsRefDelete),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_REQUEST,
+				"LassoIdWsf2SubsRefDelete", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_subsref_delete_new:
+ *
+ * Creates a new #LassoIdWsf2SubsRefDelete object.
+ *
+ * Return value: a newly created #LassoIdWsf2SubsRefDelete object
+ **/
+LassoIdWsf2SubsRefDelete*
+lasso_idwsf2_subsref_delete_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SUBSREF_DELETE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/subsref_delete.h b/lasso/xml/id-wsf-2.0/subsref_delete.h
new file mode 100644
index 00000000..ded53690
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_delete.h
@@ -0,0 +1,82 @@
+/* $Id: subsref_delete.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SUBSREF_DELETE_H__
+#define __LASSO_IDWSF2_SUBSREF_DELETE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "dst_request.h"
+
+#define LASSO_TYPE_IDWSF2_SUBSREF_DELETE (lasso_idwsf2_subsref_delete_get_type())
+#define LASSO_IDWSF2_SUBSREF_DELETE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_DELETE, \
+		LassoIdWsf2SubsRefDelete))
+#define LASSO_IDWSF2_SUBSREF_DELETE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_DELETE, \
+		LassoIdWsf2SubsRefDeleteClass))
+#define LASSO_IS_IDWSF2_SUBSREF_DELETE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_DELETE))
+#define LASSO_IS_IDWSF2_SUBSREF_DELETE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_DELETE))
+#define LASSO_IDWSF2_SUBSREF_DELETE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SUBSREF_DELETE, \
+		LassoIdWsf2SubsRefDeleteClass)) 
+
+
+typedef struct _LassoIdWsf2SubsRefDelete LassoIdWsf2SubsRefDelete;
+typedef struct _LassoIdWsf2SubsRefDeleteClass LassoIdWsf2SubsRefDeleteClass;
+
+
+struct _LassoIdWsf2SubsRefDelete {
+	LassoIdWsf2DstRequest parent;
+
+	/*< public >*/
+	/* elements */
+	GList *DeleteItem;
+};
+
+
+struct _LassoIdWsf2SubsRefDeleteClass {
+	LassoIdWsf2DstRequestClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_subsref_delete_get_type(void);
+LASSO_EXPORT LassoIdWsf2SubsRefDelete* lasso_idwsf2_subsref_delete_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SUBSREF_DELETE_H__ */
diff --git a/lasso/xml/id-wsf-2.0/subsref_delete_item.c b/lasso/xml/id-wsf-2.0/subsref_delete_item.c
new file mode 100644
index 00000000..321b5b1c
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_delete_item.c
@@ -0,0 +1,112 @@
+/* $Id: subsref_delete_item.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "subsref_delete_item.h"
+
+/*
+ * Schema fragment (liberty-idwsf-subs-ref-v1.0.xsd):
+ *
+ * <xs:complexType name="DeleteItemType">
+ *   <xs:complexContent>
+ *     <xs:extension base="dst:DeleteItemBaseType">
+ *       <xs:sequence>
+ *         <xs:element ref="subsref:Select" minOccurs="0" maxOccurs="1"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Select", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefDeleteItem, Select) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2SubsRefDeleteItem *node)
+{
+	node->Select = NULL;
+}
+
+static void
+class_init(LassoIdWsf2SubsRefDeleteItemClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "DeleteItem");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SUBSREF_HREF, LASSO_IDWSF2_SUBSREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_subsref_delete_item_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2SubsRefDeleteItemClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2SubsRefDeleteItem),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_DELETE_ITEM_BASE,
+				"LassoIdWsf2SubsRefDeleteItem", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_subsref_delete_item_new:
+ *
+ * Creates a new #LassoIdWsf2SubsRefDeleteItem object.
+ *
+ * Return value: a newly created #LassoIdWsf2SubsRefDeleteItem object
+ **/
+LassoIdWsf2SubsRefDeleteItem*
+lasso_idwsf2_subsref_delete_item_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SUBSREF_DELETE_ITEM, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/subsref_delete_item.h b/lasso/xml/id-wsf-2.0/subsref_delete_item.h
new file mode 100644
index 00000000..ae1daa1d
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_delete_item.h
@@ -0,0 +1,82 @@
+/* $Id: subsref_delete_item.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SUBSREF_DELETE_ITEM_H__
+#define __LASSO_IDWSF2_SUBSREF_DELETE_ITEM_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "dst_delete_item_base.h"
+
+#define LASSO_TYPE_IDWSF2_SUBSREF_DELETE_ITEM (lasso_idwsf2_subsref_delete_item_get_type())
+#define LASSO_IDWSF2_SUBSREF_DELETE_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_DELETE_ITEM, \
+		LassoIdWsf2SubsRefDeleteItem))
+#define LASSO_IDWSF2_SUBSREF_DELETE_ITEM_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_DELETE_ITEM, \
+		LassoIdWsf2SubsRefDeleteItemClass))
+#define LASSO_IS_IDWSF2_SUBSREF_DELETE_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_DELETE_ITEM))
+#define LASSO_IS_IDWSF2_SUBSREF_DELETE_ITEM_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_DELETE_ITEM))
+#define LASSO_IDWSF2_SUBSREF_DELETE_ITEM_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SUBSREF_DELETE_ITEM, \
+		LassoIdWsf2SubsRefDeleteItemClass)) 
+
+
+typedef struct _LassoIdWsf2SubsRefDeleteItem LassoIdWsf2SubsRefDeleteItem;
+typedef struct _LassoIdWsf2SubsRefDeleteItemClass LassoIdWsf2SubsRefDeleteItemClass;
+
+
+struct _LassoIdWsf2SubsRefDeleteItem {
+	LassoIdWsf2DstDeleteItemBase parent;
+
+	/*< public >*/
+	/* elements */
+	/* XXX */ void *Select;
+};
+
+
+struct _LassoIdWsf2SubsRefDeleteItemClass {
+	LassoIdWsf2DstDeleteItemBaseClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_subsref_delete_item_get_type(void);
+LASSO_EXPORT LassoIdWsf2SubsRefDeleteItem* lasso_idwsf2_subsref_delete_item_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SUBSREF_DELETE_ITEM_H__ */
diff --git a/lasso/xml/id-wsf-2.0/subsref_delete_response.c b/lasso/xml/id-wsf-2.0/subsref_delete_response.c
new file mode 100644
index 00000000..3fc67911
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_delete_response.c
@@ -0,0 +1,105 @@
+/* $Id: subsref_delete_response.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "subsref_delete_response.h"
+
+/*
+ * Schema fragment (liberty-idwsf-subs-ref-v1.0.xsd):
+ *
+ * <xs:complexType name="DeleteResponseType">
+ *   <xs:complexContent>
+ *     <xs:extension base="lu:ResponseType"/>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2SubsRefDeleteResponse *node)
+{
+}
+
+static void
+class_init(LassoIdWsf2SubsRefDeleteResponseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "DeleteResponse");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SUBSREF_HREF, LASSO_IDWSF2_SUBSREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_subsref_delete_response_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2SubsRefDeleteResponseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2SubsRefDeleteResponse),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_UTIL_RESPONSE,
+				"LassoIdWsf2SubsRefDeleteResponse", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_subsref_delete_response_new:
+ *
+ * Creates a new #LassoIdWsf2SubsRefDeleteResponse object.
+ *
+ * Return value: a newly created #LassoIdWsf2SubsRefDeleteResponse object
+ **/
+LassoIdWsf2SubsRefDeleteResponse*
+lasso_idwsf2_subsref_delete_response_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SUBSREF_DELETE_RESPONSE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/subsref_delete_response.h b/lasso/xml/id-wsf-2.0/subsref_delete_response.h
new file mode 100644
index 00000000..4b0d2a0e
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_delete_response.h
@@ -0,0 +1,81 @@
+/* $Id: subsref_delete_response.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SUBSREF_DELETE_RESPONSE_H__
+#define __LASSO_IDWSF2_SUBSREF_DELETE_RESPONSE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "util_response.h"
+
+#define LASSO_TYPE_IDWSF2_SUBSREF_DELETE_RESPONSE \
+	(lasso_idwsf2_subsref_delete_response_get_type())
+#define LASSO_IDWSF2_SUBSREF_DELETE_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_DELETE_RESPONSE, \
+		LassoIdWsf2SubsRefDeleteResponse))
+#define LASSO_IDWSF2_SUBSREF_DELETE_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_DELETE_RESPONSE, \
+		LassoIdWsf2SubsRefDeleteResponseClass))
+#define LASSO_IS_IDWSF2_SUBSREF_DELETE_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_DELETE_RESPONSE))
+#define LASSO_IS_IDWSF2_SUBSREF_DELETE_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_DELETE_RESPONSE))
+#define LASSO_IDWSF2_SUBSREF_DELETE_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SUBSREF_DELETE_RESPONSE, \
+		LassoIdWsf2SubsRefDeleteResponseClass)) 
+
+
+typedef struct _LassoIdWsf2SubsRefDeleteResponse LassoIdWsf2SubsRefDeleteResponse;
+typedef struct _LassoIdWsf2SubsRefDeleteResponseClass LassoIdWsf2SubsRefDeleteResponseClass;
+
+
+struct _LassoIdWsf2SubsRefDeleteResponse {
+	LassoIdWsf2UtilResponse parent;
+
+	/*< public >*/
+};
+
+
+struct _LassoIdWsf2SubsRefDeleteResponseClass {
+	LassoIdWsf2UtilResponseClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_subsref_delete_response_get_type(void);
+LASSO_EXPORT LassoIdWsf2SubsRefDeleteResponse* lasso_idwsf2_subsref_delete_response_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SUBSREF_DELETE_RESPONSE_H__ */
diff --git a/lasso/xml/id-wsf-2.0/subsref_item_data.c b/lasso/xml/id-wsf-2.0/subsref_item_data.c
new file mode 100644
index 00000000..78a27a8a
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_item_data.c
@@ -0,0 +1,116 @@
+/* $Id: subsref_item_data.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "subsref_item_data.h"
+
+/*
+ * Schema fragment (liberty-idwsf-subs-ref-v1.0.xsd):
+ *
+ * <xs:complexType name="ItemDataType">
+ *   <xs:complexContent>
+ *     <xs:extension base="subsref:AppDataType">
+ *       <xs:attributeGroup ref="dst:ItemDataAttributeGroup"/>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "itemIDRef", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefItemData, itemIDRef) },
+	{ "notSorted", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefItemData, notSorted) },
+	{ "changeFormat", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefItemData, changeFormat) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2SubsRefItemData *node)
+{
+	node->itemIDRef = NULL;
+	node->notSorted = NULL;
+	node->changeFormat = NULL;
+}
+
+static void
+class_init(LassoIdWsf2SubsRefItemDataClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "ItemData");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SUBSREF_HREF, LASSO_IDWSF2_SUBSREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_subsref_item_data_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2SubsRefItemDataClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2SubsRefItemData),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_SUBSREF_APP_DATA,
+				"LassoIdWsf2SubsRefItemData", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_subsref_item_data_new:
+ *
+ * Creates a new #LassoIdWsf2SubsRefItemData object.
+ *
+ * Return value: a newly created #LassoIdWsf2SubsRefItemData object
+ **/
+LassoIdWsf2SubsRefItemData*
+lasso_idwsf2_subsref_item_data_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SUBSREF_ITEM_DATA, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/subsref_item_data.h b/lasso/xml/id-wsf-2.0/subsref_item_data.h
new file mode 100644
index 00000000..5099d0d5
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_item_data.h
@@ -0,0 +1,84 @@
+/* $Id: subsref_item_data.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SUBSREF_ITEM_DATA_H__
+#define __LASSO_IDWSF2_SUBSREF_ITEM_DATA_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "subsref_app_data.h"
+
+#define LASSO_TYPE_IDWSF2_SUBSREF_ITEM_DATA (lasso_idwsf2_subsref_item_data_get_type())
+#define LASSO_IDWSF2_SUBSREF_ITEM_DATA(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_ITEM_DATA, \
+		LassoIdWsf2SubsRefItemData))
+#define LASSO_IDWSF2_SUBSREF_ITEM_DATA_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_ITEM_DATA, \
+		LassoIdWsf2SubsRefItemDataClass))
+#define LASSO_IS_IDWSF2_SUBSREF_ITEM_DATA(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_ITEM_DATA))
+#define LASSO_IS_IDWSF2_SUBSREF_ITEM_DATA_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_ITEM_DATA))
+#define LASSO_IDWSF2_SUBSREF_ITEM_DATA_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SUBSREF_ITEM_DATA, \
+		LassoIdWsf2SubsRefItemDataClass)) 
+
+
+typedef struct _LassoIdWsf2SubsRefItemData LassoIdWsf2SubsRefItemData;
+typedef struct _LassoIdWsf2SubsRefItemDataClass LassoIdWsf2SubsRefItemDataClass;
+
+
+struct _LassoIdWsf2SubsRefItemData {
+	LassoIdWsf2SubsRefAppData parent;
+
+	/*< public >*/
+	/* attributes */
+	char *itemIDRef;
+	char *notSorted;
+	char *changeFormat;
+};
+
+
+struct _LassoIdWsf2SubsRefItemDataClass {
+	LassoIdWsf2SubsRefAppDataClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_subsref_item_data_get_type(void);
+LASSO_EXPORT LassoIdWsf2SubsRefItemData* lasso_idwsf2_subsref_item_data_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SUBSREF_ITEM_DATA_H__ */
diff --git a/lasso/xml/id-wsf-2.0/subsref_modify.c b/lasso/xml/id-wsf-2.0/subsref_modify.c
new file mode 100644
index 00000000..9f7ab3f8
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_modify.c
@@ -0,0 +1,120 @@
+/* $Id: subsref_modify.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "subsref_modify.h"
+
+/*
+ * Schema fragment (liberty-idwsf-subs-ref-v1.0.xsd):
+ *
+ * <xs:complexType name="ModifyType">
+ *   <xs:complexContent>
+ *     <xs:extension base="dst:RequestType">
+ *       <xs:sequence>
+ *         <xs:element ref="subsref:Subscription" minOccurs="0" maxOccurs="unbounded"/>
+ *         <xs:element ref="subsref:ModifyItem" minOccurs="1" maxOccurs="unbounded"/>
+ *         <xs:element ref="subsref:ResultQuery" minOccurs="0" maxOccurs="unbounded"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Subscription", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefModify, Subscription) },
+	{ "ModifyItem", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefModify, ModifyItem) },
+	{ "ResultQuery", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefModify, ResultQuery) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2SubsRefModify *node)
+{
+	node->Subscription = NULL;
+	node->ModifyItem = NULL;
+	node->ResultQuery = NULL;
+}
+
+static void
+class_init(LassoIdWsf2SubsRefModifyClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Modify");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SUBSREF_HREF, LASSO_IDWSF2_SUBSREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_subsref_modify_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2SubsRefModifyClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2SubsRefModify),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_REQUEST,
+				"LassoIdWsf2SubsRefModify", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_subsref_modify_new:
+ *
+ * Creates a new #LassoIdWsf2SubsRefModify object.
+ *
+ * Return value: a newly created #LassoIdWsf2SubsRefModify object
+ **/
+LassoIdWsf2SubsRefModify*
+lasso_idwsf2_subsref_modify_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SUBSREF_MODIFY, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/subsref_modify.h b/lasso/xml/id-wsf-2.0/subsref_modify.h
new file mode 100644
index 00000000..70c8d83a
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_modify.h
@@ -0,0 +1,84 @@
+/* $Id: subsref_modify.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SUBSREF_MODIFY_H__
+#define __LASSO_IDWSF2_SUBSREF_MODIFY_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "dst_request.h"
+
+#define LASSO_TYPE_IDWSF2_SUBSREF_MODIFY (lasso_idwsf2_subsref_modify_get_type())
+#define LASSO_IDWSF2_SUBSREF_MODIFY(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_MODIFY, \
+		LassoIdWsf2SubsRefModify))
+#define LASSO_IDWSF2_SUBSREF_MODIFY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_MODIFY, \
+		LassoIdWsf2SubsRefModifyClass))
+#define LASSO_IS_IDWSF2_SUBSREF_MODIFY(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_MODIFY))
+#define LASSO_IS_IDWSF2_SUBSREF_MODIFY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_MODIFY))
+#define LASSO_IDWSF2_SUBSREF_MODIFY_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SUBSREF_MODIFY, \
+		LassoIdWsf2SubsRefModifyClass)) 
+
+
+typedef struct _LassoIdWsf2SubsRefModify LassoIdWsf2SubsRefModify;
+typedef struct _LassoIdWsf2SubsRefModifyClass LassoIdWsf2SubsRefModifyClass;
+
+
+struct _LassoIdWsf2SubsRefModify {
+	LassoIdWsf2DstRequest parent;
+
+	/*< public >*/
+	/* elements */
+	GList *Subscription;
+	GList *ModifyItem;
+	GList *ResultQuery;
+};
+
+
+struct _LassoIdWsf2SubsRefModifyClass {
+	LassoIdWsf2DstRequestClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_subsref_modify_get_type(void);
+LASSO_EXPORT LassoIdWsf2SubsRefModify* lasso_idwsf2_subsref_modify_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SUBSREF_MODIFY_H__ */
diff --git a/lasso/xml/id-wsf-2.0/subsref_modify_item.c b/lasso/xml/id-wsf-2.0/subsref_modify_item.c
new file mode 100644
index 00000000..0ddd8f5e
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_modify_item.c
@@ -0,0 +1,125 @@
+/* $Id: subsref_modify_item.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "subsref_modify_item.h"
+
+/*
+ * Schema fragment (liberty-idwsf-subs-ref-v1.0.xsd):
+ *
+ * <xs:complexType name="ModifyItemType">
+ *   <xs:sequence>
+ *     <xs:element ref="subsref:Select" minOccurs="0" maxOccurs="1"/>
+ *     <xs:element ref="subsref:NewData" minOccurs="0" maxOccurs="1"/>
+ *   </xs:sequence>
+ *   <xs:attributeGroup ref="dst:ModifyItemAttributeGroup"/>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Select", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefModifyItem, Select) },
+	{ "NewData", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefModifyItem, NewData) },
+	{ "notChangedSince", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefModifyItem, notChangedSince) },
+	{ "overrideAllowed", SNIPPET_ATTRIBUTE | SNIPPET_BOOLEAN | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefModifyItem, overrideAllowed) },
+	{ "id", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefModifyItem, id) },
+	{ "itemID", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefModifyItem, itemID) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2SubsRefModifyItem *node)
+{
+	node->Select = NULL;
+	node->NewData = NULL;
+	node->notChangedSince = NULL;
+	node->overrideAllowed = FALSE;
+	node->id = NULL;
+	node->itemID = NULL;
+}
+
+static void
+class_init(LassoIdWsf2SubsRefModifyItemClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "ModifyItem");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SUBSREF_HREF, LASSO_IDWSF2_SUBSREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_subsref_modify_item_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2SubsRefModifyItemClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2SubsRefModifyItem),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2SubsRefModifyItem", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_subsref_modify_item_new:
+ *
+ * Creates a new #LassoIdWsf2SubsRefModifyItem object.
+ *
+ * Return value: a newly created #LassoIdWsf2SubsRefModifyItem object
+ **/
+LassoIdWsf2SubsRefModifyItem*
+lasso_idwsf2_subsref_modify_item_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SUBSREF_MODIFY_ITEM, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/subsref_modify_item.h b/lasso/xml/id-wsf-2.0/subsref_modify_item.h
new file mode 100644
index 00000000..d5354021
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_modify_item.h
@@ -0,0 +1,88 @@
+/* $Id: subsref_modify_item.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SUBSREF_MODIFY_ITEM_H__
+#define __LASSO_IDWSF2_SUBSREF_MODIFY_ITEM_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "subsref_app_data.h"
+
+#define LASSO_TYPE_IDWSF2_SUBSREF_MODIFY_ITEM (lasso_idwsf2_subsref_modify_item_get_type())
+#define LASSO_IDWSF2_SUBSREF_MODIFY_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_MODIFY_ITEM, \
+		LassoIdWsf2SubsRefModifyItem))
+#define LASSO_IDWSF2_SUBSREF_MODIFY_ITEM_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_MODIFY_ITEM, \
+		LassoIdWsf2SubsRefModifyItemClass))
+#define LASSO_IS_IDWSF2_SUBSREF_MODIFY_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_MODIFY_ITEM))
+#define LASSO_IS_IDWSF2_SUBSREF_MODIFY_ITEM_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_MODIFY_ITEM))
+#define LASSO_IDWSF2_SUBSREF_MODIFY_ITEM_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SUBSREF_MODIFY_ITEM, \
+		LassoIdWsf2SubsRefModifyItemClass)) 
+
+
+typedef struct _LassoIdWsf2SubsRefModifyItem LassoIdWsf2SubsRefModifyItem;
+typedef struct _LassoIdWsf2SubsRefModifyItemClass LassoIdWsf2SubsRefModifyItemClass;
+
+
+struct _LassoIdWsf2SubsRefModifyItem {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	/* XXX */ void *Select;
+	/* XXX */ void *NewData;
+	/* attributes */
+	char *notChangedSince;
+	gboolean overrideAllowed;
+	char *id;
+	char *itemID;
+};
+
+
+struct _LassoIdWsf2SubsRefModifyItemClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_subsref_modify_item_get_type(void);
+LASSO_EXPORT LassoIdWsf2SubsRefModifyItem* lasso_idwsf2_subsref_modify_item_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SUBSREF_MODIFY_ITEM_H__ */
diff --git a/lasso/xml/id-wsf-2.0/subsref_modify_response.c b/lasso/xml/id-wsf-2.0/subsref_modify_response.c
new file mode 100644
index 00000000..1403cb66
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_modify_response.c
@@ -0,0 +1,105 @@
+/* $Id: subsref_modify_response.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "subsref_modify_response.h"
+
+/*
+ * Schema fragment (liberty-idwsf-subs-ref-v1.0.xsd):
+ *
+ * <xs:complexType name="ModifyResponseType">
+ *   <xs:complexContent>
+ *     <xs:extension base="subsref:DataResponseType"/>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2SubsRefModifyResponse *node)
+{
+}
+
+static void
+class_init(LassoIdWsf2SubsRefModifyResponseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "ModifyResponse");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SUBSREF_HREF, LASSO_IDWSF2_SUBSREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_subsref_modify_response_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2SubsRefModifyResponseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2SubsRefModifyResponse),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_SUBSREF_DATA_RESPONSE,
+				"LassoIdWsf2SubsRefModifyResponse", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_subsref_modify_response_new:
+ *
+ * Creates a new #LassoIdWsf2SubsRefModifyResponse object.
+ *
+ * Return value: a newly created #LassoIdWsf2SubsRefModifyResponse object
+ **/
+LassoIdWsf2SubsRefModifyResponse*
+lasso_idwsf2_subsref_modify_response_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SUBSREF_MODIFY_RESPONSE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/subsref_modify_response.h b/lasso/xml/id-wsf-2.0/subsref_modify_response.h
new file mode 100644
index 00000000..aedd382c
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_modify_response.h
@@ -0,0 +1,81 @@
+/* $Id: subsref_modify_response.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SUBSREF_MODIFY_RESPONSE_H__
+#define __LASSO_IDWSF2_SUBSREF_MODIFY_RESPONSE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "subsref_data_response.h"
+
+#define LASSO_TYPE_IDWSF2_SUBSREF_MODIFY_RESPONSE \
+	(lasso_idwsf2_subsref_modify_response_get_type())
+#define LASSO_IDWSF2_SUBSREF_MODIFY_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_MODIFY_RESPONSE, \
+		LassoIdWsf2SubsRefModifyResponse))
+#define LASSO_IDWSF2_SUBSREF_MODIFY_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_MODIFY_RESPONSE, \
+		LassoIdWsf2SubsRefModifyResponseClass))
+#define LASSO_IS_IDWSF2_SUBSREF_MODIFY_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_MODIFY_RESPONSE))
+#define LASSO_IS_IDWSF2_SUBSREF_MODIFY_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_MODIFY_RESPONSE))
+#define LASSO_IDWSF2_SUBSREF_MODIFY_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SUBSREF_MODIFY_RESPONSE, \
+		LassoIdWsf2SubsRefModifyResponseClass)) 
+
+
+typedef struct _LassoIdWsf2SubsRefModifyResponse LassoIdWsf2SubsRefModifyResponse;
+typedef struct _LassoIdWsf2SubsRefModifyResponseClass LassoIdWsf2SubsRefModifyResponseClass;
+
+
+struct _LassoIdWsf2SubsRefModifyResponse {
+	LassoIdWsf2SubsRefDataResponse parent;
+
+	/*< public >*/
+};
+
+
+struct _LassoIdWsf2SubsRefModifyResponseClass {
+	LassoIdWsf2SubsRefDataResponseClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_subsref_modify_response_get_type(void);
+LASSO_EXPORT LassoIdWsf2SubsRefModifyResponse* lasso_idwsf2_subsref_modify_response_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SUBSREF_MODIFY_RESPONSE_H__ */
diff --git a/lasso/xml/id-wsf-2.0/subsref_notification.c b/lasso/xml/id-wsf-2.0/subsref_notification.c
new file mode 100644
index 00000000..682e1fa3
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_notification.c
@@ -0,0 +1,112 @@
+/* $Id: subsref_notification.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "subsref_notification.h"
+
+/*
+ * Schema fragment (liberty-idwsf-subs-ref-v1.0.xsd):
+ *
+ * <xs:complexType name="NotificationType">
+ *   <xs:complexContent>
+ *     <xs:extension base="subs:NotificationType">
+ *       <xs:sequence>
+ *         <xs:element ref="subsref:ItemData" minOccurs="0" maxOccurs="unbounded"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "ItemData", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefNotification, ItemData) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2SubsRefNotification *node)
+{
+	node->ItemData = NULL;
+}
+
+static void
+class_init(LassoIdWsf2SubsRefNotificationClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Notification");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SUBSREF_HREF, LASSO_IDWSF2_SUBSREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_subsref_notification_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2SubsRefNotificationClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2SubsRefNotification),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_SUBS_NOTIFICATION,
+				"LassoIdWsf2SubsRefNotification", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_subsref_notification_new:
+ *
+ * Creates a new #LassoIdWsf2SubsRefNotification object.
+ *
+ * Return value: a newly created #LassoIdWsf2SubsRefNotification object
+ **/
+LassoIdWsf2SubsRefNotification*
+lasso_idwsf2_subsref_notification_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SUBSREF_NOTIFICATION, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/subsref_notification.h b/lasso/xml/id-wsf-2.0/subsref_notification.h
new file mode 100644
index 00000000..f5a3af11
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_notification.h
@@ -0,0 +1,83 @@
+/* $Id: subsref_notification.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SUBSREF_NOTIFICATION_H__
+#define __LASSO_IDWSF2_SUBSREF_NOTIFICATION_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "subs_notification.h"
+
+#define LASSO_TYPE_IDWSF2_SUBSREF_NOTIFICATION \
+	(lasso_idwsf2_subsref_notification_get_type())
+#define LASSO_IDWSF2_SUBSREF_NOTIFICATION(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_NOTIFICATION, \
+		LassoIdWsf2SubsRefNotification))
+#define LASSO_IDWSF2_SUBSREF_NOTIFICATION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_NOTIFICATION, \
+		LassoIdWsf2SubsRefNotificationClass))
+#define LASSO_IS_IDWSF2_SUBSREF_NOTIFICATION(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_NOTIFICATION))
+#define LASSO_IS_IDWSF2_SUBSREF_NOTIFICATION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_NOTIFICATION))
+#define LASSO_IDWSF2_SUBSREF_NOTIFICATION_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SUBSREF_NOTIFICATION, \
+		LassoIdWsf2SubsRefNotificationClass)) 
+
+
+typedef struct _LassoIdWsf2SubsRefNotification LassoIdWsf2SubsRefNotification;
+typedef struct _LassoIdWsf2SubsRefNotificationClass LassoIdWsf2SubsRefNotificationClass;
+
+
+struct _LassoIdWsf2SubsRefNotification {
+	LassoIdWsf2SubsNotification parent;
+
+	/*< public >*/
+	/* elements */
+	GList *ItemData;
+};
+
+
+struct _LassoIdWsf2SubsRefNotificationClass {
+	LassoIdWsf2SubsNotificationClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_subsref_notification_get_type(void);
+LASSO_EXPORT LassoIdWsf2SubsRefNotification* lasso_idwsf2_subsref_notification_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SUBSREF_NOTIFICATION_H__ */
diff --git a/lasso/xml/id-wsf-2.0/subsref_notify.c b/lasso/xml/id-wsf-2.0/subsref_notify.c
new file mode 100644
index 00000000..72fe3144
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_notify.c
@@ -0,0 +1,116 @@
+/* $Id: subsref_notify.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "subsref_notify.h"
+
+/*
+ * Schema fragment (liberty-idwsf-subs-ref-v1.0.xsd):
+ *
+ * <xs:complexType name="NotifyType">
+ *   <xs:complexContent>
+ *     <xs:extension base="dst:RequestType">
+ *       <xs:sequence>
+ *         <xs:element ref="subsref:Notification" minOccurs="0" maxOccurs="unbounded"/>
+ *       </xs:sequence>
+ *       <xs:attributeGroup ref="subs:NotifyAttributeGroup"/>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Notification", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefNotify, Notification) },
+	{ "timeStamp", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefNotify, timeStamp) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2SubsRefNotify *node)
+{
+	node->Notification = NULL;
+	node->timeStamp = NULL;
+}
+
+static void
+class_init(LassoIdWsf2SubsRefNotifyClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Notify");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SUBSREF_HREF, LASSO_IDWSF2_SUBSREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_subsref_notify_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2SubsRefNotifyClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2SubsRefNotify),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_REQUEST,
+				"LassoIdWsf2SubsRefNotify", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_subsref_notify_new:
+ *
+ * Creates a new #LassoIdWsf2SubsRefNotify object.
+ *
+ * Return value: a newly created #LassoIdWsf2SubsRefNotify object
+ **/
+LassoIdWsf2SubsRefNotify*
+lasso_idwsf2_subsref_notify_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SUBSREF_NOTIFY, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/subsref_notify.h b/lasso/xml/id-wsf-2.0/subsref_notify.h
new file mode 100644
index 00000000..10fda091
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_notify.h
@@ -0,0 +1,84 @@
+/* $Id: subsref_notify.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SUBSREF_NOTIFY_H__
+#define __LASSO_IDWSF2_SUBSREF_NOTIFY_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "dst_request.h"
+
+#define LASSO_TYPE_IDWSF2_SUBSREF_NOTIFY (lasso_idwsf2_subsref_notify_get_type())
+#define LASSO_IDWSF2_SUBSREF_NOTIFY(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_NOTIFY, \
+		LassoIdWsf2SubsRefNotify))
+#define LASSO_IDWSF2_SUBSREF_NOTIFY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_NOTIFY, \
+		LassoIdWsf2SubsRefNotifyClass))
+#define LASSO_IS_IDWSF2_SUBSREF_NOTIFY(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_NOTIFY))
+#define LASSO_IS_IDWSF2_SUBSREF_NOTIFY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_NOTIFY))
+#define LASSO_IDWSF2_SUBSREF_NOTIFY_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SUBSREF_NOTIFY, \
+		LassoIdWsf2SubsRefNotifyClass)) 
+
+
+typedef struct _LassoIdWsf2SubsRefNotify LassoIdWsf2SubsRefNotify;
+typedef struct _LassoIdWsf2SubsRefNotifyClass LassoIdWsf2SubsRefNotifyClass;
+
+
+struct _LassoIdWsf2SubsRefNotify {
+	LassoIdWsf2DstRequest parent;
+
+	/*< public >*/
+	/* elements */
+	GList *Notification;
+	/* attributes */
+	char *timeStamp;
+};
+
+
+struct _LassoIdWsf2SubsRefNotifyClass {
+	LassoIdWsf2DstRequestClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_subsref_notify_get_type(void);
+LASSO_EXPORT LassoIdWsf2SubsRefNotify* lasso_idwsf2_subsref_notify_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SUBSREF_NOTIFY_H__ */
diff --git a/lasso/xml/id-wsf-2.0/subsref_notify_response.c b/lasso/xml/id-wsf-2.0/subsref_notify_response.c
new file mode 100644
index 00000000..e24253ae
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_notify_response.c
@@ -0,0 +1,105 @@
+/* $Id: subsref_notify_response.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "subsref_notify_response.h"
+
+/*
+ * Schema fragment (liberty-idwsf-subs-ref-v1.0.xsd):
+ *
+ * <xs:complexType name="NotifyResponseType">
+ *   <xs:complexContent>
+ *     <xs:extension base="subs:NotifyResponseType"/>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2SubsRefNotifyResponse *node)
+{
+}
+
+static void
+class_init(LassoIdWsf2SubsRefNotifyResponseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "NotifyResponse");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SUBSREF_HREF, LASSO_IDWSF2_SUBSREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_subsref_notify_response_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2SubsRefNotifyResponseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2SubsRefNotifyResponse),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_SUBS_NOTIFY_RESPONSE,
+				"LassoIdWsf2SubsRefNotifyResponse", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_subsref_notify_response_new:
+ *
+ * Creates a new #LassoIdWsf2SubsRefNotifyResponse object.
+ *
+ * Return value: a newly created #LassoIdWsf2SubsRefNotifyResponse object
+ **/
+LassoIdWsf2SubsRefNotifyResponse*
+lasso_idwsf2_subsref_notify_response_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SUBSREF_NOTIFY_RESPONSE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/subsref_notify_response.h b/lasso/xml/id-wsf-2.0/subsref_notify_response.h
new file mode 100644
index 00000000..42508f5a
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_notify_response.h
@@ -0,0 +1,81 @@
+/* $Id: subsref_notify_response.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SUBSREF_NOTIFY_RESPONSE_H__
+#define __LASSO_IDWSF2_SUBSREF_NOTIFY_RESPONSE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "subs_notify_response.h"
+
+#define LASSO_TYPE_IDWSF2_SUBSREF_NOTIFY_RESPONSE \
+	(lasso_idwsf2_subsref_notify_response_get_type())
+#define LASSO_IDWSF2_SUBSREF_NOTIFY_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_NOTIFY_RESPONSE, \
+		LassoIdWsf2SubsRefNotifyResponse))
+#define LASSO_IDWSF2_SUBSREF_NOTIFY_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_NOTIFY_RESPONSE, \
+		LassoIdWsf2SubsRefNotifyResponseClass))
+#define LASSO_IS_IDWSF2_SUBSREF_NOTIFY_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_NOTIFY_RESPONSE))
+#define LASSO_IS_IDWSF2_SUBSREF_NOTIFY_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_NOTIFY_RESPONSE))
+#define LASSO_IDWSF2_SUBSREF_NOTIFY_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SUBSREF_NOTIFY_RESPONSE, \
+		LassoIdWsf2SubsRefNotifyResponseClass)) 
+
+
+typedef struct _LassoIdWsf2SubsRefNotifyResponse LassoIdWsf2SubsRefNotifyResponse;
+typedef struct _LassoIdWsf2SubsRefNotifyResponseClass LassoIdWsf2SubsRefNotifyResponseClass;
+
+
+struct _LassoIdWsf2SubsRefNotifyResponse {
+	LassoIdWsf2SubsNotifyResponse parent;
+
+	/*< public >*/
+};
+
+
+struct _LassoIdWsf2SubsRefNotifyResponseClass {
+	LassoIdWsf2SubsNotifyResponseClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_subsref_notify_response_get_type(void);
+LASSO_EXPORT LassoIdWsf2SubsRefNotifyResponse* lasso_idwsf2_subsref_notify_response_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SUBSREF_NOTIFY_RESPONSE_H__ */
diff --git a/lasso/xml/id-wsf-2.0/subsref_query.c b/lasso/xml/id-wsf-2.0/subsref_query.c
new file mode 100644
index 00000000..473994f6
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_query.c
@@ -0,0 +1,120 @@
+/* $Id: subsref_query.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "subsref_query.h"
+
+/*
+ * Schema fragment (liberty-idwsf-subs-ref-v1.0.xsd):
+ *
+ * <xs:complexType name="QueryType">
+ *   <xs:complexContent>
+ *     <xs:extension base="dst:RequestType">
+ *       <xs:sequence>
+ *         <xs:element ref="subsref:TestItem" minOccurs="0" maxOccurs="unbounded"/>
+ *         <xs:element ref="subsref:QueryItem" minOccurs="0" maxOccurs="unbounded"/>
+ *         <xs:element ref="subsref:Subscription" minOccurs="0" maxOccurs="unbounded"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "TestItem", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefQuery, TestItem) },
+	{ "QueryItem", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefQuery, QueryItem) },
+	{ "Subscription", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefQuery, Subscription) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2SubsRefQuery *node)
+{
+	node->TestItem = NULL;
+	node->QueryItem = NULL;
+	node->Subscription = NULL;
+}
+
+static void
+class_init(LassoIdWsf2SubsRefQueryClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Query");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SUBSREF_HREF, LASSO_IDWSF2_SUBSREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_subsref_query_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2SubsRefQueryClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2SubsRefQuery),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_REQUEST,
+				"LassoIdWsf2SubsRefQuery", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_subsref_query_new:
+ *
+ * Creates a new #LassoIdWsf2SubsRefQuery object.
+ *
+ * Return value: a newly created #LassoIdWsf2SubsRefQuery object
+ **/
+LassoIdWsf2SubsRefQuery*
+lasso_idwsf2_subsref_query_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SUBSREF_QUERY, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/subsref_query.h b/lasso/xml/id-wsf-2.0/subsref_query.h
new file mode 100644
index 00000000..65e077f2
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_query.h
@@ -0,0 +1,84 @@
+/* $Id: subsref_query.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SUBSREF_QUERY_H__
+#define __LASSO_IDWSF2_SUBSREF_QUERY_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "dst_request.h"
+
+#define LASSO_TYPE_IDWSF2_SUBSREF_QUERY (lasso_idwsf2_subsref_query_get_type())
+#define LASSO_IDWSF2_SUBSREF_QUERY(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_QUERY, \
+		LassoIdWsf2SubsRefQuery))
+#define LASSO_IDWSF2_SUBSREF_QUERY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_QUERY, \
+		LassoIdWsf2SubsRefQueryClass))
+#define LASSO_IS_IDWSF2_SUBSREF_QUERY(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_QUERY))
+#define LASSO_IS_IDWSF2_SUBSREF_QUERY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_QUERY))
+#define LASSO_IDWSF2_SUBSREF_QUERY_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SUBSREF_QUERY, \
+		LassoIdWsf2SubsRefQueryClass)) 
+
+
+typedef struct _LassoIdWsf2SubsRefQuery LassoIdWsf2SubsRefQuery;
+typedef struct _LassoIdWsf2SubsRefQueryClass LassoIdWsf2SubsRefQueryClass;
+
+
+struct _LassoIdWsf2SubsRefQuery {
+	LassoIdWsf2DstRequest parent;
+
+	/*< public >*/
+	/* elements */
+	GList *TestItem;
+	GList *QueryItem;
+	GList *Subscription;
+};
+
+
+struct _LassoIdWsf2SubsRefQueryClass {
+	LassoIdWsf2DstRequestClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_subsref_query_get_type(void);
+LASSO_EXPORT LassoIdWsf2SubsRefQuery* lasso_idwsf2_subsref_query_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SUBSREF_QUERY_H__ */
diff --git a/lasso/xml/id-wsf-2.0/subsref_query_item.c b/lasso/xml/id-wsf-2.0/subsref_query_item.c
new file mode 100644
index 00000000..51eb9a23
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_query_item.c
@@ -0,0 +1,119 @@
+/* $Id: subsref_query_item.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "subsref_query_item.h"
+
+/*
+ * Schema fragment (liberty-idwsf-subs-ref-v1.0.xsd):
+ *
+ * <xs:complexType name="QueryItemType">
+ *   <xs:complexContent>
+ *     <xs:extension base="subsref:ResultQueryType">
+ *       <xs:attributeGroup ref="dst:PaginationAttributeGroup"/>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "count", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL_NEG,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefQueryItem, count) },
+	{ "offset", SNIPPET_ATTRIBUTE | SNIPPET_INTEGER | SNIPPET_OPTIONAL_NEG,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefQueryItem, offset) },
+	{ "setID", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefQueryItem, setID) },
+	{ "setReq", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefQueryItem, setReq) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2SubsRefQueryItem *node)
+{
+	node->count = -1;
+	node->offset = -1;
+	node->setID = NULL;
+	node->setReq = NULL;
+}
+
+static void
+class_init(LassoIdWsf2SubsRefQueryItemClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "QueryItem");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SUBSREF_HREF, LASSO_IDWSF2_SUBSREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_subsref_query_item_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2SubsRefQueryItemClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2SubsRefQueryItem),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_SUBSREF_RESULT_QUERY,
+				"LassoIdWsf2SubsRefQueryItem", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_subsref_query_item_new:
+ *
+ * Creates a new #LassoIdWsf2SubsRefQueryItem object.
+ *
+ * Return value: a newly created #LassoIdWsf2SubsRefQueryItem object
+ **/
+LassoIdWsf2SubsRefQueryItem*
+lasso_idwsf2_subsref_query_item_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SUBSREF_QUERY_ITEM, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/subsref_query_item.h b/lasso/xml/id-wsf-2.0/subsref_query_item.h
new file mode 100644
index 00000000..4d65bf7e
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_query_item.h
@@ -0,0 +1,85 @@
+/* $Id: subsref_query_item.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SUBSREF_QUERY_ITEM_H__
+#define __LASSO_IDWSF2_SUBSREF_QUERY_ITEM_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "subsref_result_query.h"
+
+#define LASSO_TYPE_IDWSF2_SUBSREF_QUERY_ITEM (lasso_idwsf2_subsref_query_item_get_type())
+#define LASSO_IDWSF2_SUBSREF_QUERY_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_QUERY_ITEM, \
+		LassoIdWsf2SubsRefQueryItem))
+#define LASSO_IDWSF2_SUBSREF_QUERY_ITEM_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_QUERY_ITEM, \
+		LassoIdWsf2SubsRefQueryItemClass))
+#define LASSO_IS_IDWSF2_SUBSREF_QUERY_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_QUERY_ITEM))
+#define LASSO_IS_IDWSF2_SUBSREF_QUERY_ITEM_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_QUERY_ITEM))
+#define LASSO_IDWSF2_SUBSREF_QUERY_ITEM_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SUBSREF_QUERY_ITEM, \
+		LassoIdWsf2SubsRefQueryItemClass)) 
+
+
+typedef struct _LassoIdWsf2SubsRefQueryItem LassoIdWsf2SubsRefQueryItem;
+typedef struct _LassoIdWsf2SubsRefQueryItemClass LassoIdWsf2SubsRefQueryItemClass;
+
+
+struct _LassoIdWsf2SubsRefQueryItem {
+	LassoIdWsf2SubsRefResultQuery parent;
+
+	/*< public >*/
+	/* attributes */
+	int count;
+	int offset;
+	char *setID;
+	char *setReq;
+};
+
+
+struct _LassoIdWsf2SubsRefQueryItemClass {
+	LassoIdWsf2SubsRefResultQueryClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_subsref_query_item_get_type(void);
+LASSO_EXPORT LassoIdWsf2SubsRefQueryItem* lasso_idwsf2_subsref_query_item_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SUBSREF_QUERY_ITEM_H__ */
diff --git a/lasso/xml/id-wsf-2.0/subsref_query_response.c b/lasso/xml/id-wsf-2.0/subsref_query_response.c
new file mode 100644
index 00000000..d2162d49
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_query_response.c
@@ -0,0 +1,117 @@
+/* $Id: subsref_query_response.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "subsref_query_response.h"
+
+/*
+ * Schema fragment (liberty-idwsf-subs-ref-v1.0.xsd):
+ *
+ * <xs:complexType name="QueryResponseType">
+ *   <xs:complexContent>
+ *     <xs:extension base="dst:DataResponseBaseType">
+ *       <xs:sequence>
+ *         <xs:element ref="lu:TestResult" minOccurs="0" maxOccurs="unbounded"/>
+ *         <xs:element ref="subsref:Data" minOccurs="0" maxOccurs="unbounded"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "TestResult", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefQueryResponse, TestResult),
+		"LassoIdWsf2UtilTestResult" },
+	{ "Data", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefQueryResponse, Data) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2SubsRefQueryResponse *node)
+{
+	node->TestResult = NULL;
+	node->Data = NULL;
+}
+
+static void
+class_init(LassoIdWsf2SubsRefQueryResponseClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "QueryResponse");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SUBSREF_HREF, LASSO_IDWSF2_SUBSREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_subsref_query_response_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2SubsRefQueryResponseClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2SubsRefQueryResponse),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_DATA_RESPONSE_BASE,
+				"LassoIdWsf2SubsRefQueryResponse", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_subsref_query_response_new:
+ *
+ * Creates a new #LassoIdWsf2SubsRefQueryResponse object.
+ *
+ * Return value: a newly created #LassoIdWsf2SubsRefQueryResponse object
+ **/
+LassoIdWsf2SubsRefQueryResponse*
+lasso_idwsf2_subsref_query_response_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SUBSREF_QUERY_RESPONSE, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/subsref_query_response.h b/lasso/xml/id-wsf-2.0/subsref_query_response.h
new file mode 100644
index 00000000..187ca81c
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_query_response.h
@@ -0,0 +1,84 @@
+/* $Id: subsref_query_response.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SUBSREF_QUERY_RESPONSE_H__
+#define __LASSO_IDWSF2_SUBSREF_QUERY_RESPONSE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "dst_data_response_base.h"
+
+#define LASSO_TYPE_IDWSF2_SUBSREF_QUERY_RESPONSE \
+	(lasso_idwsf2_subsref_query_response_get_type())
+#define LASSO_IDWSF2_SUBSREF_QUERY_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_QUERY_RESPONSE, \
+		LassoIdWsf2SubsRefQueryResponse))
+#define LASSO_IDWSF2_SUBSREF_QUERY_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_QUERY_RESPONSE, \
+		LassoIdWsf2SubsRefQueryResponseClass))
+#define LASSO_IS_IDWSF2_SUBSREF_QUERY_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_QUERY_RESPONSE))
+#define LASSO_IS_IDWSF2_SUBSREF_QUERY_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_QUERY_RESPONSE))
+#define LASSO_IDWSF2_SUBSREF_QUERY_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SUBSREF_QUERY_RESPONSE, \
+		LassoIdWsf2SubsRefQueryResponseClass)) 
+
+
+typedef struct _LassoIdWsf2SubsRefQueryResponse LassoIdWsf2SubsRefQueryResponse;
+typedef struct _LassoIdWsf2SubsRefQueryResponseClass LassoIdWsf2SubsRefQueryResponseClass;
+
+
+struct _LassoIdWsf2SubsRefQueryResponse {
+	LassoIdWsf2DstDataResponseBase parent;
+
+	/*< public >*/
+	/* elements */
+	GList *TestResult; /* of LassoIdWsf2UtilTestResult */
+	GList *Data;
+};
+
+
+struct _LassoIdWsf2SubsRefQueryResponseClass {
+	LassoIdWsf2DstDataResponseBaseClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_subsref_query_response_get_type(void);
+LASSO_EXPORT LassoIdWsf2SubsRefQueryResponse* lasso_idwsf2_subsref_query_response_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SUBSREF_QUERY_RESPONSE_H__ */
diff --git a/lasso/xml/id-wsf-2.0/subsref_result_query.c b/lasso/xml/id-wsf-2.0/subsref_result_query.c
new file mode 100644
index 00000000..2fd8b198
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_result_query.c
@@ -0,0 +1,116 @@
+/* $Id: subsref_result_query.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "subsref_result_query.h"
+
+/*
+ * Schema fragment (liberty-idwsf-subs-ref-v1.0.xsd):
+ *
+ * <xs:complexType name="ResultQueryType">
+ *   <xs:complexContent>
+ *     <xs:extension base="dst:ResultQueryBaseType">
+ *       <xs:sequence>
+ *         <xs:element ref="subsref:Select" minOccurs="0" maxOccurs="1"/>
+ *         <xs:element name="Sort" minOccurs="0" maxOccurs="1" type="subsref:SortType"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Select", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefResultQuery, Select) },
+	{ "Sort", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefResultQuery, Sort) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2SubsRefResultQuery *node)
+{
+	node->Select = NULL;
+	node->Sort = NULL;
+}
+
+static void
+class_init(LassoIdWsf2SubsRefResultQueryClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "ResultQuery");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SUBSREF_HREF, LASSO_IDWSF2_SUBSREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_subsref_result_query_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2SubsRefResultQueryClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2SubsRefResultQuery),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_RESULT_QUERY_BASE,
+				"LassoIdWsf2SubsRefResultQuery", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_subsref_result_query_new:
+ *
+ * Creates a new #LassoIdWsf2SubsRefResultQuery object.
+ *
+ * Return value: a newly created #LassoIdWsf2SubsRefResultQuery object
+ **/
+LassoIdWsf2SubsRefResultQuery*
+lasso_idwsf2_subsref_result_query_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SUBSREF_RESULT_QUERY, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/subsref_result_query.h b/lasso/xml/id-wsf-2.0/subsref_result_query.h
new file mode 100644
index 00000000..4255ecf2
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_result_query.h
@@ -0,0 +1,84 @@
+/* $Id: subsref_result_query.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SUBSREF_RESULT_QUERY_H__
+#define __LASSO_IDWSF2_SUBSREF_RESULT_QUERY_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "dst_result_query_base.h"
+
+#define LASSO_TYPE_IDWSF2_SUBSREF_RESULT_QUERY \
+	(lasso_idwsf2_subsref_result_query_get_type())
+#define LASSO_IDWSF2_SUBSREF_RESULT_QUERY(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_RESULT_QUERY, \
+		LassoIdWsf2SubsRefResultQuery))
+#define LASSO_IDWSF2_SUBSREF_RESULT_QUERY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_RESULT_QUERY, \
+		LassoIdWsf2SubsRefResultQueryClass))
+#define LASSO_IS_IDWSF2_SUBSREF_RESULT_QUERY(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_RESULT_QUERY))
+#define LASSO_IS_IDWSF2_SUBSREF_RESULT_QUERY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_RESULT_QUERY))
+#define LASSO_IDWSF2_SUBSREF_RESULT_QUERY_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SUBSREF_RESULT_QUERY, \
+		LassoIdWsf2SubsRefResultQueryClass)) 
+
+
+typedef struct _LassoIdWsf2SubsRefResultQuery LassoIdWsf2SubsRefResultQuery;
+typedef struct _LassoIdWsf2SubsRefResultQueryClass LassoIdWsf2SubsRefResultQueryClass;
+
+
+struct _LassoIdWsf2SubsRefResultQuery {
+	LassoIdWsf2DstResultQueryBase parent;
+
+	/*< public >*/
+	/* elements */
+	/* XXX */ void *Select;
+	/* XXX */ void *Sort;
+};
+
+
+struct _LassoIdWsf2SubsRefResultQueryClass {
+	LassoIdWsf2DstResultQueryBaseClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_subsref_result_query_get_type(void);
+LASSO_EXPORT LassoIdWsf2SubsRefResultQuery* lasso_idwsf2_subsref_result_query_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SUBSREF_RESULT_QUERY_H__ */
diff --git a/lasso/xml/id-wsf-2.0/subsref_subscription.c b/lasso/xml/id-wsf-2.0/subsref_subscription.c
new file mode 100644
index 00000000..c4ff7ef1
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_subscription.c
@@ -0,0 +1,121 @@
+/* $Id: subsref_subscription.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "subsref_subscription.h"
+
+/*
+ * Schema fragment (liberty-idwsf-subs-ref-v1.0.xsd):
+ *
+ * <xs:complexType name="SubscriptionType">
+ *   <xs:complexContent>
+ *     <xs:extension base="subs:SubscriptionType">
+ *       <xs:sequence>
+ *         <xs:element ref="subsref:ResultQuery" minOccurs="0" maxOccurs="unbounded"/>
+ *         <xs:element name="Aggregation" minOccurs="0" maxOccurs="1"
+ *                 type="subsref:AggregationType"/>
+ *         <xs:element name="Trigger" minOccurs="0" maxOccurs="1" type="subsref:TriggerType"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "ResultQuery", SNIPPET_LIST_NODES,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefSubscription, ResultQuery) },
+	{ "Aggregation", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefSubscription, Aggregation) },
+	{ "Trigger", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefSubscription, Trigger) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2SubsRefSubscription *node)
+{
+	node->ResultQuery = NULL;
+	node->Aggregation = NULL;
+	node->Trigger = NULL;
+}
+
+static void
+class_init(LassoIdWsf2SubsRefSubscriptionClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Subscription");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SUBSREF_HREF, LASSO_IDWSF2_SUBSREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_subsref_subscription_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2SubsRefSubscriptionClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2SubsRefSubscription),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_SUBS_SUBSCRIPTION,
+				"LassoIdWsf2SubsRefSubscription", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_subsref_subscription_new:
+ *
+ * Creates a new #LassoIdWsf2SubsRefSubscription object.
+ *
+ * Return value: a newly created #LassoIdWsf2SubsRefSubscription object
+ **/
+LassoIdWsf2SubsRefSubscription*
+lasso_idwsf2_subsref_subscription_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SUBSREF_SUBSCRIPTION, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/subsref_subscription.h b/lasso/xml/id-wsf-2.0/subsref_subscription.h
new file mode 100644
index 00000000..02e8918f
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_subscription.h
@@ -0,0 +1,85 @@
+/* $Id: subsref_subscription.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SUBSREF_SUBSCRIPTION_H__
+#define __LASSO_IDWSF2_SUBSREF_SUBSCRIPTION_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "subs_subscription.h"
+
+#define LASSO_TYPE_IDWSF2_SUBSREF_SUBSCRIPTION \
+	(lasso_idwsf2_subsref_subscription_get_type())
+#define LASSO_IDWSF2_SUBSREF_SUBSCRIPTION(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_SUBSCRIPTION, \
+		LassoIdWsf2SubsRefSubscription))
+#define LASSO_IDWSF2_SUBSREF_SUBSCRIPTION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_SUBSCRIPTION, \
+		LassoIdWsf2SubsRefSubscriptionClass))
+#define LASSO_IS_IDWSF2_SUBSREF_SUBSCRIPTION(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_SUBSCRIPTION))
+#define LASSO_IS_IDWSF2_SUBSREF_SUBSCRIPTION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_SUBSCRIPTION))
+#define LASSO_IDWSF2_SUBSREF_SUBSCRIPTION_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SUBSREF_SUBSCRIPTION, \
+		LassoIdWsf2SubsRefSubscriptionClass)) 
+
+
+typedef struct _LassoIdWsf2SubsRefSubscription LassoIdWsf2SubsRefSubscription;
+typedef struct _LassoIdWsf2SubsRefSubscriptionClass LassoIdWsf2SubsRefSubscriptionClass;
+
+
+struct _LassoIdWsf2SubsRefSubscription {
+	LassoIdWsf2SubsSubscription parent;
+
+	/*< public >*/
+	/* elements */
+	GList *ResultQuery;
+	/* XXX */ void *Aggregation;
+	/* XXX */ void *Trigger;
+};
+
+
+struct _LassoIdWsf2SubsRefSubscriptionClass {
+	LassoIdWsf2SubsSubscriptionClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_subsref_subscription_get_type(void);
+LASSO_EXPORT LassoIdWsf2SubsRefSubscription* lasso_idwsf2_subsref_subscription_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SUBSREF_SUBSCRIPTION_H__ */
diff --git a/lasso/xml/id-wsf-2.0/subsref_test_item.c b/lasso/xml/id-wsf-2.0/subsref_test_item.c
new file mode 100644
index 00000000..341589a7
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_test_item.c
@@ -0,0 +1,112 @@
+/* $Id: subsref_test_item.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "subsref_test_item.h"
+
+/*
+ * Schema fragment (liberty-idwsf-subs-ref-v1.0.xsd):
+ *
+ * <xs:complexType name="TestItemType">
+ *   <xs:complexContent>
+ *     <xs:extension base="dst:TestItemBaseType">
+ *       <xs:sequence>
+ *         <xs:element name="TestOp" minOccurs="0" maxOccurs="1" type="subsref:TestOpType"/>
+ *       </xs:sequence>
+ *     </xs:extension>
+ *   </xs:complexContent>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "TestOp", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoIdWsf2SubsRefTestItem, TestOp) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2SubsRefTestItem *node)
+{
+	node->TestOp = NULL;
+}
+
+static void
+class_init(LassoIdWsf2SubsRefTestItemClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "TestItem");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_SUBSREF_HREF, LASSO_IDWSF2_SUBSREF_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_subsref_test_item_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2SubsRefTestItemClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2SubsRefTestItem),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_IDWSF2_DST_TEST_ITEM_BASE,
+				"LassoIdWsf2SubsRefTestItem", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_subsref_test_item_new:
+ *
+ * Creates a new #LassoIdWsf2SubsRefTestItem object.
+ *
+ * Return value: a newly created #LassoIdWsf2SubsRefTestItem object
+ **/
+LassoIdWsf2SubsRefTestItem*
+lasso_idwsf2_subsref_test_item_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_SUBSREF_TEST_ITEM, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/subsref_test_item.h b/lasso/xml/id-wsf-2.0/subsref_test_item.h
new file mode 100644
index 00000000..b7b5551e
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/subsref_test_item.h
@@ -0,0 +1,82 @@
+/* $Id: subsref_test_item.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_SUBSREF_TEST_ITEM_H__
+#define __LASSO_IDWSF2_SUBSREF_TEST_ITEM_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+#include "dst_test_item_base.h"
+
+#define LASSO_TYPE_IDWSF2_SUBSREF_TEST_ITEM (lasso_idwsf2_subsref_test_item_get_type())
+#define LASSO_IDWSF2_SUBSREF_TEST_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_TEST_ITEM, \
+		LassoIdWsf2SubsRefTestItem))
+#define LASSO_IDWSF2_SUBSREF_TEST_ITEM_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_TEST_ITEM, \
+		LassoIdWsf2SubsRefTestItemClass))
+#define LASSO_IS_IDWSF2_SUBSREF_TEST_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_SUBSREF_TEST_ITEM))
+#define LASSO_IS_IDWSF2_SUBSREF_TEST_ITEM_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_SUBSREF_TEST_ITEM))
+#define LASSO_IDWSF2_SUBSREF_TEST_ITEM_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_SUBSREF_TEST_ITEM, \
+		LassoIdWsf2SubsRefTestItemClass)) 
+
+
+typedef struct _LassoIdWsf2SubsRefTestItem LassoIdWsf2SubsRefTestItem;
+typedef struct _LassoIdWsf2SubsRefTestItemClass LassoIdWsf2SubsRefTestItemClass;
+
+
+struct _LassoIdWsf2SubsRefTestItem {
+	LassoIdWsf2DstTestItemBase parent;
+
+	/*< public >*/
+	/* elements */
+	/* XXX */ void *TestOp;
+};
+
+
+struct _LassoIdWsf2SubsRefTestItemClass {
+	LassoIdWsf2DstTestItemBaseClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_subsref_test_item_get_type(void);
+LASSO_EXPORT LassoIdWsf2SubsRefTestItem* lasso_idwsf2_subsref_test_item_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_SUBSREF_TEST_ITEM_H__ */
diff --git a/lasso/xml/id-wsf-2.0/util_empty.c b/lasso/xml/id-wsf-2.0/util_empty.c
new file mode 100644
index 00000000..c417b5dd
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/util_empty.c
@@ -0,0 +1,108 @@
+/* $Id: util_empty.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "util_empty.h"
+
+/*
+ * Schema fragment (liberty-idwsf-utility-v2.0.xsd):
+ *
+ * <xs:complexType name="EmptyType">
+ *   <xs:annotation>
+ *     <xs:documentation> This type may be used to create an empty element </xs:documentation>
+ *     </xs:annotation>
+ *     <xs:complexContent>
+ *       <xs:restriction base="xs:anyType"/>
+ *     </xs:complexContent>
+ *   </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2UtilEmpty *node)
+{
+}
+
+static void
+class_init(LassoIdWsf2UtilEmptyClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Empty");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_UTIL_HREF, LASSO_IDWSF2_UTIL_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_util_empty_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2UtilEmptyClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2UtilEmpty),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2UtilEmpty", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_util_empty_new:
+ *
+ * Creates a new #LassoIdWsf2UtilEmpty object.
+ *
+ * Return value: a newly created #LassoIdWsf2UtilEmpty object
+ **/
+LassoIdWsf2UtilEmpty*
+lasso_idwsf2_util_empty_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_UTIL_EMPTY, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/util_empty.h b/lasso/xml/id-wsf-2.0/util_empty.h
new file mode 100644
index 00000000..7c0b320a
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/util_empty.h
@@ -0,0 +1,79 @@
+/* $Id: util_empty.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_UTIL_EMPTY_H__
+#define __LASSO_IDWSF2_UTIL_EMPTY_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_UTIL_EMPTY (lasso_idwsf2_util_empty_get_type())
+#define LASSO_IDWSF2_UTIL_EMPTY(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_UTIL_EMPTY, \
+		LassoIdWsf2UtilEmpty))
+#define LASSO_IDWSF2_UTIL_EMPTY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_UTIL_EMPTY, \
+		LassoIdWsf2UtilEmptyClass))
+#define LASSO_IS_IDWSF2_UTIL_EMPTY(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_UTIL_EMPTY))
+#define LASSO_IS_IDWSF2_UTIL_EMPTY_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_UTIL_EMPTY))
+#define LASSO_IDWSF2_UTIL_EMPTY_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_UTIL_EMPTY, \
+		LassoIdWsf2UtilEmptyClass)) 
+
+
+typedef struct _LassoIdWsf2UtilEmpty LassoIdWsf2UtilEmpty;
+typedef struct _LassoIdWsf2UtilEmptyClass LassoIdWsf2UtilEmptyClass;
+
+
+struct _LassoIdWsf2UtilEmpty {
+	LassoNode parent;
+
+	/*< public >*/
+};
+
+
+struct _LassoIdWsf2UtilEmptyClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_util_empty_get_type(void);
+LASSO_EXPORT LassoIdWsf2UtilEmpty* lasso_idwsf2_util_empty_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_UTIL_EMPTY_H__ */
diff --git a/lasso/xml/id-wsf-2.0/util_extension.c b/lasso/xml/id-wsf-2.0/util_extension.c
new file mode 100644
index 00000000..a0515490
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/util_extension.c
@@ -0,0 +1,110 @@
+/* $Id: util_extension.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "util_extension.h"
+
+/*
+ * Schema fragment (liberty-idwsf-utility-v2.0.xsd):
+ *
+ * <xs:complexType name="extensionType">
+ *   <xs:annotation>
+ *     <xs:documentation>
+ *       A type for arbitrary content extensions from other namespaces
+ *     </xs:documentation>
+ *   </xs:annotation>
+ *   <xs:sequence>
+ *     <xs:any namespace="##other" processContents="lax" maxOccurs="unbounded"/>
+ *   </xs:sequence>
+ * </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoIdWsf2Utilextension *node)
+{
+}
+
+static void
+class_init(LassoIdWsf2UtilextensionClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "extension");
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_UTIL_HREF, LASSO_IDWSF2_UTIL_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_idwsf2_util_extension_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoIdWsf2UtilextensionClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoIdWsf2Utilextension),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoIdWsf2Utilextension", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_idwsf2_util_extension_new:
+ *
+ * Creates a new #LassoIdWsf2Utilextension object.
+ *
+ * Return value: a newly created #LassoIdWsf2Utilextension object
+ **/
+LassoIdWsf2Utilextension*
+lasso_idwsf2_util_extension_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_UTIL_EXTENSION, NULL);
+}
diff --git a/lasso/xml/id-wsf-2.0/util_extension.h b/lasso/xml/id-wsf-2.0/util_extension.h
new file mode 100644
index 00000000..f664534e
--- /dev/null
+++ b/lasso/xml/id-wsf-2.0/util_extension.h
@@ -0,0 +1,79 @@
+/* $Id: util_extension.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_IDWSF2_UTIL_EXTENSION_H__
+#define __LASSO_IDWSF2_UTIL_EXTENSION_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_IDWSF2_UTIL_EXTENSION (lasso_idwsf2_util_extension_get_type())
+#define LASSO_IDWSF2_UTIL_EXTENSION(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_UTIL_EXTENSION, \
+		LassoIdWsf2Utilextension))
+#define LASSO_IDWSF2_UTIL_EXTENSION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_UTIL_EXTENSION, \
+		LassoIdWsf2UtilextensionClass))
+#define LASSO_IS_IDWSF2_UTIL_EXTENSION(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_UTIL_EXTENSION))
+#define LASSO_IS_IDWSF2_UTIL_EXTENSION_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_UTIL_EXTENSION))
+#define LASSO_IDWSF2_UTIL_EXTENSION_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_UTIL_EXTENSION, \
+		LassoIdWsf2UtilextensionClass)) 
+
+
+typedef struct _LassoIdWsf2Utilextension LassoIdWsf2Utilextension;
+typedef struct _LassoIdWsf2UtilextensionClass LassoIdWsf2UtilextensionClass;
+
+
+struct _LassoIdWsf2Utilextension {
+	LassoNode parent;
+
+	/*< public >*/
+};
+
+
+struct _LassoIdWsf2UtilextensionClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_idwsf2_util_extension_get_type(void);
+LASSO_EXPORT LassoIdWsf2Utilextension* lasso_idwsf2_util_extension_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_IDWSF2_UTIL_EXTENSION_H__ */
diff --git a/lasso/xml/id-wsf-2.0/util_response.c b/lasso/xml/id-wsf-2.0/util_response.c
index 95efd2d6..a83671ab 100644
--- a/lasso/xml/id-wsf-2.0/util_response.c
+++ b/lasso/xml/id-wsf-2.0/util_response.c
@@ -44,13 +44,14 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Status", SNIPPET_NODE,
-		G_STRUCT_OFFSET(LassoIdWsf2UtilResponse, Status) },
+		G_STRUCT_OFFSET(LassoIdWsf2UtilResponse, Status),
+		"LassoIdWsf2UtilStatus" },
 	{ "Extension", SNIPPET_LIST_NODES,
 		G_STRUCT_OFFSET(LassoIdWsf2UtilResponse, Extension),
 		"LassoIdWsf2Utilextension" },
-	{ "itemIDRef", SNIPPET_ATTRIBUTE,
+	{ "itemIDRef", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
 		G_STRUCT_OFFSET(LassoIdWsf2UtilResponse, itemIDRef) },
-	{ "any", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
 		G_STRUCT_OFFSET(LassoIdWsf2UtilResponse, attributes) },
 	{NULL, 0, 0}
 };
@@ -115,7 +116,7 @@ lasso_idwsf2_util_response_get_type()
  *
  * Return value: a newly created #LassoIdWsf2UtilResponse object
  **/
-LassoNode*
+LassoIdWsf2UtilResponse*
 lasso_idwsf2_util_response_new()
 {
 	return g_object_new(LASSO_TYPE_IDWSF2_UTIL_RESPONSE, NULL);
diff --git a/lasso/xml/id-wsf-2.0/util_response.h b/lasso/xml/id-wsf-2.0/util_response.h
index 0934a6c6..0bdb4cc6 100644
--- a/lasso/xml/id-wsf-2.0/util_response.h
+++ b/lasso/xml/id-wsf-2.0/util_response.h
@@ -75,7 +75,7 @@ struct _LassoIdWsf2UtilResponseClass {
 };
 
 LASSO_EXPORT GType lasso_idwsf2_util_response_get_type(void);
-LASSO_EXPORT LassoNode* lasso_idwsf2_util_response_new(void);
+LASSO_EXPORT LassoIdWsf2UtilResponse* lasso_idwsf2_util_response_new(void);
 
 
 
diff --git a/lasso/xml/id-wsf-2.0/util_status.c b/lasso/xml/id-wsf-2.0/util_status.c
index 4e887452..86d2f8e5 100644
--- a/lasso/xml/id-wsf-2.0/util_status.c
+++ b/lasso/xml/id-wsf-2.0/util_status.c
@@ -49,12 +49,13 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Status", SNIPPET_LIST_NODES,
-		G_STRUCT_OFFSET(LassoIdWsf2UtilStatus, Status) },
+		G_STRUCT_OFFSET(LassoIdWsf2UtilStatus, Status),
+		"LassoIdWsf2UtilStatus" },
 	{ "code", SNIPPET_ATTRIBUTE,
 		G_STRUCT_OFFSET(LassoIdWsf2UtilStatus, code) },
-	{ "ref", SNIPPET_ATTRIBUTE,
+	{ "ref", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
 		G_STRUCT_OFFSET(LassoIdWsf2UtilStatus, ref) },
-	{ "comment", SNIPPET_ATTRIBUTE,
+	{ "comment", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
 		G_STRUCT_OFFSET(LassoIdWsf2UtilStatus, comment) },
 	{NULL, 0, 0}
 };
@@ -82,13 +83,13 @@ class_init(LassoIdWsf2UtilStatusClass *klass)
 
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
-	lasso_node_class_set_nodename(nclass, "Status"); 
+	lasso_node_class_set_nodename(nclass, "Status");
 	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_UTIL_HREF, LASSO_IDWSF2_UTIL_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
 GType
-lasso_util_status_get_type()
+lasso_idwsf2_util_status_get_type()
 {
 	static GType this_type = 0;
 
@@ -112,18 +113,14 @@ lasso_util_status_get_type()
 }
 
 /**
- * lasso_util_status_new:
+ * lasso_idwsf2_util_status_new:
  *
  * Creates a new #LassoIdWsf2UtilStatus object.
  *
  * Return value: a newly created #LassoIdWsf2UtilStatus object
  **/
 LassoIdWsf2UtilStatus*
-lasso_util_status_new(gchar *code)
+lasso_idwsf2_util_status_new()
 {
-	LassoIdWsf2UtilStatus *status = LASSO_UTIL_STATUS(g_object_new(LASSO_TYPE_UTIL_STATUS, NULL));
-	
-	status->code = g_strdup(code);
-
-	return status;
+	return g_object_new(LASSO_TYPE_IDWSF2_UTIL_STATUS, NULL);
 }
diff --git a/lasso/xml/id-wsf-2.0/util_status.h b/lasso/xml/id-wsf-2.0/util_status.h
index 3ba5c445..4fdd6d34 100644
--- a/lasso/xml/id-wsf-2.0/util_status.h
+++ b/lasso/xml/id-wsf-2.0/util_status.h
@@ -22,8 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __LASSO_UTIL_STATUS_H__
-#define __LASSO_UTIL_STATUS_H__
+#ifndef __LASSO_IDWSF2_UTIL_STATUS_H__
+#define __LASSO_IDWSF2_UTIL_STATUS_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -31,20 +31,26 @@ extern "C" {
 
 #include <lasso/xml/xml.h>
 
-#define LASSO_TYPE_UTIL_STATUS (lasso_util_status_get_type())
-#define LASSO_UTIL_STATUS(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_UTIL_STATUS, \
-				LassoIdWsf2UtilStatus))
-#define LASSO_UTIL_STATUS_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_UTIL_STATUS, \
-				LassoIdWsf2UtilStatusClass))
-#define LASSO_IS_UTIL_STATUS(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_UTIL_STATUS))
-#define LASSO_IS_UTIL_STATUS_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_UTIL_STATUS))
-#define LASSO_UTIL_STATUS_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_UTIL_STATUS, \
-				LassoIdWsf2UtilStatusClass)) 
+#define LASSO_TYPE_IDWSF2_UTIL_STATUS (lasso_idwsf2_util_status_get_type())
+#define LASSO_IDWSF2_UTIL_STATUS(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_IDWSF2_UTIL_STATUS, \
+		LassoIdWsf2UtilStatus))
+#define LASSO_IDWSF2_UTIL_STATUS_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_IDWSF2_UTIL_STATUS, \
+		LassoIdWsf2UtilStatusClass))
+#define LASSO_IS_IDWSF2_UTIL_STATUS(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_IDWSF2_UTIL_STATUS))
+#define LASSO_IS_IDWSF2_UTIL_STATUS_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_IDWSF2_UTIL_STATUS))
+#define LASSO_IDWSF2_UTIL_STATUS_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_IDWSF2_UTIL_STATUS, \
+		LassoIdWsf2UtilStatusClass)) 
+
 
 typedef struct _LassoIdWsf2UtilStatus LassoIdWsf2UtilStatus;
 typedef struct _LassoIdWsf2UtilStatusClass LassoIdWsf2UtilStatusClass;
@@ -55,7 +61,7 @@ struct _LassoIdWsf2UtilStatus {
 
 	/*< public >*/
 	/* elements */
-	GList *Status;
+	GList *Status; /* of LassoIdWsf2UtilStatus */
 	/* attributes */
 	char *code;
 	char *ref;
@@ -67,12 +73,13 @@ struct _LassoIdWsf2UtilStatusClass {
 	LassoNodeClass parent;
 };
 
-LASSO_EXPORT GType lasso_util_status_get_type(void);
-LASSO_EXPORT LassoIdWsf2UtilStatus* lasso_util_status_new(gchar *code);
+LASSO_EXPORT GType lasso_idwsf2_util_status_get_type(void);
+LASSO_EXPORT LassoIdWsf2UtilStatus* lasso_idwsf2_util_status_new(void);
+
 
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* __LASSO_UTIL_STATUS_H__ */
+#endif /* __LASSO_IDWSF2_UTIL_STATUS_H__ */
diff --git a/lasso/xml/ws/Makefile.am b/lasso/xml/ws/Makefile.am
index b4c7fcf5..4b44a354 100644
--- a/lasso/xml/ws/Makefile.am
+++ b/lasso/xml/ws/Makefile.am
@@ -18,7 +18,12 @@ liblasso_xml_ws_la_SOURCES = \
 	wsa_problem_action.c \
 	wsa_reference_parameters.c \
 	wsa_relates_to.c \
-	wsse_200401_security.c \
+	wsse_embedded.c \
+	wsse_reference.c \
+	wsse_security_header.c \
+	wsse_security_token_reference.c \
+	wsse_transformation_parameters.c \
+	wsse_username_token.c \
 	wsu_timestamp.c
 
 liblassoinclude_HEADERS = \
@@ -31,5 +36,11 @@ liblassoinclude_HEADERS = \
 	wsa_problem_action.h \
 	wsa_reference_parameters.h \
 	wsa_relates_to.h \
-	wsse_200401_security.h \
+	wsse_embedded.h \
+	wsse_reference.h \
+	wsse_security_header.h \
+	wsse_security_token_reference.h \
+	wsse_transformation_parameters.h \
+	wsse_username_token.h \
 	wsu_timestamp.h
+
diff --git a/lasso/xml/ws/wsa_attributed_any.c b/lasso/xml/ws/wsa_attributed_any.c
index 4ff54fe0..4152983d 100644
--- a/lasso/xml/ws/wsa_attributed_any.c
+++ b/lasso/xml/ws/wsa_attributed_any.c
@@ -41,7 +41,9 @@
 
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "any", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+	{ "", SNIPPET_LIST_NODES | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoWsAddrAttributedAny, any) },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
 		G_STRUCT_OFFSET(LassoWsAddrAttributedAny, attributes) },
 	{NULL, 0, 0}
 };
@@ -56,6 +58,9 @@ static LassoNodeClass *parent_class = NULL;
 static void
 instance_init(LassoWsAddrAttributedAny *node)
 {
+	node->any = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
 }
 
 static void
@@ -65,7 +70,7 @@ class_init(LassoWsAddrAttributedAnyClass *klass)
 
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
-	lasso_node_class_set_nodename(nclass, "AttributedAny"); 
+	lasso_node_class_set_nodename(nclass, "ProblemHeader");
 	lasso_node_class_set_ns(nclass, LASSO_WSA_HREF, LASSO_WSA_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
@@ -101,7 +106,7 @@ lasso_wsa_attributed_any_get_type()
  *
  * Return value: a newly created #LassoWsAddrAttributedAny object
  **/
-LassoNode*
+LassoWsAddrAttributedAny*
 lasso_wsa_attributed_any_new()
 {
 	return g_object_new(LASSO_TYPE_WSA_ATTRIBUTED_ANY, NULL);
diff --git a/lasso/xml/ws/wsa_attributed_any.h b/lasso/xml/ws/wsa_attributed_any.h
index 2e2dfe7d..c6b3976c 100644
--- a/lasso/xml/ws/wsa_attributed_any.h
+++ b/lasso/xml/ws/wsa_attributed_any.h
@@ -33,18 +33,24 @@ extern "C" {
 
 #define LASSO_TYPE_WSA_ATTRIBUTED_ANY (lasso_wsa_attributed_any_get_type())
 #define LASSO_WSA_ATTRIBUTED_ANY(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_WSA_ATTRIBUTED_ANY, \
-				LassoWsAddrAttributedAny))
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_WSA_ATTRIBUTED_ANY, \
+		LassoWsAddrAttributedAny))
 #define LASSO_WSA_ATTRIBUTED_ANY_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_WSA_ATTRIBUTED_ANY, \
-				LassoWsAddrAttributedAnyClass))
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_WSA_ATTRIBUTED_ANY, \
+		LassoWsAddrAttributedAnyClass))
 #define LASSO_IS_WSA_ATTRIBUTED_ANY(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_WSA_ATTRIBUTED_ANY))
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_WSA_ATTRIBUTED_ANY))
 #define LASSO_IS_WSA_ATTRIBUTED_ANY_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_WSA_ATTRIBUTED_ANY))
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_WSA_ATTRIBUTED_ANY))
 #define LASSO_WSA_ATTRIBUTED_ANY_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_WSA_ATTRIBUTED_ANY, \
-				LassoWsAddrAttributedAnyClass)) 
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_WSA_ATTRIBUTED_ANY, \
+		LassoWsAddrAttributedAnyClass)) 
+
 
 typedef struct _LassoWsAddrAttributedAny LassoWsAddrAttributedAny;
 typedef struct _LassoWsAddrAttributedAnyClass LassoWsAddrAttributedAnyClass;
@@ -54,6 +60,8 @@ struct _LassoWsAddrAttributedAny {
 	LassoNode parent;
 
 	/*< public >*/
+	/* elements */
+	GList *any; /* of LassoNode */
 	/* attributes */
 	GHashTable *attributes;
 };
@@ -64,7 +72,7 @@ struct _LassoWsAddrAttributedAnyClass {
 };
 
 LASSO_EXPORT GType lasso_wsa_attributed_any_get_type(void);
-LASSO_EXPORT LassoNode* lasso_wsa_attributed_any_new(void);
+LASSO_EXPORT LassoWsAddrAttributedAny* lasso_wsa_attributed_any_new(void);
 
 
 
diff --git a/lasso/xml/ws/wsa_attributed_qname.c b/lasso/xml/ws/wsa_attributed_qname.c
index d23c38fb..db3d4f73 100644
--- a/lasso/xml/ws/wsa_attributed_qname.c
+++ b/lasso/xml/ws/wsa_attributed_qname.c
@@ -42,9 +42,9 @@
 
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "content", SNIPPET_CONTENT,
+	{ "content", SNIPPET_TEXT_CHILD,
 		G_STRUCT_OFFSET(LassoWsAddrAttributedQName, content) },
-	{ "any", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
 		G_STRUCT_OFFSET(LassoWsAddrAttributedQName, attributes) },
 	{NULL, 0, 0}
 };
@@ -60,6 +60,8 @@ static void
 instance_init(LassoWsAddrAttributedQName *node)
 {
 	node->content = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
 }
 
 static void
@@ -69,7 +71,7 @@ class_init(LassoWsAddrAttributedQNameClass *klass)
 
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
-	lasso_node_class_set_nodename(nclass, "AttributedQName"); 
+	lasso_node_class_set_nodename(nclass, "ProblemHeaderQName");
 	lasso_node_class_set_ns(nclass, LASSO_WSA_HREF, LASSO_WSA_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
@@ -105,7 +107,7 @@ lasso_wsa_attributed_qname_get_type()
  *
  * Return value: a newly created #LassoWsAddrAttributedQName object
  **/
-LassoNode*
+LassoWsAddrAttributedQName*
 lasso_wsa_attributed_qname_new()
 {
 	return g_object_new(LASSO_TYPE_WSA_ATTRIBUTED_QNAME, NULL);
@@ -121,11 +123,11 @@ lasso_wsa_attributed_qname_new()
  *
  * Return value: a newly created #LassoWsAddrAttributedQName object
  **/
-LassoNode*
+LassoWsAddrAttributedQName*
 lasso_wsa_attributed_qname_new_with_string(char *content)
 {
 	LassoWsAddrAttributedQName *object;
 	object = g_object_new(LASSO_TYPE_WSA_ATTRIBUTED_QNAME, NULL);
 	object->content = g_strdup(content);
-	return LASSO_NODE(object);
+	return object;
 }
diff --git a/lasso/xml/ws/wsa_attributed_qname.h b/lasso/xml/ws/wsa_attributed_qname.h
index 0481b9e6..eb6566ea 100644
--- a/lasso/xml/ws/wsa_attributed_qname.h
+++ b/lasso/xml/ws/wsa_attributed_qname.h
@@ -33,18 +33,24 @@ extern "C" {
 
 #define LASSO_TYPE_WSA_ATTRIBUTED_QNAME (lasso_wsa_attributed_qname_get_type())
 #define LASSO_WSA_ATTRIBUTED_QNAME(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_WSA_ATTRIBUTED_QNAME, \
-				LassoWsAddrAttributedQName))
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_WSA_ATTRIBUTED_QNAME, \
+		LassoWsAddrAttributedQName))
 #define LASSO_WSA_ATTRIBUTED_QNAME_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_WSA_ATTRIBUTED_QNAME, \
-				LassoWsAddrAttributedQNameClass))
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_WSA_ATTRIBUTED_QNAME, \
+		LassoWsAddrAttributedQNameClass))
 #define LASSO_IS_WSA_ATTRIBUTED_QNAME(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_WSA_ATTRIBUTED_QNAME))
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_WSA_ATTRIBUTED_QNAME))
 #define LASSO_IS_WSA_ATTRIBUTED_QNAME_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_WSA_ATTRIBUTED_QNAME))
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_WSA_ATTRIBUTED_QNAME))
 #define LASSO_WSA_ATTRIBUTED_QNAME_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_WSA_ATTRIBUTED_QNAME, \
-				LassoWsAddrAttributedQNameClass)) 
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_WSA_ATTRIBUTED_QNAME, \
+		LassoWsAddrAttributedQNameClass)) 
+
 
 typedef struct _LassoWsAddrAttributedQName LassoWsAddrAttributedQName;
 typedef struct _LassoWsAddrAttributedQNameClass LassoWsAddrAttributedQNameClass;
@@ -66,9 +72,9 @@ struct _LassoWsAddrAttributedQNameClass {
 };
 
 LASSO_EXPORT GType lasso_wsa_attributed_qname_get_type(void);
-LASSO_EXPORT LassoNode* lasso_wsa_attributed_qname_new(void);
+LASSO_EXPORT LassoWsAddrAttributedQName* lasso_wsa_attributed_qname_new(void);
 
-LASSO_EXPORT LassoNode* lasso_wsa_attributed_qname_new_with_string(char *content);
+LASSO_EXPORT LassoWsAddrAttributedQName* lasso_wsa_attributed_qname_new_with_string(char *content);
 
 
 #ifdef __cplusplus
diff --git a/lasso/xml/ws/wsa_attributed_unsigned_long.c b/lasso/xml/ws/wsa_attributed_unsigned_long.c
index 347f90fb..cd55853a 100644
--- a/lasso/xml/ws/wsa_attributed_unsigned_long.c
+++ b/lasso/xml/ws/wsa_attributed_unsigned_long.c
@@ -44,7 +44,7 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "content", SNIPPET_TEXT_CHILD | SNIPPET_INTEGER,
 		G_STRUCT_OFFSET(LassoWsAddrAttributedUnsignedLong, content) },
-	{ "any", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
 		G_STRUCT_OFFSET(LassoWsAddrAttributedUnsignedLong, attributes) },
 	{NULL, 0, 0}
 };
@@ -71,7 +71,7 @@ class_init(LassoWsAddrAttributedUnsignedLongClass *klass)
 
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
-	lasso_node_class_set_nodename(nclass, "AttributedUnsignedLong");
+	lasso_node_class_set_nodename(nclass, "RetryAfter");
 	lasso_node_class_set_ns(nclass, LASSO_WSA_HREF, LASSO_WSA_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
@@ -107,7 +107,7 @@ lasso_wsa_attributed_unsigned_long_get_type()
  *
  * Return value: a newly created #LassoWsAddrAttributedUnsignedLong object
  **/
-LassoNode*
+LassoWsAddrAttributedUnsignedLong*
 lasso_wsa_attributed_unsigned_long_new()
 {
 	return g_object_new(LASSO_TYPE_WSA_ATTRIBUTED_UNSIGNED_LONG, NULL);
diff --git a/lasso/xml/ws/wsa_attributed_unsigned_long.h b/lasso/xml/ws/wsa_attributed_unsigned_long.h
index f3064c2b..982a32fc 100644
--- a/lasso/xml/ws/wsa_attributed_unsigned_long.h
+++ b/lasso/xml/ws/wsa_attributed_unsigned_long.h
@@ -31,20 +31,27 @@ extern "C" {
 
 #include <lasso/xml/xml.h>
 
-#define LASSO_TYPE_WSA_ATTRIBUTED_UNSIGNED_LONG (lasso_wsa_attributed_unsigned_long_get_type())
+#define LASSO_TYPE_WSA_ATTRIBUTED_UNSIGNED_LONG \
+	(lasso_wsa_attributed_unsigned_long_get_type())
 #define LASSO_WSA_ATTRIBUTED_UNSIGNED_LONG(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_WSA_ATTRIBUTED_UNSIGNED_LONG, \
-				LassoWsAddrAttributedUnsignedLong))
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_WSA_ATTRIBUTED_UNSIGNED_LONG, \
+		LassoWsAddrAttributedUnsignedLong))
 #define LASSO_WSA_ATTRIBUTED_UNSIGNED_LONG_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_WSA_ATTRIBUTED_UNSIGNED_LONG, \
-				LassoWsAddrAttributedUnsignedLongClass))
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_WSA_ATTRIBUTED_UNSIGNED_LONG, \
+		LassoWsAddrAttributedUnsignedLongClass))
 #define LASSO_IS_WSA_ATTRIBUTED_UNSIGNED_LONG(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_WSA_ATTRIBUTED_UNSIGNED_LONG))
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_WSA_ATTRIBUTED_UNSIGNED_LONG))
 #define LASSO_IS_WSA_ATTRIBUTED_UNSIGNED_LONG_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_WSA_ATTRIBUTED_UNSIGNED_LONG))
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_WSA_ATTRIBUTED_UNSIGNED_LONG))
 #define LASSO_WSA_ATTRIBUTED_UNSIGNED_LONG_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_WSA_ATTRIBUTED_UNSIGNED_LONG, \
-				LassoWsAddrAttributedUnsignedLongClass)) 
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_WSA_ATTRIBUTED_UNSIGNED_LONG, \
+		LassoWsAddrAttributedUnsignedLongClass)) 
+
 
 typedef struct _LassoWsAddrAttributedUnsignedLong LassoWsAddrAttributedUnsignedLong;
 typedef struct _LassoWsAddrAttributedUnsignedLongClass LassoWsAddrAttributedUnsignedLongClass;
@@ -66,7 +73,7 @@ struct _LassoWsAddrAttributedUnsignedLongClass {
 };
 
 LASSO_EXPORT GType lasso_wsa_attributed_unsigned_long_get_type(void);
-LASSO_EXPORT LassoNode* lasso_wsa_attributed_unsigned_long_new(void);
+LASSO_EXPORT LassoWsAddrAttributedUnsignedLong* lasso_wsa_attributed_unsigned_long_new(void);
 
 
 
diff --git a/lasso/xml/ws/wsa_attributed_uri.c b/lasso/xml/ws/wsa_attributed_uri.c
index 7bdd2d41..afb6eabc 100644
--- a/lasso/xml/ws/wsa_attributed_uri.c
+++ b/lasso/xml/ws/wsa_attributed_uri.c
@@ -44,7 +44,7 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "content", SNIPPET_TEXT_CHILD,
 		G_STRUCT_OFFSET(LassoWsAddrAttributedURI, content) },
-	{ "any", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
 		G_STRUCT_OFFSET(LassoWsAddrAttributedURI, attributes) },
 	{NULL, 0, 0}
 };
@@ -60,6 +60,8 @@ static void
 instance_init(LassoWsAddrAttributedURI *node)
 {
 	node->content = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
 }
 
 static void
@@ -69,7 +71,7 @@ class_init(LassoWsAddrAttributedURIClass *klass)
 
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
-	lasso_node_class_set_nodename(nclass, "AttributedURI"); 
+	lasso_node_class_set_nodename(nclass, "AttributedURI");
 	lasso_node_class_set_ns(nclass, LASSO_WSA_HREF, LASSO_WSA_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
@@ -124,9 +126,8 @@ lasso_wsa_attributed_uri_new()
 LassoWsAddrAttributedURI*
 lasso_wsa_attributed_uri_new_with_string(char *content)
 {
-	LassoWsAddrAttributedURI *object = g_object_new(LASSO_TYPE_WSA_ATTRIBUTED_URI, NULL);
-
+	LassoWsAddrAttributedURI *object;
+	object = g_object_new(LASSO_TYPE_WSA_ATTRIBUTED_URI, NULL);
 	object->content = g_strdup(content);
-
 	return object;
 }
diff --git a/lasso/xml/ws/wsa_attributed_uri.h b/lasso/xml/ws/wsa_attributed_uri.h
index 3a7bb5a3..b138d6bc 100644
--- a/lasso/xml/ws/wsa_attributed_uri.h
+++ b/lasso/xml/ws/wsa_attributed_uri.h
@@ -33,18 +33,24 @@ extern "C" {
 
 #define LASSO_TYPE_WSA_ATTRIBUTED_URI (lasso_wsa_attributed_uri_get_type())
 #define LASSO_WSA_ATTRIBUTED_URI(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_WSA_ATTRIBUTED_URI, \
-				LassoWsAddrAttributedURI))
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_WSA_ATTRIBUTED_URI, \
+		LassoWsAddrAttributedURI))
 #define LASSO_WSA_ATTRIBUTED_URI_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_WSA_ATTRIBUTED_URI, \
-				LassoWsAddrAttributedURIClass))
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_WSA_ATTRIBUTED_URI, \
+		LassoWsAddrAttributedURIClass))
 #define LASSO_IS_WSA_ATTRIBUTED_URI(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_WSA_ATTRIBUTED_URI))
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_WSA_ATTRIBUTED_URI))
 #define LASSO_IS_WSA_ATTRIBUTED_URI_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_WSA_ATTRIBUTED_URI))
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_WSA_ATTRIBUTED_URI))
 #define LASSO_WSA_ATTRIBUTED_URI_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_WSA_ATTRIBUTED_URI, \
-				LassoWsAddrAttributedURIClass)) 
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_WSA_ATTRIBUTED_URI, \
+		LassoWsAddrAttributedURIClass)) 
+
 
 typedef struct _LassoWsAddrAttributedURI LassoWsAddrAttributedURI;
 typedef struct _LassoWsAddrAttributedURIClass LassoWsAddrAttributedURIClass;
diff --git a/lasso/xml/ws/wsa_endpoint_reference.c b/lasso/xml/ws/wsa_endpoint_reference.c
index a9bb294a..ebc67170 100644
--- a/lasso/xml/ws/wsa_endpoint_reference.c
+++ b/lasso/xml/ws/wsa_endpoint_reference.c
@@ -39,16 +39,6 @@
  */
 
 /*****************************************************************************/
-/* public methods                                                            */
-/*****************************************************************************/
-
-void
-lasso_wsa_endpoint_reference_destroy(LassoWsAddrEndpointReference *epr)
-{
-	lasso_node_destroy(LASSO_NODE(epr));
-}
-
-/*****************************************************************************/
 /* private methods                                                           */
 /*****************************************************************************/
 
@@ -63,7 +53,9 @@ static struct XmlSnippet schema_snippets[] = {
 	{ "Metadata", SNIPPET_NODE,
 		G_STRUCT_OFFSET(LassoWsAddrEndpointReference, Metadata),
 		"LassoWsAddrMetadata" },
-	{ "any", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+	{ "", SNIPPET_LIST_NODES | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoWsAddrEndpointReference, any) },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
 		G_STRUCT_OFFSET(LassoWsAddrEndpointReference, attributes) },
 	{NULL, 0, 0}
 };
@@ -81,6 +73,9 @@ instance_init(LassoWsAddrEndpointReference *node)
 	node->Address = NULL;
 	node->ReferenceParameters = NULL;
 	node->Metadata = NULL;
+	node->any = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
 }
 
 static void
@@ -90,7 +85,7 @@ class_init(LassoWsAddrEndpointReferenceClass *klass)
 
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
-	lasso_node_class_set_nodename(nclass, "EndpointReference"); 
+	lasso_node_class_set_nodename(nclass, "EndpointReference");
 	lasso_node_class_set_ns(nclass, LASSO_WSA_HREF, LASSO_WSA_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
diff --git a/lasso/xml/ws/wsa_endpoint_reference.h b/lasso/xml/ws/wsa_endpoint_reference.h
index c153c346..7854a5bf 100644
--- a/lasso/xml/ws/wsa_endpoint_reference.h
+++ b/lasso/xml/ws/wsa_endpoint_reference.h
@@ -36,18 +36,24 @@ extern "C" {
 
 #define LASSO_TYPE_WSA_ENDPOINT_REFERENCE (lasso_wsa_endpoint_reference_get_type())
 #define LASSO_WSA_ENDPOINT_REFERENCE(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_WSA_ENDPOINT_REFERENCE, \
-				LassoWsAddrEndpointReference))
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_WSA_ENDPOINT_REFERENCE, \
+		LassoWsAddrEndpointReference))
 #define LASSO_WSA_ENDPOINT_REFERENCE_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_WSA_ENDPOINT_REFERENCE, \
-				LassoWsAddrEndpointReferenceClass))
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_WSA_ENDPOINT_REFERENCE, \
+		LassoWsAddrEndpointReferenceClass))
 #define LASSO_IS_WSA_ENDPOINT_REFERENCE(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_WSA_ENDPOINT_REFERENCE))
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_WSA_ENDPOINT_REFERENCE))
 #define LASSO_IS_WSA_ENDPOINT_REFERENCE_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_WSA_ENDPOINT_REFERENCE))
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_WSA_ENDPOINT_REFERENCE))
 #define LASSO_WSA_ENDPOINT_REFERENCE_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_WSA_ENDPOINT_REFERENCE, \
-				LassoWsAddrEndpointReferenceClass)) 
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_WSA_ENDPOINT_REFERENCE, \
+		LassoWsAddrEndpointReferenceClass)) 
+
 
 typedef struct _LassoWsAddrEndpointReference LassoWsAddrEndpointReference;
 typedef struct _LassoWsAddrEndpointReferenceClass LassoWsAddrEndpointReferenceClass;
@@ -61,6 +67,7 @@ struct _LassoWsAddrEndpointReference {
 	LassoWsAddrAttributedURI *Address;
 	LassoWsAddrReferenceParameters *ReferenceParameters;
 	LassoWsAddrMetadata *Metadata;
+	GList *any; /* of LassoNode */
 	/* attributes */
 	GHashTable *attributes;
 };
@@ -70,11 +77,11 @@ struct _LassoWsAddrEndpointReferenceClass {
 	LassoNodeClass parent;
 };
 
-void lasso_wsa_endpoint_reference_destroy(LassoWsAddrEndpointReference *epr);
-
 LASSO_EXPORT GType lasso_wsa_endpoint_reference_get_type(void);
 LASSO_EXPORT LassoWsAddrEndpointReference* lasso_wsa_endpoint_reference_new(void);
 
+
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/lasso/xml/ws/wsa_metadata.c b/lasso/xml/ws/wsa_metadata.c
index a893ae67..3d137413 100644
--- a/lasso/xml/ws/wsa_metadata.c
+++ b/lasso/xml/ws/wsa_metadata.c
@@ -43,7 +43,7 @@
 static struct XmlSnippet schema_snippets[] = {
 	{ "", SNIPPET_LIST_NODES | SNIPPET_ANY,
 		G_STRUCT_OFFSET(LassoWsAddrMetadata, any) },
-	{ "any", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
 		G_STRUCT_OFFSET(LassoWsAddrMetadata, attributes) },
 	{NULL, 0, 0}
 };
@@ -58,6 +58,9 @@ static LassoNodeClass *parent_class = NULL;
 static void
 instance_init(LassoWsAddrMetadata *node)
 {
+	node->any = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
 }
 
 static void
@@ -67,7 +70,7 @@ class_init(LassoWsAddrMetadataClass *klass)
 
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
-	lasso_node_class_set_nodename(nclass, "Metadata"); 
+	lasso_node_class_set_nodename(nclass, "Metadata");
 	lasso_node_class_set_ns(nclass, LASSO_WSA_HREF, LASSO_WSA_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
diff --git a/lasso/xml/ws/wsa_metadata.h b/lasso/xml/ws/wsa_metadata.h
index 980d9642..5a32638d 100644
--- a/lasso/xml/ws/wsa_metadata.h
+++ b/lasso/xml/ws/wsa_metadata.h
@@ -33,18 +33,24 @@ extern "C" {
 
 #define LASSO_TYPE_WSA_METADATA (lasso_wsa_metadata_get_type())
 #define LASSO_WSA_METADATA(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_WSA_METADATA, \
-				LassoWsAddrMetadata))
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_WSA_METADATA, \
+		LassoWsAddrMetadata))
 #define LASSO_WSA_METADATA_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_WSA_METADATA, \
-				LassoWsAddrMetadataClass))
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_WSA_METADATA, \
+		LassoWsAddrMetadataClass))
 #define LASSO_IS_WSA_METADATA(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_WSA_METADATA))
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_WSA_METADATA))
 #define LASSO_IS_WSA_METADATA_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_WSA_METADATA))
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_WSA_METADATA))
 #define LASSO_WSA_METADATA_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_WSA_METADATA, \
-				LassoWsAddrMetadataClass)) 
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_WSA_METADATA, \
+		LassoWsAddrMetadataClass)) 
+
 
 typedef struct _LassoWsAddrMetadata LassoWsAddrMetadata;
 typedef struct _LassoWsAddrMetadataClass LassoWsAddrMetadataClass;
@@ -54,10 +60,8 @@ struct _LassoWsAddrMetadata {
 	LassoNode parent;
 
 	/*< public >*/
-	
 	/* elements */
-	GList *any;
-	
+	GList *any; /* of LassoNode */
 	/* attributes */
 	GHashTable *attributes;
 };
diff --git a/lasso/xml/ws/wsa_problem_action.c b/lasso/xml/ws/wsa_problem_action.c
index 2356f53b..f521c2c7 100644
--- a/lasso/xml/ws/wsa_problem_action.c
+++ b/lasso/xml/ws/wsa_problem_action.c
@@ -47,7 +47,7 @@ static struct XmlSnippet schema_snippets[] = {
 		"LassoWsAddrAttributedURI" },
 	{ "SoapAction", SNIPPET_CONTENT,
 		G_STRUCT_OFFSET(LassoWsAddrProblemAction, SoapAction) },
-	{ "any", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
 		G_STRUCT_OFFSET(LassoWsAddrProblemAction, attributes) },
 	{NULL, 0, 0}
 };
@@ -64,6 +64,8 @@ instance_init(LassoWsAddrProblemAction *node)
 {
 	node->Action = NULL;
 	node->SoapAction = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
 }
 
 static void
@@ -73,7 +75,7 @@ class_init(LassoWsAddrProblemActionClass *klass)
 
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
-	lasso_node_class_set_nodename(nclass, "ProblemAction"); 
+	lasso_node_class_set_nodename(nclass, "ProblemAction");
 	lasso_node_class_set_ns(nclass, LASSO_WSA_HREF, LASSO_WSA_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
@@ -109,7 +111,7 @@ lasso_wsa_problem_action_get_type()
  *
  * Return value: a newly created #LassoWsAddrProblemAction object
  **/
-LassoNode*
+LassoWsAddrProblemAction*
 lasso_wsa_problem_action_new()
 {
 	return g_object_new(LASSO_TYPE_WSA_PROBLEM_ACTION, NULL);
diff --git a/lasso/xml/ws/wsa_problem_action.h b/lasso/xml/ws/wsa_problem_action.h
index 7f223ec1..f0fc0b51 100644
--- a/lasso/xml/ws/wsa_problem_action.h
+++ b/lasso/xml/ws/wsa_problem_action.h
@@ -34,18 +34,24 @@ extern "C" {
 
 #define LASSO_TYPE_WSA_PROBLEM_ACTION (lasso_wsa_problem_action_get_type())
 #define LASSO_WSA_PROBLEM_ACTION(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_WSA_PROBLEM_ACTION, \
-				LassoWsAddrProblemAction))
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_WSA_PROBLEM_ACTION, \
+		LassoWsAddrProblemAction))
 #define LASSO_WSA_PROBLEM_ACTION_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_WSA_PROBLEM_ACTION, \
-				LassoWsAddrProblemActionClass))
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_WSA_PROBLEM_ACTION, \
+		LassoWsAddrProblemActionClass))
 #define LASSO_IS_WSA_PROBLEM_ACTION(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_WSA_PROBLEM_ACTION))
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_WSA_PROBLEM_ACTION))
 #define LASSO_IS_WSA_PROBLEM_ACTION_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_WSA_PROBLEM_ACTION))
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_WSA_PROBLEM_ACTION))
 #define LASSO_WSA_PROBLEM_ACTION_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_WSA_PROBLEM_ACTION, \
-				LassoWsAddrProblemActionClass)) 
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_WSA_PROBLEM_ACTION, \
+		LassoWsAddrProblemActionClass)) 
+
 
 typedef struct _LassoWsAddrProblemAction LassoWsAddrProblemAction;
 typedef struct _LassoWsAddrProblemActionClass LassoWsAddrProblemActionClass;
@@ -68,7 +74,7 @@ struct _LassoWsAddrProblemActionClass {
 };
 
 LASSO_EXPORT GType lasso_wsa_problem_action_get_type(void);
-LASSO_EXPORT LassoNode* lasso_wsa_problem_action_new(void);
+LASSO_EXPORT LassoWsAddrProblemAction* lasso_wsa_problem_action_new(void);
 
 
 
diff --git a/lasso/xml/ws/wsa_reference_parameters.c b/lasso/xml/ws/wsa_reference_parameters.c
index 1de95624..3dd5fd00 100644
--- a/lasso/xml/ws/wsa_reference_parameters.c
+++ b/lasso/xml/ws/wsa_reference_parameters.c
@@ -41,7 +41,9 @@
 
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "any", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+	{ "", SNIPPET_LIST_NODES | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoWsAddrReferenceParameters, any) },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
 		G_STRUCT_OFFSET(LassoWsAddrReferenceParameters, attributes) },
 	{NULL, 0, 0}
 };
@@ -56,6 +58,9 @@ static LassoNodeClass *parent_class = NULL;
 static void
 instance_init(LassoWsAddrReferenceParameters *node)
 {
+	node->any = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
 }
 
 static void
@@ -65,7 +70,7 @@ class_init(LassoWsAddrReferenceParametersClass *klass)
 
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
-	lasso_node_class_set_nodename(nclass, "ReferenceParameters"); 
+	lasso_node_class_set_nodename(nclass, "ReferenceParameters");
 	lasso_node_class_set_ns(nclass, LASSO_WSA_HREF, LASSO_WSA_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
@@ -101,7 +106,7 @@ lasso_wsa_reference_parameters_get_type()
  *
  * Return value: a newly created #LassoWsAddrReferenceParameters object
  **/
-LassoNode*
+LassoWsAddrReferenceParameters*
 lasso_wsa_reference_parameters_new()
 {
 	return g_object_new(LASSO_TYPE_WSA_REFERENCE_PARAMETERS, NULL);
diff --git a/lasso/xml/ws/wsa_reference_parameters.h b/lasso/xml/ws/wsa_reference_parameters.h
index 8ccfe269..6c8c43ad 100644
--- a/lasso/xml/ws/wsa_reference_parameters.h
+++ b/lasso/xml/ws/wsa_reference_parameters.h
@@ -33,18 +33,24 @@ extern "C" {
 
 #define LASSO_TYPE_WSA_REFERENCE_PARAMETERS (lasso_wsa_reference_parameters_get_type())
 #define LASSO_WSA_REFERENCE_PARAMETERS(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_WSA_REFERENCE_PARAMETERS, \
-				LassoWsAddrReferenceParameters))
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_WSA_REFERENCE_PARAMETERS, \
+		LassoWsAddrReferenceParameters))
 #define LASSO_WSA_REFERENCE_PARAMETERS_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_WSA_REFERENCE_PARAMETERS, \
-				LassoWsAddrReferenceParametersClass))
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_WSA_REFERENCE_PARAMETERS, \
+		LassoWsAddrReferenceParametersClass))
 #define LASSO_IS_WSA_REFERENCE_PARAMETERS(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_WSA_REFERENCE_PARAMETERS))
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_WSA_REFERENCE_PARAMETERS))
 #define LASSO_IS_WSA_REFERENCE_PARAMETERS_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_WSA_REFERENCE_PARAMETERS))
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_WSA_REFERENCE_PARAMETERS))
 #define LASSO_WSA_REFERENCE_PARAMETERS_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_WSA_REFERENCE_PARAMETERS, \
-				LassoWsAddrReferenceParametersClass)) 
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_WSA_REFERENCE_PARAMETERS, \
+		LassoWsAddrReferenceParametersClass)) 
+
 
 typedef struct _LassoWsAddrReferenceParameters LassoWsAddrReferenceParameters;
 typedef struct _LassoWsAddrReferenceParametersClass LassoWsAddrReferenceParametersClass;
@@ -54,6 +60,8 @@ struct _LassoWsAddrReferenceParameters {
 	LassoNode parent;
 
 	/*< public >*/
+	/* elements */
+	GList *any; /* of LassoNode */
 	/* attributes */
 	GHashTable *attributes;
 };
@@ -64,7 +72,7 @@ struct _LassoWsAddrReferenceParametersClass {
 };
 
 LASSO_EXPORT GType lasso_wsa_reference_parameters_get_type(void);
-LASSO_EXPORT LassoNode* lasso_wsa_reference_parameters_new(void);
+LASSO_EXPORT LassoWsAddrReferenceParameters* lasso_wsa_reference_parameters_new(void);
 
 
 
diff --git a/lasso/xml/ws/wsa_relates_to.c b/lasso/xml/ws/wsa_relates_to.c
index f0e7db7f..c303869e 100644
--- a/lasso/xml/ws/wsa_relates_to.c
+++ b/lasso/xml/ws/wsa_relates_to.c
@@ -30,7 +30,8 @@
  * <xs:complexType name="RelatesToType" mixed="false">
  *   <xs:simpleContent>
  *     <xs:extension base="xs:anyURI">
- *       <xs:attribute name="RelationshipType" type="tns:RelationshipTypeOpenEnum" use="optional" default="http://www.w3.org/2005/08/addressing/reply"/>
+ *       <xs:attribute name="RelationshipType" type="tns:RelationshipTypeOpenEnum"
+ *               use="optional" default="http://www.w3.org/2005/08/addressing/reply"/>
  *       <xs:anyAttribute namespace="##other" processContents="lax"/>
  *     </xs:extension>
  *   </xs:simpleContent>
@@ -43,11 +44,11 @@
 
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "content", SNIPPET_CONTENT,
+	{ "content", SNIPPET_TEXT_CHILD,
 		G_STRUCT_OFFSET(LassoWsAddrRelatesTo, content) },
-	{ "RelationshipType", SNIPPET_ATTRIBUTE,
+	{ "RelationshipType", SNIPPET_ATTRIBUTE | SNIPPET_OPTIONAL,
 		G_STRUCT_OFFSET(LassoWsAddrRelatesTo, RelationshipType) },
-	{ "any", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
 		G_STRUCT_OFFSET(LassoWsAddrRelatesTo, attributes) },
 	{NULL, 0, 0}
 };
@@ -64,6 +65,8 @@ instance_init(LassoWsAddrRelatesTo *node)
 {
 	node->content = NULL;
 	node->RelationshipType = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
 }
 
 static void
@@ -73,7 +76,7 @@ class_init(LassoWsAddrRelatesToClass *klass)
 
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
-	lasso_node_class_set_nodename(nclass, "RelatesTo"); 
+	lasso_node_class_set_nodename(nclass, "RelatesTo");
 	lasso_node_class_set_ns(nclass, LASSO_WSA_HREF, LASSO_WSA_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
@@ -109,7 +112,7 @@ lasso_wsa_relates_to_get_type()
  *
  * Return value: a newly created #LassoWsAddrRelatesTo object
  **/
-LassoNode*
+LassoWsAddrRelatesTo*
 lasso_wsa_relates_to_new()
 {
 	return g_object_new(LASSO_TYPE_WSA_RELATES_TO, NULL);
@@ -125,11 +128,11 @@ lasso_wsa_relates_to_new()
  *
  * Return value: a newly created #LassoWsAddrRelatesTo object
  **/
-LassoNode*
+LassoWsAddrRelatesTo*
 lasso_wsa_relates_to_new_with_string(char *content)
 {
 	LassoWsAddrRelatesTo *object;
 	object = g_object_new(LASSO_TYPE_WSA_RELATES_TO, NULL);
 	object->content = g_strdup(content);
-	return LASSO_NODE(object);
+	return object;
 }
diff --git a/lasso/xml/ws/wsa_relates_to.h b/lasso/xml/ws/wsa_relates_to.h
index 50307bd7..9938da7d 100644
--- a/lasso/xml/ws/wsa_relates_to.h
+++ b/lasso/xml/ws/wsa_relates_to.h
@@ -33,18 +33,24 @@ extern "C" {
 
 #define LASSO_TYPE_WSA_RELATES_TO (lasso_wsa_relates_to_get_type())
 #define LASSO_WSA_RELATES_TO(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_WSA_RELATES_TO, \
-				LassoWsAddrRelatesTo))
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_WSA_RELATES_TO, \
+		LassoWsAddrRelatesTo))
 #define LASSO_WSA_RELATES_TO_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_WSA_RELATES_TO, \
-				LassoWsAddrRelatesToClass))
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_WSA_RELATES_TO, \
+		LassoWsAddrRelatesToClass))
 #define LASSO_IS_WSA_RELATES_TO(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_WSA_RELATES_TO))
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_WSA_RELATES_TO))
 #define LASSO_IS_WSA_RELATES_TO_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_WSA_RELATES_TO))
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_WSA_RELATES_TO))
 #define LASSO_WSA_RELATES_TO_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_WSA_RELATES_TO, \
-				LassoWsAddrRelatesToClass)) 
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_WSA_RELATES_TO, \
+		LassoWsAddrRelatesToClass)) 
+
 
 typedef struct _LassoWsAddrRelatesTo LassoWsAddrRelatesTo;
 typedef struct _LassoWsAddrRelatesToClass LassoWsAddrRelatesToClass;
@@ -67,9 +73,9 @@ struct _LassoWsAddrRelatesToClass {
 };
 
 LASSO_EXPORT GType lasso_wsa_relates_to_get_type(void);
-LASSO_EXPORT LassoNode* lasso_wsa_relates_to_new(void);
+LASSO_EXPORT LassoWsAddrRelatesTo* lasso_wsa_relates_to_new(void);
 
-LASSO_EXPORT LassoNode* lasso_wsa_relates_to_new_with_string(char *content);
+LASSO_EXPORT LassoWsAddrRelatesTo* lasso_wsa_relates_to_new_with_string(char *content);
 
 
 #ifdef __cplusplus
diff --git a/lasso/xml/ws/wsse_200401_security.h b/lasso/xml/ws/wsse_200401_security.h
deleted file mode 100644
index 60bc4f30..00000000
--- a/lasso/xml/ws/wsse_200401_security.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* $Id: wsse_200401_security.h 2495 2005-05-02 09:17:08Z nclapies $ 
- *
- * Lasso - A free implementation of the Liberty Alliance specifications.
- *
- * Copyright (C) 2004-2007 Entr'ouvert
- * http://lasso.entrouvert.org
- * 
- * Authors: See AUTHORS file in top-level directory.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __LASSO_WSSE_200401_SECURITY_H__
-#define __LASSO_WSSE_200401_SECURITY_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */ 
-
-#include <lasso/xml/xml.h>
-
-#define LASSO_TYPE_WSSE_200401_SECURITY (lasso_wsse_200401_security_get_type())
-#define LASSO_WSSE_200401_SECURITY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-			LASSO_TYPE_WSSE_200401_SECURITY, LassoWsse200401Security))
-#define LASSO_WSSE_200401_SECURITY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
-			LASSO_TYPE_WSSE_200401_SECURITY, LassoWsse200401SecurityClass))
-#define LASSO_IS_WSSE_200401_SECURITY(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_WSSE_200401_SECURITY))
-#define LASSO_IS_WSSE_200401_SECURITY_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((klass),LASSO_TYPE_WSSE_200401_SECURITY))
-#define LASSO_WSSE_200401_SECURITY_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_WSSE_200401_SECURITY, LassoWsse200401SecurityClass)) 
-
-typedef struct _LassoWsse200401Security LassoWsse200401Security;
-typedef struct _LassoWsse200401SecurityClass LassoWsse200401SecurityClass;
-
-struct _LassoWsse200401Security {
-	LassoNode parent;
-
-	GList *any;
-};
-
-struct _LassoWsse200401SecurityClass {
-	LassoNodeClass parent;
-};
-
-LASSO_EXPORT GType lasso_wsse_200401_security_get_type(void);
-
-LASSO_EXPORT LassoWsse200401Security* lasso_wsse_200401_security_new(void);
-
-LASSO_EXPORT LassoWsse200401Security* lasso_wsse_200401_security_new_from_message(const gchar *message);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __LASSO_WSSE_200401_SECURITY_H__ */
diff --git a/lasso/xml/ws/wsse_embedded.c b/lasso/xml/ws/wsse_embedded.c
new file mode 100644
index 00000000..6002ca23
--- /dev/null
+++ b/lasso/xml/ws/wsse_embedded.c
@@ -0,0 +1,118 @@
+/* $Id: wsse_embedded.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "wsse_embedded.h"
+
+/*
+ * Schema fragment (oasis-200401-wss-wssecurity-secext-1.0.xsd):
+ *
+ * <xs:complexType name="EmbeddedType">
+ *   <xs:annotation>
+ *     <xs:documentation>This type represents a reference to an embedded security
+ *             token.</xs:documentation>
+ *     </xs:annotation>
+ *     <xs:choice minOccurs="0" maxOccurs="unbounded">
+ *       <xs:any processContents="lax"/>
+ *     </xs:choice>
+ *     <xs:attribute name="ValueType" type="xs:anyURI"/>
+ *     <xs:anyAttribute namespace="##other" processContents="lax"/>
+ *   </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "ValueType", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoWsSec1Embedded, ValueType) },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoWsSec1Embedded, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoWsSec1Embedded *node)
+{
+	node->ValueType = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoWsSec1EmbeddedClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Embedded");
+	lasso_node_class_set_ns(nclass, LASSO_WSSE1_HREF, LASSO_WSSE1_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_wsse_embedded_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoWsSec1EmbeddedClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoWsSec1Embedded),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoWsSec1Embedded", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_wsse_embedded_new:
+ *
+ * Creates a new #LassoWsSec1Embedded object.
+ *
+ * Return value: a newly created #LassoWsSec1Embedded object
+ **/
+LassoWsSec1Embedded*
+lasso_wsse_embedded_new()
+{
+	return g_object_new(LASSO_TYPE_WSSE_EMBEDDED, NULL);
+}
diff --git a/lasso/xml/ws/wsse_embedded.h b/lasso/xml/ws/wsse_embedded.h
new file mode 100644
index 00000000..2d614c36
--- /dev/null
+++ b/lasso/xml/ws/wsse_embedded.h
@@ -0,0 +1,82 @@
+/* $Id: wsse_embedded.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_WSSE_EMBEDDED_H__
+#define __LASSO_WSSE_EMBEDDED_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_WSSE_EMBEDDED (lasso_wsse_embedded_get_type())
+#define LASSO_WSSE_EMBEDDED(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_WSSE_EMBEDDED, \
+		LassoWsSec1Embedded))
+#define LASSO_WSSE_EMBEDDED_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_WSSE_EMBEDDED, \
+		LassoWsSec1EmbeddedClass))
+#define LASSO_IS_WSSE_EMBEDDED(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_WSSE_EMBEDDED))
+#define LASSO_IS_WSSE_EMBEDDED_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_WSSE_EMBEDDED))
+#define LASSO_WSSE_EMBEDDED_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_WSSE_EMBEDDED, \
+		LassoWsSec1EmbeddedClass)) 
+
+
+typedef struct _LassoWsSec1Embedded LassoWsSec1Embedded;
+typedef struct _LassoWsSec1EmbeddedClass LassoWsSec1EmbeddedClass;
+
+
+struct _LassoWsSec1Embedded {
+	LassoNode parent;
+
+	/*< public >*/
+	/* attributes */
+	char *ValueType;
+	GHashTable *attributes;
+};
+
+
+struct _LassoWsSec1EmbeddedClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_wsse_embedded_get_type(void);
+LASSO_EXPORT LassoWsSec1Embedded* lasso_wsse_embedded_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_WSSE_EMBEDDED_H__ */
diff --git a/lasso/xml/ws/wsse_reference.c b/lasso/xml/ws/wsse_reference.c
new file mode 100644
index 00000000..89ec20e4
--- /dev/null
+++ b/lasso/xml/ws/wsse_reference.c
@@ -0,0 +1,119 @@
+/* $Id: wsse_reference.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "wsse_reference.h"
+
+/*
+ * Schema fragment (oasis-200401-wss-wssecurity-secext-1.0.xsd):
+ *
+ * <xs:complexType name="ReferenceType">
+ *   <xs:annotation>
+ *     <xs:documentation>This type represents a reference to an external security
+ *             token.</xs:documentation>
+ *     </xs:annotation>
+ *     <xs:attribute name="URI" type="xs:anyURI"/>
+ *     <xs:attribute name="ValueType" type="xs:anyURI"/>
+ *     <xs:anyAttribute namespace="##other" processContents="lax"/>
+ *   </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "URI", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoWsSec1Reference, URI) },
+	{ "ValueType", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoWsSec1Reference, ValueType) },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoWsSec1Reference, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoWsSec1Reference *node)
+{
+	node->URI = NULL;
+	node->ValueType = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoWsSec1ReferenceClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Reference");
+	lasso_node_class_set_ns(nclass, LASSO_WSSE1_HREF, LASSO_WSSE1_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_wsse_reference_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoWsSec1ReferenceClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoWsSec1Reference),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoWsSec1Reference", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_wsse_reference_new:
+ *
+ * Creates a new #LassoWsSec1Reference object.
+ *
+ * Return value: a newly created #LassoWsSec1Reference object
+ **/
+LassoWsSec1Reference*
+lasso_wsse_reference_new()
+{
+	return g_object_new(LASSO_TYPE_WSSE_REFERENCE, NULL);
+}
diff --git a/lasso/xml/ws/wsse_reference.h b/lasso/xml/ws/wsse_reference.h
new file mode 100644
index 00000000..ae8e55a7
--- /dev/null
+++ b/lasso/xml/ws/wsse_reference.h
@@ -0,0 +1,83 @@
+/* $Id: wsse_reference.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_WSSE_REFERENCE_H__
+#define __LASSO_WSSE_REFERENCE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_WSSE_REFERENCE (lasso_wsse_reference_get_type())
+#define LASSO_WSSE_REFERENCE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_WSSE_REFERENCE, \
+		LassoWsSec1Reference))
+#define LASSO_WSSE_REFERENCE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_WSSE_REFERENCE, \
+		LassoWsSec1ReferenceClass))
+#define LASSO_IS_WSSE_REFERENCE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_WSSE_REFERENCE))
+#define LASSO_IS_WSSE_REFERENCE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_WSSE_REFERENCE))
+#define LASSO_WSSE_REFERENCE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_WSSE_REFERENCE, \
+		LassoWsSec1ReferenceClass)) 
+
+
+typedef struct _LassoWsSec1Reference LassoWsSec1Reference;
+typedef struct _LassoWsSec1ReferenceClass LassoWsSec1ReferenceClass;
+
+
+struct _LassoWsSec1Reference {
+	LassoNode parent;
+
+	/*< public >*/
+	/* attributes */
+	char *URI;
+	char *ValueType;
+	GHashTable *attributes;
+};
+
+
+struct _LassoWsSec1ReferenceClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_wsse_reference_get_type(void);
+LASSO_EXPORT LassoWsSec1Reference* lasso_wsse_reference_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_WSSE_REFERENCE_H__ */
diff --git a/lasso/xml/ws/wsse_security_header.c b/lasso/xml/ws/wsse_security_header.c
new file mode 100644
index 00000000..8328e37d
--- /dev/null
+++ b/lasso/xml/ws/wsse_security_header.c
@@ -0,0 +1,122 @@
+/* $Id: wsse_security_header.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "wsse_security_header.h"
+
+/*
+ * Schema fragment (oasis-200401-wss-wssecurity-secext-1.0.xsd):
+ *
+ * <xs:complexType name="SecurityHeaderType">
+ *   <xs:annotation>
+ *     <xs:documentation>This complexType defines header block to use for security-relevant
+ *             data directed at a specific SOAP actor.</xs:documentation>
+ *     </xs:annotation>
+ *     <xs:sequence>
+ *       <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ *         <xs:annotation>
+ *           <xs:documentation>The use of "any" is to allow extensibility and different
+ *                   forms of security data.</xs:documentation>
+ *           </xs:annotation>
+ *         </xs:any>
+ *       </xs:sequence>
+ *       <xs:anyAttribute namespace="##other" processContents="lax"/>
+ *     </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "", SNIPPET_LIST_NODES | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoWsSec1SecurityHeader, any) },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoWsSec1SecurityHeader, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoWsSec1SecurityHeader *node)
+{
+	node->any = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoWsSec1SecurityHeaderClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "Security");
+	lasso_node_class_set_ns(nclass, LASSO_WSSE1_HREF, LASSO_WSSE1_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_wsse_security_header_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoWsSec1SecurityHeaderClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoWsSec1SecurityHeader),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoWsSec1SecurityHeader", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_wsse_security_header_new:
+ *
+ * Creates a new #LassoWsSec1SecurityHeader object.
+ *
+ * Return value: a newly created #LassoWsSec1SecurityHeader object
+ **/
+LassoWsSec1SecurityHeader*
+lasso_wsse_security_header_new()
+{
+	return g_object_new(LASSO_TYPE_WSSE_SECURITY_HEADER, NULL);
+}
diff --git a/lasso/xml/ws/wsse_security_header.h b/lasso/xml/ws/wsse_security_header.h
new file mode 100644
index 00000000..b7fb2726
--- /dev/null
+++ b/lasso/xml/ws/wsse_security_header.h
@@ -0,0 +1,83 @@
+/* $Id: wsse_security_header.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_WSSE_SECURITY_HEADER_H__
+#define __LASSO_WSSE_SECURITY_HEADER_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_WSSE_SECURITY_HEADER (lasso_wsse_security_header_get_type())
+#define LASSO_WSSE_SECURITY_HEADER(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_WSSE_SECURITY_HEADER, \
+		LassoWsSec1SecurityHeader))
+#define LASSO_WSSE_SECURITY_HEADER_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_WSSE_SECURITY_HEADER, \
+		LassoWsSec1SecurityHeaderClass))
+#define LASSO_IS_WSSE_SECURITY_HEADER(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_WSSE_SECURITY_HEADER))
+#define LASSO_IS_WSSE_SECURITY_HEADER_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_WSSE_SECURITY_HEADER))
+#define LASSO_WSSE_SECURITY_HEADER_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_WSSE_SECURITY_HEADER, \
+		LassoWsSec1SecurityHeaderClass)) 
+
+
+typedef struct _LassoWsSec1SecurityHeader LassoWsSec1SecurityHeader;
+typedef struct _LassoWsSec1SecurityHeaderClass LassoWsSec1SecurityHeaderClass;
+
+
+struct _LassoWsSec1SecurityHeader {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	GList *any; /* of LassoNode */
+	/* attributes */
+	GHashTable *attributes;
+};
+
+
+struct _LassoWsSec1SecurityHeaderClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_wsse_security_header_get_type(void);
+LASSO_EXPORT LassoWsSec1SecurityHeader* lasso_wsse_security_header_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_WSSE_SECURITY_HEADER_H__ */
diff --git a/lasso/xml/ws/wsse_security_token_reference.c b/lasso/xml/ws/wsse_security_token_reference.c
new file mode 100644
index 00000000..c3e9bc6b
--- /dev/null
+++ b/lasso/xml/ws/wsse_security_token_reference.c
@@ -0,0 +1,121 @@
+/* $Id: wsse_security_token_reference.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "wsse_security_token_reference.h"
+
+/*
+ * Schema fragment (oasis-200401-wss-wssecurity-secext-1.0.xsd):
+ *
+ * <xs:complexType name="SecurityTokenReferenceType">
+ *   <xs:annotation>
+ *     <xs:documentation>This type is used reference a security token.</xs:documentation>
+ *     </xs:annotation>
+ *     <xs:choice minOccurs="0" maxOccurs="unbounded">
+ *       <xs:any processContents="lax"/>
+ *     </xs:choice>
+ *     <xs:attribute ref="wsu:Id"/>
+ *     <xs:attribute ref="wsse:Usage"/>
+ *     <xs:anyAttribute namespace="##other" processContents="lax"/>
+ *   </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Id", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoWsSec1SecurityTokenReference, Id) },
+	{ "Usage", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoWsSec1SecurityTokenReference, Usage) },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoWsSec1SecurityTokenReference, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoWsSec1SecurityTokenReference *node)
+{
+	node->Id = NULL;
+	node->Usage = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoWsSec1SecurityTokenReferenceClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "SecurityTokenReference");
+	lasso_node_class_set_ns(nclass, LASSO_WSSE1_HREF, LASSO_WSSE1_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_wsse_security_token_reference_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoWsSec1SecurityTokenReferenceClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoWsSec1SecurityTokenReference),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoWsSec1SecurityTokenReference", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_wsse_security_token_reference_new:
+ *
+ * Creates a new #LassoWsSec1SecurityTokenReference object.
+ *
+ * Return value: a newly created #LassoWsSec1SecurityTokenReference object
+ **/
+LassoWsSec1SecurityTokenReference*
+lasso_wsse_security_token_reference_new()
+{
+	return g_object_new(LASSO_TYPE_WSSE_SECURITY_TOKEN_REFERENCE, NULL);
+}
diff --git a/lasso/xml/ws/wsse_security_token_reference.h b/lasso/xml/ws/wsse_security_token_reference.h
new file mode 100644
index 00000000..b1879a77
--- /dev/null
+++ b/lasso/xml/ws/wsse_security_token_reference.h
@@ -0,0 +1,84 @@
+/* $Id: wsse_security_token_reference.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_WSSE_SECURITY_TOKEN_REFERENCE_H__
+#define __LASSO_WSSE_SECURITY_TOKEN_REFERENCE_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_WSSE_SECURITY_TOKEN_REFERENCE \
+	(lasso_wsse_security_token_reference_get_type())
+#define LASSO_WSSE_SECURITY_TOKEN_REFERENCE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_WSSE_SECURITY_TOKEN_REFERENCE, \
+		LassoWsSec1SecurityTokenReference))
+#define LASSO_WSSE_SECURITY_TOKEN_REFERENCE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_WSSE_SECURITY_TOKEN_REFERENCE, \
+		LassoWsSec1SecurityTokenReferenceClass))
+#define LASSO_IS_WSSE_SECURITY_TOKEN_REFERENCE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_WSSE_SECURITY_TOKEN_REFERENCE))
+#define LASSO_IS_WSSE_SECURITY_TOKEN_REFERENCE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_WSSE_SECURITY_TOKEN_REFERENCE))
+#define LASSO_WSSE_SECURITY_TOKEN_REFERENCE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_WSSE_SECURITY_TOKEN_REFERENCE, \
+		LassoWsSec1SecurityTokenReferenceClass)) 
+
+
+typedef struct _LassoWsSec1SecurityTokenReference LassoWsSec1SecurityTokenReference;
+typedef struct _LassoWsSec1SecurityTokenReferenceClass LassoWsSec1SecurityTokenReferenceClass;
+
+
+struct _LassoWsSec1SecurityTokenReference {
+	LassoNode parent;
+
+	/*< public >*/
+	/* attributes */
+	char *Id;
+	char *Usage;
+	GHashTable *attributes;
+};
+
+
+struct _LassoWsSec1SecurityTokenReferenceClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_wsse_security_token_reference_get_type(void);
+LASSO_EXPORT LassoWsSec1SecurityTokenReference* lasso_wsse_security_token_reference_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_WSSE_SECURITY_TOKEN_REFERENCE_H__ */
diff --git a/lasso/xml/ws/wsse_transformation_parameters.c b/lasso/xml/ws/wsse_transformation_parameters.c
new file mode 100644
index 00000000..538d25de
--- /dev/null
+++ b/lasso/xml/ws/wsse_transformation_parameters.c
@@ -0,0 +1,120 @@
+/* $Id: wsse_transformation_parameters.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "wsse_transformation_parameters.h"
+
+/*
+ * Schema fragment (oasis-200401-wss-wssecurity-secext-1.0.xsd):
+ *
+ * <xs:complexType name="TransformationParametersType">
+ *   <xs:annotation>
+ *     <xs:documentation>This complexType defines a container for elements to
+ *             be specified from any namespace as properties/parameters
+ *             of a DSIG transformation.</xs:documentation>
+ *     </xs:annotation>
+ *     <xs:sequence>
+ *       <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ *         <xs:annotation>
+ *           <xs:documentation>The use of "any" is to allow extensibility from
+ *                   any namespace.</xs:documentation>
+ *           </xs:annotation>
+ *         </xs:any>
+ *       </xs:sequence>
+ *       <xs:anyAttribute namespace="##other" processContents="lax"/>
+ *     </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoWsSec1TransformationParameters, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoWsSec1TransformationParameters *node)
+{
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoWsSec1TransformationParametersClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "TransformationParameters");
+	lasso_node_class_set_ns(nclass, LASSO_WSSE1_HREF, LASSO_WSSE1_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_wsse_transformation_parameters_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoWsSec1TransformationParametersClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoWsSec1TransformationParameters),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoWsSec1TransformationParameters", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_wsse_transformation_parameters_new:
+ *
+ * Creates a new #LassoWsSec1TransformationParameters object.
+ *
+ * Return value: a newly created #LassoWsSec1TransformationParameters object
+ **/
+LassoWsSec1TransformationParameters*
+lasso_wsse_transformation_parameters_new()
+{
+	return g_object_new(LASSO_TYPE_WSSE_TRANSFORMATION_PARAMETERS, NULL);
+}
diff --git a/lasso/xml/ws/wsse_transformation_parameters.h b/lasso/xml/ws/wsse_transformation_parameters.h
new file mode 100644
index 00000000..31b0f413
--- /dev/null
+++ b/lasso/xml/ws/wsse_transformation_parameters.h
@@ -0,0 +1,82 @@
+/* $Id: wsse_transformation_parameters.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_WSSE_TRANSFORMATION_PARAMETERS_H__
+#define __LASSO_WSSE_TRANSFORMATION_PARAMETERS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_WSSE_TRANSFORMATION_PARAMETERS \
+	(lasso_wsse_transformation_parameters_get_type())
+#define LASSO_WSSE_TRANSFORMATION_PARAMETERS(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_WSSE_TRANSFORMATION_PARAMETERS, \
+		LassoWsSec1TransformationParameters))
+#define LASSO_WSSE_TRANSFORMATION_PARAMETERS_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_WSSE_TRANSFORMATION_PARAMETERS, \
+		LassoWsSec1TransformationParametersClass))
+#define LASSO_IS_WSSE_TRANSFORMATION_PARAMETERS(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_WSSE_TRANSFORMATION_PARAMETERS))
+#define LASSO_IS_WSSE_TRANSFORMATION_PARAMETERS_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_WSSE_TRANSFORMATION_PARAMETERS))
+#define LASSO_WSSE_TRANSFORMATION_PARAMETERS_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_WSSE_TRANSFORMATION_PARAMETERS, \
+		LassoWsSec1TransformationParametersClass)) 
+
+
+typedef struct _LassoWsSec1TransformationParameters LassoWsSec1TransformationParameters;
+typedef struct _LassoWsSec1TransformationParametersClass LassoWsSec1TransformationParametersClass;
+
+
+struct _LassoWsSec1TransformationParameters {
+	LassoNode parent;
+
+	/*< public >*/
+	/* attributes */
+	GHashTable *attributes;
+};
+
+
+struct _LassoWsSec1TransformationParametersClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_wsse_transformation_parameters_get_type(void);
+LASSO_EXPORT LassoWsSec1TransformationParameters* lasso_wsse_transformation_parameters_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_WSSE_TRANSFORMATION_PARAMETERS_H__ */
diff --git a/lasso/xml/ws/wsse_username_token.c b/lasso/xml/ws/wsse_username_token.c
new file mode 100644
index 00000000..07349cff
--- /dev/null
+++ b/lasso/xml/ws/wsse_username_token.c
@@ -0,0 +1,122 @@
+/* $Id: wsse_username_token.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "wsse_username_token.h"
+
+/*
+ * Schema fragment (oasis-200401-wss-wssecurity-secext-1.0.xsd):
+ *
+ * <xs:complexType name="UsernameTokenType">
+ *   <xs:annotation>
+ *     <xs:documentation>This type represents a username token per Section
+ *             4.1</xs:documentation>
+ *     </xs:annotation>
+ *     <xs:sequence>
+ *       <xs:element name="Username" type="wsse:AttributedString"/>
+ *       <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ *     </xs:sequence>
+ *     <xs:attribute ref="wsu:Id"/>
+ *     <xs:anyAttribute namespace="##other" processContents="lax"/>
+ *   </xs:complexType>
+ */
+
+/*****************************************************************************/
+/* private methods                                                           */
+/*****************************************************************************/
+
+
+static struct XmlSnippet schema_snippets[] = {
+	{ "Username", SNIPPET_NODE,
+		G_STRUCT_OFFSET(LassoWsSec1UsernameToken, Username) },
+	{ "Id", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoWsSec1UsernameToken, Id) },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoWsSec1UsernameToken, attributes) },
+	{NULL, 0, 0}
+};
+
+static LassoNodeClass *parent_class = NULL;
+
+
+/*****************************************************************************/
+/* instance and class init functions                                         */
+/*****************************************************************************/
+
+static void
+instance_init(LassoWsSec1UsernameToken *node)
+{
+	node->Username = NULL;
+	node->Id = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
+}
+
+static void
+class_init(LassoWsSec1UsernameTokenClass *klass)
+{
+	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+	nclass->node_data = g_new0(LassoNodeClassData, 1);
+	lasso_node_class_set_nodename(nclass, "UsernameToken");
+	lasso_node_class_set_ns(nclass, LASSO_WSSE1_HREF, LASSO_WSSE1_PREFIX);
+	lasso_node_class_add_snippets(nclass, schema_snippets);
+}
+
+GType
+lasso_wsse_username_token_get_type()
+{
+	static GType this_type = 0;
+
+	if (!this_type) {
+		static const GTypeInfo this_info = {
+			sizeof (LassoWsSec1UsernameTokenClass),
+			NULL,
+			NULL,
+			(GClassInitFunc) class_init,
+			NULL,
+			NULL,
+			sizeof(LassoWsSec1UsernameToken),
+			0,
+			(GInstanceInitFunc) instance_init,
+		};
+
+		this_type = g_type_register_static(LASSO_TYPE_NODE,
+				"LassoWsSec1UsernameToken", &this_info, 0);
+	}
+	return this_type;
+}
+
+/**
+ * lasso_wsse_username_token_new:
+ *
+ * Creates a new #LassoWsSec1UsernameToken object.
+ *
+ * Return value: a newly created #LassoWsSec1UsernameToken object
+ **/
+LassoWsSec1UsernameToken*
+lasso_wsse_username_token_new()
+{
+	return g_object_new(LASSO_TYPE_WSSE_USERNAME_TOKEN, NULL);
+}
diff --git a/lasso/xml/ws/wsse_username_token.h b/lasso/xml/ws/wsse_username_token.h
new file mode 100644
index 00000000..2781b3dd
--- /dev/null
+++ b/lasso/xml/ws/wsse_username_token.h
@@ -0,0 +1,84 @@
+/* $Id: wsse_username_token.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __LASSO_WSSE_USERNAME_TOKEN_H__
+#define __LASSO_WSSE_USERNAME_TOKEN_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <lasso/xml/xml.h>
+
+#define LASSO_TYPE_WSSE_USERNAME_TOKEN (lasso_wsse_username_token_get_type())
+#define LASSO_WSSE_USERNAME_TOKEN(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_WSSE_USERNAME_TOKEN, \
+		LassoWsSec1UsernameToken))
+#define LASSO_WSSE_USERNAME_TOKEN_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_WSSE_USERNAME_TOKEN, \
+		LassoWsSec1UsernameTokenClass))
+#define LASSO_IS_WSSE_USERNAME_TOKEN(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_WSSE_USERNAME_TOKEN))
+#define LASSO_IS_WSSE_USERNAME_TOKEN_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_WSSE_USERNAME_TOKEN))
+#define LASSO_WSSE_USERNAME_TOKEN_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_WSSE_USERNAME_TOKEN, \
+		LassoWsSec1UsernameTokenClass)) 
+
+
+typedef struct _LassoWsSec1UsernameToken LassoWsSec1UsernameToken;
+typedef struct _LassoWsSec1UsernameTokenClass LassoWsSec1UsernameTokenClass;
+
+
+struct _LassoWsSec1UsernameToken {
+	LassoNode parent;
+
+	/*< public >*/
+	/* elements */
+	/* XXX */ void *Username;
+	/* attributes */
+	char *Id;
+	GHashTable *attributes;
+};
+
+
+struct _LassoWsSec1UsernameTokenClass {
+	LassoNodeClass parent;
+};
+
+LASSO_EXPORT GType lasso_wsse_username_token_get_type(void);
+LASSO_EXPORT LassoWsSec1UsernameToken* lasso_wsse_username_token_new(void);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __LASSO_WSSE_USERNAME_TOKEN_H__ */
diff --git a/lasso/xml/ws/wsu_timestamp.c b/lasso/xml/ws/wsu_timestamp.c
index 4cad5257..08d4c393 100644
--- a/lasso/xml/ws/wsu_timestamp.c
+++ b/lasso/xml/ws/wsu_timestamp.c
@@ -1,4 +1,5 @@
-/* $Id: wsu_timestamp.c 2495 2005-05-02 09:17:08Z dlaniel $
+/* $Id: wsu_timestamp.c,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
  * Lasso - A free implementation of the Liberty Alliance specifications.
  *
  * Copyright (C) 2004-2007 Entr'ouvert
@@ -21,41 +22,71 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <lasso/xml/ws/wsu_timestamp.h>
+#include "wsu_timestamp.h"
 
 /*
+ * Schema fragment (oasis-200401-wss-wssecurity-utility-1.0.xsd):
  *
- */ 
+ * <xs:complexType name="TimestampType">
+ *   <xs:annotation>
+ *     <xs:documentation>
+ *       This complex type ties together the timestamp related elements into a composite type.
+ *     </xs:documentation>
+ *   </xs:annotation>
+ *   <xs:sequence>
+ *     <xs:element ref="wsu:Created" minOccurs="0"/>
+ *     <xs:element ref="wsu:Expires" minOccurs="0"/>
+ *     <xs:choice minOccurs="0" maxOccurs="unbounded">
+ *       <xs:any namespace="##other" processContents="lax"/>
+ *     </xs:choice>
+ *   </xs:sequence>
+ *   <xs:attributeGroup ref="wsu:commonAtts"/>
+ * </xs:complexType>
+ */
 
 /*****************************************************************************/
 /* private methods                                                           */
 /*****************************************************************************/
 
+
 static struct XmlSnippet schema_snippets[] = {
-	{ "Created", SNIPPET_NODE, G_STRUCT_OFFSET(LassoWsuTimestamp, Created) },
-	{ "Expired", SNIPPET_NODE, G_STRUCT_OFFSET(LassoWsuTimestamp, Expired) },
-	{ NULL, 0, 0}
+	{ "Created", SNIPPET_CONTENT,
+		G_STRUCT_OFFSET(LassoWsUtil1Timestamp, Created) },
+	{ "Expires", SNIPPET_CONTENT,
+		G_STRUCT_OFFSET(LassoWsUtil1Timestamp, Expires) },
+	{ "Id", SNIPPET_ATTRIBUTE,
+		G_STRUCT_OFFSET(LassoWsUtil1Timestamp, Id) },
+	{ "attributes", SNIPPET_ATTRIBUTE | SNIPPET_ANY,
+		G_STRUCT_OFFSET(LassoWsUtil1Timestamp, attributes) },
+	{NULL, 0, 0}
 };
 
+static LassoNodeClass *parent_class = NULL;
+
+
 /*****************************************************************************/
 /* instance and class init functions                                         */
 /*****************************************************************************/
 
 static void
-instance_init(LassoWsuTimestamp *node)
+instance_init(LassoWsUtil1Timestamp *node)
 {
 	node->Created = NULL;
-	node->Expired = NULL;
+	node->Expires = NULL;
+	node->Id = NULL;
+	node->attributes = g_hash_table_new_full(
+		g_str_hash, g_str_equal, g_free, g_free);
 }
 
 static void
-class_init(LassoWsuTimestampClass *klass)
+class_init(LassoWsUtil1TimestampClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
 
+	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "Timestamp");
-	lasso_node_class_set_ns(nclass, LASSO_WSU_HREF, LASSO_WSU_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_WSUTIL1_HREF, LASSO_WSUTIL1_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
@@ -66,29 +97,32 @@ lasso_wsu_timestamp_get_type()
 
 	if (!this_type) {
 		static const GTypeInfo this_info = {
-			sizeof (LassoWsuTimestampClass),
+			sizeof (LassoWsUtil1TimestampClass),
 			NULL,
 			NULL,
 			(GClassInitFunc) class_init,
 			NULL,
 			NULL,
-			sizeof(LassoWsuTimestamp),
+			sizeof(LassoWsUtil1Timestamp),
 			0,
 			(GInstanceInitFunc) instance_init,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
-				"LassoWsuTimestamp", &this_info, 0);
+				"LassoWsUtil1Timestamp", &this_info, 0);
 	}
 	return this_type;
 }
 
-LassoWsuTimestamp*
+/**
+ * lasso_wsu_timestamp_new:
+ *
+ * Creates a new #LassoWsUtil1Timestamp object.
+ *
+ * Return value: a newly created #LassoWsUtil1Timestamp object
+ **/
+LassoWsUtil1Timestamp*
 lasso_wsu_timestamp_new()
 {
-	LassoWsuTimestamp *node;
-
-	node = g_object_new(LASSO_TYPE_WSU_TIMESTAMP, NULL);
-
-	return node;
+	return g_object_new(LASSO_TYPE_WSU_TIMESTAMP, NULL);
 }
diff --git a/lasso/xml/ws/wsu_timestamp.h b/lasso/xml/ws/wsu_timestamp.h
index 13ccd33c..fb63dc04 100644
--- a/lasso/xml/ws/wsu_timestamp.h
+++ b/lasso/xml/ws/wsu_timestamp.h
@@ -1,4 +1,4 @@
-/* $Id: wsu_timestamp.h 2495 2005-05-02 09:17:08Z dlaniel $ 
+/* $Id: wsu_timestamp.h,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
  *
  * Lasso - A free implementation of the Liberty Alliance specifications.
  *
@@ -27,40 +27,56 @@
 
 #ifdef __cplusplus
 extern "C" {
-#endif /* __cplusplus */ 
+#endif /* __cplusplus */
 
 #include <lasso/xml/xml.h>
 
 #define LASSO_TYPE_WSU_TIMESTAMP (lasso_wsu_timestamp_get_type())
-#define LASSO_WSU_TIMESTAMP(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-			LASSO_TYPE_WSU_TIMESTAMP, LassoWsuTimestamp))
-#define LASSO_WSU_TIMESTAMP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
-			LASSO_TYPE_WSU_TIMESTAMP, LassoWsuTimestampClass))
-#define LASSO_IS_WSU_TIMESTAMP(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_WSU_TIMESTAMP))
+#define LASSO_WSU_TIMESTAMP(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
+		LASSO_TYPE_WSU_TIMESTAMP, \
+		LassoWsUtil1Timestamp))
+#define LASSO_WSU_TIMESTAMP_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), \
+		LASSO_TYPE_WSU_TIMESTAMP, \
+		LassoWsUtil1TimestampClass))
+#define LASSO_IS_WSU_TIMESTAMP(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+		LASSO_TYPE_WSU_TIMESTAMP))
 #define LASSO_IS_WSU_TIMESTAMP_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((klass),LASSO_TYPE_WSU_TIMESTAMP))
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), \
+		LASSO_TYPE_WSU_TIMESTAMP))
 #define LASSO_WSU_TIMESTAMP_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_WSU_TIMESTAMP, LassoWsuTimestampClass)) 
+	(G_TYPE_INSTANCE_GET_CLASS ((o), \
+		LASSO_TYPE_WSU_TIMESTAMP, \
+		LassoWsUtil1TimestampClass)) 
+
 
-typedef struct _LassoWsuTimestamp LassoWsuTimestamp;
-typedef struct _LassoWsuTimestampClass LassoWsuTimestampClass;
+typedef struct _LassoWsUtil1Timestamp LassoWsUtil1Timestamp;
+typedef struct _LassoWsUtil1TimestampClass LassoWsUtil1TimestampClass;
 
-struct _LassoWsuTimestamp {
+
+struct _LassoWsUtil1Timestamp {
 	LassoNode parent;
 
-	gchar *Created;
-	gchar *Expired;
+	/*< public >*/
+	/* elements */
+	char *Created;
+	char *Expires;
+	/* attributes */
+	char *Id;
+	GHashTable *attributes;
 };
 
-struct _LassoWsuTimestampClass {
+
+struct _LassoWsUtil1TimestampClass {
 	LassoNodeClass parent;
 };
 
 LASSO_EXPORT GType lasso_wsu_timestamp_get_type(void);
+LASSO_EXPORT LassoWsUtil1Timestamp* lasso_wsu_timestamp_new(void);
 
-LASSO_EXPORT LassoWsuTimestamp* lasso_wsu_timestamp_new(void);
 
-LASSO_EXPORT LassoWsuTimestamp* lasso_wsu_timestamp_new_from_message(const gchar *message);
 
 #ifdef __cplusplus
 }
diff --git a/swig/Lasso.i b/swig/Lasso.i
index 88e8a687..82e6f900 100644
--- a/swig/Lasso.i
+++ b/swig/Lasso.i
@@ -674,6 +674,7 @@ SET_NODE_INFO(Node, DowncastableNode)
 %include inheritance.h
 %include saml-2.0/inheritance.h
 #ifdef LASSO_WSF_ENABLED
+%include ws/inheritance.h
 %include id-wsf-2.0/inheritance.h
 #endif /* ifdef LASSO_WSF_ENABLED */
 
@@ -692,6 +693,7 @@ SET_NODE_INFO(Node, DowncastableNode)
 %include inheritance.h
 %include saml-2.0/inheritance.h
 #ifdef LASSO_WSF_ENABLED
+%include ws/inheritance.h
 %include id-wsf-2.0/inheritance.h
 #endif /* ifdef LASSO_WSF_ENABLED */
 
@@ -717,6 +719,7 @@ SET_NODE_INFO(Node, DowncastableNode)
 #include <swig/inheritance.h>
 #include <swig/saml-2.0/inheritance.h>
 #ifdef LASSO_WSF_ENABLED
+#include <swig/ws/inheritance.h>
 #include <swig/id-wsf-2.0/inheritance.h>
 #endif /* ifdef LASSO_WSF_ENABLED */
 
@@ -7115,6 +7118,7 @@ typedef struct {
 %include Lasso-wsf.i
 %include Lasso-wsf2.i
 %include id-wsf-2.0/main.h
+%include ws/main.h
 #endif
 
 %include Lasso-saml2.i
diff --git a/swig/Makefile.am b/swig/Makefile.am
index f3c8f411..afe723d3 100644
--- a/swig/Makefile.am
+++ b/swig/Makefile.am
@@ -4,4 +4,4 @@ EXTRA_DIST = Lasso.i Lasso-wsf.i Lasso-wsf-disco.i Lasso-wsf-dst.i \
 		wsf-support.i.in Lasso-wsf2.i Lasso-wsf2-disco.i \
 		Lasso-saml2.i
 
-SUBDIRS = saml-2.0 id-wsf-2.0
+SUBDIRS = saml-2.0 id-wsf-2.0 ws
diff --git a/swig/id-wsf-2.0/Makefile.am b/swig/id-wsf-2.0/Makefile.am
index 5c3d5f35..67c4729d 100644
--- a/swig/id-wsf-2.0/Makefile.am
+++ b/swig/id-wsf-2.0/Makefile.am
@@ -1,6 +1,139 @@
-
 EXTRA_DIST = \
 	inheritance.h \
 	main.h \
 	Makefile.am \
-	disco_svc_metadata.i
+	disco_abstract.i \
+	disco_endpoint_context.i \
+	disco_keys.i \
+	disco_options.i \
+	disco_provider_id.i \
+	disco_query.i \
+	disco_query_response.i \
+	disco_requested_service.i \
+	disco_security_context.i \
+	disco_service_context.i \
+	disco_service_type.i \
+	disco_svc_md_association_add.i \
+	disco_svc_md_association_add_response.i \
+	disco_svc_md_association_delete.i \
+	disco_svc_md_association_delete_response.i \
+	disco_svc_md_association_query.i \
+	disco_svc_md_association_query_response.i \
+	disco_svc_md_delete.i \
+	disco_svc_md_delete_response.i \
+	disco_svc_md_query.i \
+	disco_svc_md_query_response.i \
+	disco_svc_md_register.i \
+	disco_svc_md_register_response.i \
+	disco_svc_md_replace.i \
+	disco_svc_md_replace_response.i \
+	disco_svc_metadata.i \
+	dst_data_response_base.i \
+	dst_delete_item_base.i \
+	dst_delete_response.i \
+	dst_request.i \
+	dst_result_query_base.i \
+	dst_test_item_base.i \
+	dstref_app_data.i \
+	dstref_create.i \
+	dstref_create_item.i \
+	dstref_create_response.i \
+	dstref_data.i \
+	dstref_data_response.i \
+	dstref_delete.i \
+	dstref_delete_item.i \
+	dstref_delete_response.i \
+	dstref_item_data.i \
+	dstref_modify.i \
+	dstref_modify_item.i \
+	dstref_modify_response.i \
+	dstref_query.i \
+	dstref_query_item.i \
+	dstref_query_response.i \
+	dstref_result_query.i \
+	dstref_test_item.i \
+	ims_identity_mapping_request.i \
+	ims_identity_mapping_response.i \
+	ims_mapping_input.i \
+	ims_mapping_output.i \
+	is_help.i \
+	is_inquiry.i \
+	is_inquiry_element.i \
+	is_interaction_request.i \
+	is_interaction_response.i \
+	is_interaction_statement.i \
+	is_item.i \
+	is_parameter.i \
+	is_select.i \
+	is_text.i \
+	ps_add_collection_request.i \
+	ps_add_collection_response.i \
+	ps_add_entity_request.i \
+	ps_add_entity_response.i \
+	ps_add_known_entity_request.i \
+	ps_add_known_entity_response.i \
+	ps_add_to_collection_request.i \
+	ps_get_object_info_request.i \
+	ps_get_object_info_response.i \
+	ps_item_data.i \
+	ps_list_members_request.i \
+	ps_list_members_response.i \
+	ps_notification.i \
+	ps_notify.i \
+	ps_object.i \
+	ps_query_objects_request.i \
+	ps_query_objects_response.i \
+	ps_remove_collection_request.i \
+	ps_remove_entity_request.i \
+	ps_remove_from_collection_request.i \
+	ps_request_abstract.i \
+	ps_resolve_identifier_request.i \
+	ps_resolve_identifier_response.i \
+	ps_resolve_input.i \
+	ps_response_abstract.i \
+	ps_set_object_info_request.i \
+	ps_test_membership_request.i \
+	ps_test_membership_response.i \
+	sb2_consent.i \
+	sb2_credentials_context.i \
+	sb2_endpoint_update.i \
+	sb2_redirect_request.i \
+	sb2_sender.i \
+	sb2_target_identity.i \
+	sb2_timeout.i \
+	sb2_usage_directive.i \
+	sb2_user_interaction_header.i \
+	sbf_framework.i \
+	sec_token.i \
+	sec_token_policy.i \
+	sec_transited_provider_path.i \
+	subs_notification.i \
+	subs_notify_response.i \
+	subs_ref_item.i \
+	subs_subscription.i \
+	subsref_app_data.i \
+	subsref_create.i \
+	subsref_create_item.i \
+	subsref_create_response.i \
+	subsref_data.i \
+	subsref_data_response.i \
+	subsref_delete.i \
+	subsref_delete_item.i \
+	subsref_delete_response.i \
+	subsref_item_data.i \
+	subsref_modify.i \
+	subsref_modify_item.i \
+	subsref_modify_response.i \
+	subsref_notification.i \
+	subsref_notify.i \
+	subsref_notify_response.i \
+	subsref_query.i \
+	subsref_query_item.i \
+	subsref_query_response.i \
+	subsref_result_query.i \
+	subsref_subscription.i \
+	subsref_test_item.i \
+	util_empty.i \
+	util_extension.i \
+	util_response.i \
+	util_status.i
diff --git a/swig/id-wsf-2.0/disco_abstract.i b/swig/id-wsf-2.0/disco_abstract.i
new file mode 100644
index 00000000..f70412cd
--- /dev/null
+++ b/swig/id-wsf-2.0/disco_abstract.i
@@ -0,0 +1,55 @@
+/* $Id: disco_abstract.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DiscoAbstract) LassoIdWsf2DiscoAbstract;
+#endif
+typedef struct {
+	char *content;
+} LassoIdWsf2DiscoAbstract;
+%extend LassoIdWsf2DiscoAbstract {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DiscoAbstract();
+	~LassoIdWsf2DiscoAbstract();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DiscoAbstract lasso_idwsf2_disco_abstract_new
+#define delete_LassoIdWsf2DiscoAbstract(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DiscoAbstract_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/disco_endpoint_context.i b/swig/id-wsf-2.0/disco_endpoint_context.i
new file mode 100644
index 00000000..afa12490
--- /dev/null
+++ b/swig/id-wsf-2.0/disco_endpoint_context.i
@@ -0,0 +1,54 @@
+/* $Id: disco_endpoint_context.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DiscoEndpointContext) LassoIdWsf2DiscoEndpointContext;
+#endif
+typedef struct {
+} LassoIdWsf2DiscoEndpointContext;
+%extend LassoIdWsf2DiscoEndpointContext {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DiscoEndpointContext();
+	~LassoIdWsf2DiscoEndpointContext();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DiscoEndpointContext lasso_idwsf2_disco_endpoint_context_new
+#define delete_LassoIdWsf2DiscoEndpointContext(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DiscoEndpointContext_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/disco_keys.i b/swig/id-wsf-2.0/disco_keys.i
new file mode 100644
index 00000000..f46901ab
--- /dev/null
+++ b/swig/id-wsf-2.0/disco_keys.i
@@ -0,0 +1,54 @@
+/* $Id: disco_keys.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DiscoKeys) LassoIdWsf2DiscoKeys;
+#endif
+typedef struct {
+} LassoIdWsf2DiscoKeys;
+%extend LassoIdWsf2DiscoKeys {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DiscoKeys();
+	~LassoIdWsf2DiscoKeys();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DiscoKeys lasso_idwsf2_disco_keys_new
+#define delete_LassoIdWsf2DiscoKeys(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DiscoKeys_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/disco_options.i b/swig/id-wsf-2.0/disco_options.i
new file mode 100644
index 00000000..ceb94811
--- /dev/null
+++ b/swig/id-wsf-2.0/disco_options.i
@@ -0,0 +1,54 @@
+/* $Id: disco_options.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DiscoOptions) LassoIdWsf2DiscoOptions;
+#endif
+typedef struct {
+} LassoIdWsf2DiscoOptions;
+%extend LassoIdWsf2DiscoOptions {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DiscoOptions();
+	~LassoIdWsf2DiscoOptions();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DiscoOptions lasso_idwsf2_disco_options_new
+#define delete_LassoIdWsf2DiscoOptions(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DiscoOptions_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/disco_provider_id.i b/swig/id-wsf-2.0/disco_provider_id.i
new file mode 100644
index 00000000..023e8652
--- /dev/null
+++ b/swig/id-wsf-2.0/disco_provider_id.i
@@ -0,0 +1,55 @@
+/* $Id: disco_provider_id.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DiscoProviderID) LassoIdWsf2DiscoProviderID;
+#endif
+typedef struct {
+	char *content;
+} LassoIdWsf2DiscoProviderID;
+%extend LassoIdWsf2DiscoProviderID {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DiscoProviderID();
+	~LassoIdWsf2DiscoProviderID();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DiscoProviderID lasso_idwsf2_disco_provider_id_new
+#define delete_LassoIdWsf2DiscoProviderID(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DiscoProviderID_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/disco_query.i b/swig/id-wsf-2.0/disco_query.i
new file mode 100644
index 00000000..1d3ff81d
--- /dev/null
+++ b/swig/id-wsf-2.0/disco_query.i
@@ -0,0 +1,67 @@
+/* $Id: disco_query.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DiscoQuery) LassoIdWsf2DiscoQuery;
+#endif
+typedef struct {
+} LassoIdWsf2DiscoQuery;
+%extend LassoIdWsf2DiscoQuery {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DiscoQuery();
+	~LassoIdWsf2DiscoQuery();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2DiscoQuery_attributes_get(LassoIdWsf2DiscoQuery *self);
+#define LassoIdWsf2DiscoQuery_get_attributes LassoIdWsf2DiscoQuery_attributes_get
+LassoStringDict* LassoIdWsf2DiscoQuery_attributes_get(LassoIdWsf2DiscoQuery *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DiscoQuery lasso_idwsf2_disco_query_new
+#define delete_LassoIdWsf2DiscoQuery(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DiscoQuery_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/disco_query_response.i b/swig/id-wsf-2.0/disco_query_response.i
new file mode 100644
index 00000000..feb634c3
--- /dev/null
+++ b/swig/id-wsf-2.0/disco_query_response.i
@@ -0,0 +1,81 @@
+/* $Id: disco_query_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DiscoQueryResponse) LassoIdWsf2DiscoQueryResponse;
+#endif
+typedef struct {
+} LassoIdWsf2DiscoQueryResponse;
+%extend LassoIdWsf2DiscoQueryResponse {
+
+#ifndef SWIGPHP4
+	%rename(status) Status;
+#endif
+	%newobject *Status_get;
+	LassoIdWsf2UtilStatus *Status;
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DiscoQueryResponse();
+	~LassoIdWsf2DiscoQueryResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* Status */
+
+#define LassoIdWsf2DiscoQueryResponse_get_Status(self) get_node((self)->Status)
+#define LassoIdWsf2DiscoQueryResponse_Status_get(self) get_node((self)->Status)
+#define LassoIdWsf2DiscoQueryResponse_set_Status(self,value) set_node((gpointer*)&(self)->Status, (value))
+#define LassoIdWsf2DiscoQueryResponse_Status_set(self,value) set_node((gpointer*)&(self)->Status, (value))
+                    
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2DiscoQueryResponse_attributes_get(LassoIdWsf2DiscoQueryResponse *self);
+#define LassoIdWsf2DiscoQueryResponse_get_attributes LassoIdWsf2DiscoQueryResponse_attributes_get
+LassoStringDict* LassoIdWsf2DiscoQueryResponse_attributes_get(LassoIdWsf2DiscoQueryResponse *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DiscoQueryResponse lasso_idwsf2_disco_query_response_new
+#define delete_LassoIdWsf2DiscoQueryResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DiscoQueryResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/disco_requested_service.i b/swig/id-wsf-2.0/disco_requested_service.i
new file mode 100644
index 00000000..eb2e9d5c
--- /dev/null
+++ b/swig/id-wsf-2.0/disco_requested_service.i
@@ -0,0 +1,67 @@
+/* $Id: disco_requested_service.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DiscoRequestedService) LassoIdWsf2DiscoRequestedService;
+#endif
+typedef struct {
+	char *reqID;
+	char *resultsType;
+} LassoIdWsf2DiscoRequestedService;
+%extend LassoIdWsf2DiscoRequestedService {
+
+	%newobject *any_get;
+	LassoNode *any;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DiscoRequestedService();
+	~LassoIdWsf2DiscoRequestedService();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any */
+
+#define LassoIdWsf2DiscoRequestedService_get_any(self) get_node((self)->any)
+#define LassoIdWsf2DiscoRequestedService_any_get(self) get_node((self)->any)
+#define LassoIdWsf2DiscoRequestedService_set_any(self,value) set_node((gpointer*)&(self)->any, (value))
+#define LassoIdWsf2DiscoRequestedService_any_set(self,value) set_node((gpointer*)&(self)->any, (value))
+                    
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DiscoRequestedService lasso_idwsf2_disco_requested_service_new
+#define delete_LassoIdWsf2DiscoRequestedService(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DiscoRequestedService_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/disco_security_context.i b/swig/id-wsf-2.0/disco_security_context.i
new file mode 100644
index 00000000..017a83d3
--- /dev/null
+++ b/swig/id-wsf-2.0/disco_security_context.i
@@ -0,0 +1,54 @@
+/* $Id: disco_security_context.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DiscoSecurityContext) LassoIdWsf2DiscoSecurityContext;
+#endif
+typedef struct {
+} LassoIdWsf2DiscoSecurityContext;
+%extend LassoIdWsf2DiscoSecurityContext {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DiscoSecurityContext();
+	~LassoIdWsf2DiscoSecurityContext();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DiscoSecurityContext lasso_idwsf2_disco_security_context_new
+#define delete_LassoIdWsf2DiscoSecurityContext(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DiscoSecurityContext_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/disco_service_context.i b/swig/id-wsf-2.0/disco_service_context.i
new file mode 100644
index 00000000..f65d31ba
--- /dev/null
+++ b/swig/id-wsf-2.0/disco_service_context.i
@@ -0,0 +1,54 @@
+/* $Id: disco_service_context.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DiscoServiceContext) LassoIdWsf2DiscoServiceContext;
+#endif
+typedef struct {
+} LassoIdWsf2DiscoServiceContext;
+%extend LassoIdWsf2DiscoServiceContext {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DiscoServiceContext();
+	~LassoIdWsf2DiscoServiceContext();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DiscoServiceContext lasso_idwsf2_disco_service_context_new
+#define delete_LassoIdWsf2DiscoServiceContext(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DiscoServiceContext_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/disco_service_type.i b/swig/id-wsf-2.0/disco_service_type.i
new file mode 100644
index 00000000..0068bef4
--- /dev/null
+++ b/swig/id-wsf-2.0/disco_service_type.i
@@ -0,0 +1,55 @@
+/* $Id: disco_service_type.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DiscoServiceType) LassoIdWsf2DiscoServiceType;
+#endif
+typedef struct {
+	char *content;
+} LassoIdWsf2DiscoServiceType;
+%extend LassoIdWsf2DiscoServiceType {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DiscoServiceType();
+	~LassoIdWsf2DiscoServiceType();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DiscoServiceType lasso_idwsf2_disco_service_type_new
+#define delete_LassoIdWsf2DiscoServiceType(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DiscoServiceType_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/disco_svc_md_association_add.i b/swig/id-wsf-2.0/disco_svc_md_association_add.i
new file mode 100644
index 00000000..5159c434
--- /dev/null
+++ b/swig/id-wsf-2.0/disco_svc_md_association_add.i
@@ -0,0 +1,67 @@
+/* $Id: disco_svc_md_association_add.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DiscoSvcMDAssociationAdd) LassoIdWsf2DiscoSvcMDAssociationAdd;
+#endif
+typedef struct {
+} LassoIdWsf2DiscoSvcMDAssociationAdd;
+%extend LassoIdWsf2DiscoSvcMDAssociationAdd {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DiscoSvcMDAssociationAdd();
+	~LassoIdWsf2DiscoSvcMDAssociationAdd();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2DiscoSvcMDAssociationAdd_attributes_get(LassoIdWsf2DiscoSvcMDAssociationAdd *self);
+#define LassoIdWsf2DiscoSvcMDAssociationAdd_get_attributes LassoIdWsf2DiscoSvcMDAssociationAdd_attributes_get
+LassoStringDict* LassoIdWsf2DiscoSvcMDAssociationAdd_attributes_get(LassoIdWsf2DiscoSvcMDAssociationAdd *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DiscoSvcMDAssociationAdd lasso_idwsf2_disco_svc_md_association_add_new
+#define delete_LassoIdWsf2DiscoSvcMDAssociationAdd(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DiscoSvcMDAssociationAdd_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/disco_svc_md_association_add_response.i b/swig/id-wsf-2.0/disco_svc_md_association_add_response.i
new file mode 100644
index 00000000..8156dd3c
--- /dev/null
+++ b/swig/id-wsf-2.0/disco_svc_md_association_add_response.i
@@ -0,0 +1,81 @@
+/* $Id: disco_svc_md_association_add_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DiscoSvcMDAssociationAddResponse) LassoIdWsf2DiscoSvcMDAssociationAddResponse;
+#endif
+typedef struct {
+} LassoIdWsf2DiscoSvcMDAssociationAddResponse;
+%extend LassoIdWsf2DiscoSvcMDAssociationAddResponse {
+
+#ifndef SWIGPHP4
+	%rename(status) Status;
+#endif
+	%newobject *Status_get;
+	LassoIdWsf2UtilStatus *Status;
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DiscoSvcMDAssociationAddResponse();
+	~LassoIdWsf2DiscoSvcMDAssociationAddResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* Status */
+
+#define LassoIdWsf2DiscoSvcMDAssociationAddResponse_get_Status(self) get_node((self)->Status)
+#define LassoIdWsf2DiscoSvcMDAssociationAddResponse_Status_get(self) get_node((self)->Status)
+#define LassoIdWsf2DiscoSvcMDAssociationAddResponse_set_Status(self,value) set_node((gpointer*)&(self)->Status, (value))
+#define LassoIdWsf2DiscoSvcMDAssociationAddResponse_Status_set(self,value) set_node((gpointer*)&(self)->Status, (value))
+                    
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2DiscoSvcMDAssociationAddResponse_attributes_get(LassoIdWsf2DiscoSvcMDAssociationAddResponse *self);
+#define LassoIdWsf2DiscoSvcMDAssociationAddResponse_get_attributes LassoIdWsf2DiscoSvcMDAssociationAddResponse_attributes_get
+LassoStringDict* LassoIdWsf2DiscoSvcMDAssociationAddResponse_attributes_get(LassoIdWsf2DiscoSvcMDAssociationAddResponse *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DiscoSvcMDAssociationAddResponse lasso_idwsf2_disco_svc_md_association_add_response_new
+#define delete_LassoIdWsf2DiscoSvcMDAssociationAddResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DiscoSvcMDAssociationAddResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/disco_svc_md_association_delete.i b/swig/id-wsf-2.0/disco_svc_md_association_delete.i
new file mode 100644
index 00000000..e8a286e3
--- /dev/null
+++ b/swig/id-wsf-2.0/disco_svc_md_association_delete.i
@@ -0,0 +1,67 @@
+/* $Id: disco_svc_md_association_delete.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DiscoSvcMDAssociationDelete) LassoIdWsf2DiscoSvcMDAssociationDelete;
+#endif
+typedef struct {
+} LassoIdWsf2DiscoSvcMDAssociationDelete;
+%extend LassoIdWsf2DiscoSvcMDAssociationDelete {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DiscoSvcMDAssociationDelete();
+	~LassoIdWsf2DiscoSvcMDAssociationDelete();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2DiscoSvcMDAssociationDelete_attributes_get(LassoIdWsf2DiscoSvcMDAssociationDelete *self);
+#define LassoIdWsf2DiscoSvcMDAssociationDelete_get_attributes LassoIdWsf2DiscoSvcMDAssociationDelete_attributes_get
+LassoStringDict* LassoIdWsf2DiscoSvcMDAssociationDelete_attributes_get(LassoIdWsf2DiscoSvcMDAssociationDelete *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DiscoSvcMDAssociationDelete lasso_idwsf2_disco_svc_md_association_delete_new
+#define delete_LassoIdWsf2DiscoSvcMDAssociationDelete(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DiscoSvcMDAssociationDelete_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/disco_svc_md_association_delete_response.i b/swig/id-wsf-2.0/disco_svc_md_association_delete_response.i
new file mode 100644
index 00000000..d0681dc9
--- /dev/null
+++ b/swig/id-wsf-2.0/disco_svc_md_association_delete_response.i
@@ -0,0 +1,81 @@
+/* $Id: disco_svc_md_association_delete_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DiscoSvcMDAssociationDeleteResponse) LassoIdWsf2DiscoSvcMDAssociationDeleteResponse;
+#endif
+typedef struct {
+} LassoIdWsf2DiscoSvcMDAssociationDeleteResponse;
+%extend LassoIdWsf2DiscoSvcMDAssociationDeleteResponse {
+
+#ifndef SWIGPHP4
+	%rename(status) Status;
+#endif
+	%newobject *Status_get;
+	LassoIdWsf2UtilStatus *Status;
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DiscoSvcMDAssociationDeleteResponse();
+	~LassoIdWsf2DiscoSvcMDAssociationDeleteResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* Status */
+
+#define LassoIdWsf2DiscoSvcMDAssociationDeleteResponse_get_Status(self) get_node((self)->Status)
+#define LassoIdWsf2DiscoSvcMDAssociationDeleteResponse_Status_get(self) get_node((self)->Status)
+#define LassoIdWsf2DiscoSvcMDAssociationDeleteResponse_set_Status(self,value) set_node((gpointer*)&(self)->Status, (value))
+#define LassoIdWsf2DiscoSvcMDAssociationDeleteResponse_Status_set(self,value) set_node((gpointer*)&(self)->Status, (value))
+                    
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2DiscoSvcMDAssociationDeleteResponse_attributes_get(LassoIdWsf2DiscoSvcMDAssociationDeleteResponse *self);
+#define LassoIdWsf2DiscoSvcMDAssociationDeleteResponse_get_attributes LassoIdWsf2DiscoSvcMDAssociationDeleteResponse_attributes_get
+LassoStringDict* LassoIdWsf2DiscoSvcMDAssociationDeleteResponse_attributes_get(LassoIdWsf2DiscoSvcMDAssociationDeleteResponse *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DiscoSvcMDAssociationDeleteResponse lasso_idwsf2_disco_svc_md_association_delete_response_new
+#define delete_LassoIdWsf2DiscoSvcMDAssociationDeleteResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DiscoSvcMDAssociationDeleteResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/disco_svc_md_association_query.i b/swig/id-wsf-2.0/disco_svc_md_association_query.i
new file mode 100644
index 00000000..7c1e5915
--- /dev/null
+++ b/swig/id-wsf-2.0/disco_svc_md_association_query.i
@@ -0,0 +1,67 @@
+/* $Id: disco_svc_md_association_query.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DiscoSvcMDAssociationQuery) LassoIdWsf2DiscoSvcMDAssociationQuery;
+#endif
+typedef struct {
+} LassoIdWsf2DiscoSvcMDAssociationQuery;
+%extend LassoIdWsf2DiscoSvcMDAssociationQuery {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DiscoSvcMDAssociationQuery();
+	~LassoIdWsf2DiscoSvcMDAssociationQuery();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2DiscoSvcMDAssociationQuery_attributes_get(LassoIdWsf2DiscoSvcMDAssociationQuery *self);
+#define LassoIdWsf2DiscoSvcMDAssociationQuery_get_attributes LassoIdWsf2DiscoSvcMDAssociationQuery_attributes_get
+LassoStringDict* LassoIdWsf2DiscoSvcMDAssociationQuery_attributes_get(LassoIdWsf2DiscoSvcMDAssociationQuery *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DiscoSvcMDAssociationQuery lasso_idwsf2_disco_svc_md_association_query_new
+#define delete_LassoIdWsf2DiscoSvcMDAssociationQuery(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DiscoSvcMDAssociationQuery_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/disco_svc_md_association_query_response.i b/swig/id-wsf-2.0/disco_svc_md_association_query_response.i
new file mode 100644
index 00000000..aa187998
--- /dev/null
+++ b/swig/id-wsf-2.0/disco_svc_md_association_query_response.i
@@ -0,0 +1,81 @@
+/* $Id: disco_svc_md_association_query_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DiscoSvcMDAssociationQueryResponse) LassoIdWsf2DiscoSvcMDAssociationQueryResponse;
+#endif
+typedef struct {
+} LassoIdWsf2DiscoSvcMDAssociationQueryResponse;
+%extend LassoIdWsf2DiscoSvcMDAssociationQueryResponse {
+
+#ifndef SWIGPHP4
+	%rename(status) Status;
+#endif
+	%newobject *Status_get;
+	LassoIdWsf2UtilStatus *Status;
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DiscoSvcMDAssociationQueryResponse();
+	~LassoIdWsf2DiscoSvcMDAssociationQueryResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* Status */
+
+#define LassoIdWsf2DiscoSvcMDAssociationQueryResponse_get_Status(self) get_node((self)->Status)
+#define LassoIdWsf2DiscoSvcMDAssociationQueryResponse_Status_get(self) get_node((self)->Status)
+#define LassoIdWsf2DiscoSvcMDAssociationQueryResponse_set_Status(self,value) set_node((gpointer*)&(self)->Status, (value))
+#define LassoIdWsf2DiscoSvcMDAssociationQueryResponse_Status_set(self,value) set_node((gpointer*)&(self)->Status, (value))
+                    
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2DiscoSvcMDAssociationQueryResponse_attributes_get(LassoIdWsf2DiscoSvcMDAssociationQueryResponse *self);
+#define LassoIdWsf2DiscoSvcMDAssociationQueryResponse_get_attributes LassoIdWsf2DiscoSvcMDAssociationQueryResponse_attributes_get
+LassoStringDict* LassoIdWsf2DiscoSvcMDAssociationQueryResponse_attributes_get(LassoIdWsf2DiscoSvcMDAssociationQueryResponse *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DiscoSvcMDAssociationQueryResponse lasso_idwsf2_disco_svc_md_association_query_response_new
+#define delete_LassoIdWsf2DiscoSvcMDAssociationQueryResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DiscoSvcMDAssociationQueryResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/disco_svc_md_delete.i b/swig/id-wsf-2.0/disco_svc_md_delete.i
new file mode 100644
index 00000000..739b969f
--- /dev/null
+++ b/swig/id-wsf-2.0/disco_svc_md_delete.i
@@ -0,0 +1,67 @@
+/* $Id: disco_svc_md_delete.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DiscoSvcMDDelete) LassoIdWsf2DiscoSvcMDDelete;
+#endif
+typedef struct {
+} LassoIdWsf2DiscoSvcMDDelete;
+%extend LassoIdWsf2DiscoSvcMDDelete {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DiscoSvcMDDelete();
+	~LassoIdWsf2DiscoSvcMDDelete();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2DiscoSvcMDDelete_attributes_get(LassoIdWsf2DiscoSvcMDDelete *self);
+#define LassoIdWsf2DiscoSvcMDDelete_get_attributes LassoIdWsf2DiscoSvcMDDelete_attributes_get
+LassoStringDict* LassoIdWsf2DiscoSvcMDDelete_attributes_get(LassoIdWsf2DiscoSvcMDDelete *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DiscoSvcMDDelete lasso_idwsf2_disco_svc_md_delete_new
+#define delete_LassoIdWsf2DiscoSvcMDDelete(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DiscoSvcMDDelete_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/disco_svc_md_delete_response.i b/swig/id-wsf-2.0/disco_svc_md_delete_response.i
new file mode 100644
index 00000000..ddc2b005
--- /dev/null
+++ b/swig/id-wsf-2.0/disco_svc_md_delete_response.i
@@ -0,0 +1,81 @@
+/* $Id: disco_svc_md_delete_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DiscoSvcMDDeleteResponse) LassoIdWsf2DiscoSvcMDDeleteResponse;
+#endif
+typedef struct {
+} LassoIdWsf2DiscoSvcMDDeleteResponse;
+%extend LassoIdWsf2DiscoSvcMDDeleteResponse {
+
+#ifndef SWIGPHP4
+	%rename(status) Status;
+#endif
+	%newobject *Status_get;
+	LassoIdWsf2UtilStatus *Status;
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DiscoSvcMDDeleteResponse();
+	~LassoIdWsf2DiscoSvcMDDeleteResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* Status */
+
+#define LassoIdWsf2DiscoSvcMDDeleteResponse_get_Status(self) get_node((self)->Status)
+#define LassoIdWsf2DiscoSvcMDDeleteResponse_Status_get(self) get_node((self)->Status)
+#define LassoIdWsf2DiscoSvcMDDeleteResponse_set_Status(self,value) set_node((gpointer*)&(self)->Status, (value))
+#define LassoIdWsf2DiscoSvcMDDeleteResponse_Status_set(self,value) set_node((gpointer*)&(self)->Status, (value))
+                    
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2DiscoSvcMDDeleteResponse_attributes_get(LassoIdWsf2DiscoSvcMDDeleteResponse *self);
+#define LassoIdWsf2DiscoSvcMDDeleteResponse_get_attributes LassoIdWsf2DiscoSvcMDDeleteResponse_attributes_get
+LassoStringDict* LassoIdWsf2DiscoSvcMDDeleteResponse_attributes_get(LassoIdWsf2DiscoSvcMDDeleteResponse *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DiscoSvcMDDeleteResponse lasso_idwsf2_disco_svc_md_delete_response_new
+#define delete_LassoIdWsf2DiscoSvcMDDeleteResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DiscoSvcMDDeleteResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/disco_svc_md_query.i b/swig/id-wsf-2.0/disco_svc_md_query.i
new file mode 100644
index 00000000..3399d132
--- /dev/null
+++ b/swig/id-wsf-2.0/disco_svc_md_query.i
@@ -0,0 +1,67 @@
+/* $Id: disco_svc_md_query.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DiscoSvcMDQuery) LassoIdWsf2DiscoSvcMDQuery;
+#endif
+typedef struct {
+} LassoIdWsf2DiscoSvcMDQuery;
+%extend LassoIdWsf2DiscoSvcMDQuery {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DiscoSvcMDQuery();
+	~LassoIdWsf2DiscoSvcMDQuery();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2DiscoSvcMDQuery_attributes_get(LassoIdWsf2DiscoSvcMDQuery *self);
+#define LassoIdWsf2DiscoSvcMDQuery_get_attributes LassoIdWsf2DiscoSvcMDQuery_attributes_get
+LassoStringDict* LassoIdWsf2DiscoSvcMDQuery_attributes_get(LassoIdWsf2DiscoSvcMDQuery *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DiscoSvcMDQuery lasso_idwsf2_disco_svc_md_query_new
+#define delete_LassoIdWsf2DiscoSvcMDQuery(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DiscoSvcMDQuery_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/disco_svc_md_query_response.i b/swig/id-wsf-2.0/disco_svc_md_query_response.i
new file mode 100644
index 00000000..1af6bc9f
--- /dev/null
+++ b/swig/id-wsf-2.0/disco_svc_md_query_response.i
@@ -0,0 +1,81 @@
+/* $Id: disco_svc_md_query_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DiscoSvcMDQueryResponse) LassoIdWsf2DiscoSvcMDQueryResponse;
+#endif
+typedef struct {
+} LassoIdWsf2DiscoSvcMDQueryResponse;
+%extend LassoIdWsf2DiscoSvcMDQueryResponse {
+
+#ifndef SWIGPHP4
+	%rename(status) Status;
+#endif
+	%newobject *Status_get;
+	LassoIdWsf2UtilStatus *Status;
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DiscoSvcMDQueryResponse();
+	~LassoIdWsf2DiscoSvcMDQueryResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* Status */
+
+#define LassoIdWsf2DiscoSvcMDQueryResponse_get_Status(self) get_node((self)->Status)
+#define LassoIdWsf2DiscoSvcMDQueryResponse_Status_get(self) get_node((self)->Status)
+#define LassoIdWsf2DiscoSvcMDQueryResponse_set_Status(self,value) set_node((gpointer*)&(self)->Status, (value))
+#define LassoIdWsf2DiscoSvcMDQueryResponse_Status_set(self,value) set_node((gpointer*)&(self)->Status, (value))
+                    
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2DiscoSvcMDQueryResponse_attributes_get(LassoIdWsf2DiscoSvcMDQueryResponse *self);
+#define LassoIdWsf2DiscoSvcMDQueryResponse_get_attributes LassoIdWsf2DiscoSvcMDQueryResponse_attributes_get
+LassoStringDict* LassoIdWsf2DiscoSvcMDQueryResponse_attributes_get(LassoIdWsf2DiscoSvcMDQueryResponse *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DiscoSvcMDQueryResponse lasso_idwsf2_disco_svc_md_query_response_new
+#define delete_LassoIdWsf2DiscoSvcMDQueryResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DiscoSvcMDQueryResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/disco_svc_md_register.i b/swig/id-wsf-2.0/disco_svc_md_register.i
new file mode 100644
index 00000000..e7472737
--- /dev/null
+++ b/swig/id-wsf-2.0/disco_svc_md_register.i
@@ -0,0 +1,67 @@
+/* $Id: disco_svc_md_register.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DiscoSvcMDRegister) LassoIdWsf2DiscoSvcMDRegister;
+#endif
+typedef struct {
+} LassoIdWsf2DiscoSvcMDRegister;
+%extend LassoIdWsf2DiscoSvcMDRegister {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DiscoSvcMDRegister();
+	~LassoIdWsf2DiscoSvcMDRegister();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2DiscoSvcMDRegister_attributes_get(LassoIdWsf2DiscoSvcMDRegister *self);
+#define LassoIdWsf2DiscoSvcMDRegister_get_attributes LassoIdWsf2DiscoSvcMDRegister_attributes_get
+LassoStringDict* LassoIdWsf2DiscoSvcMDRegister_attributes_get(LassoIdWsf2DiscoSvcMDRegister *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DiscoSvcMDRegister lasso_idwsf2_disco_svc_md_register_new
+#define delete_LassoIdWsf2DiscoSvcMDRegister(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DiscoSvcMDRegister_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/disco_svc_md_register_response.i b/swig/id-wsf-2.0/disco_svc_md_register_response.i
new file mode 100644
index 00000000..6c1725e3
--- /dev/null
+++ b/swig/id-wsf-2.0/disco_svc_md_register_response.i
@@ -0,0 +1,81 @@
+/* $Id: disco_svc_md_register_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DiscoSvcMDRegisterResponse) LassoIdWsf2DiscoSvcMDRegisterResponse;
+#endif
+typedef struct {
+} LassoIdWsf2DiscoSvcMDRegisterResponse;
+%extend LassoIdWsf2DiscoSvcMDRegisterResponse {
+
+#ifndef SWIGPHP4
+	%rename(status) Status;
+#endif
+	%newobject *Status_get;
+	LassoIdWsf2UtilStatus *Status;
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DiscoSvcMDRegisterResponse();
+	~LassoIdWsf2DiscoSvcMDRegisterResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* Status */
+
+#define LassoIdWsf2DiscoSvcMDRegisterResponse_get_Status(self) get_node((self)->Status)
+#define LassoIdWsf2DiscoSvcMDRegisterResponse_Status_get(self) get_node((self)->Status)
+#define LassoIdWsf2DiscoSvcMDRegisterResponse_set_Status(self,value) set_node((gpointer*)&(self)->Status, (value))
+#define LassoIdWsf2DiscoSvcMDRegisterResponse_Status_set(self,value) set_node((gpointer*)&(self)->Status, (value))
+                    
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2DiscoSvcMDRegisterResponse_attributes_get(LassoIdWsf2DiscoSvcMDRegisterResponse *self);
+#define LassoIdWsf2DiscoSvcMDRegisterResponse_get_attributes LassoIdWsf2DiscoSvcMDRegisterResponse_attributes_get
+LassoStringDict* LassoIdWsf2DiscoSvcMDRegisterResponse_attributes_get(LassoIdWsf2DiscoSvcMDRegisterResponse *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DiscoSvcMDRegisterResponse lasso_idwsf2_disco_svc_md_register_response_new
+#define delete_LassoIdWsf2DiscoSvcMDRegisterResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DiscoSvcMDRegisterResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/disco_svc_md_replace.i b/swig/id-wsf-2.0/disco_svc_md_replace.i
new file mode 100644
index 00000000..f6bf8c41
--- /dev/null
+++ b/swig/id-wsf-2.0/disco_svc_md_replace.i
@@ -0,0 +1,67 @@
+/* $Id: disco_svc_md_replace.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DiscoSvcMDReplace) LassoIdWsf2DiscoSvcMDReplace;
+#endif
+typedef struct {
+} LassoIdWsf2DiscoSvcMDReplace;
+%extend LassoIdWsf2DiscoSvcMDReplace {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DiscoSvcMDReplace();
+	~LassoIdWsf2DiscoSvcMDReplace();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2DiscoSvcMDReplace_attributes_get(LassoIdWsf2DiscoSvcMDReplace *self);
+#define LassoIdWsf2DiscoSvcMDReplace_get_attributes LassoIdWsf2DiscoSvcMDReplace_attributes_get
+LassoStringDict* LassoIdWsf2DiscoSvcMDReplace_attributes_get(LassoIdWsf2DiscoSvcMDReplace *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DiscoSvcMDReplace lasso_idwsf2_disco_svc_md_replace_new
+#define delete_LassoIdWsf2DiscoSvcMDReplace(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DiscoSvcMDReplace_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/disco_svc_md_replace_response.i b/swig/id-wsf-2.0/disco_svc_md_replace_response.i
new file mode 100644
index 00000000..01a6c9dd
--- /dev/null
+++ b/swig/id-wsf-2.0/disco_svc_md_replace_response.i
@@ -0,0 +1,81 @@
+/* $Id: disco_svc_md_replace_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DiscoSvcMDReplaceResponse) LassoIdWsf2DiscoSvcMDReplaceResponse;
+#endif
+typedef struct {
+} LassoIdWsf2DiscoSvcMDReplaceResponse;
+%extend LassoIdWsf2DiscoSvcMDReplaceResponse {
+
+#ifndef SWIGPHP4
+	%rename(status) Status;
+#endif
+	%newobject *Status_get;
+	LassoIdWsf2UtilStatus *Status;
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DiscoSvcMDReplaceResponse();
+	~LassoIdWsf2DiscoSvcMDReplaceResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* Status */
+
+#define LassoIdWsf2DiscoSvcMDReplaceResponse_get_Status(self) get_node((self)->Status)
+#define LassoIdWsf2DiscoSvcMDReplaceResponse_Status_get(self) get_node((self)->Status)
+#define LassoIdWsf2DiscoSvcMDReplaceResponse_set_Status(self,value) set_node((gpointer*)&(self)->Status, (value))
+#define LassoIdWsf2DiscoSvcMDReplaceResponse_Status_set(self,value) set_node((gpointer*)&(self)->Status, (value))
+                    
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2DiscoSvcMDReplaceResponse_attributes_get(LassoIdWsf2DiscoSvcMDReplaceResponse *self);
+#define LassoIdWsf2DiscoSvcMDReplaceResponse_get_attributes LassoIdWsf2DiscoSvcMDReplaceResponse_attributes_get
+LassoStringDict* LassoIdWsf2DiscoSvcMDReplaceResponse_attributes_get(LassoIdWsf2DiscoSvcMDReplaceResponse *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DiscoSvcMDReplaceResponse lasso_idwsf2_disco_svc_md_replace_response_new
+#define delete_LassoIdWsf2DiscoSvcMDReplaceResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DiscoSvcMDReplaceResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/disco_svc_metadata.i b/swig/id-wsf-2.0/disco_svc_metadata.i
index f210ec10..02cf08cc 100644
--- a/swig/id-wsf-2.0/disco_svc_metadata.i
+++ b/swig/id-wsf-2.0/disco_svc_metadata.i
@@ -1,15 +1,39 @@
-
-#ifndef SWIG_PHP_RENAMES
+/* $Id: disco_svc_metadata.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
 %rename(IdWsf2DiscoSvcMetadata) LassoIdWsf2DiscoSvcMetadata;
 #endif
 typedef struct {
-#ifndef SWIG_PHP_RENAMES
+#ifndef SWIGPHP4
 	%rename(abstract) Abstract;
-        char *Abstract;
+#endif
+	char *Abstract;
+#ifndef SWIGPHP4
+	%rename(providerID) ProviderID;
 #endif
 	char *ProviderID;
-	/* XXX : Change this "void" if we happen to add ServiceContext in swig as well */
-	void *ServiceContext;
 	char *svcMDID;
 } LassoIdWsf2DiscoSvcMetadata;
 %extend LassoIdWsf2DiscoSvcMetadata {
diff --git a/swig/id-wsf-2.0/dst_data_response_base.i b/swig/id-wsf-2.0/dst_data_response_base.i
new file mode 100644
index 00000000..dcaf5b9b
--- /dev/null
+++ b/swig/id-wsf-2.0/dst_data_response_base.i
@@ -0,0 +1,55 @@
+/* $Id: dst_data_response_base.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DstDataResponseBase) LassoIdWsf2DstDataResponseBase;
+#endif
+typedef struct {
+	char *timeStamp;
+} LassoIdWsf2DstDataResponseBase;
+%extend LassoIdWsf2DstDataResponseBase {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DstDataResponseBase();
+	~LassoIdWsf2DstDataResponseBase();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DstDataResponseBase lasso_idwsf2_dst_data_response_base_new
+#define delete_LassoIdWsf2DstDataResponseBase(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DstDataResponseBase_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/dst_delete_item_base.i b/swig/id-wsf-2.0/dst_delete_item_base.i
new file mode 100644
index 00000000..d94c95c2
--- /dev/null
+++ b/swig/id-wsf-2.0/dst_delete_item_base.i
@@ -0,0 +1,59 @@
+/* $Id: dst_delete_item_base.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DstDeleteItemBase) LassoIdWsf2DstDeleteItemBase;
+#endif
+typedef struct {
+	char *notChangedSince;
+	char *id;
+	char *itemID;
+	char *objectType;
+	char *predefined;
+} LassoIdWsf2DstDeleteItemBase;
+%extend LassoIdWsf2DstDeleteItemBase {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DstDeleteItemBase();
+	~LassoIdWsf2DstDeleteItemBase();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DstDeleteItemBase lasso_idwsf2_dst_delete_item_base_new
+#define delete_LassoIdWsf2DstDeleteItemBase(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DstDeleteItemBase_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/dst_delete_response.i b/swig/id-wsf-2.0/dst_delete_response.i
new file mode 100644
index 00000000..cf7add68
--- /dev/null
+++ b/swig/id-wsf-2.0/dst_delete_response.i
@@ -0,0 +1,54 @@
+/* $Id: dst_delete_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DstDeleteResponse) LassoIdWsf2DstDeleteResponse;
+#endif
+typedef struct {
+} LassoIdWsf2DstDeleteResponse;
+%extend LassoIdWsf2DstDeleteResponse {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DstDeleteResponse();
+	~LassoIdWsf2DstDeleteResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DstDeleteResponse lasso_idwsf2_dst_delete_response_new
+#define delete_LassoIdWsf2DstDeleteResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DstDeleteResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/dst_request.i b/swig/id-wsf-2.0/dst_request.i
new file mode 100644
index 00000000..5aaae41d
--- /dev/null
+++ b/swig/id-wsf-2.0/dst_request.i
@@ -0,0 +1,68 @@
+/* $Id: dst_request.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DstRequest) LassoIdWsf2DstRequest;
+#endif
+typedef struct {
+	char *itemID;
+} LassoIdWsf2DstRequest;
+%extend LassoIdWsf2DstRequest {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DstRequest();
+	~LassoIdWsf2DstRequest();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2DstRequest_attributes_get(LassoIdWsf2DstRequest *self);
+#define LassoIdWsf2DstRequest_get_attributes LassoIdWsf2DstRequest_attributes_get
+LassoStringDict* LassoIdWsf2DstRequest_attributes_get(LassoIdWsf2DstRequest *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DstRequest lasso_idwsf2_dst_request_new
+#define delete_LassoIdWsf2DstRequest(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DstRequest_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/dst_result_query_base.i b/swig/id-wsf-2.0/dst_result_query_base.i
new file mode 100644
index 00000000..cb6d22c2
--- /dev/null
+++ b/swig/id-wsf-2.0/dst_result_query_base.i
@@ -0,0 +1,65 @@
+/* $Id: dst_result_query_base.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DstResultQueryBase) LassoIdWsf2DstResultQueryBase;
+#endif
+typedef struct {
+#ifndef SWIGPHP4
+	%rename(changeFormat) ChangeFormat;
+#endif
+	char *ChangeFormat;
+	char *itemIDRef;
+	gboolean contingency;
+	gboolean includeCommonAttributes;
+	char *changedSince;
+	char *itemID;
+	char *objectType;
+	char *predefined;
+} LassoIdWsf2DstResultQueryBase;
+%extend LassoIdWsf2DstResultQueryBase {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DstResultQueryBase();
+	~LassoIdWsf2DstResultQueryBase();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DstResultQueryBase lasso_idwsf2_dst_result_query_base_new
+#define delete_LassoIdWsf2DstResultQueryBase(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DstResultQueryBase_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/dst_test_item_base.i b/swig/id-wsf-2.0/dst_test_item_base.i
new file mode 100644
index 00000000..cf1cafa2
--- /dev/null
+++ b/swig/id-wsf-2.0/dst_test_item_base.i
@@ -0,0 +1,58 @@
+/* $Id: dst_test_item_base.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DstTestItemBase) LassoIdWsf2DstTestItemBase;
+#endif
+typedef struct {
+	char *id;
+	char *itemID;
+	char *objectType;
+	char *predefined;
+} LassoIdWsf2DstTestItemBase;
+%extend LassoIdWsf2DstTestItemBase {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DstTestItemBase();
+	~LassoIdWsf2DstTestItemBase();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DstTestItemBase lasso_idwsf2_dst_test_item_base_new
+#define delete_LassoIdWsf2DstTestItemBase(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DstTestItemBase_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/dstref_app_data.i b/swig/id-wsf-2.0/dstref_app_data.i
new file mode 100644
index 00000000..806dc565
--- /dev/null
+++ b/swig/id-wsf-2.0/dstref_app_data.i
@@ -0,0 +1,55 @@
+/* $Id: dstref_app_data.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DstRefAppData) LassoIdWsf2DstRefAppData;
+#endif
+typedef struct {
+	char *content;
+} LassoIdWsf2DstRefAppData;
+%extend LassoIdWsf2DstRefAppData {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DstRefAppData();
+	~LassoIdWsf2DstRefAppData();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DstRefAppData lasso_idwsf2_dstref_app_data_new
+#define delete_LassoIdWsf2DstRefAppData(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DstRefAppData_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/dstref_create.i b/swig/id-wsf-2.0/dstref_create.i
new file mode 100644
index 00000000..b8edbae9
--- /dev/null
+++ b/swig/id-wsf-2.0/dstref_create.i
@@ -0,0 +1,54 @@
+/* $Id: dstref_create.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DstRefCreate) LassoIdWsf2DstRefCreate;
+#endif
+typedef struct {
+} LassoIdWsf2DstRefCreate;
+%extend LassoIdWsf2DstRefCreate {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DstRefCreate();
+	~LassoIdWsf2DstRefCreate();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DstRefCreate lasso_idwsf2_dstref_create_new
+#define delete_LassoIdWsf2DstRefCreate(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DstRefCreate_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/dstref_create_item.i b/swig/id-wsf-2.0/dstref_create_item.i
new file mode 100644
index 00000000..d1b2ae55
--- /dev/null
+++ b/swig/id-wsf-2.0/dstref_create_item.i
@@ -0,0 +1,71 @@
+/* $Id: dstref_create_item.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DstRefCreateItem) LassoIdWsf2DstRefCreateItem;
+#endif
+typedef struct {
+	char *objectType;
+	char *id;
+	char *itemID;
+} LassoIdWsf2DstRefCreateItem;
+%extend LassoIdWsf2DstRefCreateItem {
+
+#ifndef SWIGPHP4
+	%rename(newData) NewData;
+#endif
+	%newobject *NewData_get;
+	LassoIdWsf2DstRefAppData *NewData;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DstRefCreateItem();
+	~LassoIdWsf2DstRefCreateItem();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* NewData */
+
+#define LassoIdWsf2DstRefCreateItem_get_NewData(self) get_node((self)->NewData)
+#define LassoIdWsf2DstRefCreateItem_NewData_get(self) get_node((self)->NewData)
+#define LassoIdWsf2DstRefCreateItem_set_NewData(self,value) set_node((gpointer*)&(self)->NewData, (value))
+#define LassoIdWsf2DstRefCreateItem_NewData_set(self,value) set_node((gpointer*)&(self)->NewData, (value))
+                    
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DstRefCreateItem lasso_idwsf2_dstref_create_item_new
+#define delete_LassoIdWsf2DstRefCreateItem(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DstRefCreateItem_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/dstref_create_response.i b/swig/id-wsf-2.0/dstref_create_response.i
new file mode 100644
index 00000000..ee4905f6
--- /dev/null
+++ b/swig/id-wsf-2.0/dstref_create_response.i
@@ -0,0 +1,54 @@
+/* $Id: dstref_create_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DstRefCreateResponse) LassoIdWsf2DstRefCreateResponse;
+#endif
+typedef struct {
+} LassoIdWsf2DstRefCreateResponse;
+%extend LassoIdWsf2DstRefCreateResponse {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DstRefCreateResponse();
+	~LassoIdWsf2DstRefCreateResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DstRefCreateResponse lasso_idwsf2_dstref_create_response_new
+#define delete_LassoIdWsf2DstRefCreateResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DstRefCreateResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/dstref_data.i b/swig/id-wsf-2.0/dstref_data.i
new file mode 100644
index 00000000..aa095640
--- /dev/null
+++ b/swig/id-wsf-2.0/dstref_data.i
@@ -0,0 +1,57 @@
+/* $Id: dstref_data.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DstRefData) LassoIdWsf2DstRefData;
+#endif
+typedef struct {
+	int remaining;
+	int nextOffset;
+	char *setID;
+} LassoIdWsf2DstRefData;
+%extend LassoIdWsf2DstRefData {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DstRefData();
+	~LassoIdWsf2DstRefData();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DstRefData lasso_idwsf2_dstref_data_new
+#define delete_LassoIdWsf2DstRefData(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DstRefData_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/dstref_data_response.i b/swig/id-wsf-2.0/dstref_data_response.i
new file mode 100644
index 00000000..98e7b9c7
--- /dev/null
+++ b/swig/id-wsf-2.0/dstref_data_response.i
@@ -0,0 +1,54 @@
+/* $Id: dstref_data_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DstRefDataResponse) LassoIdWsf2DstRefDataResponse;
+#endif
+typedef struct {
+} LassoIdWsf2DstRefDataResponse;
+%extend LassoIdWsf2DstRefDataResponse {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DstRefDataResponse();
+	~LassoIdWsf2DstRefDataResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DstRefDataResponse lasso_idwsf2_dstref_data_response_new
+#define delete_LassoIdWsf2DstRefDataResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DstRefDataResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/dstref_delete.i b/swig/id-wsf-2.0/dstref_delete.i
new file mode 100644
index 00000000..6f8dbaae
--- /dev/null
+++ b/swig/id-wsf-2.0/dstref_delete.i
@@ -0,0 +1,54 @@
+/* $Id: dstref_delete.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DstRefDelete) LassoIdWsf2DstRefDelete;
+#endif
+typedef struct {
+} LassoIdWsf2DstRefDelete;
+%extend LassoIdWsf2DstRefDelete {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DstRefDelete();
+	~LassoIdWsf2DstRefDelete();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DstRefDelete lasso_idwsf2_dstref_delete_new
+#define delete_LassoIdWsf2DstRefDelete(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DstRefDelete_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/dstref_delete_item.i b/swig/id-wsf-2.0/dstref_delete_item.i
new file mode 100644
index 00000000..13075ebc
--- /dev/null
+++ b/swig/id-wsf-2.0/dstref_delete_item.i
@@ -0,0 +1,58 @@
+/* $Id: dstref_delete_item.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DstRefDeleteItem) LassoIdWsf2DstRefDeleteItem;
+#endif
+typedef struct {
+#ifndef SWIGPHP4
+	%rename(select) Select;
+#endif
+	char *Select;
+} LassoIdWsf2DstRefDeleteItem;
+%extend LassoIdWsf2DstRefDeleteItem {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DstRefDeleteItem();
+	~LassoIdWsf2DstRefDeleteItem();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DstRefDeleteItem lasso_idwsf2_dstref_delete_item_new
+#define delete_LassoIdWsf2DstRefDeleteItem(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DstRefDeleteItem_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/dstref_delete_response.i b/swig/id-wsf-2.0/dstref_delete_response.i
new file mode 100644
index 00000000..80055833
--- /dev/null
+++ b/swig/id-wsf-2.0/dstref_delete_response.i
@@ -0,0 +1,54 @@
+/* $Id: dstref_delete_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DstRefDeleteResponse) LassoIdWsf2DstRefDeleteResponse;
+#endif
+typedef struct {
+} LassoIdWsf2DstRefDeleteResponse;
+%extend LassoIdWsf2DstRefDeleteResponse {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DstRefDeleteResponse();
+	~LassoIdWsf2DstRefDeleteResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DstRefDeleteResponse lasso_idwsf2_dstref_delete_response_new
+#define delete_LassoIdWsf2DstRefDeleteResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DstRefDeleteResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/dstref_item_data.i b/swig/id-wsf-2.0/dstref_item_data.i
new file mode 100644
index 00000000..0fe5f903
--- /dev/null
+++ b/swig/id-wsf-2.0/dstref_item_data.i
@@ -0,0 +1,57 @@
+/* $Id: dstref_item_data.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DstRefItemData) LassoIdWsf2DstRefItemData;
+#endif
+typedef struct {
+	char *itemIDRef;
+	char *notSorted;
+	char *changeFormat;
+} LassoIdWsf2DstRefItemData;
+%extend LassoIdWsf2DstRefItemData {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DstRefItemData();
+	~LassoIdWsf2DstRefItemData();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DstRefItemData lasso_idwsf2_dstref_item_data_new
+#define delete_LassoIdWsf2DstRefItemData(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DstRefItemData_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/dstref_modify.i b/swig/id-wsf-2.0/dstref_modify.i
new file mode 100644
index 00000000..59f30f03
--- /dev/null
+++ b/swig/id-wsf-2.0/dstref_modify.i
@@ -0,0 +1,54 @@
+/* $Id: dstref_modify.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DstRefModify) LassoIdWsf2DstRefModify;
+#endif
+typedef struct {
+} LassoIdWsf2DstRefModify;
+%extend LassoIdWsf2DstRefModify {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DstRefModify();
+	~LassoIdWsf2DstRefModify();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DstRefModify lasso_idwsf2_dstref_modify_new
+#define delete_LassoIdWsf2DstRefModify(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DstRefModify_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/dstref_modify_item.i b/swig/id-wsf-2.0/dstref_modify_item.i
new file mode 100644
index 00000000..bad944b1
--- /dev/null
+++ b/swig/id-wsf-2.0/dstref_modify_item.i
@@ -0,0 +1,76 @@
+/* $Id: dstref_modify_item.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DstRefModifyItem) LassoIdWsf2DstRefModifyItem;
+#endif
+typedef struct {
+#ifndef SWIGPHP4
+	%rename(select) Select;
+#endif
+	char *Select;
+	char *notChangedSince;
+	gboolean overrideAllowed;
+	char *id;
+	char *itemID;
+} LassoIdWsf2DstRefModifyItem;
+%extend LassoIdWsf2DstRefModifyItem {
+
+#ifndef SWIGPHP4
+	%rename(newData) NewData;
+#endif
+	%newobject *NewData_get;
+	LassoIdWsf2DstRefAppData *NewData;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DstRefModifyItem();
+	~LassoIdWsf2DstRefModifyItem();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* NewData */
+
+#define LassoIdWsf2DstRefModifyItem_get_NewData(self) get_node((self)->NewData)
+#define LassoIdWsf2DstRefModifyItem_NewData_get(self) get_node((self)->NewData)
+#define LassoIdWsf2DstRefModifyItem_set_NewData(self,value) set_node((gpointer*)&(self)->NewData, (value))
+#define LassoIdWsf2DstRefModifyItem_NewData_set(self,value) set_node((gpointer*)&(self)->NewData, (value))
+                    
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DstRefModifyItem lasso_idwsf2_dstref_modify_item_new
+#define delete_LassoIdWsf2DstRefModifyItem(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DstRefModifyItem_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/dstref_modify_response.i b/swig/id-wsf-2.0/dstref_modify_response.i
new file mode 100644
index 00000000..a0ab47c4
--- /dev/null
+++ b/swig/id-wsf-2.0/dstref_modify_response.i
@@ -0,0 +1,54 @@
+/* $Id: dstref_modify_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DstRefModifyResponse) LassoIdWsf2DstRefModifyResponse;
+#endif
+typedef struct {
+} LassoIdWsf2DstRefModifyResponse;
+%extend LassoIdWsf2DstRefModifyResponse {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DstRefModifyResponse();
+	~LassoIdWsf2DstRefModifyResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DstRefModifyResponse lasso_idwsf2_dstref_modify_response_new
+#define delete_LassoIdWsf2DstRefModifyResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DstRefModifyResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/dstref_query.i b/swig/id-wsf-2.0/dstref_query.i
new file mode 100644
index 00000000..c0dbd5a4
--- /dev/null
+++ b/swig/id-wsf-2.0/dstref_query.i
@@ -0,0 +1,54 @@
+/* $Id: dstref_query.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DstRefQuery) LassoIdWsf2DstRefQuery;
+#endif
+typedef struct {
+} LassoIdWsf2DstRefQuery;
+%extend LassoIdWsf2DstRefQuery {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DstRefQuery();
+	~LassoIdWsf2DstRefQuery();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DstRefQuery lasso_idwsf2_dstref_query_new
+#define delete_LassoIdWsf2DstRefQuery(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DstRefQuery_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/dstref_query_item.i b/swig/id-wsf-2.0/dstref_query_item.i
new file mode 100644
index 00000000..661f0393
--- /dev/null
+++ b/swig/id-wsf-2.0/dstref_query_item.i
@@ -0,0 +1,58 @@
+/* $Id: dstref_query_item.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DstRefQueryItem) LassoIdWsf2DstRefQueryItem;
+#endif
+typedef struct {
+	int count;
+	int offset;
+	char *setID;
+	char *setReq;
+} LassoIdWsf2DstRefQueryItem;
+%extend LassoIdWsf2DstRefQueryItem {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DstRefQueryItem();
+	~LassoIdWsf2DstRefQueryItem();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DstRefQueryItem lasso_idwsf2_dstref_query_item_new
+#define delete_LassoIdWsf2DstRefQueryItem(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DstRefQueryItem_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/dstref_query_response.i b/swig/id-wsf-2.0/dstref_query_response.i
new file mode 100644
index 00000000..7f8a5513
--- /dev/null
+++ b/swig/id-wsf-2.0/dstref_query_response.i
@@ -0,0 +1,54 @@
+/* $Id: dstref_query_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DstRefQueryResponse) LassoIdWsf2DstRefQueryResponse;
+#endif
+typedef struct {
+} LassoIdWsf2DstRefQueryResponse;
+%extend LassoIdWsf2DstRefQueryResponse {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DstRefQueryResponse();
+	~LassoIdWsf2DstRefQueryResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DstRefQueryResponse lasso_idwsf2_dstref_query_response_new
+#define delete_LassoIdWsf2DstRefQueryResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DstRefQueryResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/dstref_result_query.i b/swig/id-wsf-2.0/dstref_result_query.i
new file mode 100644
index 00000000..51a7a482
--- /dev/null
+++ b/swig/id-wsf-2.0/dstref_result_query.i
@@ -0,0 +1,62 @@
+/* $Id: dstref_result_query.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DstRefResultQuery) LassoIdWsf2DstRefResultQuery;
+#endif
+typedef struct {
+#ifndef SWIGPHP4
+	%rename(select) Select;
+#endif
+	char *Select;
+#ifndef SWIGPHP4
+	%rename(sort) Sort;
+#endif
+	char *Sort;
+} LassoIdWsf2DstRefResultQuery;
+%extend LassoIdWsf2DstRefResultQuery {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DstRefResultQuery();
+	~LassoIdWsf2DstRefResultQuery();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DstRefResultQuery lasso_idwsf2_dstref_result_query_new
+#define delete_LassoIdWsf2DstRefResultQuery(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DstRefResultQuery_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/dstref_test_item.i b/swig/id-wsf-2.0/dstref_test_item.i
new file mode 100644
index 00000000..6c114099
--- /dev/null
+++ b/swig/id-wsf-2.0/dstref_test_item.i
@@ -0,0 +1,58 @@
+/* $Id: dstref_test_item.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2DstRefTestItem) LassoIdWsf2DstRefTestItem;
+#endif
+typedef struct {
+#ifndef SWIGPHP4
+	%rename(testOp) TestOp;
+#endif
+	char *TestOp;
+} LassoIdWsf2DstRefTestItem;
+%extend LassoIdWsf2DstRefTestItem {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2DstRefTestItem();
+	~LassoIdWsf2DstRefTestItem();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2DstRefTestItem lasso_idwsf2_dstref_test_item_new
+#define delete_LassoIdWsf2DstRefTestItem(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2DstRefTestItem_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ims_identity_mapping_request.i b/swig/id-wsf-2.0/ims_identity_mapping_request.i
new file mode 100644
index 00000000..670533bb
--- /dev/null
+++ b/swig/id-wsf-2.0/ims_identity_mapping_request.i
@@ -0,0 +1,67 @@
+/* $Id: ims_identity_mapping_request.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2ImsIdentityMappingRequest) LassoIdWsf2ImsIdentityMappingRequest;
+#endif
+typedef struct {
+} LassoIdWsf2ImsIdentityMappingRequest;
+%extend LassoIdWsf2ImsIdentityMappingRequest {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2ImsIdentityMappingRequest();
+	~LassoIdWsf2ImsIdentityMappingRequest();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2ImsIdentityMappingRequest_attributes_get(LassoIdWsf2ImsIdentityMappingRequest *self);
+#define LassoIdWsf2ImsIdentityMappingRequest_get_attributes LassoIdWsf2ImsIdentityMappingRequest_attributes_get
+LassoStringDict* LassoIdWsf2ImsIdentityMappingRequest_attributes_get(LassoIdWsf2ImsIdentityMappingRequest *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2ImsIdentityMappingRequest lasso_idwsf2_ims_identity_mapping_request_new
+#define delete_LassoIdWsf2ImsIdentityMappingRequest(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2ImsIdentityMappingRequest_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ims_identity_mapping_response.i b/swig/id-wsf-2.0/ims_identity_mapping_response.i
new file mode 100644
index 00000000..bccc5fce
--- /dev/null
+++ b/swig/id-wsf-2.0/ims_identity_mapping_response.i
@@ -0,0 +1,81 @@
+/* $Id: ims_identity_mapping_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2ImsIdentityMappingResponse) LassoIdWsf2ImsIdentityMappingResponse;
+#endif
+typedef struct {
+} LassoIdWsf2ImsIdentityMappingResponse;
+%extend LassoIdWsf2ImsIdentityMappingResponse {
+
+#ifndef SWIGPHP4
+	%rename(status) Status;
+#endif
+	%newobject *Status_get;
+	LassoIdWsf2UtilStatus *Status;
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2ImsIdentityMappingResponse();
+	~LassoIdWsf2ImsIdentityMappingResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* Status */
+
+#define LassoIdWsf2ImsIdentityMappingResponse_get_Status(self) get_node((self)->Status)
+#define LassoIdWsf2ImsIdentityMappingResponse_Status_get(self) get_node((self)->Status)
+#define LassoIdWsf2ImsIdentityMappingResponse_set_Status(self,value) set_node((gpointer*)&(self)->Status, (value))
+#define LassoIdWsf2ImsIdentityMappingResponse_Status_set(self,value) set_node((gpointer*)&(self)->Status, (value))
+                    
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2ImsIdentityMappingResponse_attributes_get(LassoIdWsf2ImsIdentityMappingResponse *self);
+#define LassoIdWsf2ImsIdentityMappingResponse_get_attributes LassoIdWsf2ImsIdentityMappingResponse_attributes_get
+LassoStringDict* LassoIdWsf2ImsIdentityMappingResponse_attributes_get(LassoIdWsf2ImsIdentityMappingResponse *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2ImsIdentityMappingResponse lasso_idwsf2_ims_identity_mapping_response_new
+#define delete_LassoIdWsf2ImsIdentityMappingResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2ImsIdentityMappingResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ims_mapping_input.i b/swig/id-wsf-2.0/ims_mapping_input.i
new file mode 100644
index 00000000..3c9fadef
--- /dev/null
+++ b/swig/id-wsf-2.0/ims_mapping_input.i
@@ -0,0 +1,55 @@
+/* $Id: ims_mapping_input.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2ImsMappingInput) LassoIdWsf2ImsMappingInput;
+#endif
+typedef struct {
+	char *reqID;
+} LassoIdWsf2ImsMappingInput;
+%extend LassoIdWsf2ImsMappingInput {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2ImsMappingInput();
+	~LassoIdWsf2ImsMappingInput();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2ImsMappingInput lasso_idwsf2_ims_mapping_input_new
+#define delete_LassoIdWsf2ImsMappingInput(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2ImsMappingInput_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ims_mapping_output.i b/swig/id-wsf-2.0/ims_mapping_output.i
new file mode 100644
index 00000000..02fce918
--- /dev/null
+++ b/swig/id-wsf-2.0/ims_mapping_output.i
@@ -0,0 +1,55 @@
+/* $Id: ims_mapping_output.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2ImsMappingOutput) LassoIdWsf2ImsMappingOutput;
+#endif
+typedef struct {
+	char *reqRef;
+} LassoIdWsf2ImsMappingOutput;
+%extend LassoIdWsf2ImsMappingOutput {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2ImsMappingOutput();
+	~LassoIdWsf2ImsMappingOutput();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2ImsMappingOutput lasso_idwsf2_ims_mapping_output_new
+#define delete_LassoIdWsf2ImsMappingOutput(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2ImsMappingOutput_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/inheritance.h b/swig/id-wsf-2.0/inheritance.h
index 624ab9cd..6bdce119 100644
--- a/swig/id-wsf-2.0/inheritance.h
+++ b/swig/id-wsf-2.0/inheritance.h
@@ -1 +1,136 @@
+SET_NODE_INFO(IdWsf2Sb2Sender, Node)
+SET_NODE_INFO(IdWsf2Sb2Consent, Node)
+SET_NODE_INFO(IdWsf2Sb2RedirectRequest, Node)
+SET_NODE_INFO(IdWsf2Sb2UserInteractionHeader, Node)
+SET_NODE_INFO(IdWsf2Sb2UsageDirective, Node)
+SET_NODE_INFO(IdWsf2Sb2TargetIdentity, Node)
+SET_NODE_INFO(IdWsf2Sb2Timeout, Node)
+SET_NODE_INFO(IdWsf2Sb2CredentialsContext, Node)
+SET_NODE_INFO(IdWsf2PsObject, Node)
+SET_NODE_INFO(IdWsf2PsRequestAbstract, Node)
+SET_NODE_INFO(IdWsf2PsTestMembershipRequest, IdWsf2PsRequestAbstract)
+SET_NODE_INFO(IdWsf2PsRemoveEntityRequest, IdWsf2PsRequestAbstract)
+SET_NODE_INFO(IdWsf2PsAddToCollectionRequest, IdWsf2PsRequestAbstract)
+SET_NODE_INFO(IdWsf2PsRemoveCollectionRequest, IdWsf2PsRequestAbstract)
+SET_NODE_INFO(IdWsf2PsAddKnownEntityRequest, IdWsf2PsRequestAbstract)
+SET_NODE_INFO(IdWsf2PsAddEntityRequest, IdWsf2PsRequestAbstract)
+SET_NODE_INFO(IdWsf2PsRemoveFromCollectionRequest, IdWsf2PsRequestAbstract)
+SET_NODE_INFO(IdWsf2PsListMembersRequest, IdWsf2PsRequestAbstract)
+SET_NODE_INFO(IdWsf2PsQueryObjectsRequest, IdWsf2PsRequestAbstract)
+SET_NODE_INFO(IdWsf2PsSetObjectInfoRequest, IdWsf2PsRequestAbstract)
+SET_NODE_INFO(IdWsf2PsGetObjectInfoRequest, IdWsf2PsRequestAbstract)
+SET_NODE_INFO(IdWsf2PsItemData, Node)
+SET_NODE_INFO(IdWsf2PsResponseAbstract, Node)
+SET_NODE_INFO(IdWsf2PsAddKnownEntityResponse, IdWsf2PsResponseAbstract)
+SET_NODE_INFO(IdWsf2PsAddEntityResponse, IdWsf2PsResponseAbstract)
+SET_NODE_INFO(IdWsf2PsAddCollectionResponse, IdWsf2PsResponseAbstract)
+SET_NODE_INFO(IdWsf2PsQueryObjectsResponse, IdWsf2PsResponseAbstract)
+SET_NODE_INFO(IdWsf2PsListMembersResponse, IdWsf2PsResponseAbstract)
+SET_NODE_INFO(IdWsf2PsGetObjectInfoResponse, IdWsf2PsResponseAbstract)
+SET_NODE_INFO(IdWsf2PsResolveIdentifierResponse, IdWsf2PsResponseAbstract)
+SET_NODE_INFO(IdWsf2PsResolveIdentifierRequest, IdWsf2PsRequestAbstract)
+SET_NODE_INFO(IdWsf2PsTestMembershipResponse, IdWsf2PsResponseAbstract)
+SET_NODE_INFO(IdWsf2PsAddCollectionRequest, IdWsf2PsRequestAbstract)
+SET_NODE_INFO(IdWsf2PsNotify, IdWsf2PsRequestAbstract)
+SET_NODE_INFO(IdWsf2SubsRefAppData, Node)
+SET_NODE_INFO(IdWsf2SubsRefCreateItem, Node)
+SET_NODE_INFO(IdWsf2SubsRefModifyItem, Node)
+SET_NODE_INFO(IdWsf2SubsRefItemData, IdWsf2SubsRefAppData)
+SET_NODE_INFO(IdWsf2SubsRefData, IdWsf2SubsRefItemData)
+SET_NODE_INFO(IdWsf2SubsNotification, Node)
+SET_NODE_INFO(IdWsf2PsNotification, IdWsf2SubsNotification)
+SET_NODE_INFO(IdWsf2SubsRefNotification, IdWsf2SubsNotification)
+SET_NODE_INFO(IdWsf2SubsRefItem, Node)
+SET_NODE_INFO(IdWsf2SubsSubscription, Node)
+SET_NODE_INFO(IdWsf2SubsRefSubscription, IdWsf2SubsSubscription)
+SET_NODE_INFO(IdWsf2Sb2EndpointUpdate, WsAddrEndpointReference)
+SET_NODE_INFO(IdWsf2DstResultQueryBase, Node)
+SET_NODE_INFO(IdWsf2SubsRefResultQuery, IdWsf2DstResultQueryBase)
+SET_NODE_INFO(IdWsf2SubsRefQueryItem, IdWsf2SubsRefResultQuery)
+SET_NODE_INFO(IdWsf2DstRequest, Node)
+SET_NODE_INFO(IdWsf2SubsRefCreate, IdWsf2DstRequest)
+SET_NODE_INFO(IdWsf2SubsRefModify, IdWsf2DstRequest)
+SET_NODE_INFO(IdWsf2SubsRefDelete, IdWsf2DstRequest)
+SET_NODE_INFO(IdWsf2SubsRefNotify, IdWsf2DstRequest)
+SET_NODE_INFO(IdWsf2SubsRefQuery, IdWsf2DstRequest)
+SET_NODE_INFO(IdWsf2DstDeleteItemBase, Node)
+SET_NODE_INFO(IdWsf2SubsRefDeleteItem, IdWsf2DstDeleteItemBase)
+SET_NODE_INFO(IdWsf2DstTestItemBase, Node)
+SET_NODE_INFO(IdWsf2SubsRefTestItem, IdWsf2DstTestItemBase)
+SET_NODE_INFO(IdWsf2DiscoEndpointContext, Node)
+SET_NODE_INFO(IdWsf2DiscoSvcMDReplace, Node)
+SET_NODE_INFO(IdWsf2DiscoSvcMDQuery, Node)
+SET_NODE_INFO(IdWsf2DiscoKeys, Node)
 SET_NODE_INFO(IdWsf2DiscoSvcMetadata, Node)
+SET_NODE_INFO(IdWsf2DiscoOptions, Node)
+SET_NODE_INFO(IdWsf2DiscoProviderID, Node)
+SET_NODE_INFO(IdWsf2DiscoSecurityContext, Node)
+SET_NODE_INFO(IdWsf2DiscoSvcMDReplaceResponse, Node)
+SET_NODE_INFO(IdWsf2DiscoSvcMDDelete, Node)
+SET_NODE_INFO(IdWsf2DiscoServiceType, Node)
+SET_NODE_INFO(IdWsf2DiscoSvcMDRegister, Node)
+SET_NODE_INFO(IdWsf2DiscoSvcMDAssociationDeleteResponse, Node)
+SET_NODE_INFO(IdWsf2DiscoSvcMDAssociationAdd, Node)
+SET_NODE_INFO(IdWsf2DiscoSvcMDRegisterResponse, Node)
+SET_NODE_INFO(IdWsf2DiscoRequestedService, Node)
+SET_NODE_INFO(IdWsf2DiscoSvcMDAssociationQuery, Node)
+SET_NODE_INFO(IdWsf2DiscoSvcMDAssociationDelete, Node)
+SET_NODE_INFO(IdWsf2DiscoSvcMDAssociationAddResponse, Node)
+SET_NODE_INFO(IdWsf2DiscoSvcMDAssociationQueryResponse, Node)
+SET_NODE_INFO(IdWsf2DiscoSvcMDDeleteResponse, Node)
+SET_NODE_INFO(IdWsf2DiscoSvcMDQueryResponse, Node)
+SET_NODE_INFO(IdWsf2DiscoAbstract, Node)
+SET_NODE_INFO(IdWsf2DiscoServiceContext, Node)
+SET_NODE_INFO(IdWsf2DiscoQuery, Node)
+SET_NODE_INFO(IdWsf2DiscoQueryResponse, Node)
+SET_NODE_INFO(IdWsf2UtilStatus, Node)
+SET_NODE_INFO(IdWsf2Utilextension, Node)
+SET_NODE_INFO(IdWsf2UtilResponse, Node)
+SET_NODE_INFO(IdWsf2SubsRefDeleteResponse, IdWsf2UtilResponse)
+SET_NODE_INFO(IdWsf2SubsNotifyResponse, IdWsf2UtilResponse)
+SET_NODE_INFO(IdWsf2SubsRefNotifyResponse, IdWsf2SubsNotifyResponse)
+SET_NODE_INFO(IdWsf2DstDeleteResponse, IdWsf2UtilResponse)
+SET_NODE_INFO(IdWsf2DstDataResponseBase, IdWsf2UtilResponse)
+SET_NODE_INFO(IdWsf2SubsRefDataResponse, IdWsf2DstDataResponseBase)
+SET_NODE_INFO(IdWsf2SubsRefModifyResponse, IdWsf2SubsRefDataResponse)
+SET_NODE_INFO(IdWsf2SubsRefCreateResponse, IdWsf2SubsRefDataResponse)
+SET_NODE_INFO(IdWsf2SubsRefQueryResponse, IdWsf2DstDataResponseBase)
+SET_NODE_INFO(IdWsf2UtilEmpty, Node)
+SET_NODE_INFO(IdWsf2ImsMappingOutput, Node)
+SET_NODE_INFO(IdWsf2ImsIdentityMappingRequest, Node)
+SET_NODE_INFO(IdWsf2ImsMappingInput, Node)
+SET_NODE_INFO(IdWsf2PsResolveInput, IdWsf2ImsMappingInput)
+SET_NODE_INFO(IdWsf2ImsIdentityMappingResponse, Node)
+SET_NODE_INFO(IdWsf2SecTransitedProviderPath, Node)
+SET_NODE_INFO(IdWsf2SecToken, Node)
+SET_NODE_INFO(IdWsf2SecTokenPolicy, Node)
+SET_NODE_INFO(IdWsf2SbfFramework, Node)
+SET_NODE_INFO(IdWsf2DstRefDataResponse, IdWsf2DstDataResponseBase)
+SET_NODE_INFO(IdWsf2DstRefDeleteResponse, IdWsf2UtilResponse)
+SET_NODE_INFO(IdWsf2DstRefModifyItem, Node)
+SET_NODE_INFO(IdWsf2DstRefAppData, Node)
+SET_NODE_INFO(IdWsf2DstRefTestItem, IdWsf2DstTestItemBase)
+SET_NODE_INFO(IdWsf2DstRefCreate, IdWsf2DstRequest)
+SET_NODE_INFO(IdWsf2DstRefItemData, Node)
+SET_NODE_INFO(IdWsf2DstRefData, IdWsf2DstRefItemData)
+SET_NODE_INFO(IdWsf2DstRefModify, IdWsf2DstRequest)
+SET_NODE_INFO(IdWsf2DstRefResultQuery, IdWsf2DstResultQueryBase)
+SET_NODE_INFO(IdWsf2DstRefQueryItem, IdWsf2DstRefResultQuery)
+SET_NODE_INFO(IdWsf2DstRefCreateResponse, IdWsf2DstRefDataResponse)
+SET_NODE_INFO(IdWsf2DstRefCreateItem, Node)
+SET_NODE_INFO(IdWsf2DstRefQuery, IdWsf2DstRequest)
+SET_NODE_INFO(IdWsf2DstRefDelete, IdWsf2DstRequest)
+SET_NODE_INFO(IdWsf2DstRefQueryResponse, IdWsf2DstDataResponseBase)
+SET_NODE_INFO(IdWsf2DstRefDeleteItem, IdWsf2DstDeleteItemBase)
+SET_NODE_INFO(IdWsf2DstRefModifyResponse, IdWsf2DstRefDataResponse)
+SET_NODE_INFO(IdWsf2IsInteractionStatement, Node)
+SET_NODE_INFO(IdWsf2IsHelp, Node)
+SET_NODE_INFO(IdWsf2IsInquiryElement, Node)
+SET_NODE_INFO(IdWsf2IsText, IdWsf2IsInquiryElement)
+SET_NODE_INFO(IdWsf2IsInteractionResponse, Node)
+SET_NODE_INFO(IdWsf2IsInteractionRequest, Node)
+SET_NODE_INFO(IdWsf2IsItem, Node)
+SET_NODE_INFO(IdWsf2IsInquiry, Node)
+SET_NODE_INFO(IdWsf2IsParameter, Node)
+SET_NODE_INFO(IdWsf2IsSelect, IdWsf2IsInquiryElement)
+
diff --git a/swig/id-wsf-2.0/is_help.i b/swig/id-wsf-2.0/is_help.i
new file mode 100644
index 00000000..1cec40ef
--- /dev/null
+++ b/swig/id-wsf-2.0/is_help.i
@@ -0,0 +1,57 @@
+/* $Id: is_help.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2IsHelp) LassoIdWsf2IsHelp;
+#endif
+typedef struct {
+	char *label;
+	char *link;
+	char *moreLink;
+} LassoIdWsf2IsHelp;
+%extend LassoIdWsf2IsHelp {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2IsHelp();
+	~LassoIdWsf2IsHelp();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2IsHelp lasso_idwsf2_is_help_new
+#define delete_LassoIdWsf2IsHelp(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2IsHelp_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/is_inquiry.i b/swig/id-wsf-2.0/is_inquiry.i
new file mode 100644
index 00000000..25a4b87c
--- /dev/null
+++ b/swig/id-wsf-2.0/is_inquiry.i
@@ -0,0 +1,56 @@
+/* $Id: is_inquiry.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2IsInquiry) LassoIdWsf2IsInquiry;
+#endif
+typedef struct {
+	char *id;
+	char *title;
+} LassoIdWsf2IsInquiry;
+%extend LassoIdWsf2IsInquiry {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2IsInquiry();
+	~LassoIdWsf2IsInquiry();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2IsInquiry lasso_idwsf2_is_inquiry_new
+#define delete_LassoIdWsf2IsInquiry(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2IsInquiry_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/is_inquiry_element.i b/swig/id-wsf-2.0/is_inquiry_element.i
new file mode 100644
index 00000000..162ff267
--- /dev/null
+++ b/swig/id-wsf-2.0/is_inquiry_element.i
@@ -0,0 +1,67 @@
+/* $Id: is_inquiry_element.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2IsInquiryElement) LassoIdWsf2IsInquiryElement;
+#endif
+typedef struct {
+#ifndef SWIGPHP4
+	%rename(hint) Hint;
+#endif
+	char *Hint;
+#ifndef SWIGPHP4
+	%rename(label) Label;
+#endif
+	char *Label;
+#ifndef SWIGPHP4
+	%rename(value) Value;
+#endif
+	char *Value;
+	char *name;
+} LassoIdWsf2IsInquiryElement;
+%extend LassoIdWsf2IsInquiryElement {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2IsInquiryElement();
+	~LassoIdWsf2IsInquiryElement();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2IsInquiryElement lasso_idwsf2_is_inquiry_element_new
+#define delete_LassoIdWsf2IsInquiryElement(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2IsInquiryElement_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/is_interaction_request.i b/swig/id-wsf-2.0/is_interaction_request.i
new file mode 100644
index 00000000..bc00731a
--- /dev/null
+++ b/swig/id-wsf-2.0/is_interaction_request.i
@@ -0,0 +1,58 @@
+/* $Id: is_interaction_request.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2IsInteractionRequest) LassoIdWsf2IsInteractionRequest;
+#endif
+typedef struct {
+	char *id;
+	char *language;
+	int maxInteractTime;
+	char *signed_;
+} LassoIdWsf2IsInteractionRequest;
+%extend LassoIdWsf2IsInteractionRequest {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2IsInteractionRequest();
+	~LassoIdWsf2IsInteractionRequest();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2IsInteractionRequest lasso_idwsf2_is_interaction_request_new
+#define delete_LassoIdWsf2IsInteractionRequest(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2IsInteractionRequest_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/is_interaction_response.i b/swig/id-wsf-2.0/is_interaction_response.i
new file mode 100644
index 00000000..4b30f782
--- /dev/null
+++ b/swig/id-wsf-2.0/is_interaction_response.i
@@ -0,0 +1,68 @@
+/* $Id: is_interaction_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2IsInteractionResponse) LassoIdWsf2IsInteractionResponse;
+#endif
+typedef struct {
+} LassoIdWsf2IsInteractionResponse;
+%extend LassoIdWsf2IsInteractionResponse {
+
+#ifndef SWIGPHP4
+	%rename(status) Status;
+#endif
+	%newobject *Status_get;
+	LassoIdWsf2UtilStatus *Status;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2IsInteractionResponse();
+	~LassoIdWsf2IsInteractionResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* Status */
+
+#define LassoIdWsf2IsInteractionResponse_get_Status(self) get_node((self)->Status)
+#define LassoIdWsf2IsInteractionResponse_Status_get(self) get_node((self)->Status)
+#define LassoIdWsf2IsInteractionResponse_set_Status(self,value) set_node((gpointer*)&(self)->Status, (value))
+#define LassoIdWsf2IsInteractionResponse_Status_set(self,value) set_node((gpointer*)&(self)->Status, (value))
+                    
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2IsInteractionResponse lasso_idwsf2_is_interaction_response_new
+#define delete_LassoIdWsf2IsInteractionResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2IsInteractionResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/is_interaction_statement.i b/swig/id-wsf-2.0/is_interaction_statement.i
new file mode 100644
index 00000000..aad46a1d
--- /dev/null
+++ b/swig/id-wsf-2.0/is_interaction_statement.i
@@ -0,0 +1,54 @@
+/* $Id: is_interaction_statement.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2IsInteractionStatement) LassoIdWsf2IsInteractionStatement;
+#endif
+typedef struct {
+} LassoIdWsf2IsInteractionStatement;
+%extend LassoIdWsf2IsInteractionStatement {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2IsInteractionStatement();
+	~LassoIdWsf2IsInteractionStatement();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2IsInteractionStatement lasso_idwsf2_is_interaction_statement_new
+#define delete_LassoIdWsf2IsInteractionStatement(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2IsInteractionStatement_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/is_item.i b/swig/id-wsf-2.0/is_item.i
new file mode 100644
index 00000000..bc419596
--- /dev/null
+++ b/swig/id-wsf-2.0/is_item.i
@@ -0,0 +1,60 @@
+/* $Id: is_item.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2IsItem) LassoIdWsf2IsItem;
+#endif
+typedef struct {
+#ifndef SWIGPHP4
+	%rename(hint) Hint;
+#endif
+	char *Hint;
+	char *label;
+	char *value;
+} LassoIdWsf2IsItem;
+%extend LassoIdWsf2IsItem {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2IsItem();
+	~LassoIdWsf2IsItem();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2IsItem lasso_idwsf2_is_item_new
+#define delete_LassoIdWsf2IsItem(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2IsItem_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/is_parameter.i b/swig/id-wsf-2.0/is_parameter.i
new file mode 100644
index 00000000..ebd938dd
--- /dev/null
+++ b/swig/id-wsf-2.0/is_parameter.i
@@ -0,0 +1,56 @@
+/* $Id: is_parameter.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2IsParameter) LassoIdWsf2IsParameter;
+#endif
+typedef struct {
+	char *name;
+	char *value;
+} LassoIdWsf2IsParameter;
+%extend LassoIdWsf2IsParameter {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2IsParameter();
+	~LassoIdWsf2IsParameter();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2IsParameter lasso_idwsf2_is_parameter_new
+#define delete_LassoIdWsf2IsParameter(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2IsParameter_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/is_select.i b/swig/id-wsf-2.0/is_select.i
new file mode 100644
index 00000000..7ff4d2e9
--- /dev/null
+++ b/swig/id-wsf-2.0/is_select.i
@@ -0,0 +1,54 @@
+/* $Id: is_select.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2IsSelect) LassoIdWsf2IsSelect;
+#endif
+typedef struct {
+} LassoIdWsf2IsSelect;
+%extend LassoIdWsf2IsSelect {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2IsSelect();
+	~LassoIdWsf2IsSelect();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2IsSelect lasso_idwsf2_is_select_new
+#define delete_LassoIdWsf2IsSelect(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2IsSelect_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/is_text.i b/swig/id-wsf-2.0/is_text.i
new file mode 100644
index 00000000..6871a3e7
--- /dev/null
+++ b/swig/id-wsf-2.0/is_text.i
@@ -0,0 +1,57 @@
+/* $Id: is_text.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2IsText) LassoIdWsf2IsText;
+#endif
+typedef struct {
+	int minChars;
+	int maxChars;
+	char *format;
+} LassoIdWsf2IsText;
+%extend LassoIdWsf2IsText {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2IsText();
+	~LassoIdWsf2IsText();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2IsText lasso_idwsf2_is_text_new
+#define delete_LassoIdWsf2IsText(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2IsText_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/main.h b/swig/id-wsf-2.0/main.h
index e130d852..e78b5ae7 100644
--- a/swig/id-wsf-2.0/main.h
+++ b/swig/id-wsf-2.0/main.h
@@ -1,5 +1,272 @@
 %{
+#include <lasso/xml/id-wsf-2.0/sb2_sender.h>
+#include <lasso/xml/id-wsf-2.0/sb2_consent.h>
+#include <lasso/xml/id-wsf-2.0/sb2_redirect_request.h>
+#include <lasso/xml/id-wsf-2.0/sb2_user_interaction_header.h>
+#include <lasso/xml/id-wsf-2.0/sb2_usage_directive.h>
+#include <lasso/xml/id-wsf-2.0/sb2_target_identity.h>
+#include <lasso/xml/id-wsf-2.0/sb2_timeout.h>
+#include <lasso/xml/id-wsf-2.0/sb2_credentials_context.h>
+#include <lasso/xml/id-wsf-2.0/ps_object.h>
+#include <lasso/xml/id-wsf-2.0/ps_request_abstract.h>
+#include <lasso/xml/id-wsf-2.0/ps_test_membership_request.h>
+#include <lasso/xml/id-wsf-2.0/ps_remove_entity_request.h>
+#include <lasso/xml/id-wsf-2.0/ps_add_to_collection_request.h>
+#include <lasso/xml/id-wsf-2.0/ps_remove_collection_request.h>
+#include <lasso/xml/id-wsf-2.0/ps_add_known_entity_request.h>
+#include <lasso/xml/id-wsf-2.0/ps_add_entity_request.h>
+#include <lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.h>
+#include <lasso/xml/id-wsf-2.0/ps_list_members_request.h>
+#include <lasso/xml/id-wsf-2.0/ps_query_objects_request.h>
+#include <lasso/xml/id-wsf-2.0/ps_set_object_info_request.h>
+#include <lasso/xml/id-wsf-2.0/ps_get_object_info_request.h>
+#include <lasso/xml/id-wsf-2.0/ps_item_data.h>
+#include <lasso/xml/id-wsf-2.0/ps_response_abstract.h>
+#include <lasso/xml/id-wsf-2.0/ps_add_known_entity_response.h>
+#include <lasso/xml/id-wsf-2.0/ps_add_entity_response.h>
+#include <lasso/xml/id-wsf-2.0/ps_add_collection_response.h>
+#include <lasso/xml/id-wsf-2.0/ps_query_objects_response.h>
+#include <lasso/xml/id-wsf-2.0/ps_list_members_response.h>
+#include <lasso/xml/id-wsf-2.0/ps_get_object_info_response.h>
+#include <lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.h>
+#include <lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.h>
+#include <lasso/xml/id-wsf-2.0/ps_test_membership_response.h>
+#include <lasso/xml/id-wsf-2.0/ps_add_collection_request.h>
+#include <lasso/xml/id-wsf-2.0/ps_notify.h>
+#include <lasso/xml/id-wsf-2.0/subsref_app_data.h>
+#include <lasso/xml/id-wsf-2.0/subsref_create_item.h>
+#include <lasso/xml/id-wsf-2.0/subsref_modify_item.h>
+#include <lasso/xml/id-wsf-2.0/subsref_item_data.h>
+#include <lasso/xml/id-wsf-2.0/subsref_data.h>
+#include <lasso/xml/id-wsf-2.0/subs_notification.h>
+#include <lasso/xml/id-wsf-2.0/ps_notification.h>
+#include <lasso/xml/id-wsf-2.0/subsref_notification.h>
+#include <lasso/xml/id-wsf-2.0/subs_ref_item.h>
+#include <lasso/xml/id-wsf-2.0/subs_subscription.h>
+#include <lasso/xml/id-wsf-2.0/subsref_subscription.h>
+#include <lasso/xml/id-wsf-2.0/sb2_endpoint_update.h>
+#include <lasso/xml/id-wsf-2.0/dst_result_query_base.h>
+#include <lasso/xml/id-wsf-2.0/subsref_result_query.h>
+#include <lasso/xml/id-wsf-2.0/subsref_query_item.h>
+#include <lasso/xml/id-wsf-2.0/dst_request.h>
+#include <lasso/xml/id-wsf-2.0/subsref_create.h>
+#include <lasso/xml/id-wsf-2.0/subsref_modify.h>
+#include <lasso/xml/id-wsf-2.0/subsref_delete.h>
+#include <lasso/xml/id-wsf-2.0/subsref_notify.h>
+#include <lasso/xml/id-wsf-2.0/subsref_query.h>
+#include <lasso/xml/id-wsf-2.0/dst_delete_item_base.h>
+#include <lasso/xml/id-wsf-2.0/subsref_delete_item.h>
+#include <lasso/xml/id-wsf-2.0/dst_test_item_base.h>
+#include <lasso/xml/id-wsf-2.0/subsref_test_item.h>
+#include <lasso/xml/id-wsf-2.0/disco_endpoint_context.h>
+#include <lasso/xml/id-wsf-2.0/disco_svc_md_replace.h>
+#include <lasso/xml/id-wsf-2.0/disco_svc_md_query.h>
+#include <lasso/xml/id-wsf-2.0/disco_keys.h>
 #include <lasso/xml/id-wsf-2.0/disco_svc_metadata.h>
+#include <lasso/xml/id-wsf-2.0/disco_options.h>
+#include <lasso/xml/id-wsf-2.0/disco_provider_id.h>
+#include <lasso/xml/id-wsf-2.0/disco_security_context.h>
+#include <lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.h>
+#include <lasso/xml/id-wsf-2.0/disco_svc_md_delete.h>
+#include <lasso/xml/id-wsf-2.0/disco_service_type.h>
+#include <lasso/xml/id-wsf-2.0/disco_svc_md_register.h>
+#include <lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.h>
+#include <lasso/xml/id-wsf-2.0/disco_svc_md_association_add.h>
+#include <lasso/xml/id-wsf-2.0/disco_svc_md_register_response.h>
+#include <lasso/xml/id-wsf-2.0/disco_requested_service.h>
+#include <lasso/xml/id-wsf-2.0/disco_svc_md_association_query.h>
+#include <lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.h>
+#include <lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.h>
+#include <lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.h>
+#include <lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.h>
+#include <lasso/xml/id-wsf-2.0/disco_svc_md_query_response.h>
+#include <lasso/xml/id-wsf-2.0/disco_abstract.h>
+#include <lasso/xml/id-wsf-2.0/disco_service_context.h>
+#include <lasso/xml/id-wsf-2.0/disco_query.h>
+#include <lasso/xml/id-wsf-2.0/disco_query_response.h>
+#include <lasso/xml/id-wsf-2.0/util_status.h>
+#include <lasso/xml/id-wsf-2.0/util_extension.h>
+#include <lasso/xml/id-wsf-2.0/util_response.h>
+#include <lasso/xml/id-wsf-2.0/subsref_delete_response.h>
+#include <lasso/xml/id-wsf-2.0/subs_notify_response.h>
+#include <lasso/xml/id-wsf-2.0/subsref_notify_response.h>
+#include <lasso/xml/id-wsf-2.0/dst_delete_response.h>
+#include <lasso/xml/id-wsf-2.0/dst_data_response_base.h>
+#include <lasso/xml/id-wsf-2.0/subsref_data_response.h>
+#include <lasso/xml/id-wsf-2.0/subsref_modify_response.h>
+#include <lasso/xml/id-wsf-2.0/subsref_create_response.h>
+#include <lasso/xml/id-wsf-2.0/subsref_query_response.h>
+#include <lasso/xml/id-wsf-2.0/util_empty.h>
+#include <lasso/xml/id-wsf-2.0/ims_mapping_output.h>
+#include <lasso/xml/id-wsf-2.0/ims_identity_mapping_request.h>
+#include <lasso/xml/id-wsf-2.0/ims_mapping_input.h>
+#include <lasso/xml/id-wsf-2.0/ps_resolve_input.h>
+#include <lasso/xml/id-wsf-2.0/ims_identity_mapping_response.h>
+#include <lasso/xml/id-wsf-2.0/sec_transited_provider_path.h>
+#include <lasso/xml/id-wsf-2.0/sec_token.h>
+#include <lasso/xml/id-wsf-2.0/sec_token_policy.h>
+#include <lasso/xml/id-wsf-2.0/sbf_framework.h>
+#include <lasso/xml/id-wsf-2.0/dstref_data_response.h>
+#include <lasso/xml/id-wsf-2.0/dstref_delete_response.h>
+#include <lasso/xml/id-wsf-2.0/dstref_modify_item.h>
+#include <lasso/xml/id-wsf-2.0/dstref_app_data.h>
+#include <lasso/xml/id-wsf-2.0/dstref_test_item.h>
+#include <lasso/xml/id-wsf-2.0/dstref_create.h>
+#include <lasso/xml/id-wsf-2.0/dstref_item_data.h>
+#include <lasso/xml/id-wsf-2.0/dstref_data.h>
+#include <lasso/xml/id-wsf-2.0/dstref_modify.h>
+#include <lasso/xml/id-wsf-2.0/dstref_result_query.h>
+#include <lasso/xml/id-wsf-2.0/dstref_query_item.h>
+#include <lasso/xml/id-wsf-2.0/dstref_create_response.h>
+#include <lasso/xml/id-wsf-2.0/dstref_create_item.h>
+#include <lasso/xml/id-wsf-2.0/dstref_query.h>
+#include <lasso/xml/id-wsf-2.0/dstref_delete.h>
+#include <lasso/xml/id-wsf-2.0/dstref_query_response.h>
+#include <lasso/xml/id-wsf-2.0/dstref_delete_item.h>
+#include <lasso/xml/id-wsf-2.0/dstref_modify_response.h>
+#include <lasso/xml/id-wsf-2.0/is_interaction_statement.h>
+#include <lasso/xml/id-wsf-2.0/is_help.h>
+#include <lasso/xml/id-wsf-2.0/is_inquiry_element.h>
+#include <lasso/xml/id-wsf-2.0/is_text.h>
+#include <lasso/xml/id-wsf-2.0/is_interaction_response.h>
+#include <lasso/xml/id-wsf-2.0/is_interaction_request.h>
+#include <lasso/xml/id-wsf-2.0/is_item.h>
+#include <lasso/xml/id-wsf-2.0/is_inquiry.h>
+#include <lasso/xml/id-wsf-2.0/is_parameter.h>
+#include <lasso/xml/id-wsf-2.0/is_select.h>
 %}
-
+%include sb2_sender.i
+%include sb2_consent.i
+%include sb2_redirect_request.i
+%include sb2_user_interaction_header.i
+%include sb2_usage_directive.i
+%include sb2_target_identity.i
+%include sb2_timeout.i
+%include sb2_credentials_context.i
+%include ps_object.i
+%include ps_request_abstract.i
+%include ps_test_membership_request.i
+%include ps_remove_entity_request.i
+%include ps_add_to_collection_request.i
+%include ps_remove_collection_request.i
+%include ps_add_known_entity_request.i
+%include ps_add_entity_request.i
+%include ps_remove_from_collection_request.i
+%include ps_list_members_request.i
+%include ps_query_objects_request.i
+%include ps_set_object_info_request.i
+%include ps_get_object_info_request.i
+%include ps_item_data.i
+%include ps_response_abstract.i
+%include ps_add_known_entity_response.i
+%include ps_add_entity_response.i
+%include ps_add_collection_response.i
+%include ps_query_objects_response.i
+%include ps_list_members_response.i
+%include ps_get_object_info_response.i
+%include ps_resolve_identifier_response.i
+%include ps_resolve_identifier_request.i
+%include ps_test_membership_response.i
+%include ps_add_collection_request.i
+%include ps_notify.i
+%include subsref_app_data.i
+%include subsref_create_item.i
+%include subsref_modify_item.i
+%include subsref_item_data.i
+%include subsref_data.i
+%include subs_notification.i
+%include ps_notification.i
+%include subsref_notification.i
+%include subs_ref_item.i
+%include subs_subscription.i
+%include subsref_subscription.i
+%include sb2_endpoint_update.i
+%include dst_result_query_base.i
+%include subsref_result_query.i
+%include subsref_query_item.i
+%include dst_request.i
+%include subsref_create.i
+%include subsref_modify.i
+%include subsref_delete.i
+%include subsref_notify.i
+%include subsref_query.i
+%include dst_delete_item_base.i
+%include subsref_delete_item.i
+%include dst_test_item_base.i
+%include subsref_test_item.i
+%include disco_endpoint_context.i
+%include disco_svc_md_replace.i
+%include disco_svc_md_query.i
+%include disco_keys.i
 %include disco_svc_metadata.i
+%include disco_options.i
+%include disco_provider_id.i
+%include disco_security_context.i
+%include disco_svc_md_replace_response.i
+%include disco_svc_md_delete.i
+%include disco_service_type.i
+%include disco_svc_md_register.i
+%include disco_svc_md_association_delete_response.i
+%include disco_svc_md_association_add.i
+%include disco_svc_md_register_response.i
+%include disco_requested_service.i
+%include disco_svc_md_association_query.i
+%include disco_svc_md_association_delete.i
+%include disco_svc_md_association_add_response.i
+%include disco_svc_md_association_query_response.i
+%include disco_svc_md_delete_response.i
+%include disco_svc_md_query_response.i
+%include disco_abstract.i
+%include disco_service_context.i
+%include disco_query.i
+%include disco_query_response.i
+%include util_status.i
+%include util_extension.i
+%include util_response.i
+%include subsref_delete_response.i
+%include subs_notify_response.i
+%include subsref_notify_response.i
+%include dst_delete_response.i
+%include dst_data_response_base.i
+%include subsref_data_response.i
+%include subsref_modify_response.i
+%include subsref_create_response.i
+%include subsref_query_response.i
+%include util_empty.i
+%include ims_mapping_output.i
+%include ims_identity_mapping_request.i
+%include ims_mapping_input.i
+%include ps_resolve_input.i
+%include ims_identity_mapping_response.i
+%include sec_transited_provider_path.i
+%include sec_token.i
+%include sec_token_policy.i
+%include sbf_framework.i
+%include dstref_data_response.i
+%include dstref_delete_response.i
+%include dstref_modify_item.i
+%include dstref_app_data.i
+%include dstref_test_item.i
+%include dstref_create.i
+%include dstref_item_data.i
+%include dstref_data.i
+%include dstref_modify.i
+%include dstref_result_query.i
+%include dstref_query_item.i
+%include dstref_create_response.i
+%include dstref_create_item.i
+%include dstref_query.i
+%include dstref_delete.i
+%include dstref_query_response.i
+%include dstref_delete_item.i
+%include dstref_modify_response.i
+%include is_interaction_statement.i
+%include is_help.i
+%include is_inquiry_element.i
+%include is_text.i
+%include is_interaction_response.i
+%include is_interaction_request.i
+%include is_item.i
+%include is_inquiry.i
+%include is_parameter.i
+%include is_select.i
\ No newline at end of file
diff --git a/swig/id-wsf-2.0/ps_add_collection_request.i b/swig/id-wsf-2.0/ps_add_collection_request.i
new file mode 100644
index 00000000..b2053fa6
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_add_collection_request.i
@@ -0,0 +1,54 @@
+/* $Id: ps_add_collection_request.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsAddCollectionRequest) LassoIdWsf2PsAddCollectionRequest;
+#endif
+typedef struct {
+} LassoIdWsf2PsAddCollectionRequest;
+%extend LassoIdWsf2PsAddCollectionRequest {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsAddCollectionRequest();
+	~LassoIdWsf2PsAddCollectionRequest();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsAddCollectionRequest lasso_idwsf2_ps_add_collection_request_new
+#define delete_LassoIdWsf2PsAddCollectionRequest(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsAddCollectionRequest_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ps_add_collection_response.i b/swig/id-wsf-2.0/ps_add_collection_response.i
new file mode 100644
index 00000000..e96c6098
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_add_collection_response.i
@@ -0,0 +1,54 @@
+/* $Id: ps_add_collection_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsAddCollectionResponse) LassoIdWsf2PsAddCollectionResponse;
+#endif
+typedef struct {
+} LassoIdWsf2PsAddCollectionResponse;
+%extend LassoIdWsf2PsAddCollectionResponse {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsAddCollectionResponse();
+	~LassoIdWsf2PsAddCollectionResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsAddCollectionResponse lasso_idwsf2_ps_add_collection_response_new
+#define delete_LassoIdWsf2PsAddCollectionResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsAddCollectionResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ps_add_entity_request.i b/swig/id-wsf-2.0/ps_add_entity_request.i
new file mode 100644
index 00000000..46b340f9
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_add_entity_request.i
@@ -0,0 +1,58 @@
+/* $Id: ps_add_entity_request.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsAddEntityRequest) LassoIdWsf2PsAddEntityRequest;
+#endif
+typedef struct {
+#ifndef SWIGPHP4
+	%rename(createPSObject) CreatePSObject;
+#endif
+	char *CreatePSObject;
+} LassoIdWsf2PsAddEntityRequest;
+%extend LassoIdWsf2PsAddEntityRequest {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsAddEntityRequest();
+	~LassoIdWsf2PsAddEntityRequest();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsAddEntityRequest lasso_idwsf2_ps_add_entity_request_new
+#define delete_LassoIdWsf2PsAddEntityRequest(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsAddEntityRequest_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ps_add_entity_response.i b/swig/id-wsf-2.0/ps_add_entity_response.i
new file mode 100644
index 00000000..40e380b8
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_add_entity_response.i
@@ -0,0 +1,54 @@
+/* $Id: ps_add_entity_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsAddEntityResponse) LassoIdWsf2PsAddEntityResponse;
+#endif
+typedef struct {
+} LassoIdWsf2PsAddEntityResponse;
+%extend LassoIdWsf2PsAddEntityResponse {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsAddEntityResponse();
+	~LassoIdWsf2PsAddEntityResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsAddEntityResponse lasso_idwsf2_ps_add_entity_response_new
+#define delete_LassoIdWsf2PsAddEntityResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsAddEntityResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ps_add_known_entity_request.i b/swig/id-wsf-2.0/ps_add_known_entity_request.i
new file mode 100644
index 00000000..89c6eaa4
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_add_known_entity_request.i
@@ -0,0 +1,58 @@
+/* $Id: ps_add_known_entity_request.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsAddKnownEntityRequest) LassoIdWsf2PsAddKnownEntityRequest;
+#endif
+typedef struct {
+#ifndef SWIGPHP4
+	%rename(createPSObject) CreatePSObject;
+#endif
+	char *CreatePSObject;
+} LassoIdWsf2PsAddKnownEntityRequest;
+%extend LassoIdWsf2PsAddKnownEntityRequest {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsAddKnownEntityRequest();
+	~LassoIdWsf2PsAddKnownEntityRequest();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsAddKnownEntityRequest lasso_idwsf2_ps_add_known_entity_request_new
+#define delete_LassoIdWsf2PsAddKnownEntityRequest(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsAddKnownEntityRequest_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ps_add_known_entity_response.i b/swig/id-wsf-2.0/ps_add_known_entity_response.i
new file mode 100644
index 00000000..57b4b191
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_add_known_entity_response.i
@@ -0,0 +1,54 @@
+/* $Id: ps_add_known_entity_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsAddKnownEntityResponse) LassoIdWsf2PsAddKnownEntityResponse;
+#endif
+typedef struct {
+} LassoIdWsf2PsAddKnownEntityResponse;
+%extend LassoIdWsf2PsAddKnownEntityResponse {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsAddKnownEntityResponse();
+	~LassoIdWsf2PsAddKnownEntityResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsAddKnownEntityResponse lasso_idwsf2_ps_add_known_entity_response_new
+#define delete_LassoIdWsf2PsAddKnownEntityResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsAddKnownEntityResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ps_add_to_collection_request.i b/swig/id-wsf-2.0/ps_add_to_collection_request.i
new file mode 100644
index 00000000..dd20c7c5
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_add_to_collection_request.i
@@ -0,0 +1,54 @@
+/* $Id: ps_add_to_collection_request.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsAddToCollectionRequest) LassoIdWsf2PsAddToCollectionRequest;
+#endif
+typedef struct {
+} LassoIdWsf2PsAddToCollectionRequest;
+%extend LassoIdWsf2PsAddToCollectionRequest {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsAddToCollectionRequest();
+	~LassoIdWsf2PsAddToCollectionRequest();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsAddToCollectionRequest lasso_idwsf2_ps_add_to_collection_request_new
+#define delete_LassoIdWsf2PsAddToCollectionRequest(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsAddToCollectionRequest_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ps_get_object_info_request.i b/swig/id-wsf-2.0/ps_get_object_info_request.i
new file mode 100644
index 00000000..8db232f4
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_get_object_info_request.i
@@ -0,0 +1,54 @@
+/* $Id: ps_get_object_info_request.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsGetObjectInfoRequest) LassoIdWsf2PsGetObjectInfoRequest;
+#endif
+typedef struct {
+} LassoIdWsf2PsGetObjectInfoRequest;
+%extend LassoIdWsf2PsGetObjectInfoRequest {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsGetObjectInfoRequest();
+	~LassoIdWsf2PsGetObjectInfoRequest();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsGetObjectInfoRequest lasso_idwsf2_ps_get_object_info_request_new
+#define delete_LassoIdWsf2PsGetObjectInfoRequest(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsGetObjectInfoRequest_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ps_get_object_info_response.i b/swig/id-wsf-2.0/ps_get_object_info_response.i
new file mode 100644
index 00000000..6710034f
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_get_object_info_response.i
@@ -0,0 +1,54 @@
+/* $Id: ps_get_object_info_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsGetObjectInfoResponse) LassoIdWsf2PsGetObjectInfoResponse;
+#endif
+typedef struct {
+} LassoIdWsf2PsGetObjectInfoResponse;
+%extend LassoIdWsf2PsGetObjectInfoResponse {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsGetObjectInfoResponse();
+	~LassoIdWsf2PsGetObjectInfoResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsGetObjectInfoResponse lasso_idwsf2_ps_get_object_info_response_new
+#define delete_LassoIdWsf2PsGetObjectInfoResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsGetObjectInfoResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ps_item_data.i b/swig/id-wsf-2.0/ps_item_data.i
new file mode 100644
index 00000000..59776ab6
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_item_data.i
@@ -0,0 +1,54 @@
+/* $Id: ps_item_data.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsItemData) LassoIdWsf2PsItemData;
+#endif
+typedef struct {
+} LassoIdWsf2PsItemData;
+%extend LassoIdWsf2PsItemData {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsItemData();
+	~LassoIdWsf2PsItemData();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsItemData lasso_idwsf2_ps_item_data_new
+#define delete_LassoIdWsf2PsItemData(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsItemData_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ps_list_members_request.i b/swig/id-wsf-2.0/ps_list_members_request.i
new file mode 100644
index 00000000..542d8199
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_list_members_request.i
@@ -0,0 +1,66 @@
+/* $Id: ps_list_members_request.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsListMembersRequest) LassoIdWsf2PsListMembersRequest;
+#endif
+typedef struct {
+#ifndef SWIGPHP4
+	%rename(structured) Structured;
+#endif
+	char *Structured;
+#ifndef SWIGPHP4
+	%rename(count) Count;
+#endif
+	int Count;
+#ifndef SWIGPHP4
+	%rename(offset) Offset;
+#endif
+	int Offset;
+} LassoIdWsf2PsListMembersRequest;
+%extend LassoIdWsf2PsListMembersRequest {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsListMembersRequest();
+	~LassoIdWsf2PsListMembersRequest();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsListMembersRequest lasso_idwsf2_ps_list_members_request_new
+#define delete_LassoIdWsf2PsListMembersRequest(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsListMembersRequest_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ps_list_members_response.i b/swig/id-wsf-2.0/ps_list_members_response.i
new file mode 100644
index 00000000..176bdd31
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_list_members_response.i
@@ -0,0 +1,54 @@
+/* $Id: ps_list_members_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsListMembersResponse) LassoIdWsf2PsListMembersResponse;
+#endif
+typedef struct {
+} LassoIdWsf2PsListMembersResponse;
+%extend LassoIdWsf2PsListMembersResponse {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsListMembersResponse();
+	~LassoIdWsf2PsListMembersResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsListMembersResponse lasso_idwsf2_ps_list_members_response_new
+#define delete_LassoIdWsf2PsListMembersResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsListMembersResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ps_notification.i b/swig/id-wsf-2.0/ps_notification.i
new file mode 100644
index 00000000..9ee743d1
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_notification.i
@@ -0,0 +1,54 @@
+/* $Id: ps_notification.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsNotification) LassoIdWsf2PsNotification;
+#endif
+typedef struct {
+} LassoIdWsf2PsNotification;
+%extend LassoIdWsf2PsNotification {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsNotification();
+	~LassoIdWsf2PsNotification();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsNotification lasso_idwsf2_ps_notification_new
+#define delete_LassoIdWsf2PsNotification(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsNotification_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ps_notify.i b/swig/id-wsf-2.0/ps_notify.i
new file mode 100644
index 00000000..f2ea05d3
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_notify.i
@@ -0,0 +1,55 @@
+/* $Id: ps_notify.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsNotify) LassoIdWsf2PsNotify;
+#endif
+typedef struct {
+	char *timeStamp;
+} LassoIdWsf2PsNotify;
+%extend LassoIdWsf2PsNotify {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsNotify();
+	~LassoIdWsf2PsNotify();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsNotify lasso_idwsf2_ps_notify_new
+#define delete_LassoIdWsf2PsNotify(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsNotify_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ps_object.i b/swig/id-wsf-2.0/ps_object.i
new file mode 100644
index 00000000..47c9bc1c
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_object.i
@@ -0,0 +1,66 @@
+/* $Id: ps_object.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsObject) LassoIdWsf2PsObject;
+#endif
+typedef struct {
+#ifndef SWIGPHP4
+	%rename(nodeType) NodeType;
+#endif
+	char *NodeType;
+#ifndef SWIGPHP4
+	%rename(createdDateTime) CreatedDateTime;
+#endif
+	char *CreatedDateTime;
+#ifndef SWIGPHP4
+	%rename(modifiedDateTime) ModifiedDateTime;
+#endif
+	char *ModifiedDateTime;
+} LassoIdWsf2PsObject;
+%extend LassoIdWsf2PsObject {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsObject();
+	~LassoIdWsf2PsObject();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsObject lasso_idwsf2_ps_object_new
+#define delete_LassoIdWsf2PsObject(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsObject_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ps_query_objects_request.i b/swig/id-wsf-2.0/ps_query_objects_request.i
new file mode 100644
index 00000000..7f8b6a13
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_query_objects_request.i
@@ -0,0 +1,66 @@
+/* $Id: ps_query_objects_request.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsQueryObjectsRequest) LassoIdWsf2PsQueryObjectsRequest;
+#endif
+typedef struct {
+#ifndef SWIGPHP4
+	%rename(filter) Filter;
+#endif
+	char *Filter;
+#ifndef SWIGPHP4
+	%rename(count) Count;
+#endif
+	int Count;
+#ifndef SWIGPHP4
+	%rename(offset) Offset;
+#endif
+	int Offset;
+} LassoIdWsf2PsQueryObjectsRequest;
+%extend LassoIdWsf2PsQueryObjectsRequest {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsQueryObjectsRequest();
+	~LassoIdWsf2PsQueryObjectsRequest();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsQueryObjectsRequest lasso_idwsf2_ps_query_objects_request_new
+#define delete_LassoIdWsf2PsQueryObjectsRequest(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsQueryObjectsRequest_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ps_query_objects_response.i b/swig/id-wsf-2.0/ps_query_objects_response.i
new file mode 100644
index 00000000..2ab9be01
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_query_objects_response.i
@@ -0,0 +1,54 @@
+/* $Id: ps_query_objects_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsQueryObjectsResponse) LassoIdWsf2PsQueryObjectsResponse;
+#endif
+typedef struct {
+} LassoIdWsf2PsQueryObjectsResponse;
+%extend LassoIdWsf2PsQueryObjectsResponse {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsQueryObjectsResponse();
+	~LassoIdWsf2PsQueryObjectsResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsQueryObjectsResponse lasso_idwsf2_ps_query_objects_response_new
+#define delete_LassoIdWsf2PsQueryObjectsResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsQueryObjectsResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ps_remove_collection_request.i b/swig/id-wsf-2.0/ps_remove_collection_request.i
new file mode 100644
index 00000000..ad8b3901
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_remove_collection_request.i
@@ -0,0 +1,54 @@
+/* $Id: ps_remove_collection_request.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsRemoveCollectionRequest) LassoIdWsf2PsRemoveCollectionRequest;
+#endif
+typedef struct {
+} LassoIdWsf2PsRemoveCollectionRequest;
+%extend LassoIdWsf2PsRemoveCollectionRequest {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsRemoveCollectionRequest();
+	~LassoIdWsf2PsRemoveCollectionRequest();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsRemoveCollectionRequest lasso_idwsf2_ps_remove_collection_request_new
+#define delete_LassoIdWsf2PsRemoveCollectionRequest(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsRemoveCollectionRequest_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ps_remove_entity_request.i b/swig/id-wsf-2.0/ps_remove_entity_request.i
new file mode 100644
index 00000000..f3d68647
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_remove_entity_request.i
@@ -0,0 +1,54 @@
+/* $Id: ps_remove_entity_request.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsRemoveEntityRequest) LassoIdWsf2PsRemoveEntityRequest;
+#endif
+typedef struct {
+} LassoIdWsf2PsRemoveEntityRequest;
+%extend LassoIdWsf2PsRemoveEntityRequest {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsRemoveEntityRequest();
+	~LassoIdWsf2PsRemoveEntityRequest();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsRemoveEntityRequest lasso_idwsf2_ps_remove_entity_request_new
+#define delete_LassoIdWsf2PsRemoveEntityRequest(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsRemoveEntityRequest_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ps_remove_from_collection_request.i b/swig/id-wsf-2.0/ps_remove_from_collection_request.i
new file mode 100644
index 00000000..f5eb9179
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_remove_from_collection_request.i
@@ -0,0 +1,54 @@
+/* $Id: ps_remove_from_collection_request.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsRemoveFromCollectionRequest) LassoIdWsf2PsRemoveFromCollectionRequest;
+#endif
+typedef struct {
+} LassoIdWsf2PsRemoveFromCollectionRequest;
+%extend LassoIdWsf2PsRemoveFromCollectionRequest {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsRemoveFromCollectionRequest();
+	~LassoIdWsf2PsRemoveFromCollectionRequest();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsRemoveFromCollectionRequest lasso_idwsf2_ps_remove_from_collection_request_new
+#define delete_LassoIdWsf2PsRemoveFromCollectionRequest(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsRemoveFromCollectionRequest_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ps_request_abstract.i b/swig/id-wsf-2.0/ps_request_abstract.i
new file mode 100644
index 00000000..9ac69cb1
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_request_abstract.i
@@ -0,0 +1,67 @@
+/* $Id: ps_request_abstract.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsRequestAbstract) LassoIdWsf2PsRequestAbstract;
+#endif
+typedef struct {
+} LassoIdWsf2PsRequestAbstract;
+%extend LassoIdWsf2PsRequestAbstract {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsRequestAbstract();
+	~LassoIdWsf2PsRequestAbstract();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2PsRequestAbstract_attributes_get(LassoIdWsf2PsRequestAbstract *self);
+#define LassoIdWsf2PsRequestAbstract_get_attributes LassoIdWsf2PsRequestAbstract_attributes_get
+LassoStringDict* LassoIdWsf2PsRequestAbstract_attributes_get(LassoIdWsf2PsRequestAbstract *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsRequestAbstract lasso_idwsf2_ps_request_abstract_new
+#define delete_LassoIdWsf2PsRequestAbstract(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsRequestAbstract_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ps_resolve_identifier_request.i b/swig/id-wsf-2.0/ps_resolve_identifier_request.i
new file mode 100644
index 00000000..924af4e4
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_resolve_identifier_request.i
@@ -0,0 +1,54 @@
+/* $Id: ps_resolve_identifier_request.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsResolveIdentifierRequest) LassoIdWsf2PsResolveIdentifierRequest;
+#endif
+typedef struct {
+} LassoIdWsf2PsResolveIdentifierRequest;
+%extend LassoIdWsf2PsResolveIdentifierRequest {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsResolveIdentifierRequest();
+	~LassoIdWsf2PsResolveIdentifierRequest();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsResolveIdentifierRequest lasso_idwsf2_ps_resolve_identifier_request_new
+#define delete_LassoIdWsf2PsResolveIdentifierRequest(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsResolveIdentifierRequest_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ps_resolve_identifier_response.i b/swig/id-wsf-2.0/ps_resolve_identifier_response.i
new file mode 100644
index 00000000..17a36aac
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_resolve_identifier_response.i
@@ -0,0 +1,54 @@
+/* $Id: ps_resolve_identifier_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsResolveIdentifierResponse) LassoIdWsf2PsResolveIdentifierResponse;
+#endif
+typedef struct {
+} LassoIdWsf2PsResolveIdentifierResponse;
+%extend LassoIdWsf2PsResolveIdentifierResponse {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsResolveIdentifierResponse();
+	~LassoIdWsf2PsResolveIdentifierResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsResolveIdentifierResponse lasso_idwsf2_ps_resolve_identifier_response_new
+#define delete_LassoIdWsf2PsResolveIdentifierResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsResolveIdentifierResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ps_resolve_input.i b/swig/id-wsf-2.0/ps_resolve_input.i
new file mode 100644
index 00000000..fc8c0643
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_resolve_input.i
@@ -0,0 +1,54 @@
+/* $Id: ps_resolve_input.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsResolveInput) LassoIdWsf2PsResolveInput;
+#endif
+typedef struct {
+} LassoIdWsf2PsResolveInput;
+%extend LassoIdWsf2PsResolveInput {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsResolveInput();
+	~LassoIdWsf2PsResolveInput();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsResolveInput lasso_idwsf2_ps_resolve_input_new
+#define delete_LassoIdWsf2PsResolveInput(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsResolveInput_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ps_response_abstract.i b/swig/id-wsf-2.0/ps_response_abstract.i
new file mode 100644
index 00000000..b1e36c5a
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_response_abstract.i
@@ -0,0 +1,81 @@
+/* $Id: ps_response_abstract.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsResponseAbstract) LassoIdWsf2PsResponseAbstract;
+#endif
+typedef struct {
+} LassoIdWsf2PsResponseAbstract;
+%extend LassoIdWsf2PsResponseAbstract {
+
+#ifndef SWIGPHP4
+	%rename(status) Status;
+#endif
+	%newobject *Status_get;
+	LassoIdWsf2UtilStatus *Status;
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsResponseAbstract();
+	~LassoIdWsf2PsResponseAbstract();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* Status */
+
+#define LassoIdWsf2PsResponseAbstract_get_Status(self) get_node((self)->Status)
+#define LassoIdWsf2PsResponseAbstract_Status_get(self) get_node((self)->Status)
+#define LassoIdWsf2PsResponseAbstract_set_Status(self,value) set_node((gpointer*)&(self)->Status, (value))
+#define LassoIdWsf2PsResponseAbstract_Status_set(self,value) set_node((gpointer*)&(self)->Status, (value))
+                    
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2PsResponseAbstract_attributes_get(LassoIdWsf2PsResponseAbstract *self);
+#define LassoIdWsf2PsResponseAbstract_get_attributes LassoIdWsf2PsResponseAbstract_attributes_get
+LassoStringDict* LassoIdWsf2PsResponseAbstract_attributes_get(LassoIdWsf2PsResponseAbstract *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsResponseAbstract lasso_idwsf2_ps_response_abstract_new
+#define delete_LassoIdWsf2PsResponseAbstract(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsResponseAbstract_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ps_set_object_info_request.i b/swig/id-wsf-2.0/ps_set_object_info_request.i
new file mode 100644
index 00000000..3415222e
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_set_object_info_request.i
@@ -0,0 +1,54 @@
+/* $Id: ps_set_object_info_request.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsSetObjectInfoRequest) LassoIdWsf2PsSetObjectInfoRequest;
+#endif
+typedef struct {
+} LassoIdWsf2PsSetObjectInfoRequest;
+%extend LassoIdWsf2PsSetObjectInfoRequest {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsSetObjectInfoRequest();
+	~LassoIdWsf2PsSetObjectInfoRequest();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsSetObjectInfoRequest lasso_idwsf2_ps_set_object_info_request_new
+#define delete_LassoIdWsf2PsSetObjectInfoRequest(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsSetObjectInfoRequest_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ps_test_membership_request.i b/swig/id-wsf-2.0/ps_test_membership_request.i
new file mode 100644
index 00000000..e83323dc
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_test_membership_request.i
@@ -0,0 +1,54 @@
+/* $Id: ps_test_membership_request.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsTestMembershipRequest) LassoIdWsf2PsTestMembershipRequest;
+#endif
+typedef struct {
+} LassoIdWsf2PsTestMembershipRequest;
+%extend LassoIdWsf2PsTestMembershipRequest {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsTestMembershipRequest();
+	~LassoIdWsf2PsTestMembershipRequest();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsTestMembershipRequest lasso_idwsf2_ps_test_membership_request_new
+#define delete_LassoIdWsf2PsTestMembershipRequest(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsTestMembershipRequest_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/ps_test_membership_response.i b/swig/id-wsf-2.0/ps_test_membership_response.i
new file mode 100644
index 00000000..594827a9
--- /dev/null
+++ b/swig/id-wsf-2.0/ps_test_membership_response.i
@@ -0,0 +1,54 @@
+/* $Id: ps_test_membership_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2PsTestMembershipResponse) LassoIdWsf2PsTestMembershipResponse;
+#endif
+typedef struct {
+} LassoIdWsf2PsTestMembershipResponse;
+%extend LassoIdWsf2PsTestMembershipResponse {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2PsTestMembershipResponse();
+	~LassoIdWsf2PsTestMembershipResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2PsTestMembershipResponse lasso_idwsf2_ps_test_membership_response_new
+#define delete_LassoIdWsf2PsTestMembershipResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2PsTestMembershipResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/sb2_consent.i b/swig/id-wsf-2.0/sb2_consent.i
new file mode 100644
index 00000000..ca744b0d
--- /dev/null
+++ b/swig/id-wsf-2.0/sb2_consent.i
@@ -0,0 +1,69 @@
+/* $Id: sb2_consent.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2Sb2Consent) LassoIdWsf2Sb2Consent;
+#endif
+typedef struct {
+	char *uri;
+	char *timestamp;
+} LassoIdWsf2Sb2Consent;
+%extend LassoIdWsf2Sb2Consent {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2Sb2Consent();
+	~LassoIdWsf2Sb2Consent();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2Sb2Consent_attributes_get(LassoIdWsf2Sb2Consent *self);
+#define LassoIdWsf2Sb2Consent_get_attributes LassoIdWsf2Sb2Consent_attributes_get
+LassoStringDict* LassoIdWsf2Sb2Consent_attributes_get(LassoIdWsf2Sb2Consent *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2Sb2Consent lasso_idwsf2_sb2_consent_new
+#define delete_LassoIdWsf2Sb2Consent(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2Sb2Consent_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/sb2_credentials_context.i b/swig/id-wsf-2.0/sb2_credentials_context.i
new file mode 100644
index 00000000..3cf4401e
--- /dev/null
+++ b/swig/id-wsf-2.0/sb2_credentials_context.i
@@ -0,0 +1,81 @@
+/* $Id: sb2_credentials_context.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2Sb2CredentialsContext) LassoIdWsf2Sb2CredentialsContext;
+#endif
+typedef struct {
+} LassoIdWsf2Sb2CredentialsContext;
+%extend LassoIdWsf2Sb2CredentialsContext {
+
+#ifndef SWIGPHP4
+	%rename(requestedAuthnContext) RequestedAuthnContext;
+#endif
+	%newobject *RequestedAuthnContext_get;
+	LassoSamlp2RequestedAuthnContext *RequestedAuthnContext;
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2Sb2CredentialsContext();
+	~LassoIdWsf2Sb2CredentialsContext();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* RequestedAuthnContext */
+
+#define LassoIdWsf2Sb2CredentialsContext_get_RequestedAuthnContext(self) get_node((self)->RequestedAuthnContext)
+#define LassoIdWsf2Sb2CredentialsContext_RequestedAuthnContext_get(self) get_node((self)->RequestedAuthnContext)
+#define LassoIdWsf2Sb2CredentialsContext_set_RequestedAuthnContext(self,value) set_node((gpointer*)&(self)->RequestedAuthnContext, (value))
+#define LassoIdWsf2Sb2CredentialsContext_RequestedAuthnContext_set(self,value) set_node((gpointer*)&(self)->RequestedAuthnContext, (value))
+                    
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2Sb2CredentialsContext_attributes_get(LassoIdWsf2Sb2CredentialsContext *self);
+#define LassoIdWsf2Sb2CredentialsContext_get_attributes LassoIdWsf2Sb2CredentialsContext_attributes_get
+LassoStringDict* LassoIdWsf2Sb2CredentialsContext_attributes_get(LassoIdWsf2Sb2CredentialsContext *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2Sb2CredentialsContext lasso_idwsf2_sb2_credentials_context_new
+#define delete_LassoIdWsf2Sb2CredentialsContext(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2Sb2CredentialsContext_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/sb2_endpoint_update.i b/swig/id-wsf-2.0/sb2_endpoint_update.i
new file mode 100644
index 00000000..da71234a
--- /dev/null
+++ b/swig/id-wsf-2.0/sb2_endpoint_update.i
@@ -0,0 +1,55 @@
+/* $Id: sb2_endpoint_update.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2Sb2EndpointUpdate) LassoIdWsf2Sb2EndpointUpdate;
+#endif
+typedef struct {
+	char *updateType;
+} LassoIdWsf2Sb2EndpointUpdate;
+%extend LassoIdWsf2Sb2EndpointUpdate {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2Sb2EndpointUpdate();
+	~LassoIdWsf2Sb2EndpointUpdate();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2Sb2EndpointUpdate lasso_idwsf2_sb2_endpoint_update_new
+#define delete_LassoIdWsf2Sb2EndpointUpdate(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2Sb2EndpointUpdate_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/sb2_redirect_request.i b/swig/id-wsf-2.0/sb2_redirect_request.i
new file mode 100644
index 00000000..762287ec
--- /dev/null
+++ b/swig/id-wsf-2.0/sb2_redirect_request.i
@@ -0,0 +1,55 @@
+/* $Id: sb2_redirect_request.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2Sb2RedirectRequest) LassoIdWsf2Sb2RedirectRequest;
+#endif
+typedef struct {
+	char *redirectURL;
+} LassoIdWsf2Sb2RedirectRequest;
+%extend LassoIdWsf2Sb2RedirectRequest {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2Sb2RedirectRequest();
+	~LassoIdWsf2Sb2RedirectRequest();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2Sb2RedirectRequest lasso_idwsf2_sb2_redirect_request_new
+#define delete_LassoIdWsf2Sb2RedirectRequest(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2Sb2RedirectRequest_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/sb2_sender.i b/swig/id-wsf-2.0/sb2_sender.i
new file mode 100644
index 00000000..ddff0447
--- /dev/null
+++ b/swig/id-wsf-2.0/sb2_sender.i
@@ -0,0 +1,69 @@
+/* $Id: sb2_sender.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2Sb2Sender) LassoIdWsf2Sb2Sender;
+#endif
+typedef struct {
+	char *providerID;
+	char *affiliationID;
+} LassoIdWsf2Sb2Sender;
+%extend LassoIdWsf2Sb2Sender {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2Sb2Sender();
+	~LassoIdWsf2Sb2Sender();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2Sb2Sender_attributes_get(LassoIdWsf2Sb2Sender *self);
+#define LassoIdWsf2Sb2Sender_get_attributes LassoIdWsf2Sb2Sender_attributes_get
+LassoStringDict* LassoIdWsf2Sb2Sender_attributes_get(LassoIdWsf2Sb2Sender *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2Sb2Sender lasso_idwsf2_sb2_sender_new
+#define delete_LassoIdWsf2Sb2Sender(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2Sb2Sender_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/sb2_target_identity.i b/swig/id-wsf-2.0/sb2_target_identity.i
new file mode 100644
index 00000000..63a933b1
--- /dev/null
+++ b/swig/id-wsf-2.0/sb2_target_identity.i
@@ -0,0 +1,67 @@
+/* $Id: sb2_target_identity.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2Sb2TargetIdentity) LassoIdWsf2Sb2TargetIdentity;
+#endif
+typedef struct {
+} LassoIdWsf2Sb2TargetIdentity;
+%extend LassoIdWsf2Sb2TargetIdentity {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2Sb2TargetIdentity();
+	~LassoIdWsf2Sb2TargetIdentity();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2Sb2TargetIdentity_attributes_get(LassoIdWsf2Sb2TargetIdentity *self);
+#define LassoIdWsf2Sb2TargetIdentity_get_attributes LassoIdWsf2Sb2TargetIdentity_attributes_get
+LassoStringDict* LassoIdWsf2Sb2TargetIdentity_attributes_get(LassoIdWsf2Sb2TargetIdentity *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2Sb2TargetIdentity lasso_idwsf2_sb2_target_identity_new
+#define delete_LassoIdWsf2Sb2TargetIdentity(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2Sb2TargetIdentity_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/sb2_timeout.i b/swig/id-wsf-2.0/sb2_timeout.i
new file mode 100644
index 00000000..92548c8a
--- /dev/null
+++ b/swig/id-wsf-2.0/sb2_timeout.i
@@ -0,0 +1,68 @@
+/* $Id: sb2_timeout.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2Sb2Timeout) LassoIdWsf2Sb2Timeout;
+#endif
+typedef struct {
+	int maxProcessingTime;
+} LassoIdWsf2Sb2Timeout;
+%extend LassoIdWsf2Sb2Timeout {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2Sb2Timeout();
+	~LassoIdWsf2Sb2Timeout();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2Sb2Timeout_attributes_get(LassoIdWsf2Sb2Timeout *self);
+#define LassoIdWsf2Sb2Timeout_get_attributes LassoIdWsf2Sb2Timeout_attributes_get
+LassoStringDict* LassoIdWsf2Sb2Timeout_attributes_get(LassoIdWsf2Sb2Timeout *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2Sb2Timeout lasso_idwsf2_sb2_timeout_new
+#define delete_LassoIdWsf2Sb2Timeout(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2Sb2Timeout_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/sb2_usage_directive.i b/swig/id-wsf-2.0/sb2_usage_directive.i
new file mode 100644
index 00000000..05b92e10
--- /dev/null
+++ b/swig/id-wsf-2.0/sb2_usage_directive.i
@@ -0,0 +1,68 @@
+/* $Id: sb2_usage_directive.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2Sb2UsageDirective) LassoIdWsf2Sb2UsageDirective;
+#endif
+typedef struct {
+	char *ref;
+} LassoIdWsf2Sb2UsageDirective;
+%extend LassoIdWsf2Sb2UsageDirective {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2Sb2UsageDirective();
+	~LassoIdWsf2Sb2UsageDirective();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2Sb2UsageDirective_attributes_get(LassoIdWsf2Sb2UsageDirective *self);
+#define LassoIdWsf2Sb2UsageDirective_get_attributes LassoIdWsf2Sb2UsageDirective_attributes_get
+LassoStringDict* LassoIdWsf2Sb2UsageDirective_attributes_get(LassoIdWsf2Sb2UsageDirective *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2Sb2UsageDirective lasso_idwsf2_sb2_usage_directive_new
+#define delete_LassoIdWsf2Sb2UsageDirective(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2Sb2UsageDirective_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/sb2_user_interaction_header.i b/swig/id-wsf-2.0/sb2_user_interaction_header.i
new file mode 100644
index 00000000..18d62d50
--- /dev/null
+++ b/swig/id-wsf-2.0/sb2_user_interaction_header.i
@@ -0,0 +1,71 @@
+/* $Id: sb2_user_interaction_header.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2Sb2UserInteractionHeader) LassoIdWsf2Sb2UserInteractionHeader;
+#endif
+typedef struct {
+	char *interact;
+	char *language;
+	gboolean redirect;
+	int maxInteractTime;
+} LassoIdWsf2Sb2UserInteractionHeader;
+%extend LassoIdWsf2Sb2UserInteractionHeader {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2Sb2UserInteractionHeader();
+	~LassoIdWsf2Sb2UserInteractionHeader();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2Sb2UserInteractionHeader_attributes_get(LassoIdWsf2Sb2UserInteractionHeader *self);
+#define LassoIdWsf2Sb2UserInteractionHeader_get_attributes LassoIdWsf2Sb2UserInteractionHeader_attributes_get
+LassoStringDict* LassoIdWsf2Sb2UserInteractionHeader_attributes_get(LassoIdWsf2Sb2UserInteractionHeader *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2Sb2UserInteractionHeader lasso_idwsf2_sb2_user_interaction_header_new
+#define delete_LassoIdWsf2Sb2UserInteractionHeader(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2Sb2UserInteractionHeader_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/sbf_framework.i b/swig/id-wsf-2.0/sbf_framework.i
new file mode 100644
index 00000000..07e0d149
--- /dev/null
+++ b/swig/id-wsf-2.0/sbf_framework.i
@@ -0,0 +1,68 @@
+/* $Id: sbf_framework.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SbfFramework) LassoIdWsf2SbfFramework;
+#endif
+typedef struct {
+	char *version;
+} LassoIdWsf2SbfFramework;
+%extend LassoIdWsf2SbfFramework {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SbfFramework();
+	~LassoIdWsf2SbfFramework();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2SbfFramework_attributes_get(LassoIdWsf2SbfFramework *self);
+#define LassoIdWsf2SbfFramework_get_attributes LassoIdWsf2SbfFramework_attributes_get
+LassoStringDict* LassoIdWsf2SbfFramework_attributes_get(LassoIdWsf2SbfFramework *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SbfFramework lasso_idwsf2_sbf_framework_new
+#define delete_LassoIdWsf2SbfFramework(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SbfFramework_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/sec_token.i b/swig/id-wsf-2.0/sec_token.i
new file mode 100644
index 00000000..93f9158e
--- /dev/null
+++ b/swig/id-wsf-2.0/sec_token.i
@@ -0,0 +1,68 @@
+/* $Id: sec_token.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SecToken) LassoIdWsf2SecToken;
+#endif
+typedef struct {
+	char *id;
+	char *ref;
+	char *usage;
+} LassoIdWsf2SecToken;
+%extend LassoIdWsf2SecToken {
+
+	%newobject *any_get;
+	LassoNode *any;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SecToken();
+	~LassoIdWsf2SecToken();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any */
+
+#define LassoIdWsf2SecToken_get_any(self) get_node((self)->any)
+#define LassoIdWsf2SecToken_any_get(self) get_node((self)->any)
+#define LassoIdWsf2SecToken_set_any(self,value) set_node((gpointer*)&(self)->any, (value))
+#define LassoIdWsf2SecToken_any_set(self,value) set_node((gpointer*)&(self)->any, (value))
+                    
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SecToken lasso_idwsf2_sec_token_new
+#define delete_LassoIdWsf2SecToken(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SecToken_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/sec_token_policy.i b/swig/id-wsf-2.0/sec_token_policy.i
new file mode 100644
index 00000000..5a02dc45
--- /dev/null
+++ b/swig/id-wsf-2.0/sec_token_policy.i
@@ -0,0 +1,82 @@
+/* $Id: sec_token_policy.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SecTokenPolicy) LassoIdWsf2SecTokenPolicy;
+#endif
+typedef struct {
+	char *validUntil;
+	char *issueTo;
+	char *type;
+	gboolean wantDSEPR;
+} LassoIdWsf2SecTokenPolicy;
+%extend LassoIdWsf2SecTokenPolicy {
+
+	%newobject *any_get;
+	LassoNode *any;
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SecTokenPolicy();
+	~LassoIdWsf2SecTokenPolicy();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any */
+
+#define LassoIdWsf2SecTokenPolicy_get_any(self) get_node((self)->any)
+#define LassoIdWsf2SecTokenPolicy_any_get(self) get_node((self)->any)
+#define LassoIdWsf2SecTokenPolicy_set_any(self,value) set_node((gpointer*)&(self)->any, (value))
+#define LassoIdWsf2SecTokenPolicy_any_set(self,value) set_node((gpointer*)&(self)->any, (value))
+                    
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2SecTokenPolicy_attributes_get(LassoIdWsf2SecTokenPolicy *self);
+#define LassoIdWsf2SecTokenPolicy_get_attributes LassoIdWsf2SecTokenPolicy_attributes_get
+LassoStringDict* LassoIdWsf2SecTokenPolicy_attributes_get(LassoIdWsf2SecTokenPolicy *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SecTokenPolicy lasso_idwsf2_sec_token_policy_new
+#define delete_LassoIdWsf2SecTokenPolicy(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SecTokenPolicy_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/sec_transited_provider_path.i b/swig/id-wsf-2.0/sec_transited_provider_path.i
new file mode 100644
index 00000000..04f451d6
--- /dev/null
+++ b/swig/id-wsf-2.0/sec_transited_provider_path.i
@@ -0,0 +1,54 @@
+/* $Id: sec_transited_provider_path.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SecTransitedProviderPath) LassoIdWsf2SecTransitedProviderPath;
+#endif
+typedef struct {
+} LassoIdWsf2SecTransitedProviderPath;
+%extend LassoIdWsf2SecTransitedProviderPath {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SecTransitedProviderPath();
+	~LassoIdWsf2SecTransitedProviderPath();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SecTransitedProviderPath lasso_idwsf2_sec_transited_provider_path_new
+#define delete_LassoIdWsf2SecTransitedProviderPath(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SecTransitedProviderPath_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/subs_notification.i b/swig/id-wsf-2.0/subs_notification.i
new file mode 100644
index 00000000..c38d8428
--- /dev/null
+++ b/swig/id-wsf-2.0/subs_notification.i
@@ -0,0 +1,58 @@
+/* $Id: subs_notification.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SubsNotification) LassoIdWsf2SubsNotification;
+#endif
+typedef struct {
+	char *id;
+	char *subscriptionID;
+	char *expires;
+	char *endReason;
+} LassoIdWsf2SubsNotification;
+%extend LassoIdWsf2SubsNotification {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SubsNotification();
+	~LassoIdWsf2SubsNotification();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SubsNotification lasso_idwsf2_subs_notification_new
+#define delete_LassoIdWsf2SubsNotification(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SubsNotification_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/subs_notify_response.i b/swig/id-wsf-2.0/subs_notify_response.i
new file mode 100644
index 00000000..72aa8caa
--- /dev/null
+++ b/swig/id-wsf-2.0/subs_notify_response.i
@@ -0,0 +1,54 @@
+/* $Id: subs_notify_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SubsNotifyResponse) LassoIdWsf2SubsNotifyResponse;
+#endif
+typedef struct {
+} LassoIdWsf2SubsNotifyResponse;
+%extend LassoIdWsf2SubsNotifyResponse {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SubsNotifyResponse();
+	~LassoIdWsf2SubsNotifyResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SubsNotifyResponse lasso_idwsf2_subs_notify_response_new
+#define delete_LassoIdWsf2SubsNotifyResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SubsNotifyResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/subs_ref_item.i b/swig/id-wsf-2.0/subs_ref_item.i
new file mode 100644
index 00000000..cd08522b
--- /dev/null
+++ b/swig/id-wsf-2.0/subs_ref_item.i
@@ -0,0 +1,56 @@
+/* $Id: subs_ref_item.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SubsRefItem) LassoIdWsf2SubsRefItem;
+#endif
+typedef struct {
+	char *subscriptionID;
+	char *itemIDRef;
+} LassoIdWsf2SubsRefItem;
+%extend LassoIdWsf2SubsRefItem {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SubsRefItem();
+	~LassoIdWsf2SubsRefItem();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SubsRefItem lasso_idwsf2_subs_ref_item_new
+#define delete_LassoIdWsf2SubsRefItem(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SubsRefItem_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/subs_subscription.i b/swig/id-wsf-2.0/subs_subscription.i
new file mode 100644
index 00000000..e82daa2e
--- /dev/null
+++ b/swig/id-wsf-2.0/subs_subscription.i
@@ -0,0 +1,61 @@
+/* $Id: subs_subscription.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SubsSubscription) LassoIdWsf2SubsSubscription;
+#endif
+typedef struct {
+	char *subscriptionID;
+	char *notifyToRef;
+	char *adminNotifyToRef;
+	char *starts;
+	char *expires;
+	char *id;
+	char *includeData;
+} LassoIdWsf2SubsSubscription;
+%extend LassoIdWsf2SubsSubscription {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SubsSubscription();
+	~LassoIdWsf2SubsSubscription();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SubsSubscription lasso_idwsf2_subs_subscription_new
+#define delete_LassoIdWsf2SubsSubscription(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SubsSubscription_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/subsref_app_data.i b/swig/id-wsf-2.0/subsref_app_data.i
new file mode 100644
index 00000000..2c8b0042
--- /dev/null
+++ b/swig/id-wsf-2.0/subsref_app_data.i
@@ -0,0 +1,54 @@
+/* $Id: subsref_app_data.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SubsRefAppData) LassoIdWsf2SubsRefAppData;
+#endif
+typedef struct {
+} LassoIdWsf2SubsRefAppData;
+%extend LassoIdWsf2SubsRefAppData {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SubsRefAppData();
+	~LassoIdWsf2SubsRefAppData();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SubsRefAppData lasso_idwsf2_subsref_app_data_new
+#define delete_LassoIdWsf2SubsRefAppData(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SubsRefAppData_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/subsref_create.i b/swig/id-wsf-2.0/subsref_create.i
new file mode 100644
index 00000000..69cc17a5
--- /dev/null
+++ b/swig/id-wsf-2.0/subsref_create.i
@@ -0,0 +1,54 @@
+/* $Id: subsref_create.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SubsRefCreate) LassoIdWsf2SubsRefCreate;
+#endif
+typedef struct {
+} LassoIdWsf2SubsRefCreate;
+%extend LassoIdWsf2SubsRefCreate {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SubsRefCreate();
+	~LassoIdWsf2SubsRefCreate();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SubsRefCreate lasso_idwsf2_subsref_create_new
+#define delete_LassoIdWsf2SubsRefCreate(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SubsRefCreate_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/subsref_create_item.i b/swig/id-wsf-2.0/subsref_create_item.i
new file mode 100644
index 00000000..8ac62eb5
--- /dev/null
+++ b/swig/id-wsf-2.0/subsref_create_item.i
@@ -0,0 +1,57 @@
+/* $Id: subsref_create_item.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SubsRefCreateItem) LassoIdWsf2SubsRefCreateItem;
+#endif
+typedef struct {
+	char *objectType;
+	char *id;
+	char *itemID;
+} LassoIdWsf2SubsRefCreateItem;
+%extend LassoIdWsf2SubsRefCreateItem {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SubsRefCreateItem();
+	~LassoIdWsf2SubsRefCreateItem();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SubsRefCreateItem lasso_idwsf2_subsref_create_item_new
+#define delete_LassoIdWsf2SubsRefCreateItem(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SubsRefCreateItem_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/subsref_create_response.i b/swig/id-wsf-2.0/subsref_create_response.i
new file mode 100644
index 00000000..e65eee36
--- /dev/null
+++ b/swig/id-wsf-2.0/subsref_create_response.i
@@ -0,0 +1,54 @@
+/* $Id: subsref_create_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SubsRefCreateResponse) LassoIdWsf2SubsRefCreateResponse;
+#endif
+typedef struct {
+} LassoIdWsf2SubsRefCreateResponse;
+%extend LassoIdWsf2SubsRefCreateResponse {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SubsRefCreateResponse();
+	~LassoIdWsf2SubsRefCreateResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SubsRefCreateResponse lasso_idwsf2_subsref_create_response_new
+#define delete_LassoIdWsf2SubsRefCreateResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SubsRefCreateResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/subsref_data.i b/swig/id-wsf-2.0/subsref_data.i
new file mode 100644
index 00000000..1f50f1a9
--- /dev/null
+++ b/swig/id-wsf-2.0/subsref_data.i
@@ -0,0 +1,57 @@
+/* $Id: subsref_data.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SubsRefData) LassoIdWsf2SubsRefData;
+#endif
+typedef struct {
+	int remaining;
+	int nextOffset;
+	char *setID;
+} LassoIdWsf2SubsRefData;
+%extend LassoIdWsf2SubsRefData {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SubsRefData();
+	~LassoIdWsf2SubsRefData();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SubsRefData lasso_idwsf2_subsref_data_new
+#define delete_LassoIdWsf2SubsRefData(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SubsRefData_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/subsref_data_response.i b/swig/id-wsf-2.0/subsref_data_response.i
new file mode 100644
index 00000000..c89f12e1
--- /dev/null
+++ b/swig/id-wsf-2.0/subsref_data_response.i
@@ -0,0 +1,54 @@
+/* $Id: subsref_data_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SubsRefDataResponse) LassoIdWsf2SubsRefDataResponse;
+#endif
+typedef struct {
+} LassoIdWsf2SubsRefDataResponse;
+%extend LassoIdWsf2SubsRefDataResponse {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SubsRefDataResponse();
+	~LassoIdWsf2SubsRefDataResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SubsRefDataResponse lasso_idwsf2_subsref_data_response_new
+#define delete_LassoIdWsf2SubsRefDataResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SubsRefDataResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/subsref_delete.i b/swig/id-wsf-2.0/subsref_delete.i
new file mode 100644
index 00000000..6bb13392
--- /dev/null
+++ b/swig/id-wsf-2.0/subsref_delete.i
@@ -0,0 +1,54 @@
+/* $Id: subsref_delete.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SubsRefDelete) LassoIdWsf2SubsRefDelete;
+#endif
+typedef struct {
+} LassoIdWsf2SubsRefDelete;
+%extend LassoIdWsf2SubsRefDelete {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SubsRefDelete();
+	~LassoIdWsf2SubsRefDelete();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SubsRefDelete lasso_idwsf2_subsref_delete_new
+#define delete_LassoIdWsf2SubsRefDelete(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SubsRefDelete_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/subsref_delete_item.i b/swig/id-wsf-2.0/subsref_delete_item.i
new file mode 100644
index 00000000..dd5f0f0d
--- /dev/null
+++ b/swig/id-wsf-2.0/subsref_delete_item.i
@@ -0,0 +1,54 @@
+/* $Id: subsref_delete_item.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SubsRefDeleteItem) LassoIdWsf2SubsRefDeleteItem;
+#endif
+typedef struct {
+} LassoIdWsf2SubsRefDeleteItem;
+%extend LassoIdWsf2SubsRefDeleteItem {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SubsRefDeleteItem();
+	~LassoIdWsf2SubsRefDeleteItem();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SubsRefDeleteItem lasso_idwsf2_subsref_delete_item_new
+#define delete_LassoIdWsf2SubsRefDeleteItem(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SubsRefDeleteItem_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/subsref_delete_response.i b/swig/id-wsf-2.0/subsref_delete_response.i
new file mode 100644
index 00000000..f43b4168
--- /dev/null
+++ b/swig/id-wsf-2.0/subsref_delete_response.i
@@ -0,0 +1,54 @@
+/* $Id: subsref_delete_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SubsRefDeleteResponse) LassoIdWsf2SubsRefDeleteResponse;
+#endif
+typedef struct {
+} LassoIdWsf2SubsRefDeleteResponse;
+%extend LassoIdWsf2SubsRefDeleteResponse {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SubsRefDeleteResponse();
+	~LassoIdWsf2SubsRefDeleteResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SubsRefDeleteResponse lasso_idwsf2_subsref_delete_response_new
+#define delete_LassoIdWsf2SubsRefDeleteResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SubsRefDeleteResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/subsref_item_data.i b/swig/id-wsf-2.0/subsref_item_data.i
new file mode 100644
index 00000000..c3fc155b
--- /dev/null
+++ b/swig/id-wsf-2.0/subsref_item_data.i
@@ -0,0 +1,57 @@
+/* $Id: subsref_item_data.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SubsRefItemData) LassoIdWsf2SubsRefItemData;
+#endif
+typedef struct {
+	char *itemIDRef;
+	char *notSorted;
+	char *changeFormat;
+} LassoIdWsf2SubsRefItemData;
+%extend LassoIdWsf2SubsRefItemData {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SubsRefItemData();
+	~LassoIdWsf2SubsRefItemData();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SubsRefItemData lasso_idwsf2_subsref_item_data_new
+#define delete_LassoIdWsf2SubsRefItemData(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SubsRefItemData_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/subsref_modify.i b/swig/id-wsf-2.0/subsref_modify.i
new file mode 100644
index 00000000..013873ad
--- /dev/null
+++ b/swig/id-wsf-2.0/subsref_modify.i
@@ -0,0 +1,54 @@
+/* $Id: subsref_modify.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SubsRefModify) LassoIdWsf2SubsRefModify;
+#endif
+typedef struct {
+} LassoIdWsf2SubsRefModify;
+%extend LassoIdWsf2SubsRefModify {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SubsRefModify();
+	~LassoIdWsf2SubsRefModify();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SubsRefModify lasso_idwsf2_subsref_modify_new
+#define delete_LassoIdWsf2SubsRefModify(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SubsRefModify_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/subsref_modify_item.i b/swig/id-wsf-2.0/subsref_modify_item.i
new file mode 100644
index 00000000..20d19eea
--- /dev/null
+++ b/swig/id-wsf-2.0/subsref_modify_item.i
@@ -0,0 +1,58 @@
+/* $Id: subsref_modify_item.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SubsRefModifyItem) LassoIdWsf2SubsRefModifyItem;
+#endif
+typedef struct {
+	char *notChangedSince;
+	gboolean overrideAllowed;
+	char *id;
+	char *itemID;
+} LassoIdWsf2SubsRefModifyItem;
+%extend LassoIdWsf2SubsRefModifyItem {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SubsRefModifyItem();
+	~LassoIdWsf2SubsRefModifyItem();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SubsRefModifyItem lasso_idwsf2_subsref_modify_item_new
+#define delete_LassoIdWsf2SubsRefModifyItem(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SubsRefModifyItem_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/subsref_modify_response.i b/swig/id-wsf-2.0/subsref_modify_response.i
new file mode 100644
index 00000000..97ef44cc
--- /dev/null
+++ b/swig/id-wsf-2.0/subsref_modify_response.i
@@ -0,0 +1,54 @@
+/* $Id: subsref_modify_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SubsRefModifyResponse) LassoIdWsf2SubsRefModifyResponse;
+#endif
+typedef struct {
+} LassoIdWsf2SubsRefModifyResponse;
+%extend LassoIdWsf2SubsRefModifyResponse {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SubsRefModifyResponse();
+	~LassoIdWsf2SubsRefModifyResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SubsRefModifyResponse lasso_idwsf2_subsref_modify_response_new
+#define delete_LassoIdWsf2SubsRefModifyResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SubsRefModifyResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/subsref_notification.i b/swig/id-wsf-2.0/subsref_notification.i
new file mode 100644
index 00000000..43faf611
--- /dev/null
+++ b/swig/id-wsf-2.0/subsref_notification.i
@@ -0,0 +1,54 @@
+/* $Id: subsref_notification.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SubsRefNotification) LassoIdWsf2SubsRefNotification;
+#endif
+typedef struct {
+} LassoIdWsf2SubsRefNotification;
+%extend LassoIdWsf2SubsRefNotification {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SubsRefNotification();
+	~LassoIdWsf2SubsRefNotification();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SubsRefNotification lasso_idwsf2_subsref_notification_new
+#define delete_LassoIdWsf2SubsRefNotification(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SubsRefNotification_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/subsref_notify.i b/swig/id-wsf-2.0/subsref_notify.i
new file mode 100644
index 00000000..2080a7bc
--- /dev/null
+++ b/swig/id-wsf-2.0/subsref_notify.i
@@ -0,0 +1,55 @@
+/* $Id: subsref_notify.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SubsRefNotify) LassoIdWsf2SubsRefNotify;
+#endif
+typedef struct {
+	char *timeStamp;
+} LassoIdWsf2SubsRefNotify;
+%extend LassoIdWsf2SubsRefNotify {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SubsRefNotify();
+	~LassoIdWsf2SubsRefNotify();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SubsRefNotify lasso_idwsf2_subsref_notify_new
+#define delete_LassoIdWsf2SubsRefNotify(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SubsRefNotify_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/subsref_notify_response.i b/swig/id-wsf-2.0/subsref_notify_response.i
new file mode 100644
index 00000000..44363059
--- /dev/null
+++ b/swig/id-wsf-2.0/subsref_notify_response.i
@@ -0,0 +1,54 @@
+/* $Id: subsref_notify_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SubsRefNotifyResponse) LassoIdWsf2SubsRefNotifyResponse;
+#endif
+typedef struct {
+} LassoIdWsf2SubsRefNotifyResponse;
+%extend LassoIdWsf2SubsRefNotifyResponse {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SubsRefNotifyResponse();
+	~LassoIdWsf2SubsRefNotifyResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SubsRefNotifyResponse lasso_idwsf2_subsref_notify_response_new
+#define delete_LassoIdWsf2SubsRefNotifyResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SubsRefNotifyResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/subsref_query.i b/swig/id-wsf-2.0/subsref_query.i
new file mode 100644
index 00000000..51dd622f
--- /dev/null
+++ b/swig/id-wsf-2.0/subsref_query.i
@@ -0,0 +1,54 @@
+/* $Id: subsref_query.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SubsRefQuery) LassoIdWsf2SubsRefQuery;
+#endif
+typedef struct {
+} LassoIdWsf2SubsRefQuery;
+%extend LassoIdWsf2SubsRefQuery {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SubsRefQuery();
+	~LassoIdWsf2SubsRefQuery();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SubsRefQuery lasso_idwsf2_subsref_query_new
+#define delete_LassoIdWsf2SubsRefQuery(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SubsRefQuery_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/subsref_query_item.i b/swig/id-wsf-2.0/subsref_query_item.i
new file mode 100644
index 00000000..05ab632e
--- /dev/null
+++ b/swig/id-wsf-2.0/subsref_query_item.i
@@ -0,0 +1,58 @@
+/* $Id: subsref_query_item.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SubsRefQueryItem) LassoIdWsf2SubsRefQueryItem;
+#endif
+typedef struct {
+	int count;
+	int offset;
+	char *setID;
+	char *setReq;
+} LassoIdWsf2SubsRefQueryItem;
+%extend LassoIdWsf2SubsRefQueryItem {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SubsRefQueryItem();
+	~LassoIdWsf2SubsRefQueryItem();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SubsRefQueryItem lasso_idwsf2_subsref_query_item_new
+#define delete_LassoIdWsf2SubsRefQueryItem(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SubsRefQueryItem_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/subsref_query_response.i b/swig/id-wsf-2.0/subsref_query_response.i
new file mode 100644
index 00000000..064488a8
--- /dev/null
+++ b/swig/id-wsf-2.0/subsref_query_response.i
@@ -0,0 +1,54 @@
+/* $Id: subsref_query_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SubsRefQueryResponse) LassoIdWsf2SubsRefQueryResponse;
+#endif
+typedef struct {
+} LassoIdWsf2SubsRefQueryResponse;
+%extend LassoIdWsf2SubsRefQueryResponse {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SubsRefQueryResponse();
+	~LassoIdWsf2SubsRefQueryResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SubsRefQueryResponse lasso_idwsf2_subsref_query_response_new
+#define delete_LassoIdWsf2SubsRefQueryResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SubsRefQueryResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/subsref_result_query.i b/swig/id-wsf-2.0/subsref_result_query.i
new file mode 100644
index 00000000..bfaadbde
--- /dev/null
+++ b/swig/id-wsf-2.0/subsref_result_query.i
@@ -0,0 +1,54 @@
+/* $Id: subsref_result_query.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SubsRefResultQuery) LassoIdWsf2SubsRefResultQuery;
+#endif
+typedef struct {
+} LassoIdWsf2SubsRefResultQuery;
+%extend LassoIdWsf2SubsRefResultQuery {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SubsRefResultQuery();
+	~LassoIdWsf2SubsRefResultQuery();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SubsRefResultQuery lasso_idwsf2_subsref_result_query_new
+#define delete_LassoIdWsf2SubsRefResultQuery(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SubsRefResultQuery_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/subsref_subscription.i b/swig/id-wsf-2.0/subsref_subscription.i
new file mode 100644
index 00000000..884994de
--- /dev/null
+++ b/swig/id-wsf-2.0/subsref_subscription.i
@@ -0,0 +1,54 @@
+/* $Id: subsref_subscription.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SubsRefSubscription) LassoIdWsf2SubsRefSubscription;
+#endif
+typedef struct {
+} LassoIdWsf2SubsRefSubscription;
+%extend LassoIdWsf2SubsRefSubscription {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SubsRefSubscription();
+	~LassoIdWsf2SubsRefSubscription();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SubsRefSubscription lasso_idwsf2_subsref_subscription_new
+#define delete_LassoIdWsf2SubsRefSubscription(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SubsRefSubscription_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/subsref_test_item.i b/swig/id-wsf-2.0/subsref_test_item.i
new file mode 100644
index 00000000..f5b0f699
--- /dev/null
+++ b/swig/id-wsf-2.0/subsref_test_item.i
@@ -0,0 +1,54 @@
+/* $Id: subsref_test_item.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2SubsRefTestItem) LassoIdWsf2SubsRefTestItem;
+#endif
+typedef struct {
+} LassoIdWsf2SubsRefTestItem;
+%extend LassoIdWsf2SubsRefTestItem {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2SubsRefTestItem();
+	~LassoIdWsf2SubsRefTestItem();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2SubsRefTestItem lasso_idwsf2_subsref_test_item_new
+#define delete_LassoIdWsf2SubsRefTestItem(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2SubsRefTestItem_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/util_empty.i b/swig/id-wsf-2.0/util_empty.i
new file mode 100644
index 00000000..4e4aeb42
--- /dev/null
+++ b/swig/id-wsf-2.0/util_empty.i
@@ -0,0 +1,54 @@
+/* $Id: util_empty.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2UtilEmpty) LassoIdWsf2UtilEmpty;
+#endif
+typedef struct {
+} LassoIdWsf2UtilEmpty;
+%extend LassoIdWsf2UtilEmpty {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2UtilEmpty();
+	~LassoIdWsf2UtilEmpty();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2UtilEmpty lasso_idwsf2_util_empty_new
+#define delete_LassoIdWsf2UtilEmpty(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2UtilEmpty_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/util_extension.i b/swig/id-wsf-2.0/util_extension.i
new file mode 100644
index 00000000..fe34e13f
--- /dev/null
+++ b/swig/id-wsf-2.0/util_extension.i
@@ -0,0 +1,54 @@
+/* $Id: util_extension.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2Utilextension) LassoIdWsf2Utilextension;
+#endif
+typedef struct {
+} LassoIdWsf2Utilextension;
+%extend LassoIdWsf2Utilextension {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2Utilextension();
+	~LassoIdWsf2Utilextension();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2Utilextension lasso_idwsf2_util_extension_new
+#define delete_LassoIdWsf2Utilextension(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2Utilextension_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/util_response.i b/swig/id-wsf-2.0/util_response.i
new file mode 100644
index 00000000..3a36d35e
--- /dev/null
+++ b/swig/id-wsf-2.0/util_response.i
@@ -0,0 +1,82 @@
+/* $Id: util_response.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2UtilResponse) LassoIdWsf2UtilResponse;
+#endif
+typedef struct {
+	char *itemIDRef;
+} LassoIdWsf2UtilResponse;
+%extend LassoIdWsf2UtilResponse {
+
+#ifndef SWIGPHP4
+	%rename(status) Status;
+#endif
+	%newobject *Status_get;
+	LassoIdWsf2UtilStatus *Status;
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2UtilResponse();
+	~LassoIdWsf2UtilResponse();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* Status */
+
+#define LassoIdWsf2UtilResponse_get_Status(self) get_node((self)->Status)
+#define LassoIdWsf2UtilResponse_Status_get(self) get_node((self)->Status)
+#define LassoIdWsf2UtilResponse_set_Status(self,value) set_node((gpointer*)&(self)->Status, (value))
+#define LassoIdWsf2UtilResponse_Status_set(self,value) set_node((gpointer*)&(self)->Status, (value))
+                    
+
+/* any attribute */
+LassoStringDict* LassoIdWsf2UtilResponse_attributes_get(LassoIdWsf2UtilResponse *self);
+#define LassoIdWsf2UtilResponse_get_attributes LassoIdWsf2UtilResponse_attributes_get
+LassoStringDict* LassoIdWsf2UtilResponse_attributes_get(LassoIdWsf2UtilResponse *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2UtilResponse lasso_idwsf2_util_response_new
+#define delete_LassoIdWsf2UtilResponse(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2UtilResponse_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/id-wsf-2.0/util_status.i b/swig/id-wsf-2.0/util_status.i
new file mode 100644
index 00000000..e03fb651
--- /dev/null
+++ b/swig/id-wsf-2.0/util_status.i
@@ -0,0 +1,57 @@
+/* $Id: util_status.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(IdWsf2UtilStatus) LassoIdWsf2UtilStatus;
+#endif
+typedef struct {
+	char *code;
+	char *ref;
+	char *comment;
+} LassoIdWsf2UtilStatus;
+%extend LassoIdWsf2UtilStatus {
+
+	/* Constructor, Destructor & Static Methods */
+	LassoIdWsf2UtilStatus();
+	~LassoIdWsf2UtilStatus();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoIdWsf2UtilStatus lasso_idwsf2_util_status_new
+#define delete_LassoIdWsf2UtilStatus(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoIdWsf2UtilStatus_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/ws/Makefile.am b/swig/ws/Makefile.am
new file mode 100644
index 00000000..b44f52c7
--- /dev/null
+++ b/swig/ws/Makefile.am
@@ -0,0 +1,20 @@
+EXTRA_DIST = \
+	inheritance.h \
+	main.h \
+	Makefile.am \
+	wsa_attributed_any.i \
+	wsa_attributed_qname.i \
+	wsa_attributed_unsigned_long.i \
+	wsa_attributed_uri.i \
+	wsa_endpoint_reference.i \
+	wsa_metadata.i \
+	wsa_problem_action.i \
+	wsa_reference_parameters.i \
+	wsa_relates_to.i \
+	wsse_embedded.i \
+	wsse_reference.i \
+	wsse_security_header.i \
+	wsse_security_token_reference.i \
+	wsse_transformation_parameters.i \
+	wsse_username_token.i \
+	wsu_timestamp.i
diff --git a/swig/ws/inheritance.h b/swig/ws/inheritance.h
new file mode 100644
index 00000000..5692b460
--- /dev/null
+++ b/swig/ws/inheritance.h
@@ -0,0 +1,17 @@
+SET_NODE_INFO(WsUtil1Timestamp, Node)
+SET_NODE_INFO(WsAddrProblemAction, Node)
+SET_NODE_INFO(WsAddrRelatesTo, Node)
+SET_NODE_INFO(WsAddrAttributedURI, Node)
+SET_NODE_INFO(WsAddrAttributedUnsignedLong, Node)
+SET_NODE_INFO(WsAddrAttributedQName, Node)
+SET_NODE_INFO(WsAddrReferenceParameters, Node)
+SET_NODE_INFO(WsAddrEndpointReference, Node)
+SET_NODE_INFO(WsAddrAttributedAny, Node)
+SET_NODE_INFO(WsAddrMetadata, Node)
+SET_NODE_INFO(WsSec1SecurityHeader, Node)
+SET_NODE_INFO(WsSec1Reference, Node)
+SET_NODE_INFO(WsSec1Embedded, Node)
+SET_NODE_INFO(WsSec1UsernameToken, Node)
+SET_NODE_INFO(WsSec1TransformationParameters, Node)
+SET_NODE_INFO(WsSec1SecurityTokenReference, Node)
+
diff --git a/swig/ws/main.h b/swig/ws/main.h
new file mode 100644
index 00000000..41940969
--- /dev/null
+++ b/swig/ws/main.h
@@ -0,0 +1,34 @@
+%{
+#include <lasso/xml/ws/wsu_timestamp.h>
+#include <lasso/xml/ws/wsa_problem_action.h>
+#include <lasso/xml/ws/wsa_relates_to.h>
+#include <lasso/xml/ws/wsa_attributed_uri.h>
+#include <lasso/xml/ws/wsa_attributed_unsigned_long.h>
+#include <lasso/xml/ws/wsa_attributed_qname.h>
+#include <lasso/xml/ws/wsa_reference_parameters.h>
+#include <lasso/xml/ws/wsa_endpoint_reference.h>
+#include <lasso/xml/ws/wsa_attributed_any.h>
+#include <lasso/xml/ws/wsa_metadata.h>
+#include <lasso/xml/ws/wsse_security_header.h>
+#include <lasso/xml/ws/wsse_reference.h>
+#include <lasso/xml/ws/wsse_embedded.h>
+#include <lasso/xml/ws/wsse_username_token.h>
+#include <lasso/xml/ws/wsse_transformation_parameters.h>
+#include <lasso/xml/ws/wsse_security_token_reference.h>
+%}
+%include wsu_timestamp.i
+%include wsa_problem_action.i
+%include wsa_relates_to.i
+%include wsa_attributed_uri.i
+%include wsa_attributed_unsigned_long.i
+%include wsa_attributed_qname.i
+%include wsa_reference_parameters.i
+%include wsa_endpoint_reference.i
+%include wsa_attributed_any.i
+%include wsa_metadata.i
+%include wsse_security_header.i
+%include wsse_reference.i
+%include wsse_embedded.i
+%include wsse_username_token.i
+%include wsse_transformation_parameters.i
+%include wsse_security_token_reference.i
\ No newline at end of file
diff --git a/swig/ws/wsa_attributed_any.i b/swig/ws/wsa_attributed_any.i
new file mode 100644
index 00000000..9f700133
--- /dev/null
+++ b/swig/ws/wsa_attributed_any.i
@@ -0,0 +1,67 @@
+/* $Id: wsa_attributed_any.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(WsAddrAttributedAny) LassoWsAddrAttributedAny;
+#endif
+typedef struct {
+} LassoWsAddrAttributedAny;
+%extend LassoWsAddrAttributedAny {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoWsAddrAttributedAny();
+	~LassoWsAddrAttributedAny();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoWsAddrAttributedAny_attributes_get(LassoWsAddrAttributedAny *self);
+#define LassoWsAddrAttributedAny_get_attributes LassoWsAddrAttributedAny_attributes_get
+LassoStringDict* LassoWsAddrAttributedAny_attributes_get(LassoWsAddrAttributedAny *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoWsAddrAttributedAny lasso_wsa_attributed_any_new
+#define delete_LassoWsAddrAttributedAny(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoWsAddrAttributedAny_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/ws/wsa_attributed_qname.i b/swig/ws/wsa_attributed_qname.i
new file mode 100644
index 00000000..2383ee34
--- /dev/null
+++ b/swig/ws/wsa_attributed_qname.i
@@ -0,0 +1,68 @@
+/* $Id: wsa_attributed_qname.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(WsAddrAttributedQName) LassoWsAddrAttributedQName;
+#endif
+typedef struct {
+	char *content;
+} LassoWsAddrAttributedQName;
+%extend LassoWsAddrAttributedQName {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoWsAddrAttributedQName();
+	~LassoWsAddrAttributedQName();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoWsAddrAttributedQName_attributes_get(LassoWsAddrAttributedQName *self);
+#define LassoWsAddrAttributedQName_get_attributes LassoWsAddrAttributedQName_attributes_get
+LassoStringDict* LassoWsAddrAttributedQName_attributes_get(LassoWsAddrAttributedQName *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoWsAddrAttributedQName lasso_wsa_attributed_qname_new
+#define delete_LassoWsAddrAttributedQName(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoWsAddrAttributedQName_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/ws/wsa_attributed_unsigned_long.i b/swig/ws/wsa_attributed_unsigned_long.i
new file mode 100644
index 00000000..fcd4392b
--- /dev/null
+++ b/swig/ws/wsa_attributed_unsigned_long.i
@@ -0,0 +1,67 @@
+/* $Id: wsa_attributed_unsigned_long.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(WsAddrAttributedUnsignedLong) LassoWsAddrAttributedUnsignedLong;
+#endif
+typedef struct {
+} LassoWsAddrAttributedUnsignedLong;
+%extend LassoWsAddrAttributedUnsignedLong {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoWsAddrAttributedUnsignedLong();
+	~LassoWsAddrAttributedUnsignedLong();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoWsAddrAttributedUnsignedLong_attributes_get(LassoWsAddrAttributedUnsignedLong *self);
+#define LassoWsAddrAttributedUnsignedLong_get_attributes LassoWsAddrAttributedUnsignedLong_attributes_get
+LassoStringDict* LassoWsAddrAttributedUnsignedLong_attributes_get(LassoWsAddrAttributedUnsignedLong *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoWsAddrAttributedUnsignedLong lasso_wsa_attributed_unsigned_long_new
+#define delete_LassoWsAddrAttributedUnsignedLong(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoWsAddrAttributedUnsignedLong_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/ws/wsa_attributed_uri.i b/swig/ws/wsa_attributed_uri.i
new file mode 100644
index 00000000..c0ddb8f0
--- /dev/null
+++ b/swig/ws/wsa_attributed_uri.i
@@ -0,0 +1,68 @@
+/* $Id: wsa_attributed_uri.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(WsAddrAttributedURI) LassoWsAddrAttributedURI;
+#endif
+typedef struct {
+	char *content;
+} LassoWsAddrAttributedURI;
+%extend LassoWsAddrAttributedURI {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoWsAddrAttributedURI();
+	~LassoWsAddrAttributedURI();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoWsAddrAttributedURI_attributes_get(LassoWsAddrAttributedURI *self);
+#define LassoWsAddrAttributedURI_get_attributes LassoWsAddrAttributedURI_attributes_get
+LassoStringDict* LassoWsAddrAttributedURI_attributes_get(LassoWsAddrAttributedURI *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoWsAddrAttributedURI lasso_wsa_attributed_uri_new
+#define delete_LassoWsAddrAttributedURI(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoWsAddrAttributedURI_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/ws/wsa_endpoint_reference.i b/swig/ws/wsa_endpoint_reference.i
new file mode 100644
index 00000000..164e6cf8
--- /dev/null
+++ b/swig/ws/wsa_endpoint_reference.i
@@ -0,0 +1,109 @@
+/* $Id: wsa_endpoint_reference.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(WsAddrEndpointReference) LassoWsAddrEndpointReference;
+#endif
+typedef struct {
+} LassoWsAddrEndpointReference;
+%extend LassoWsAddrEndpointReference {
+
+#ifndef SWIGPHP4
+	%rename(address) Address;
+#endif
+	%newobject *Address_get;
+	LassoWsAddrAttributedURI *Address;
+
+#ifndef SWIGPHP4
+	%rename(referenceParameters) ReferenceParameters;
+#endif
+	%newobject *ReferenceParameters_get;
+	LassoWsAddrReferenceParameters *ReferenceParameters;
+
+#ifndef SWIGPHP4
+	%rename(metadata) Metadata;
+#endif
+	%newobject *Metadata_get;
+	LassoWsAddrMetadata *Metadata;
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoWsAddrEndpointReference();
+	~LassoWsAddrEndpointReference();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* Address */
+
+#define LassoWsAddrEndpointReference_get_Address(self) get_node((self)->Address)
+#define LassoWsAddrEndpointReference_Address_get(self) get_node((self)->Address)
+#define LassoWsAddrEndpointReference_set_Address(self,value) set_node((gpointer*)&(self)->Address, (value))
+#define LassoWsAddrEndpointReference_Address_set(self,value) set_node((gpointer*)&(self)->Address, (value))
+                    
+
+/* ReferenceParameters */
+
+#define LassoWsAddrEndpointReference_get_ReferenceParameters(self) get_node((self)->ReferenceParameters)
+#define LassoWsAddrEndpointReference_ReferenceParameters_get(self) get_node((self)->ReferenceParameters)
+#define LassoWsAddrEndpointReference_set_ReferenceParameters(self,value) set_node((gpointer*)&(self)->ReferenceParameters, (value))
+#define LassoWsAddrEndpointReference_ReferenceParameters_set(self,value) set_node((gpointer*)&(self)->ReferenceParameters, (value))
+                    
+
+/* Metadata */
+
+#define LassoWsAddrEndpointReference_get_Metadata(self) get_node((self)->Metadata)
+#define LassoWsAddrEndpointReference_Metadata_get(self) get_node((self)->Metadata)
+#define LassoWsAddrEndpointReference_set_Metadata(self,value) set_node((gpointer*)&(self)->Metadata, (value))
+#define LassoWsAddrEndpointReference_Metadata_set(self,value) set_node((gpointer*)&(self)->Metadata, (value))
+                    
+
+/* any attribute */
+LassoStringDict* LassoWsAddrEndpointReference_attributes_get(LassoWsAddrEndpointReference *self);
+#define LassoWsAddrEndpointReference_get_attributes LassoWsAddrEndpointReference_attributes_get
+LassoStringDict* LassoWsAddrEndpointReference_attributes_get(LassoWsAddrEndpointReference *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoWsAddrEndpointReference lasso_wsa_endpoint_reference_new
+#define delete_LassoWsAddrEndpointReference(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoWsAddrEndpointReference_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/ws/wsa_metadata.i b/swig/ws/wsa_metadata.i
new file mode 100644
index 00000000..865914e8
--- /dev/null
+++ b/swig/ws/wsa_metadata.i
@@ -0,0 +1,67 @@
+/* $Id: wsa_metadata.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(WsAddrMetadata) LassoWsAddrMetadata;
+#endif
+typedef struct {
+} LassoWsAddrMetadata;
+%extend LassoWsAddrMetadata {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoWsAddrMetadata();
+	~LassoWsAddrMetadata();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoWsAddrMetadata_attributes_get(LassoWsAddrMetadata *self);
+#define LassoWsAddrMetadata_get_attributes LassoWsAddrMetadata_attributes_get
+LassoStringDict* LassoWsAddrMetadata_attributes_get(LassoWsAddrMetadata *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoWsAddrMetadata lasso_wsa_metadata_new
+#define delete_LassoWsAddrMetadata(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoWsAddrMetadata_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/ws/wsa_problem_action.i b/swig/ws/wsa_problem_action.i
new file mode 100644
index 00000000..3184531c
--- /dev/null
+++ b/swig/ws/wsa_problem_action.i
@@ -0,0 +1,85 @@
+/* $Id: wsa_problem_action.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(WsAddrProblemAction) LassoWsAddrProblemAction;
+#endif
+typedef struct {
+#ifndef SWIGPHP4
+	%rename(soapAction) SoapAction;
+#endif
+	char *SoapAction;
+} LassoWsAddrProblemAction;
+%extend LassoWsAddrProblemAction {
+
+#ifndef SWIGPHP4
+	%rename(action) Action;
+#endif
+	%newobject *Action_get;
+	LassoWsAddrAttributedURI *Action;
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoWsAddrProblemAction();
+	~LassoWsAddrProblemAction();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* Action */
+
+#define LassoWsAddrProblemAction_get_Action(self) get_node((self)->Action)
+#define LassoWsAddrProblemAction_Action_get(self) get_node((self)->Action)
+#define LassoWsAddrProblemAction_set_Action(self,value) set_node((gpointer*)&(self)->Action, (value))
+#define LassoWsAddrProblemAction_Action_set(self,value) set_node((gpointer*)&(self)->Action, (value))
+                    
+
+/* any attribute */
+LassoStringDict* LassoWsAddrProblemAction_attributes_get(LassoWsAddrProblemAction *self);
+#define LassoWsAddrProblemAction_get_attributes LassoWsAddrProblemAction_attributes_get
+LassoStringDict* LassoWsAddrProblemAction_attributes_get(LassoWsAddrProblemAction *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoWsAddrProblemAction lasso_wsa_problem_action_new
+#define delete_LassoWsAddrProblemAction(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoWsAddrProblemAction_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/ws/wsa_reference_parameters.i b/swig/ws/wsa_reference_parameters.i
new file mode 100644
index 00000000..55f6f1b0
--- /dev/null
+++ b/swig/ws/wsa_reference_parameters.i
@@ -0,0 +1,67 @@
+/* $Id: wsa_reference_parameters.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(WsAddrReferenceParameters) LassoWsAddrReferenceParameters;
+#endif
+typedef struct {
+} LassoWsAddrReferenceParameters;
+%extend LassoWsAddrReferenceParameters {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoWsAddrReferenceParameters();
+	~LassoWsAddrReferenceParameters();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoWsAddrReferenceParameters_attributes_get(LassoWsAddrReferenceParameters *self);
+#define LassoWsAddrReferenceParameters_get_attributes LassoWsAddrReferenceParameters_attributes_get
+LassoStringDict* LassoWsAddrReferenceParameters_attributes_get(LassoWsAddrReferenceParameters *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoWsAddrReferenceParameters lasso_wsa_reference_parameters_new
+#define delete_LassoWsAddrReferenceParameters(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoWsAddrReferenceParameters_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/ws/wsa_relates_to.i b/swig/ws/wsa_relates_to.i
new file mode 100644
index 00000000..19ca83f4
--- /dev/null
+++ b/swig/ws/wsa_relates_to.i
@@ -0,0 +1,72 @@
+/* $Id: wsa_relates_to.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(WsAddrRelatesTo) LassoWsAddrRelatesTo;
+#endif
+typedef struct {
+	char *content;
+#ifndef SWIGPHP4
+	%rename(relationshipType) RelationshipType;
+#endif
+	char *RelationshipType;
+} LassoWsAddrRelatesTo;
+%extend LassoWsAddrRelatesTo {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoWsAddrRelatesTo();
+	~LassoWsAddrRelatesTo();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoWsAddrRelatesTo_attributes_get(LassoWsAddrRelatesTo *self);
+#define LassoWsAddrRelatesTo_get_attributes LassoWsAddrRelatesTo_attributes_get
+LassoStringDict* LassoWsAddrRelatesTo_attributes_get(LassoWsAddrRelatesTo *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoWsAddrRelatesTo lasso_wsa_relates_to_new
+#define delete_LassoWsAddrRelatesTo(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoWsAddrRelatesTo_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/ws/wsse_embedded.i b/swig/ws/wsse_embedded.i
new file mode 100644
index 00000000..f7cced3b
--- /dev/null
+++ b/swig/ws/wsse_embedded.i
@@ -0,0 +1,71 @@
+/* $Id: wsse_embedded.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(WsSec1Embedded) LassoWsSec1Embedded;
+#endif
+typedef struct {
+#ifndef SWIGPHP4
+	%rename(valueType) ValueType;
+#endif
+	char *ValueType;
+} LassoWsSec1Embedded;
+%extend LassoWsSec1Embedded {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoWsSec1Embedded();
+	~LassoWsSec1Embedded();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoWsSec1Embedded_attributes_get(LassoWsSec1Embedded *self);
+#define LassoWsSec1Embedded_get_attributes LassoWsSec1Embedded_attributes_get
+LassoStringDict* LassoWsSec1Embedded_attributes_get(LassoWsSec1Embedded *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoWsSec1Embedded lasso_wsse_embedded_new
+#define delete_LassoWsSec1Embedded(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoWsSec1Embedded_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/ws/wsse_reference.i b/swig/ws/wsse_reference.i
new file mode 100644
index 00000000..4bc77ef6
--- /dev/null
+++ b/swig/ws/wsse_reference.i
@@ -0,0 +1,75 @@
+/* $Id: wsse_reference.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(WsSec1Reference) LassoWsSec1Reference;
+#endif
+typedef struct {
+#ifndef SWIGPHP4
+	%rename(uRI) URI;
+#endif
+	char *URI;
+#ifndef SWIGPHP4
+	%rename(valueType) ValueType;
+#endif
+	char *ValueType;
+} LassoWsSec1Reference;
+%extend LassoWsSec1Reference {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoWsSec1Reference();
+	~LassoWsSec1Reference();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoWsSec1Reference_attributes_get(LassoWsSec1Reference *self);
+#define LassoWsSec1Reference_get_attributes LassoWsSec1Reference_attributes_get
+LassoStringDict* LassoWsSec1Reference_attributes_get(LassoWsSec1Reference *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoWsSec1Reference lasso_wsse_reference_new
+#define delete_LassoWsSec1Reference(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoWsSec1Reference_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/ws/wsse_security_header.i b/swig/ws/wsse_security_header.i
new file mode 100644
index 00000000..6c3768d6
--- /dev/null
+++ b/swig/ws/wsse_security_header.i
@@ -0,0 +1,67 @@
+/* $Id: wsse_security_header.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(WsSec1SecurityHeader) LassoWsSec1SecurityHeader;
+#endif
+typedef struct {
+} LassoWsSec1SecurityHeader;
+%extend LassoWsSec1SecurityHeader {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoWsSec1SecurityHeader();
+	~LassoWsSec1SecurityHeader();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoWsSec1SecurityHeader_attributes_get(LassoWsSec1SecurityHeader *self);
+#define LassoWsSec1SecurityHeader_get_attributes LassoWsSec1SecurityHeader_attributes_get
+LassoStringDict* LassoWsSec1SecurityHeader_attributes_get(LassoWsSec1SecurityHeader *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoWsSec1SecurityHeader lasso_wsse_security_header_new
+#define delete_LassoWsSec1SecurityHeader(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoWsSec1SecurityHeader_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/ws/wsse_security_token_reference.i b/swig/ws/wsse_security_token_reference.i
new file mode 100644
index 00000000..4d4842fa
--- /dev/null
+++ b/swig/ws/wsse_security_token_reference.i
@@ -0,0 +1,75 @@
+/* $Id: wsse_security_token_reference.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(WsSec1SecurityTokenReference) LassoWsSec1SecurityTokenReference;
+#endif
+typedef struct {
+#ifndef SWIGPHP4
+	%rename(id) Id;
+#endif
+	char *Id;
+#ifndef SWIGPHP4
+	%rename(usage) Usage;
+#endif
+	char *Usage;
+} LassoWsSec1SecurityTokenReference;
+%extend LassoWsSec1SecurityTokenReference {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoWsSec1SecurityTokenReference();
+	~LassoWsSec1SecurityTokenReference();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoWsSec1SecurityTokenReference_attributes_get(LassoWsSec1SecurityTokenReference *self);
+#define LassoWsSec1SecurityTokenReference_get_attributes LassoWsSec1SecurityTokenReference_attributes_get
+LassoStringDict* LassoWsSec1SecurityTokenReference_attributes_get(LassoWsSec1SecurityTokenReference *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoWsSec1SecurityTokenReference lasso_wsse_security_token_reference_new
+#define delete_LassoWsSec1SecurityTokenReference(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoWsSec1SecurityTokenReference_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/ws/wsse_transformation_parameters.i b/swig/ws/wsse_transformation_parameters.i
new file mode 100644
index 00000000..2d90975e
--- /dev/null
+++ b/swig/ws/wsse_transformation_parameters.i
@@ -0,0 +1,67 @@
+/* $Id: wsse_transformation_parameters.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(WsSec1TransformationParameters) LassoWsSec1TransformationParameters;
+#endif
+typedef struct {
+} LassoWsSec1TransformationParameters;
+%extend LassoWsSec1TransformationParameters {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoWsSec1TransformationParameters();
+	~LassoWsSec1TransformationParameters();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoWsSec1TransformationParameters_attributes_get(LassoWsSec1TransformationParameters *self);
+#define LassoWsSec1TransformationParameters_get_attributes LassoWsSec1TransformationParameters_attributes_get
+LassoStringDict* LassoWsSec1TransformationParameters_attributes_get(LassoWsSec1TransformationParameters *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoWsSec1TransformationParameters lasso_wsse_transformation_parameters_new
+#define delete_LassoWsSec1TransformationParameters(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoWsSec1TransformationParameters_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/ws/wsse_username_token.i b/swig/ws/wsse_username_token.i
new file mode 100644
index 00000000..7fb23dcf
--- /dev/null
+++ b/swig/ws/wsse_username_token.i
@@ -0,0 +1,71 @@
+/* $Id: wsse_username_token.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(WsSec1UsernameToken) LassoWsSec1UsernameToken;
+#endif
+typedef struct {
+#ifndef SWIGPHP4
+	%rename(id) Id;
+#endif
+	char *Id;
+} LassoWsSec1UsernameToken;
+%extend LassoWsSec1UsernameToken {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoWsSec1UsernameToken();
+	~LassoWsSec1UsernameToken();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoWsSec1UsernameToken_attributes_get(LassoWsSec1UsernameToken *self);
+#define LassoWsSec1UsernameToken_get_attributes LassoWsSec1UsernameToken_attributes_get
+LassoStringDict* LassoWsSec1UsernameToken_attributes_get(LassoWsSec1UsernameToken *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoWsSec1UsernameToken lasso_wsse_username_token_new
+#define delete_LassoWsSec1UsernameToken(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoWsSec1UsernameToken_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+
diff --git a/swig/ws/wsu_timestamp.i b/swig/ws/wsu_timestamp.i
new file mode 100644
index 00000000..b2c1e968
--- /dev/null
+++ b/swig/ws/wsu_timestamp.i
@@ -0,0 +1,79 @@
+/* $Id: wsu_timestamp.i,v 1.0 2005/10/14 15:17:55 fpeters Exp $ 
+ *
+ * Lasso - A free implementation of the Liberty Alliance specifications.
+ *
+ * Copyright (C) 2004-2007 Entr'ouvert
+ * http://lasso.entrouvert.org
+ * 
+ * Authors: See AUTHORS file in top-level directory.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SWIGPHP4
+%rename(WsUtil1Timestamp) LassoWsUtil1Timestamp;
+#endif
+typedef struct {
+#ifndef SWIGPHP4
+	%rename(created) Created;
+#endif
+	char *Created;
+#ifndef SWIGPHP4
+	%rename(expires) Expires;
+#endif
+	char *Expires;
+#ifndef SWIGPHP4
+	%rename(id) Id;
+#endif
+	char *Id;
+} LassoWsUtil1Timestamp;
+%extend LassoWsUtil1Timestamp {
+
+	/* any attribute */
+	%immutable attributes;
+	%newobject attributes_get;
+	LassoStringDict *attributes;
+
+	/* Constructor, Destructor & Static Methods */
+	LassoWsUtil1Timestamp();
+	~LassoWsUtil1Timestamp();
+
+	/* Method inherited from LassoNode */
+	%newobject dump;
+	char* dump();
+}
+
+%{
+
+/* any attribute */
+LassoStringDict* LassoWsUtil1Timestamp_attributes_get(LassoWsUtil1Timestamp *self);
+#define LassoWsUtil1Timestamp_get_attributes LassoWsUtil1Timestamp_attributes_get
+LassoStringDict* LassoWsUtil1Timestamp_attributes_get(LassoWsUtil1Timestamp *self) {
+        return self->attributes;
+}
+/* TODO: implement attributes_set */
+
+
+/* Constructors, destructors & static methods implementations */
+
+#define new_LassoWsUtil1Timestamp lasso_wsu_timestamp_new
+#define delete_LassoWsUtil1Timestamp(self) lasso_node_destroy(LASSO_NODE(self))
+
+/* Implementations of methods inherited from LassoNode */
+
+#define LassoWsUtil1Timestamp_dump(self) lasso_node_dump(LASSO_NODE(self))
+
+%}
+