diff --git a/lib/Shipment.pm b/lib/Shipment.pm
index 043e2d6..45f8b53 100644
--- a/lib/Shipment.pm
+++ b/lib/Shipment.pm
@@ -85,6 +85,17 @@ sub ups {
     shift; return Shipment::UPS->new(@_)
 }
 
+=method temando
+
+The temando method returns a L<Shipment::Temando> object. See L<Shipment::Temando> for
+more details.
+
+=cut
+
+sub temando {
+    shift; return Shipment::UPS->new(@_)
+}
+
 =method address
 
 The address method returns a L<Shipment::Address> object.
diff --git a/lib/Shipment/Base.pm b/lib/Shipment/Base.pm
index 929a1c0..76eee18 100644
--- a/lib/Shipment/Base.pm
+++ b/lib/Shipment/Base.pm
@@ -55,7 +55,7 @@ use MooseX::Types::DateTime::ButMaintained qw( DateTime );
 
 Where the shipment is being shipped from and to
 
-type: Shipment::Address
+type: L<Shipment::Address>
 
 =cut
 
@@ -106,7 +106,7 @@ has 'bill_account' => (
 
 The billing address (typically not needed)
 
-type:  Shipment::Address
+type:  L<Shipment::Address>
 
 =cut
 
@@ -209,7 +209,7 @@ has 'package_type' => (
 
 The list of individual packages being shipped
 
-type: ArrayRef[Shipment::Package]
+type: ArrayRef[L<Shipment::Package>]
 
 methods handled: 
   all_packages  # returns a list of Shipment::Package
@@ -284,7 +284,7 @@ has 'pickup_date' => (
 
 The available services
 
-type: HashRef[Shipment::Service]
+type: HashRef[L<Shipment::Service>]
 
 methods handled: 
   all_services # returns a list of Shipment::Service
@@ -306,7 +306,7 @@ has 'services' => (
 
 Details of what was returned from a call to rate
 
-type: Shipment::Service
+type: L<Shipment::Service>
 
 =cut
 
@@ -333,7 +333,7 @@ has 'tracking_id' => (
 
 All documents for a shipment including all labels
 
-type: Shipment::Label
+type: L<Shipment::Label>
 
 =cut
 
@@ -346,7 +346,7 @@ has 'documents' => (
 
 The manifest document (usually generated by an end of day close, but may also be generated on a per shipment basis)
 
-type: Shipment::Label
+type: L<Shipment::Label>
 
 =cut
 
diff --git a/lib/Shipment/FedEx.pm b/lib/Shipment/FedEx.pm
index 0789934..7f84b23 100644
--- a/lib/Shipment/FedEx.pm
+++ b/lib/Shipment/FedEx.pm
@@ -34,7 +34,7 @@ This class provides an interface to the FedEx Web Services for Shipping. You mus
 
 https://www.fedex.com/wpor/web/jsp/drclinks.jsp?links=techresources/index.html
 
-It is an extension of Shipment::Base.
+It is an extension of L<Shipment::Base>.
 
 It makes extensive use of SOAP::WSDL in order to create/decode xml requests and responses. The Shipment::FedEx::WSDL interface was created primarily using the wsdl2perl.pl script from SOAP::WSDL.
 
diff --git a/lib/Shipment/Purolator.pm b/lib/Shipment/Purolator.pm
index 372ac56..5392aea 100644
--- a/lib/Shipment/Purolator.pm
+++ b/lib/Shipment/Purolator.pm
@@ -35,7 +35,7 @@ This class provides an interface to the Purolator E-Ship Web Services. You must
 
 https://eship.purolator.com
 
-It is an extension of Shipment::Base.
+It is an extension of L<Shipment::Base>.
 
 It makes extensive use of SOAP::WSDL in order to create/decode xml requests and responses. The Shipment::UPS::WSDL interface was created primarily using the wsdl2perl.pl script from SOAP::WSDL.
 
diff --git a/lib/Shipment/Temando.pm b/lib/Shipment/Temando.pm
index c1c8db9..039f4bb 100644
--- a/lib/Shipment/Temando.pm
+++ b/lib/Shipment/Temando.pm
@@ -34,7 +34,7 @@ This class provides an interface to the Temando Web Services API. You must sign
 
 http://www.temando.com/affiliateRegistration2.html
 
-It is an extension of Shipment::Base
+It is an extension of L<Shipment::Base>
 
 It makes extensive use of SOAP::WSDL in order to create/decode xml requests and responses. The Shipment::Temando::WSDL interface was created primarily using the wsdl2perl.pl script from SOAP::WSDL.
 
diff --git a/lib/Shipment/UPS.pm b/lib/Shipment/UPS.pm
index 663df5e..9018a2a 100644
--- a/lib/Shipment/UPS.pm
+++ b/lib/Shipment/UPS.pm
@@ -34,7 +34,7 @@ This class provides an interface to the UPS Online Tools. You must sign up for a
 
 https://www.ups.com/upsdeveloperkit
 
-It is an extension of Shipment::Base.
+It is an extension of L<Shipment::Base>.
 
 It makes extensive use of SOAP::WSDL in order to create/decode xml requests and responses. The Shipment::UPS::WSDL interface was created primarily using the wsdl2perl.pl script from SOAP::WSDL.