diff --git a/Build.PL b/Build.PL
index d249fa8..15c6433 100644
--- a/Build.PL
+++ b/Build.PL
@@ -4,7 +4,7 @@ $build = Module::Build->new(
 	create_makefile_pl => 'passthrough',
 	dist_abstract      => 'SOAP with WSDL support',
 	dist_name          => 'SOAP-WSDL',
-	dist_version       => '2.00_19',
+	dist_version       => '2.00_20',
 	module_name        => 'SOAP::WSDL',
 	license            => 'artistic',
 	requires           => {
diff --git a/CHANGES b/CHANGES
index f038089..272572c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-Release notes for SOAP::WSDL 2.00_19
+Release notes for SOAP::WSDL 2.00_20
 -------
 
 I'm proud to present a new pre-release version of SOAP::WSDL.
@@ -33,6 +33,25 @@ Features:
 
 The following changes have been made:
 
+2.00_20
+----
+The following features were added (the numbers in square brackets are the 
+tracker IDs from https://sourceforge.net/tracker/?group_id=111978&atid=660924):
+
+   * [ 1815646 ] Only include last part of port name in interface
+   * [ 1815648 ] Methods with empty body cannot be called as ->method()
+   * [ 1815651 ] Empty complexType definitions not supported
+   
+The following bugs have been fixed (the numbers in square brackets are the 
+tracker IDs from https://sourceforge.net/tracker/?group_id=111978&atid=660921):
+
+   * [ 1815643 ] ComplexTypes cannot be freezed/thawed
+
+The following uncategorized improvements have been made:   
+
+   * WSDL definitions are decoded into utf8
+   * fixed tests to use correct path on windows
+
 2.00_19
 ----
 The following features were added (the numbers in square brackets are the 
diff --git a/META.yml b/META.yml
index 5aabe7f..53140b3 100644
--- a/META.yml
+++ b/META.yml
@@ -1,250 +1,250 @@
----
-name: SOAP-WSDL
-version: 2.00_19
-author: []
-abstract: SOAP with WSDL support
-license: artistic
-resources:
-  license: http://opensource.org/licenses/artistic-license.php
-requires:
-  Class::Std: v0.0.8
-  Class::Std::Storable: 0
-  Data::Dumper: 0
-  Date::Format: 0
-  Date::Parse: 0
-  File::Basename: 0
-  File::Path: 0
-  Getopt::Long: 0
-  LWP::UserAgent: 0
-  List::Util: 0
-  Template: 0
-  Term::ReadKey: 0
-  XML::Parser::Expat: 0
-provides:
-  SOAP::WSDL:
-    file: lib/SOAP/WSDL.pm
-    version: 2.00_17
-  SOAP::WSDL::Base:
-    file: lib/SOAP/WSDL/Base.pm
-    version: 2.00_17
-  SOAP::WSDL::Binding:
-    file: lib/SOAP/WSDL/Binding.pm
-  SOAP::WSDL::Client:
-    file: lib/SOAP/WSDL/Client.pm
-    version: 2.00_17
-  SOAP::WSDL::Client::Base:
-    file: lib/SOAP/WSDL/Client/Base.pm
-    version: 2.00_17
-  SOAP::WSDL::Definitions:
-    file: lib/SOAP/WSDL/Definitions.pm
-    version: 2.00_17
-  SOAP::WSDL::Deserializer::Hash:
-    file: lib/SOAP/WSDL/Deserializer/Hash.pm
-    version: 2.00_17
-  SOAP::WSDL::Deserializer::SOAP11:
-    file: lib/SOAP/WSDL/Deserializer/SOAP11.pm
-    version: 2.00_17
-  SOAP::WSDL::Deserializer::SOM:
-    file: lib/SOAP/WSDL/Deserializer/SOM.pm
-    version: 2.00_15
-  SOAP::WSDL::Expat::Base:
-    file: lib/SOAP/WSDL/Expat/Base.pm
-  SOAP::WSDL::Expat::Message2Hash:
-    file: lib/SOAP/WSDL/Expat/Message2Hash.pm
-  SOAP::WSDL::Expat::MessageParser:
-    file: lib/SOAP/WSDL/Expat/MessageParser.pm
-  SOAP::WSDL::Expat::MessageStreamParser:
-    file: lib/SOAP/WSDL/Expat/MessageStreamParser.pm
-  SOAP::WSDL::Factory::Deserializer:
-    file: lib/SOAP/WSDL/Factory/Deserializer.pm
-  SOAP::WSDL::Factory::Generator:
-    file: lib/SOAP/WSDL/Factory/Generator.pm
-    version: 2.00_18
-  SOAP::WSDL::Factory::Serializer:
-    file: lib/SOAP/WSDL/Factory/Serializer.pm
-    version: 2.00_17
-  SOAP::WSDL::Factory::Transport:
-    file: lib/SOAP/WSDL/Factory/Transport.pm
-    version: 2.00_17
-  SOAP::WSDL::Generator::Template:
-    file: lib/SOAP/WSDL/Generator/Template.pm
-    version: 2.00_17
-  SOAP::WSDL::Generator::Template::XSD:
-    file: lib/SOAP/WSDL/Generator/Template/XSD.pm
-  SOAP::WSDL::Generator::Visitor:
-    file: lib/SOAP/WSDL/Generator/Visitor.pm
-    version: 2.00_17
-  SOAP::WSDL::Generator::Visitor::Typelib:
-    file: lib/SOAP/WSDL/Generator/Visitor/Typelib.pm
-  SOAP::WSDL::Generator::Visitor::Typemap:
-    file: lib/SOAP/WSDL/Generator/Visitor/Typemap.pm
-  SOAP::WSDL::Message:
-    file: lib/SOAP/WSDL/Message.pm
-  SOAP::WSDL::OpMessage:
-    file: lib/SOAP/WSDL/OpMessage.pm
-  SOAP::WSDL::Operation:
-    file: lib/SOAP/WSDL/Operation.pm
-  SOAP::WSDL::Part:
-    file: lib/SOAP/WSDL/Part.pm
-  SOAP::WSDL::Port:
-    file: lib/SOAP/WSDL/Port.pm
-  SOAP::WSDL::PortType:
-    file: lib/SOAP/WSDL/PortType.pm
-  SOAP::WSDL::SOAP::Address:
-    file: lib/SOAP/WSDL/SOAP/Address.pm
-  SOAP::WSDL::SOAP::Body:
-    file: lib/SOAP/WSDL/SOAP/Body.pm
-  SOAP::WSDL::SOAP::Header:
-    file: lib/SOAP/WSDL/SOAP/Header.pm
-  SOAP::WSDL::SOAP::HeaderFault:
-    file: lib/SOAP/WSDL/SOAP/HeaderFault.pm
-  SOAP::WSDL::SOAP::Operation:
-    file: lib/SOAP/WSDL/SOAP/Operation.pm
-    version: 2.00_17
-  SOAP::WSDL::SOAP::Typelib::Fault11:
-    file: lib/SOAP/WSDL/SOAP/Typelib/Fault11.pm
-    version: 2.00_17
-  SOAP::WSDL::Serializer::SOAP11:
-    file: lib/SOAP/WSDL/Serializer/SOAP11.pm
-    version: 2.00_13
-  SOAP::WSDL::Service:
-    file: lib/SOAP/WSDL/Service.pm
-  SOAP::WSDL::Transport::HTTP:
-    file: lib/SOAP/WSDL/Transport/HTTP.pm
-  SOAP::WSDL::Transport::Loopback:
-    file: lib/SOAP/WSDL/Transport/Loopback.pm
-    version: 2.00_17
-  SOAP::WSDL::Transport::Test:
-    file: lib/SOAP/WSDL/Transport/Test.pm
-    version: 2.00_14
-  SOAP::WSDL::TypeLookup:
-    file: lib/SOAP/WSDL/TypeLookup.pm
-  SOAP::WSDL::Types:
-    file: lib/SOAP/WSDL/Types.pm
-  SOAP::WSDL::XSD::Builtin:
-    file: lib/SOAP/WSDL/XSD/Builtin.pm
-  SOAP::WSDL::XSD::ComplexType:
-    file: lib/SOAP/WSDL/XSD/ComplexType.pm
-    version: 2.00_17
-  SOAP::WSDL::XSD::Element:
-    file: lib/SOAP/WSDL/XSD/Element.pm
-    version: 2.00_17
-  SOAP::WSDL::XSD::Schema:
-    file: lib/SOAP/WSDL/XSD/Schema.pm
-  SOAP::WSDL::XSD::Schema::Builtin:
-    file: lib/SOAP/WSDL/XSD/Schema/Builtin.pm
-  SOAP::WSDL::XSD::SimpleType:
-    file: lib/SOAP/WSDL/XSD/SimpleType.pm
-    version: 2.00_17
-  SOAP::WSDL::XSD::Typelib::Builtin:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin.pm
-    version: 2.00_17
-  SOAP::WSDL::XSD::Typelib::Builtin::ENTITY:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/ENTITY.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::ID:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/ID.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::IDREF:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/IDREF.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::IDREFS:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/IDREFS.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::NCName:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/NCName.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::NMTOKEN:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/NMTOKEN.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::NMTOKENS:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/NMTOKENS.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::NOTATION:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/NOTATION.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::Name:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/Name.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::QName:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/QName.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/anySimpleType.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::anyType:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/anyType.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::anyURI:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/anyURI.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::base64Binary:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/base64Binary.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::boolean:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/boolean.pm
-    version: 2.00_17
-  SOAP::WSDL::XSD::Typelib::Builtin::byte:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/byte.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::date:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/date.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::dateTime:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/dateTime.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::decimal:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/decimal.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::double:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/double.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::duration:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/duration.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::float:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/float.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::gDay:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/gDay.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::gMonth:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/gMonth.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::gMonthDay:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/gMonthDay.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::gYear:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/gYear.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::gYearMonth:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/gYearMonth.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::hexBinary:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/hexBinary.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::int:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/int.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::integer:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/integer.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::language:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/language.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::list:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/list.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::long:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/long.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::negativeInteger:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/negativeInteger.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::nonNegativeInteger:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/nonNegativeInteger.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::nonPositiveInteger:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/nonPositiveInteger.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::normalizedString:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/normalizedString.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::positiveInteger:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/positiveInteger.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::short:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/short.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::string:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/string.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::time:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/time.pm
-    version: 2.00_18
-  SOAP::WSDL::XSD::Typelib::Builtin::token:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/token.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::unsignedByte:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/unsignedByte.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::unsignedInt:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/unsignedInt.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::unsignedLong:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/unsignedLong.pm
-  SOAP::WSDL::XSD::Typelib::Builtin::unsignedShort:
-    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/unsignedShort.pm
-  SOAP::WSDL::XSD::Typelib::ComplexType:
-    file: lib/SOAP/WSDL/XSD/Typelib/ComplexType.pm
-    version: 2.00_16
-  SOAP::WSDL::XSD::Typelib::Element:
-    file: lib/SOAP/WSDL/XSD/Typelib/Element.pm
-  SOAP::WSDL::XSD::Typelib::SimpleType:
-    file: lib/SOAP/WSDL/XSD/Typelib/SimpleType.pm
-  SOAP::WSDL::XSD::Typelib::SimpleType::restriction:
-    file: lib/SOAP/WSDL/XSD/Typelib/SimpleType.pm
-generated_by: Module::Build version 0.2808
-meta-spec:
-  url: http://module-build.sourceforge.net/META-spec-v1.2.html
-  version: 1.2
-no_index:
-  namespace: SOAP::WSDL::Generator::Template::XSD
+---
+name: SOAP-WSDL
+version: 2.00_20
+author:
+abstract: SOAP with WSDL support
+license: artistic
+requires:
+  Class::Std: v0.0.8
+  Class::Std::Storable: 0
+  Data::Dumper: 0
+  Date::Format: 0
+  Date::Parse: 0
+  File::Basename: 0
+  File::Path: 0
+  Getopt::Long: 0
+  LWP::UserAgent: 0
+  List::Util: 0
+  Template: 0
+  Term::ReadKey: 0
+  XML::Parser::Expat: 0
+generated_by: Module::Build version 0.2808
+meta-spec:
+  url: http://module-build.sourceforge.net/META-spec-v1.2.html
+  version: 1.2
+no_index:
+  namespace: SOAP::WSDL::Generator::Template::XSD
+provides:
+  SOAP::WSDL:
+    file: lib/SOAP/WSDL.pm
+    version: 2.00_17
+  SOAP::WSDL::Base:
+    file: lib/SOAP/WSDL/Base.pm
+    version: 2.00_17
+  SOAP::WSDL::Binding:
+    file: lib/SOAP/WSDL/Binding.pm
+  SOAP::WSDL::Client:
+    file: lib/SOAP/WSDL/Client.pm
+    version: 2.00_17
+  SOAP::WSDL::Client::Base:
+    file: lib/SOAP/WSDL/Client/Base.pm
+    version: 2.00_17
+  SOAP::WSDL::Definitions:
+    file: lib/SOAP/WSDL/Definitions.pm
+    version: 2.00_17
+  SOAP::WSDL::Deserializer::Hash:
+    file: lib/SOAP/WSDL/Deserializer/Hash.pm
+    version: 2.00_17
+  SOAP::WSDL::Deserializer::SOAP11:
+    file: lib/SOAP/WSDL/Deserializer/SOAP11.pm
+    version: 2.00_17
+  SOAP::WSDL::Deserializer::SOM:
+    file: lib/SOAP/WSDL/Deserializer/SOM.pm
+    version: 2.00_15
+  SOAP::WSDL::Expat::Base:
+    file: lib/SOAP/WSDL/Expat/Base.pm
+  SOAP::WSDL::Expat::Message2Hash:
+    file: lib/SOAP/WSDL/Expat/Message2Hash.pm
+  SOAP::WSDL::Expat::MessageParser:
+    file: lib/SOAP/WSDL/Expat/MessageParser.pm
+  SOAP::WSDL::Expat::MessageStreamParser:
+    file: lib/SOAP/WSDL/Expat/MessageStreamParser.pm
+  SOAP::WSDL::Factory::Deserializer:
+    file: lib/SOAP/WSDL/Factory/Deserializer.pm
+  SOAP::WSDL::Factory::Generator:
+    file: lib/SOAP/WSDL/Factory/Generator.pm
+    version: 2.00_18
+  SOAP::WSDL::Factory::Serializer:
+    file: lib/SOAP/WSDL/Factory/Serializer.pm
+    version: 2.00_17
+  SOAP::WSDL::Factory::Transport:
+    file: lib/SOAP/WSDL/Factory/Transport.pm
+    version: 2.00_17
+  SOAP::WSDL::Generator::Template:
+    file: lib/SOAP/WSDL/Generator/Template.pm
+    version: 2.00_17
+  SOAP::WSDL::Generator::Template::XSD:
+    file: lib/SOAP/WSDL/Generator/Template/XSD.pm
+  SOAP::WSDL::Generator::Visitor:
+    file: lib/SOAP/WSDL/Generator/Visitor.pm
+    version: 2.00_17
+  SOAP::WSDL::Generator::Visitor::Typelib:
+    file: lib/SOAP/WSDL/Generator/Visitor/Typelib.pm
+  SOAP::WSDL::Generator::Visitor::Typemap:
+    file: lib/SOAP/WSDL/Generator/Visitor/Typemap.pm
+  SOAP::WSDL::Message:
+    file: lib/SOAP/WSDL/Message.pm
+  SOAP::WSDL::OpMessage:
+    file: lib/SOAP/WSDL/OpMessage.pm
+  SOAP::WSDL::Operation:
+    file: lib/SOAP/WSDL/Operation.pm
+  SOAP::WSDL::Part:
+    file: lib/SOAP/WSDL/Part.pm
+  SOAP::WSDL::Port:
+    file: lib/SOAP/WSDL/Port.pm
+  SOAP::WSDL::PortType:
+    file: lib/SOAP/WSDL/PortType.pm
+  SOAP::WSDL::SOAP::Address:
+    file: lib/SOAP/WSDL/SOAP/Address.pm
+  SOAP::WSDL::SOAP::Body:
+    file: lib/SOAP/WSDL/SOAP/Body.pm
+  SOAP::WSDL::SOAP::Header:
+    file: lib/SOAP/WSDL/SOAP/Header.pm
+  SOAP::WSDL::SOAP::HeaderFault:
+    file: lib/SOAP/WSDL/SOAP/HeaderFault.pm
+  SOAP::WSDL::SOAP::Operation:
+    file: lib/SOAP/WSDL/SOAP/Operation.pm
+    version: 2.00_17
+  SOAP::WSDL::SOAP::Typelib::Fault11:
+    file: lib/SOAP/WSDL/SOAP/Typelib/Fault11.pm
+    version: 2.00_17
+  SOAP::WSDL::Serializer::SOAP11:
+    file: lib/SOAP/WSDL/Serializer/SOAP11.pm
+    version: 2.00_13
+  SOAP::WSDL::Service:
+    file: lib/SOAP/WSDL/Service.pm
+  SOAP::WSDL::Transport::HTTP:
+    file: lib/SOAP/WSDL/Transport/HTTP.pm
+  SOAP::WSDL::Transport::Loopback:
+    file: lib/SOAP/WSDL/Transport/Loopback.pm
+    version: 2.00_17
+  SOAP::WSDL::Transport::Test:
+    file: lib/SOAP/WSDL/Transport/Test.pm
+    version: 2.00_14
+  SOAP::WSDL::TypeLookup:
+    file: lib/SOAP/WSDL/TypeLookup.pm
+  SOAP::WSDL::Types:
+    file: lib/SOAP/WSDL/Types.pm
+  SOAP::WSDL::XSD::Builtin:
+    file: lib/SOAP/WSDL/XSD/Builtin.pm
+  SOAP::WSDL::XSD::ComplexType:
+    file: lib/SOAP/WSDL/XSD/ComplexType.pm
+    version: 2.00_17
+  SOAP::WSDL::XSD::Element:
+    file: lib/SOAP/WSDL/XSD/Element.pm
+    version: 2.00_17
+  SOAP::WSDL::XSD::Schema:
+    file: lib/SOAP/WSDL/XSD/Schema.pm
+  SOAP::WSDL::XSD::Schema::Builtin:
+    file: lib/SOAP/WSDL/XSD/Schema/Builtin.pm
+  SOAP::WSDL::XSD::SimpleType:
+    file: lib/SOAP/WSDL/XSD/SimpleType.pm
+    version: 2.00_17
+  SOAP::WSDL::XSD::Typelib::Builtin:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin.pm
+    version: 2.00_17
+  SOAP::WSDL::XSD::Typelib::Builtin::ENTITY:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/ENTITY.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::ID:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/ID.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::IDREF:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/IDREF.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::IDREFS:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/IDREFS.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::NCName:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/NCName.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::NMTOKEN:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/NMTOKEN.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::NMTOKENS:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/NMTOKENS.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::NOTATION:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/NOTATION.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::Name:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/Name.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::QName:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/QName.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/anySimpleType.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::anyType:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/anyType.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::anyURI:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/anyURI.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::base64Binary:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/base64Binary.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::boolean:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/boolean.pm
+    version: 2.00_17
+  SOAP::WSDL::XSD::Typelib::Builtin::byte:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/byte.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::date:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/date.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::dateTime:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/dateTime.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::decimal:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/decimal.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::double:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/double.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::duration:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/duration.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::float:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/float.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::gDay:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/gDay.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::gMonth:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/gMonth.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::gMonthDay:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/gMonthDay.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::gYear:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/gYear.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::gYearMonth:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/gYearMonth.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::hexBinary:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/hexBinary.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::int:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/int.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::integer:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/integer.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::language:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/language.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::list:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/list.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::long:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/long.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::negativeInteger:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/negativeInteger.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::nonNegativeInteger:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/nonNegativeInteger.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::nonPositiveInteger:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/nonPositiveInteger.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::normalizedString:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/normalizedString.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::positiveInteger:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/positiveInteger.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::short:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/short.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::string:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/string.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::time:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/time.pm
+    version: 2.00_18
+  SOAP::WSDL::XSD::Typelib::Builtin::token:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/token.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::unsignedByte:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/unsignedByte.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::unsignedInt:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/unsignedInt.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::unsignedLong:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/unsignedLong.pm
+  SOAP::WSDL::XSD::Typelib::Builtin::unsignedShort:
+    file: lib/SOAP/WSDL/XSD/Typelib/Builtin/unsignedShort.pm
+  SOAP::WSDL::XSD::Typelib::ComplexType:
+    file: lib/SOAP/WSDL/XSD/Typelib/ComplexType.pm
+    version: 2.00_16
+  SOAP::WSDL::XSD::Typelib::Element:
+    file: lib/SOAP/WSDL/XSD/Typelib/Element.pm
+  SOAP::WSDL::XSD::Typelib::SimpleType:
+    file: lib/SOAP/WSDL/XSD/Typelib/SimpleType.pm
+  SOAP::WSDL::XSD::Typelib::SimpleType::restriction:
+    file: lib/SOAP/WSDL/XSD/Typelib/SimpleType.pm
+resources:
+  license: http://opensource.org/licenses/artistic-license.php
diff --git a/Makefile.PL b/Makefile.PL
index 192903a..fe3c4b9 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,31 +1,31 @@
-# Note: this file was auto-generated by Module::Build::Compat version 0.03
-    
-    unless (eval "use Module::Build::Compat 0.02; 1" ) {
-      print "This module requires Module::Build to install itself.\n";
-      
-      require ExtUtils::MakeMaker;
-      my $yn = ExtUtils::MakeMaker::prompt
-	('  Install Module::Build now from CPAN?', 'y');
-      
-      unless ($yn =~ /^y/i) {
-	die " *** Cannot install without Module::Build.  Exiting ...\n";
-      }
-      
-      require Cwd;
-      require File::Spec;
-      require CPAN;
-      
-      # Save this 'cause CPAN will chdir all over the place.
-      my $cwd = Cwd::cwd();
-      
-      CPAN::Shell->install('Module::Build::Compat');
-      CPAN::Shell->expand("Module", "Module::Build::Compat")->uptodate
-	or die "Couldn't install Module::Build, giving up.\n";
-      
-      chdir $cwd or die "Cannot chdir() back to $cwd: $!";
-    }
-    eval "use Module::Build::Compat 0.02; 1" or die $@;
-    
-    Module::Build::Compat->run_build_pl(args => \@ARGV);
-    require Module::Build;
-    Module::Build::Compat->write_makefile(build_class => 'Module::Build');
+# Note: this file was auto-generated by Module::Build::Compat version 0.03
+    
+    unless (eval "use Module::Build::Compat 0.02; 1" ) {
+      print "This module requires Module::Build to install itself.\n";
+      
+      require ExtUtils::MakeMaker;
+      my $yn = ExtUtils::MakeMaker::prompt
+	('  Install Module::Build now from CPAN?', 'y');
+      
+      unless ($yn =~ /^y/i) {
+	die " *** Cannot install without Module::Build.  Exiting ...\n";
+      }
+      
+      require Cwd;
+      require File::Spec;
+      require CPAN;
+      
+      # Save this 'cause CPAN will chdir all over the place.
+      my $cwd = Cwd::cwd();
+      
+      CPAN::Shell->install('Module::Build::Compat');
+      CPAN::Shell->expand("Module", "Module::Build::Compat")->uptodate
+	or die "Couldn't install Module::Build, giving up.\n";
+      
+      chdir $cwd or die "Cannot chdir() back to $cwd: $!";
+    }
+    eval "use Module::Build::Compat 0.02; 1" or die $@;
+    
+    Module::Build::Compat->run_build_pl(args => \@ARGV);
+    require Module::Build;
+    Module::Build::Compat->write_makefile(build_class => 'Module::Build');
diff --git a/lib/SOAP/WSDL.pm b/lib/SOAP/WSDL.pm
index c52d194..f71acec 100644
--- a/lib/SOAP/WSDL.pm
+++ b/lib/SOAP/WSDL.pm
@@ -734,7 +734,7 @@ Martin Kutter E<lt>martin.kutter fen-net.deE<gt>
  $Rev: 308 $
  $LastChangedBy: kutterma $
  $Id: WSDL.pm 308 2007-10-05 17:35:28Z kutterma $
- $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL.pm $
+ $HeadURL: https://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL.pm $
  
 =cut
 
diff --git a/lib/SOAP/WSDL/Client.pm b/lib/SOAP/WSDL/Client.pm
index bdff3ea..dd600a7 100644
--- a/lib/SOAP/WSDL/Client.pm
+++ b/lib/SOAP/WSDL/Client.pm
@@ -368,7 +368,7 @@ Martin Kutter E<lt>martin.kutter fen-net.deE<gt>
  $Rev: 303 $
  $LastChangedBy: kutterma $
  $Id: Client.pm 303 2007-10-01 18:51:50Z kutterma $
- $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Client.pm $
+ $HeadURL: https://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Client.pm $
  
 =cut
 
diff --git a/lib/SOAP/WSDL/Client/Base.pm b/lib/SOAP/WSDL/Client/Base.pm
index 327f24b..4e460a4 100644
--- a/lib/SOAP/WSDL/Client/Base.pm
+++ b/lib/SOAP/WSDL/Client/Base.pm
@@ -9,6 +9,7 @@ our $VERSION = '2.00_17';
 sub call {
     my ($self, $method, $body, $header) = @_;
     if (not blessed $body) {
+        $body = {} if not defined $body; 
         my $class = $method->{ body }->{ parts }->[0];
         eval "require $class" || die $@;
         $body = $class->new($body); 
@@ -116,9 +117,9 @@ Martin Kutter E<lt>martin.kutter fen-net.deE<gt>
 
 =head1 REPOSITORY INFORMATION
 
- $Rev: 303 $
+ $Rev: 323 $
  $LastChangedBy: kutterma $
- $Id: Base.pm 303 2007-10-01 18:51:50Z kutterma $
- $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Client/Base.pm $
+ $Id: Base.pm 323 2007-10-17 15:23:05Z kutterma $
+ $HeadURL: https://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Client/Base.pm $
  
 =cut
diff --git a/lib/SOAP/WSDL/Expat/MessageParser.pm b/lib/SOAP/WSDL/Expat/MessageParser.pm
index ba55b2f..b677e25 100644
--- a/lib/SOAP/WSDL/Expat/MessageParser.pm
+++ b/lib/SOAP/WSDL/Expat/MessageParser.pm
@@ -234,9 +234,9 @@ This module may be used under the same terms as perl itself.
 
  $ID: $
 
- $LastChangedDate: 2007-10-07 19:27:58 +0200 (Son, 07 Okt 2007) $
+ $LastChangedDate: 2007-10-07 19:27:58 +0200 (So, 07 Okt 2007) $
  $LastChangedRevision: 313 $
  $LastChangedBy: kutterma $
 
- $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Expat/MessageParser.pm $
+ $HeadURL: https://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Expat/MessageParser.pm $
 
diff --git a/lib/SOAP/WSDL/Expat/MessageStreamParser.pm b/lib/SOAP/WSDL/Expat/MessageStreamParser.pm
index 5fbddae..ca50c63 100644
--- a/lib/SOAP/WSDL/Expat/MessageStreamParser.pm
+++ b/lib/SOAP/WSDL/Expat/MessageStreamParser.pm
@@ -68,9 +68,9 @@ This module may be used under the same terms as perl itself.
 
  $ID: $
 
- $LastChangedDate: 2007-10-07 19:27:58 +0200 (Son, 07 Okt 2007) $
+ $LastChangedDate: 2007-10-07 19:27:58 +0200 (So, 07 Okt 2007) $
  $LastChangedRevision: 313 $
  $LastChangedBy: kutterma $
 
- $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Expat/MessageStreamParser.pm $
+ $HeadURL: https://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Expat/MessageStreamParser.pm $
 
diff --git a/lib/SOAP/WSDL/Factory/Serializer.pm b/lib/SOAP/WSDL/Factory/Serializer.pm
index ff6ad73..2499087 100644
--- a/lib/SOAP/WSDL/Factory/Serializer.pm
+++ b/lib/SOAP/WSDL/Factory/Serializer.pm
@@ -95,7 +95,7 @@ class should be used for, and $class is the class name.
  SOAP::WSDL::Factory::Serializer->register( $version, $class);
 
 To auto-register your transport class on loading, execute register() in 
-your tranport class (see L<SYNOPSIS|SYNOPSIS> above).
+your tranport class (see L</SYNOPSIS> above).
 
 =head2 Serializer package layout
 
@@ -138,9 +138,9 @@ Martin Kutter E<lt>martin.kutter fen-net.deE<gt>
 
 =head1 REPOSITORY INFORMATION
 
- $Rev: 302 $
+ $Rev: 325 $
  $LastChangedBy: kutterma $
- $Id: Serializer.pm 302 2007-09-30 19:25:25Z kutterma $
- $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Factory/Serializer.pm $
+ $Id: Serializer.pm 325 2007-10-18 10:27:46Z kutterma $
+ $HeadURL: https://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Factory/Serializer.pm $
  
 =cut
diff --git a/lib/SOAP/WSDL/Factory/Transport.pm b/lib/SOAP/WSDL/Factory/Transport.pm
index 78ecf58..d3e4682 100644
--- a/lib/SOAP/WSDL/Factory/Transport.pm
+++ b/lib/SOAP/WSDL/Factory/Transport.pm
@@ -239,6 +239,6 @@ Martin Kutter E<lt>martin.kutter fen-net.deE<gt>
  $Rev: 304 $
  $LastChangedBy: kutterma $
  $Id: Transport.pm 304 2007-10-02 20:07:21Z kutterma $
- $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Factory/Transport.pm $
+ $HeadURL: https://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Factory/Transport.pm $
  
 =cut
diff --git a/lib/SOAP/WSDL/Generator/Template/XSD.pm b/lib/SOAP/WSDL/Generator/Template/XSD.pm
index 14dfcc3..a0bad91 100644
--- a/lib/SOAP/WSDL/Generator/Template/XSD.pm
+++ b/lib/SOAP/WSDL/Generator/Template/XSD.pm
@@ -24,9 +24,10 @@ sub BUILD {
 
 sub generate {
     my $self = shift;
-    $self->generate_typelib();
-    $self->generate_interface();
-    $self->generate_typemap();
+    my $opt = shift;
+    $self->generate_typelib( $opt );
+    $self->generate_interface( $opt );
+    $self->generate_typemap( $opt );
 }
 
 sub generate_typelib {
@@ -54,17 +55,22 @@ sub generate_interface {
             next if not $port->first_address;
             next if not $port->first_address->isa('SOAP::WSDL::SOAP::Address');
 
+            my $port_name = $port->get_name;
+            $port_name =~s{ \A .+\. }{}xms;
             my $output = $arg_ref->{ output } 
                 ? $arg_ref->{ output } 
-                : $self->_generate_filename( $self->get_interface_prefix(), $service->get_name(), $port->get_name ); 
-
+                : $self->_generate_filename( 
+                    $self->get_interface_prefix(), 
+                    $service->get_name(), 
+                    $port_name,
+            ); 
             $self->_process('Interface.tt', 
             {
                 service => $service,
                 port => $port,
                 NO_POD => $arg_ref->{ NO_POD } ? 1 : 0 ,
-            },
-            $output);
+             },
+            $output, binmode => ':utf8');
         }
     }
 }
diff --git a/lib/SOAP/WSDL/Generator/Template/XSD/Interface.tt b/lib/SOAP/WSDL/Generator/Template/XSD/Interface.tt
index a85c6ef..8e440a2 100644
--- a/lib/SOAP/WSDL/Generator/Template/XSD/Interface.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/Interface.tt
@@ -1,16 +1,16 @@
-package [% interface_prefix %]::[% service.get_name %]::[% port.get_name %];
+package [% interface_prefix %]::[% service.get_name.replace('\.', '::') %]::[% port.get_name.replace('^.+\.','') %];
 use strict;
 use warnings;
 use Class::Std::Storable;
 use base qw(SOAP::WSDL::Client::Base);
 
 # only load if it hasn't been loaded before
-require [% typemap_prefix %]::[% service.get_name %]
-	if not [% typemap_prefix %]::[% service.get_name %]->can('get_class');
+require [% typemap_prefix %]::[% service.get_name.replace('\.', '::') %]
+	if not [% typemap_prefix %]::[% service.get_name.replace('\.', '::') %]->can('get_class');
 
 sub START {
     $_[0]->set_proxy('[% port.first_address.get_location %]') if not $_[2]->{proxy};
-    $_[0]->set_class_resolver('[% typemap_prefix %]::[% service.get_name %]')
+    $_[0]->set_class_resolver('[% typemap_prefix %]::[% service.get_name.replace('\.', '::') %]')
         if not $_[2]->{class_resolver};
 }
 
diff --git a/lib/SOAP/WSDL/Generator/Template/XSD/complexType/variety.tt b/lib/SOAP/WSDL/Generator/Template/XSD/complexType/variety.tt
index 4d7bb64..81022a8 100644
--- a/lib/SOAP/WSDL/Generator/Template/XSD/complexType/variety.tt
+++ b/lib/SOAP/WSDL/Generator/Template/XSD/complexType/variety.tt
@@ -7,7 +7,9 @@ ELSIF (complexType.get_variety == 'group');
 	THROW NOT_IMPLEMENTED, "${ element.get_name } - complexType group not implemented yet";
 ELSIF (complexType.get_variety == 'choice');
 	INCLUDE complexType/all.tt(complexType = complexType);
+ELSIF (complexType.get_variety);
+	THROW NOT_IMPLEMENTED, "Unknown variety ${ complexType.get_variety } in ${ complexType.get_name } (${ element.get_name })";
 ELSE;
-	THROW NOT_IMPLEMENTED, "Unknown variety ${ complexType.get_variety }";
+	# There's no variety - might be empty complexType
 END;
 %]
\ No newline at end of file
diff --git a/lib/SOAP/WSDL/Transport/HTTP.pm b/lib/SOAP/WSDL/Transport/HTTP.pm
index 486e830..5ae04ea 100644
--- a/lib/SOAP/WSDL/Transport/HTTP.pm
+++ b/lib/SOAP/WSDL/Transport/HTTP.pm
@@ -90,7 +90,7 @@ Martin Kutter E<lt>martin.kutter fen-net.deE<gt>
  $Rev: 288 $
  $LastChangedBy: kutterma $
  $Id: HTTP.pm 288 2007-09-29 19:34:20Z kutterma $
- $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Transport/HTTP.pm $
+ $HeadURL: https://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Transport/HTTP.pm $
  
 =cut
 
diff --git a/lib/SOAP/WSDL/XSD/Typelib/ComplexType.pm b/lib/SOAP/WSDL/XSD/Typelib/ComplexType.pm
index ce212ae..aa2e437 100644
--- a/lib/SOAP/WSDL/XSD/Typelib/ComplexType.pm
+++ b/lib/SOAP/WSDL/XSD/Typelib/ComplexType.pm
@@ -19,10 +19,11 @@ my %CLASSES_OF;
 # We could also handle them via AUTOMETHOD,
 # but AUTOMETHOD should always croak...
 # Do we really need this ?
-#sub STORABLE_freeze_pre {}
-#sub STORABLE_freeze_post {}
-#sub STORABLE_thaw_pre {}
-#sub STORABLE_thaw_post {}
+# ... looks like we do...
+sub STORABLE_freeze_pre {}
+sub STORABLE_freeze_post {}
+sub STORABLE_thaw_pre {}
+sub STORABLE_thaw_post {}
 
 # for error reporting. Eases working with data objects...
 sub AUTOMETHOD {
@@ -376,10 +377,10 @@ Martin Kutter E<lt>martin.kutter fen-net.deE<gt>
 
 =head1 REPOSITORY INFORMATION
 
- $Rev: 309 $
+ $Rev: 323 $
  $LastChangedBy: kutterma $
- $Id: ComplexType.pm 309 2007-10-05 17:48:37Z kutterma $
- $HeadURL: http://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/XSD/Typelib/ComplexType.pm $
+ $Id: ComplexType.pm 323 2007-10-17 15:23:05Z kutterma $
+ $HeadURL: https://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/XSD/Typelib/ComplexType.pm $
  
 =cut
 
diff --git a/t/SOAP/WSDL/03_complexType-all.t b/t/SOAP/WSDL/03_complexType-all.t
index 560d5fd..3dbacee 100644
--- a/t/SOAP/WSDL/03_complexType-all.t
+++ b/t/SOAP/WSDL/03_complexType-all.t
@@ -14,6 +14,12 @@ if ($@)
 }
 
 my $path = File::Spec->rel2abs( dirname __FILE__ );
+my ($volume, $dir) = File::Spec->splitpath($path, 1);
+my @dir_from = File::Spec->splitdir($dir);
+unshift @dir_from, $volume if $volume;
+my $url = join '/', @dir_from;
+
+# print $url;
 
 use_ok(qw/SOAP::WSDL/);
 
@@ -24,7 +30,7 @@ my $soap;
 
 #2
 ok( $soap = SOAP::WSDL->new(
-	wsdl => 'file://' . $path . '/../../acceptance/wsdl/03_complexType-all.wsdl',
+	wsdl => 'file://' . $url . '/../../acceptance/wsdl/03_complexType-all.wsdl',
 ), 'Instantiated object' );
 
 #3
diff --git a/t/SOAP/WSDL/03_complexType-element-ref.t b/t/SOAP/WSDL/03_complexType-element-ref.t
index e686981..33e6eae 100644
--- a/t/SOAP/WSDL/03_complexType-element-ref.t
+++ b/t/SOAP/WSDL/03_complexType-element-ref.t
@@ -12,14 +12,17 @@ use_ok(qw/SOAP::WSDL/);
 print "# SOAP::WSDL Version: $SOAP::WSDL::VERSION\n";
 
 my $path = File::Spec->rel2abs( dirname __FILE__ );
-
+my ($volume, $dir) = File::Spec->splitpath($path, 1);
+my @dir_from = File::Spec->splitdir($dir);
+unshift @dir_from, $volume if $volume;
+my $url = join '/', @dir_from;
 
 my $xml;
 my $soap;
 
 #2
 ok( $soap = SOAP::WSDL->new(
-	wsdl => 'file://' . $path . '/../../acceptance/wsdl/03_complexType-element-ref.wsdl',
+	wsdl => 'file://' . $url . '/../../acceptance/wsdl/03_complexType-element-ref.wsdl',
     no_dispatch => 1,
 ), 'Instantiated object' );
 
diff --git a/t/SOAP/WSDL/03_complexType-sequence.t b/t/SOAP/WSDL/03_complexType-sequence.t
index 6d01f73..a272524 100644
--- a/t/SOAP/WSDL/03_complexType-sequence.t
+++ b/t/SOAP/WSDL/03_complexType-sequence.t
@@ -19,10 +19,14 @@ use_ok(qw/SOAP::WSDL/);
 my $xml;
 
 my $path = File::Spec->rel2abs( dirname __FILE__ );
+my ($volume, $dir) = File::Spec->splitpath($path, 1);
+my @dir_from = File::Spec->splitdir($dir);
+unshift @dir_from, $volume if $volume;
+my $url = join '/', @dir_from;
 
 #2
 ok( $soap = SOAP::WSDL->new(
-	wsdl => 'file://' . $path . '/../../acceptance/wsdl/03_complexType-sequence.wsdl'
+	wsdl => 'file://' . $url . '/../../acceptance/wsdl/03_complexType-sequence.wsdl'
 ), 'Instantiated object' );
 
 #3
diff --git a/t/SOAP/WSDL/04_element.t b/t/SOAP/WSDL/04_element.t
index 77243c3..3c535fa 100644
--- a/t/SOAP/WSDL/04_element.t
+++ b/t/SOAP/WSDL/04_element.t
@@ -17,10 +17,14 @@ use_ok(qw/SOAP::WSDL/);
 my $soap;
 my $xml;
 my $path = File::Spec->rel2abs( dirname __FILE__ );
+my ($volume, $dir) = File::Spec->splitpath($path, 1);
+my @dir_from = File::Spec->splitdir($dir);
+unshift @dir_from, $volume if $volume;
+my $url = join '/', @dir_from;
 
 #2
 ok( $soap = SOAP::WSDL->new(
-	wsdl => 'file://' . $path . '/../../acceptance/wsdl/04_element.wsdl'
+	wsdl => 'file://' . $url . '/../../acceptance/wsdl/04_element.wsdl'
 ), 'Instantiated object' );
 
 #3