From e8e7ad807e3af44d914104ae82220987433a4d21 Mon Sep 17 00:00:00 2001
From: aydiv <aydiv.c@gmail.com>
Date: Wed, 24 Apr 2013 17:13:47 +0530
Subject: [PATCH] Updating model classes to use dynamic config - Moving common
 classes to sdk-core-php

---
 composer.json                                 |   4 +-
 lib/PayPal/Api/Address.php                    |  10 +-
 lib/PayPal/Api/Amount.php                     |   5 +-
 lib/PayPal/Api/AmountDetails.php              |   6 +-
 lib/PayPal/Api/Authorization.php              |   9 +-
 lib/PayPal/Api/Capture.php                    |  11 +-
 lib/PayPal/Api/CreditCard.php                 |  27 +-
 lib/PayPal/Api/CreditCardToken.php            |   4 +-
 lib/PayPal/Api/FundingInstrument.php          |   4 +-
 lib/PayPal/Api/Item.php                       |   7 +-
 lib/PayPal/Api/ItemList.php                   |   4 +-
 lib/PayPal/Api/Link.php                       |   5 +-
 lib/PayPal/Api/Payee.php                      |   5 +-
 lib/PayPal/Api/Payer.php                      |   5 +-
 lib/PayPal/Api/PayerInfo.php                  |   8 +-
 lib/PayPal/Api/Payment.php                    |  35 ++-
 lib/PayPal/Api/PaymentExecution.php           |   4 +-
 lib/PayPal/Api/PaymentHistory.php             |   5 +-
 lib/PayPal/Api/RedirectUrls.php               |   4 +-
 lib/PayPal/Api/Refund.php                     |  18 +-
 lib/PayPal/Api/Resource.php                   |   6 +-
 lib/PayPal/Api/Sale.php                       |  21 +-
 lib/PayPal/Api/ShippingAddress.php            |   3 +-
 lib/PayPal/Api/SubTransaction.php             |   6 +-
 lib/PayPal/Api/Transaction.php                |   7 +-
 lib/PayPal/Auth/OAuthTokenCredential.php      | 250 ++++++++--------
 lib/PayPal/Common/ArrayUtil.php               |  19 --
 lib/PayPal/Common/Model.php                   |  88 ------
 lib/PayPal/Common/ReflectionUtil.php          |  73 -----
 lib/PayPal/Common/UserAgent.php               |  44 ---
 lib/PayPal/Rest/ApiContext.php                | 148 +++++-----
 lib/PayPal/Rest/Call.php                      |  59 ----
 lib/PayPal/Rest/RestHandler.php               |  77 +++++
 .../Test/Auth/OAuthTokenCredentialTest.php    |  65 +++--
 tests/PayPal/Test/Common/ArrayUtilTest.php    |  43 ++-
 tests/PayPal/Test/Common/ModelTest.php        | 273 +++++++++---------
 tests/PayPal/Test/Common/UserAgentTest.php    |  47 +--
 37 files changed, 676 insertions(+), 733 deletions(-)
 delete mode 100644 lib/PayPal/Common/ArrayUtil.php
 delete mode 100644 lib/PayPal/Common/Model.php
 delete mode 100644 lib/PayPal/Common/ReflectionUtil.php
 delete mode 100644 lib/PayPal/Common/UserAgent.php
 delete mode 100644 lib/PayPal/Rest/Call.php
 create mode 100644 lib/PayPal/Rest/RestHandler.php

diff --git a/composer.json b/composer.json
index 8cd0749..600041b 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
         "php": ">=5.3.0",
         "ext-curl": "*",
         "ext-json": "*",
-        "paypal/sdk-core-php": "1.2.*"        
+        "paypal/sdk-core-php": "dev-openidconnect"        
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*"
@@ -25,4 +25,4 @@
             "PayPal": "lib/"
         }
     }    
-}
\ No newline at end of file
+}
diff --git a/lib/PayPal/Api/Address.php b/lib/PayPal/Api/Address.php
index 70f0376..9ba7716 100644
--- a/lib/PayPal/Api/Address.php
+++ b/lib/PayPal/Api/Address.php
@@ -3,7 +3,7 @@
 namespace PayPal\Api;
 
 /**
- * 
+ * 
  */
 class Address extends Resource {
 
@@ -18,6 +18,7 @@ class Address extends Resource {
 
 	/**
 	 * Getter for line1
+	 * @return string
 	 */ 
 	public function getLine1() {
 		return $this->line1;
@@ -33,6 +34,7 @@ class Address extends Resource {
 
 	/**
 	 * Getter for line2
+	 * @return string
 	 */ 
 	public function getLine2() {
 		return $this->line2;
@@ -48,6 +50,7 @@ class Address extends Resource {
 
 	/**
 	 * Getter for city
+	 * @return string
 	 */ 
 	public function getCity() {
 		return $this->city;
@@ -63,6 +66,7 @@ class Address extends Resource {
 
 	/**
 	 * Getter for state
+	 * @return string
 	 */ 
 	public function getState() {
 		return $this->state;
@@ -78,6 +82,7 @@ class Address extends Resource {
 
 	/**
 	 * Getter for postal_code
+	 * @return string
 	 */ 
 	public function getPostal_code() {
 		return $this->postal_code;
@@ -93,6 +98,7 @@ class Address extends Resource {
 
 	/**
 	 * Getter for country_code
+	 * @return string
 	 */ 
 	public function getCountry_code() {
 		return $this->country_code;
@@ -108,6 +114,7 @@ class Address extends Resource {
 
 	/**
 	 * Getter for type
+	 * @return string
 	 */ 
 	public function getType() {
 		return $this->type;
@@ -123,6 +130,7 @@ class Address extends Resource {
 
 	/**
 	 * Getter for phone
+	 * @return string
 	 */ 
 	public function getPhone() {
 		return $this->phone;
diff --git a/lib/PayPal/Api/Amount.php b/lib/PayPal/Api/Amount.php
index ad7191d..673c14b 100644
--- a/lib/PayPal/Api/Amount.php
+++ b/lib/PayPal/Api/Amount.php
@@ -3,7 +3,7 @@
 namespace PayPal\Api;
 
 /**
- * 
+ * 
  */
 class Amount extends Resource {
 
@@ -18,6 +18,7 @@ class Amount extends Resource {
 
 	/**
 	 * Getter for total
+	 * @return string
 	 */ 
 	public function getTotal() {
 		return $this->total;
@@ -33,6 +34,7 @@ class Amount extends Resource {
 
 	/**
 	 * Getter for currency
+	 * @return string
 	 */ 
 	public function getCurrency() {
 		return $this->currency;
@@ -48,6 +50,7 @@ class Amount extends Resource {
 
 	/**
 	 * Getter for details
+	 * @return PayPal\Api\AmountDetails
 	 */ 
 	public function getDetails() {
 		return $this->details;
diff --git a/lib/PayPal/Api/AmountDetails.php b/lib/PayPal/Api/AmountDetails.php
index 65e5a33..96b8a9b 100644
--- a/lib/PayPal/Api/AmountDetails.php
+++ b/lib/PayPal/Api/AmountDetails.php
@@ -3,7 +3,7 @@
 namespace PayPal\Api;
 
 /**
- * 
+ * 
  */
 class AmountDetails extends Resource {
 
@@ -18,6 +18,7 @@ class AmountDetails extends Resource {
 
 	/**
 	 * Getter for subtotal
+	 * @return string
 	 */ 
 	public function getSubtotal() {
 		return $this->subtotal;
@@ -33,6 +34,7 @@ class AmountDetails extends Resource {
 
 	/**
 	 * Getter for tax
+	 * @return string
 	 */ 
 	public function getTax() {
 		return $this->tax;
@@ -48,6 +50,7 @@ class AmountDetails extends Resource {
 
 	/**
 	 * Getter for shipping
+	 * @return string
 	 */ 
 	public function getShipping() {
 		return $this->shipping;
@@ -63,6 +66,7 @@ class AmountDetails extends Resource {
 
 	/**
 	 * Getter for fee
+	 * @return string
 	 */ 
 	public function getFee() {
 		return $this->fee;
diff --git a/lib/PayPal/Api/Authorization.php b/lib/PayPal/Api/Authorization.php
index 3b4b82c..b7602da 100644
--- a/lib/PayPal/Api/Authorization.php
+++ b/lib/PayPal/Api/Authorization.php
@@ -3,7 +3,7 @@
 namespace PayPal\Api;
 
 /**
- * 
+ * 
  */
 class Authorization extends Resource {
 
@@ -18,6 +18,7 @@ class Authorization extends Resource {
 
 	/**
 	 * Getter for id
+	 * @return string
 	 */ 
 	public function getId() {
 		return $this->id;
@@ -33,6 +34,7 @@ class Authorization extends Resource {
 
 	/**
 	 * Getter for create_time
+	 * @return string
 	 */ 
 	public function getCreate_time() {
 		return $this->create_time;
@@ -48,6 +50,7 @@ class Authorization extends Resource {
 
 	/**
 	 * Getter for update_time
+	 * @return string
 	 */ 
 	public function getUpdate_time() {
 		return $this->update_time;
@@ -63,6 +66,7 @@ class Authorization extends Resource {
 
 	/**
 	 * Getter for state
+	 * @return string
 	 */ 
 	public function getState() {
 		return $this->state;
@@ -78,6 +82,7 @@ class Authorization extends Resource {
 
 	/**
 	 * Getter for amount
+	 * @return PayPal\Api\Amount
 	 */ 
 	public function getAmount() {
 		return $this->amount;
@@ -93,6 +98,7 @@ class Authorization extends Resource {
 
 	/**
 	 * Getter for parent_payment
+	 * @return string
 	 */ 
 	public function getParent_payment() {
 		return $this->parent_payment;
@@ -108,6 +114,7 @@ class Authorization extends Resource {
 
 	/**
 	 * Getter for links
+	 * @return PayPal\Api\Link
 	 */ 
 	public function getLinks() {
 		return $this->links;
diff --git a/lib/PayPal/Api/Capture.php b/lib/PayPal/Api/Capture.php
index 3c36e5a..c34e37d 100644
--- a/lib/PayPal/Api/Capture.php
+++ b/lib/PayPal/Api/Capture.php
@@ -3,7 +3,7 @@
 namespace PayPal\Api;
 
 /**
- * 
+ * 
  */
 class Capture extends Resource {
 
@@ -18,6 +18,7 @@ class Capture extends Resource {
 
 	/**
 	 * Getter for id
+	 * @return string
 	 */ 
 	public function getId() {
 		return $this->id;
@@ -33,6 +34,7 @@ class Capture extends Resource {
 
 	/**
 	 * Getter for create_time
+	 * @return string
 	 */ 
 	public function getCreate_time() {
 		return $this->create_time;
@@ -48,6 +50,7 @@ class Capture extends Resource {
 
 	/**
 	 * Getter for update_time
+	 * @return string
 	 */ 
 	public function getUpdate_time() {
 		return $this->update_time;
@@ -63,6 +66,7 @@ class Capture extends Resource {
 
 	/**
 	 * Getter for state
+	 * @return string
 	 */ 
 	public function getState() {
 		return $this->state;
@@ -78,6 +82,7 @@ class Capture extends Resource {
 
 	/**
 	 * Getter for amount
+	 * @return PayPal\Api\Amount
 	 */ 
 	public function getAmount() {
 		return $this->amount;
@@ -93,6 +98,7 @@ class Capture extends Resource {
 
 	/**
 	 * Getter for parent_payment
+	 * @return string
 	 */ 
 	public function getParent_payment() {
 		return $this->parent_payment;
@@ -108,6 +114,7 @@ class Capture extends Resource {
 
 	/**
 	 * Getter for authorization_id
+	 * @return string
 	 */ 
 	public function getAuthorization_id() {
 		return $this->authorization_id;
@@ -123,6 +130,7 @@ class Capture extends Resource {
 
 	/**
 	 * Getter for description
+	 * @return string
 	 */ 
 	public function getDescription() {
 		return $this->description;
@@ -138,6 +146,7 @@ class Capture extends Resource {
 
 	/**
 	 * Getter for links
+	 * @return PayPal\Api\Link
 	 */ 
 	public function getLinks() {
 		return $this->links;
diff --git a/lib/PayPal/Api/CreditCard.php b/lib/PayPal/Api/CreditCard.php
index 7486242..424cb81 100644
--- a/lib/PayPal/Api/CreditCard.php
+++ b/lib/PayPal/Api/CreditCard.php
@@ -6,7 +6,7 @@ use PayPal\Rest\Call;
 use PayPal\Rest\ApiContext;
 
 /**
- * 
+ * 
  */
 class CreditCard extends Resource implements IResource {
 
@@ -26,6 +26,7 @@ class CreditCard extends Resource implements IResource {
 
 	/**
 	 * Getter for id
+	 * @return string
 	 */ 
 	public function getId() {
 		return $this->id;
@@ -41,6 +42,7 @@ class CreditCard extends Resource implements IResource {
 
 	/**
 	 * Getter for valid_until
+	 * @return string
 	 */ 
 	public function getValid_until() {
 		return $this->valid_until;
@@ -56,6 +58,7 @@ class CreditCard extends Resource implements IResource {
 
 	/**
 	 * Getter for state
+	 * @return string
 	 */ 
 	public function getState() {
 		return $this->state;
@@ -71,6 +74,7 @@ class CreditCard extends Resource implements IResource {
 
 	/**
 	 * Getter for payer_id
+	 * @return string
 	 */ 
 	public function getPayer_id() {
 		return $this->payer_id;
@@ -86,6 +90,7 @@ class CreditCard extends Resource implements IResource {
 
 	/**
 	 * Getter for type
+	 * @return string
 	 */ 
 	public function getType() {
 		return $this->type;
@@ -101,6 +106,7 @@ class CreditCard extends Resource implements IResource {
 
 	/**
 	 * Getter for number
+	 * @return string
 	 */ 
 	public function getNumber() {
 		return $this->number;
@@ -116,6 +122,7 @@ class CreditCard extends Resource implements IResource {
 
 	/**
 	 * Getter for expire_month
+	 * @return string
 	 */ 
 	public function getExpire_month() {
 		return $this->expire_month;
@@ -131,6 +138,7 @@ class CreditCard extends Resource implements IResource {
 
 	/**
 	 * Getter for expire_year
+	 * @return string
 	 */ 
 	public function getExpire_year() {
 		return $this->expire_year;
@@ -146,6 +154,7 @@ class CreditCard extends Resource implements IResource {
 
 	/**
 	 * Getter for cvv2
+	 * @return string
 	 */ 
 	public function getCvv2() {
 		return $this->cvv2;
@@ -161,6 +170,7 @@ class CreditCard extends Resource implements IResource {
 
 	/**
 	 * Getter for first_name
+	 * @return string
 	 */ 
 	public function getFirst_name() {
 		return $this->first_name;
@@ -176,6 +186,7 @@ class CreditCard extends Resource implements IResource {
 
 	/**
 	 * Getter for last_name
+	 * @return string
 	 */ 
 	public function getLast_name() {
 		return $this->last_name;
@@ -191,6 +202,7 @@ class CreditCard extends Resource implements IResource {
 
 	/**
 	 * Getter for billing_address
+	 * @return PayPal\Api\Address
 	 */ 
 	public function getBilling_address() {
 		return $this->billing_address;
@@ -206,6 +218,7 @@ class CreditCard extends Resource implements IResource {
 
 	/**
 	 * Getter for links
+	 * @return PayPal\Api\Link
 	 */ 
 	public function getLinks() {
 		return $this->links;
@@ -224,8 +237,10 @@ class CreditCard extends Resource implements IResource {
 		if($apiContext == null) {
 			$apiContext = new ApiContext(self::$credential);
 		}
-		$call = new Call();		
-		$json = $call->execute("/v1/vault/credit-card", "POST", $payLoad, $apiContext);
+		$call = new \PPRestCall();		
+		$json = $call->execute($apiContext, array('PayPal\Rest\RestHandler'),
+			"/v1/vault/credit-card", 
+			"POST", $payLoad);
 		$this->fromJson($json);
  		return $this; 		
  	}
@@ -241,8 +256,10 @@ class CreditCard extends Resource implements IResource {
 		}
 		$payLoad = "";
 		
-		$apiContext = new ApiContext(self::$credential);		$call = new Call();		
-		$json = $call->execute("/v1/vault/credit-card/$creditcardid", "GET", $payLoad, $apiContext);
+		$apiContext = new ApiContext(self::$credential);		$call = new \PPRestCall();		
+		$json = $call->execute($apiContext, array('PayPal\Rest\RestHandler'),
+			"/v1/vault/credit-card/$creditcardid", 
+			"GET", $payLoad);
 		$ret = new CreditCard();
 		$ret->fromJson($json);
 		return $ret;
diff --git a/lib/PayPal/Api/CreditCardToken.php b/lib/PayPal/Api/CreditCardToken.php
index 7ca48f1..0dae9e6 100644
--- a/lib/PayPal/Api/CreditCardToken.php
+++ b/lib/PayPal/Api/CreditCardToken.php
@@ -3,7 +3,7 @@
 namespace PayPal\Api;
 
 /**
- * 
+ * 
  */
 class CreditCardToken extends Resource {
 
@@ -18,6 +18,7 @@ class CreditCardToken extends Resource {
 
 	/**
 	 * Getter for credit_card_id
+	 * @return string
 	 */ 
 	public function getCredit_card_id() {
 		return $this->credit_card_id;
@@ -33,6 +34,7 @@ class CreditCardToken extends Resource {
 
 	/**
 	 * Getter for payer_id
+	 * @return string
 	 */ 
 	public function getPayer_id() {
 		return $this->payer_id;
diff --git a/lib/PayPal/Api/FundingInstrument.php b/lib/PayPal/Api/FundingInstrument.php
index 7fc07a0..0379245 100644
--- a/lib/PayPal/Api/FundingInstrument.php
+++ b/lib/PayPal/Api/FundingInstrument.php
@@ -3,7 +3,7 @@
 namespace PayPal\Api;
 
 /**
- * 
+ * 
  */
 class FundingInstrument extends Resource {
 
@@ -18,6 +18,7 @@ class FundingInstrument extends Resource {
 
 	/**
 	 * Getter for credit_card
+	 * @return PayPal\Api\CreditCard
 	 */ 
 	public function getCredit_card() {
 		return $this->credit_card;
@@ -33,6 +34,7 @@ class FundingInstrument extends Resource {
 
 	/**
 	 * Getter for credit_card_token
+	 * @return PayPal\Api\CreditCardToken
 	 */ 
 	public function getCredit_card_token() {
 		return $this->credit_card_token;
diff --git a/lib/PayPal/Api/Item.php b/lib/PayPal/Api/Item.php
index 7d547ae..1e88ebb 100644
--- a/lib/PayPal/Api/Item.php
+++ b/lib/PayPal/Api/Item.php
@@ -3,7 +3,7 @@
 namespace PayPal\Api;
 
 /**
- * 
+ * 
  */
 class Item extends Resource {
 
@@ -18,6 +18,7 @@ class Item extends Resource {
 
 	/**
 	 * Getter for name
+	 * @return string
 	 */ 
 	public function getName() {
 		return $this->name;
@@ -33,6 +34,7 @@ class Item extends Resource {
 
 	/**
 	 * Getter for sku
+	 * @return string
 	 */ 
 	public function getSku() {
 		return $this->sku;
@@ -48,6 +50,7 @@ class Item extends Resource {
 
 	/**
 	 * Getter for price
+	 * @return string
 	 */ 
 	public function getPrice() {
 		return $this->price;
@@ -63,6 +66,7 @@ class Item extends Resource {
 
 	/**
 	 * Getter for currency
+	 * @return string
 	 */ 
 	public function getCurrency() {
 		return $this->currency;
@@ -78,6 +82,7 @@ class Item extends Resource {
 
 	/**
 	 * Getter for quantity
+	 * @return string
 	 */ 
 	public function getQuantity() {
 		return $this->quantity;
diff --git a/lib/PayPal/Api/ItemList.php b/lib/PayPal/Api/ItemList.php
index 2c7fe18..232856e 100644
--- a/lib/PayPal/Api/ItemList.php
+++ b/lib/PayPal/Api/ItemList.php
@@ -3,7 +3,7 @@
 namespace PayPal\Api;
 
 /**
- * 
+ * 
  */
 class ItemList extends Resource {
 
@@ -18,6 +18,7 @@ class ItemList extends Resource {
 
 	/**
 	 * Getter for items
+	 * @return PayPal\Api\Item
 	 */ 
 	public function getItems() {
 		return $this->items;
@@ -33,6 +34,7 @@ class ItemList extends Resource {
 
 	/**
 	 * Getter for shipping_address
+	 * @return PayPal\Api\ShippingAddress
 	 */ 
 	public function getShipping_address() {
 		return $this->shipping_address;
diff --git a/lib/PayPal/Api/Link.php b/lib/PayPal/Api/Link.php
index 643c95c..01ac708 100644
--- a/lib/PayPal/Api/Link.php
+++ b/lib/PayPal/Api/Link.php
@@ -3,7 +3,7 @@
 namespace PayPal\Api;
 
 /**
- * 
+ * 
  */
 class Link extends Resource {
 
@@ -18,6 +18,7 @@ class Link extends Resource {
 
 	/**
 	 * Getter for href
+	 * @return string
 	 */ 
 	public function getHref() {
 		return $this->href;
@@ -33,6 +34,7 @@ class Link extends Resource {
 
 	/**
 	 * Getter for rel
+	 * @return string
 	 */ 
 	public function getRel() {
 		return $this->rel;
@@ -48,6 +50,7 @@ class Link extends Resource {
 
 	/**
 	 * Getter for method
+	 * @return string
 	 */ 
 	public function getMethod() {
 		return $this->method;
diff --git a/lib/PayPal/Api/Payee.php b/lib/PayPal/Api/Payee.php
index ab3cba3..eb33dea 100644
--- a/lib/PayPal/Api/Payee.php
+++ b/lib/PayPal/Api/Payee.php
@@ -3,7 +3,7 @@
 namespace PayPal\Api;
 
 /**
- * 
+ * 
  */
 class Payee extends Resource {
 
@@ -18,6 +18,7 @@ class Payee extends Resource {
 
 	/**
 	 * Getter for merchant_id
+	 * @return string
 	 */ 
 	public function getMerchant_id() {
 		return $this->merchant_id;
@@ -33,6 +34,7 @@ class Payee extends Resource {
 
 	/**
 	 * Getter for email
+	 * @return string
 	 */ 
 	public function getEmail() {
 		return $this->email;
@@ -48,6 +50,7 @@ class Payee extends Resource {
 
 	/**
 	 * Getter for phone
+	 * @return string
 	 */ 
 	public function getPhone() {
 		return $this->phone;
diff --git a/lib/PayPal/Api/Payer.php b/lib/PayPal/Api/Payer.php
index f083087..c1fe6f2 100644
--- a/lib/PayPal/Api/Payer.php
+++ b/lib/PayPal/Api/Payer.php
@@ -3,7 +3,7 @@
 namespace PayPal\Api;
 
 /**
- * 
+ * 
  */
 class Payer extends Resource {
 
@@ -18,6 +18,7 @@ class Payer extends Resource {
 
 	/**
 	 * Getter for payment_method
+	 * @return string
 	 */ 
 	public function getPayment_method() {
 		return $this->payment_method;
@@ -33,6 +34,7 @@ class Payer extends Resource {
 
 	/**
 	 * Getter for payer_info
+	 * @return PayPal\Api\PayerInfo
 	 */ 
 	public function getPayer_info() {
 		return $this->payer_info;
@@ -48,6 +50,7 @@ class Payer extends Resource {
 
 	/**
 	 * Getter for funding_instruments
+	 * @return PayPal\Api\FundingInstrument
 	 */ 
 	public function getFunding_instruments() {
 		return $this->funding_instruments;
diff --git a/lib/PayPal/Api/PayerInfo.php b/lib/PayPal/Api/PayerInfo.php
index 5d6a108..fe1af5c 100644
--- a/lib/PayPal/Api/PayerInfo.php
+++ b/lib/PayPal/Api/PayerInfo.php
@@ -3,7 +3,7 @@
 namespace PayPal\Api;
 
 /**
- * 
+ * 
  */
 class PayerInfo extends Resource {
 
@@ -18,6 +18,7 @@ class PayerInfo extends Resource {
 
 	/**
 	 * Getter for email
+	 * @return string
 	 */ 
 	public function getEmail() {
 		return $this->email;
@@ -33,6 +34,7 @@ class PayerInfo extends Resource {
 
 	/**
 	 * Getter for first_name
+	 * @return string
 	 */ 
 	public function getFirst_name() {
 		return $this->first_name;
@@ -48,6 +50,7 @@ class PayerInfo extends Resource {
 
 	/**
 	 * Getter for last_name
+	 * @return string
 	 */ 
 	public function getLast_name() {
 		return $this->last_name;
@@ -63,6 +66,7 @@ class PayerInfo extends Resource {
 
 	/**
 	 * Getter for payer_id
+	 * @return string
 	 */ 
 	public function getPayer_id() {
 		return $this->payer_id;
@@ -78,6 +82,7 @@ class PayerInfo extends Resource {
 
 	/**
 	 * Getter for shipping_address
+	 * @return PayPal\Api\Address
 	 */ 
 	public function getShipping_address() {
 		return $this->shipping_address;
@@ -93,6 +98,7 @@ class PayerInfo extends Resource {
 
 	/**
 	 * Getter for phone
+	 * @return string
 	 */ 
 	public function getPhone() {
 		return $this->phone;
diff --git a/lib/PayPal/Api/Payment.php b/lib/PayPal/Api/Payment.php
index a736b59..fc71a30 100644
--- a/lib/PayPal/Api/Payment.php
+++ b/lib/PayPal/Api/Payment.php
@@ -6,7 +6,7 @@ use PayPal\Rest\Call;
 use PayPal\Rest\ApiContext;
 
 /**
- * 
+ * 
  */
 class Payment extends Resource implements IResource {
 
@@ -26,6 +26,7 @@ class Payment extends Resource implements IResource {
 
 	/**
 	 * Getter for id
+	 * @return string
 	 */ 
 	public function getId() {
 		return $this->id;
@@ -41,6 +42,7 @@ class Payment extends Resource implements IResource {
 
 	/**
 	 * Getter for create_time
+	 * @return string
 	 */ 
 	public function getCreate_time() {
 		return $this->create_time;
@@ -56,6 +58,7 @@ class Payment extends Resource implements IResource {
 
 	/**
 	 * Getter for update_time
+	 * @return string
 	 */ 
 	public function getUpdate_time() {
 		return $this->update_time;
@@ -71,6 +74,7 @@ class Payment extends Resource implements IResource {
 
 	/**
 	 * Getter for state
+	 * @return string
 	 */ 
 	public function getState() {
 		return $this->state;
@@ -86,6 +90,7 @@ class Payment extends Resource implements IResource {
 
 	/**
 	 * Getter for intent
+	 * @return string
 	 */ 
 	public function getIntent() {
 		return $this->intent;
@@ -101,6 +106,7 @@ class Payment extends Resource implements IResource {
 
 	/**
 	 * Getter for payer
+	 * @return PayPal\Api\Payer
 	 */ 
 	public function getPayer() {
 		return $this->payer;
@@ -116,6 +122,7 @@ class Payment extends Resource implements IResource {
 
 	/**
 	 * Getter for transactions
+	 * @return PayPal\Api\Transaction
 	 */ 
 	public function getTransactions() {
 		return $this->transactions;
@@ -131,6 +138,7 @@ class Payment extends Resource implements IResource {
 
 	/**
 	 * Getter for redirect_urls
+	 * @return PayPal\Api\RedirectUrls
 	 */ 
 	public function getRedirect_urls() {
 		return $this->redirect_urls;
@@ -146,6 +154,7 @@ class Payment extends Resource implements IResource {
 
 	/**
 	 * Getter for links
+	 * @return PayPal\Api\Link
 	 */ 
 	public function getLinks() {
 		return $this->links;
@@ -173,8 +182,10 @@ class Payment extends Resource implements IResource {
 		$payLoad = "";
 		$allowedParams = array('count' => 1, 'start_id' => 1, 'start_index' => 1, 'start_time' => 1, 'end_time' => 1, 'payee_id' => 1, 'sort_by' => 1, 'sort_order' => 1, );		
 		
-		$apiContext = new ApiContext(self::$credential);		$call = new Call();		
-		$json = $call->execute("/v1/payments/payment?" . http_build_query(array_intersect_key($params, $allowedParams)), "GET", $payLoad, $apiContext);
+		$apiContext = new ApiContext(self::$credential);		$call = new \PPRestCall();		
+		$json = $call->execute($apiContext, array('PayPal\Rest\RestHandler'),
+			"/v1/payments/payment?" . http_build_query(array_intersect_key($params, $allowedParams)), 
+			"GET", $payLoad);
 		$ret = new PaymentHistory();
 		$ret->fromJson($json);
 		return $ret;
@@ -192,8 +203,10 @@ class Payment extends Resource implements IResource {
 		if($apiContext == null) {
 			$apiContext = new ApiContext(self::$credential);
 		}
-		$call = new Call();		
-		$json = $call->execute("/v1/payments/payment", "POST", $payLoad, $apiContext);
+		$call = new \PPRestCall();		
+		$json = $call->execute($apiContext, array('PayPal\Rest\RestHandler'),
+			"/v1/payments/payment", 
+			"POST", $payLoad);
 		$this->fromJson($json);
  		return $this; 		
  	}
@@ -209,8 +222,10 @@ class Payment extends Resource implements IResource {
 		}
 		$payLoad = "";
 		
-		$apiContext = new ApiContext(self::$credential);		$call = new Call();		
-		$json = $call->execute("/v1/payments/payment/$paymentid", "GET", $payLoad, $apiContext);
+		$apiContext = new ApiContext(self::$credential);		$call = new \PPRestCall();		
+		$json = $call->execute($apiContext, array('PayPal\Rest\RestHandler'),
+			"/v1/payments/payment/$paymentid", 
+			"GET", $payLoad);
 		$ret = new Payment();
 		$ret->fromJson($json);
 		return $ret;
@@ -234,8 +249,10 @@ class Payment extends Resource implements IResource {
 		if($apiContext == null) {
 			$apiContext = new ApiContext(self::$credential);
 		}
-		$call = new Call();		
-		$json = $call->execute("/v1/payments/payment/{$this->getId()}/execute", "POST", $payLoad, $apiContext);
+		$call = new \PPRestCall();		
+		$json = $call->execute($apiContext, array('PayPal\Rest\RestHandler'),
+			"/v1/payments/payment/{$this->getId()}/execute", 
+			"POST", $payLoad);
 		$this->fromJson($json);
  		return $this; 		
  	}
diff --git a/lib/PayPal/Api/PaymentExecution.php b/lib/PayPal/Api/PaymentExecution.php
index b095a96..4de31a5 100644
--- a/lib/PayPal/Api/PaymentExecution.php
+++ b/lib/PayPal/Api/PaymentExecution.php
@@ -3,7 +3,7 @@
 namespace PayPal\Api;
 
 /**
- * 
+ * 
  */
 class PaymentExecution extends Resource {
 
@@ -18,6 +18,7 @@ class PaymentExecution extends Resource {
 
 	/**
 	 * Getter for payer_id
+	 * @return string
 	 */ 
 	public function getPayer_id() {
 		return $this->payer_id;
@@ -33,6 +34,7 @@ class PaymentExecution extends Resource {
 
 	/**
 	 * Getter for transactions
+	 * @return PayPal\Api\Amount
 	 */ 
 	public function getTransactions() {
 		return $this->transactions;
diff --git a/lib/PayPal/Api/PaymentHistory.php b/lib/PayPal/Api/PaymentHistory.php
index de232c3..98735de 100644
--- a/lib/PayPal/Api/PaymentHistory.php
+++ b/lib/PayPal/Api/PaymentHistory.php
@@ -3,7 +3,7 @@
 namespace PayPal\Api;
 
 /**
- * 
+ * 
  */
 class PaymentHistory extends Resource {
 
@@ -18,6 +18,7 @@ class PaymentHistory extends Resource {
 
 	/**
 	 * Getter for payments
+	 * @return PayPal\Api\Payment
 	 */ 
 	public function getPayments() {
 		return $this->payments;
@@ -33,6 +34,7 @@ class PaymentHistory extends Resource {
 
 	/**
 	 * Getter for count
+	 * @return integer
 	 */ 
 	public function getCount() {
 		return $this->count;
@@ -48,6 +50,7 @@ class PaymentHistory extends Resource {
 
 	/**
 	 * Getter for next_id
+	 * @return string
 	 */ 
 	public function getNext_id() {
 		return $this->next_id;
diff --git a/lib/PayPal/Api/RedirectUrls.php b/lib/PayPal/Api/RedirectUrls.php
index 2a92f8c..99ffb04 100644
--- a/lib/PayPal/Api/RedirectUrls.php
+++ b/lib/PayPal/Api/RedirectUrls.php
@@ -3,7 +3,7 @@
 namespace PayPal\Api;
 
 /**
- * 
+ * 
  */
 class RedirectUrls extends Resource {
 
@@ -18,6 +18,7 @@ class RedirectUrls extends Resource {
 
 	/**
 	 * Getter for return_url
+	 * @return string
 	 */ 
 	public function getReturn_url() {
 		return $this->return_url;
@@ -33,6 +34,7 @@ class RedirectUrls extends Resource {
 
 	/**
 	 * Getter for cancel_url
+	 * @return string
 	 */ 
 	public function getCancel_url() {
 		return $this->cancel_url;
diff --git a/lib/PayPal/Api/Refund.php b/lib/PayPal/Api/Refund.php
index 93b14a2..cb52e26 100644
--- a/lib/PayPal/Api/Refund.php
+++ b/lib/PayPal/Api/Refund.php
@@ -6,7 +6,7 @@ use PayPal\Rest\Call;
 use PayPal\Rest\ApiContext;
 
 /**
- * 
+ * 
  */
 class Refund extends Resource implements IResource {
 
@@ -26,6 +26,7 @@ class Refund extends Resource implements IResource {
 
 	/**
 	 * Getter for id
+	 * @return string
 	 */ 
 	public function getId() {
 		return $this->id;
@@ -41,6 +42,7 @@ class Refund extends Resource implements IResource {
 
 	/**
 	 * Getter for create_time
+	 * @return string
 	 */ 
 	public function getCreate_time() {
 		return $this->create_time;
@@ -56,6 +58,7 @@ class Refund extends Resource implements IResource {
 
 	/**
 	 * Getter for update_time
+	 * @return string
 	 */ 
 	public function getUpdate_time() {
 		return $this->update_time;
@@ -71,6 +74,7 @@ class Refund extends Resource implements IResource {
 
 	/**
 	 * Getter for state
+	 * @return string
 	 */ 
 	public function getState() {
 		return $this->state;
@@ -86,6 +90,7 @@ class Refund extends Resource implements IResource {
 
 	/**
 	 * Getter for amount
+	 * @return PayPal\Api\Amount
 	 */ 
 	public function getAmount() {
 		return $this->amount;
@@ -101,6 +106,7 @@ class Refund extends Resource implements IResource {
 
 	/**
 	 * Getter for sale_id
+	 * @return string
 	 */ 
 	public function getSale_id() {
 		return $this->sale_id;
@@ -116,6 +122,7 @@ class Refund extends Resource implements IResource {
 
 	/**
 	 * Getter for capture_id
+	 * @return string
 	 */ 
 	public function getCapture_id() {
 		return $this->capture_id;
@@ -131,6 +138,7 @@ class Refund extends Resource implements IResource {
 
 	/**
 	 * Getter for parent_payment
+	 * @return string
 	 */ 
 	public function getParent_payment() {
 		return $this->parent_payment;
@@ -146,6 +154,7 @@ class Refund extends Resource implements IResource {
 
 	/**
 	 * Getter for description
+	 * @return string
 	 */ 
 	public function getDescription() {
 		return $this->description;
@@ -161,6 +170,7 @@ class Refund extends Resource implements IResource {
 
 	/**
 	 * Getter for links
+	 * @return PayPal\Api\Link
 	 */ 
 	public function getLinks() {
 		return $this->links;
@@ -179,8 +189,10 @@ class Refund extends Resource implements IResource {
 		}
 		$payLoad = "";
 		
-		$apiContext = new ApiContext(self::$credential);		$call = new Call();		
-		$json = $call->execute("/v1/payments/refund/$refundid", "GET", $payLoad, $apiContext);
+		$apiContext = new ApiContext(self::$credential);		$call = new \PPRestCall();		
+		$json = $call->execute($apiContext, array('PayPal\Rest\RestHandler'),
+			"/v1/payments/refund/$refundid", 
+			"GET", $payLoad);
 		$ret = new Refund();
 		$ret->fromJson($json);
 		return $ret;
diff --git a/lib/PayPal/Api/Resource.php b/lib/PayPal/Api/Resource.php
index 825384a..725b01c 100644
--- a/lib/PayPal/Api/Resource.php
+++ b/lib/PayPal/Api/Resource.php
@@ -1,12 +1,10 @@
 <?php 
 
 namespace PayPal\Api;
-use PayPal\Common\Model;
-
 /**
- * 
+ * 
  */
-class Resource extends Model {
+class Resource extends \PPModel {
 
 
 
diff --git a/lib/PayPal/Api/Sale.php b/lib/PayPal/Api/Sale.php
index 1efc408..1b62ef4 100644
--- a/lib/PayPal/Api/Sale.php
+++ b/lib/PayPal/Api/Sale.php
@@ -6,7 +6,7 @@ use PayPal\Rest\Call;
 use PayPal\Rest\ApiContext;
 
 /**
- * 
+ * 
  */
 class Sale extends Resource implements IResource {
 
@@ -26,6 +26,7 @@ class Sale extends Resource implements IResource {
 
 	/**
 	 * Getter for id
+	 * @return string
 	 */ 
 	public function getId() {
 		return $this->id;
@@ -41,6 +42,7 @@ class Sale extends Resource implements IResource {
 
 	/**
 	 * Getter for create_time
+	 * @return string
 	 */ 
 	public function getCreate_time() {
 		return $this->create_time;
@@ -56,6 +58,7 @@ class Sale extends Resource implements IResource {
 
 	/**
 	 * Getter for update_time
+	 * @return string
 	 */ 
 	public function getUpdate_time() {
 		return $this->update_time;
@@ -71,6 +74,7 @@ class Sale extends Resource implements IResource {
 
 	/**
 	 * Getter for state
+	 * @return string
 	 */ 
 	public function getState() {
 		return $this->state;
@@ -86,6 +90,7 @@ class Sale extends Resource implements IResource {
 
 	/**
 	 * Getter for amount
+	 * @return PayPal\Api\Amount
 	 */ 
 	public function getAmount() {
 		return $this->amount;
@@ -101,6 +106,7 @@ class Sale extends Resource implements IResource {
 
 	/**
 	 * Getter for parent_payment
+	 * @return string
 	 */ 
 	public function getParent_payment() {
 		return $this->parent_payment;
@@ -116,6 +122,7 @@ class Sale extends Resource implements IResource {
 
 	/**
 	 * Getter for links
+	 * @return PayPal\Api\Link
 	 */ 
 	public function getLinks() {
 		return $this->links;
@@ -134,8 +141,10 @@ class Sale extends Resource implements IResource {
 		}
 		$payLoad = "";
 		
-		$apiContext = new ApiContext(self::$credential);		$call = new Call();		
-		$json = $call->execute("/v1/payments/sale/$saleid", "GET", $payLoad, $apiContext);
+		$apiContext = new ApiContext(self::$credential);		$call = new \PPRestCall();		
+		$json = $call->execute($apiContext, array('PayPal\Rest\RestHandler'),
+			"/v1/payments/sale/$saleid", 
+			"GET", $payLoad);
 		$ret = new Sale();
 		$ret->fromJson($json);
 		return $ret;
@@ -159,8 +168,10 @@ class Sale extends Resource implements IResource {
 		if($apiContext == null) {
 			$apiContext = new ApiContext(self::$credential);
 		}
-		$call = new Call();		
-		$json = $call->execute("/v1/payments/sale/{$this->getId()}/refund", "POST", $payLoad, $apiContext);
+		$call = new \PPRestCall();		
+		$json = $call->execute($apiContext, array('PayPal\Rest\RestHandler'),
+			"/v1/payments/sale/{$this->getId()}/refund", 
+			"POST", $payLoad);
 		$this->fromJson($json);
  		return $this; 		
  	}
diff --git a/lib/PayPal/Api/ShippingAddress.php b/lib/PayPal/Api/ShippingAddress.php
index 798df69..80252b6 100644
--- a/lib/PayPal/Api/ShippingAddress.php
+++ b/lib/PayPal/Api/ShippingAddress.php
@@ -3,7 +3,7 @@
 namespace PayPal\Api;
 
 /**
- * 
+ * 
  */
 class ShippingAddress extends Address {
 
@@ -18,6 +18,7 @@ class ShippingAddress extends Address {
 
 	/**
 	 * Getter for recipient_name
+	 * @return string
 	 */ 
 	public function getRecipient_name() {
 		return $this->recipient_name;
diff --git a/lib/PayPal/Api/SubTransaction.php b/lib/PayPal/Api/SubTransaction.php
index 4e92a09..7afc5c3 100644
--- a/lib/PayPal/Api/SubTransaction.php
+++ b/lib/PayPal/Api/SubTransaction.php
@@ -3,7 +3,7 @@
 namespace PayPal\Api;
 
 /**
- * 
+ * 
  */
 class SubTransaction extends Resource {
 
@@ -18,6 +18,7 @@ class SubTransaction extends Resource {
 
 	/**
 	 * Getter for sale
+	 * @return PayPal\Api\Sale
 	 */ 
 	public function getSale() {
 		return $this->sale;
@@ -33,6 +34,7 @@ class SubTransaction extends Resource {
 
 	/**
 	 * Getter for authorization
+	 * @return PayPal\Api\Authorization
 	 */ 
 	public function getAuthorization() {
 		return $this->authorization;
@@ -48,6 +50,7 @@ class SubTransaction extends Resource {
 
 	/**
 	 * Getter for refund
+	 * @return PayPal\Api\Refund
 	 */ 
 	public function getRefund() {
 		return $this->refund;
@@ -63,6 +66,7 @@ class SubTransaction extends Resource {
 
 	/**
 	 * Getter for capture
+	 * @return PayPal\Api\Capture
 	 */ 
 	public function getCapture() {
 		return $this->capture;
diff --git a/lib/PayPal/Api/Transaction.php b/lib/PayPal/Api/Transaction.php
index f5857a5..d3749d0 100644
--- a/lib/PayPal/Api/Transaction.php
+++ b/lib/PayPal/Api/Transaction.php
@@ -3,7 +3,7 @@
 namespace PayPal\Api;
 
 /**
- * 
+ * 
  */
 class Transaction extends Resource {
 
@@ -18,6 +18,7 @@ class Transaction extends Resource {
 
 	/**
 	 * Getter for amount
+	 * @return PayPal\Api\Amount
 	 */ 
 	public function getAmount() {
 		return $this->amount;
@@ -33,6 +34,7 @@ class Transaction extends Resource {
 
 	/**
 	 * Getter for payee
+	 * @return PayPal\Api\Payee
 	 */ 
 	public function getPayee() {
 		return $this->payee;
@@ -48,6 +50,7 @@ class Transaction extends Resource {
 
 	/**
 	 * Getter for description
+	 * @return string
 	 */ 
 	public function getDescription() {
 		return $this->description;
@@ -63,6 +66,7 @@ class Transaction extends Resource {
 
 	/**
 	 * Getter for item_list
+	 * @return PayPal\Api\ItemList
 	 */ 
 	public function getItem_list() {
 		return $this->item_list;
@@ -78,6 +82,7 @@ class Transaction extends Resource {
 
 	/**
 	 * Getter for related_resources
+	 * @return PayPal\Api\SubTransaction
 	 */ 
 	public function getRelated_resources() {
 		return $this->related_resources;
diff --git a/lib/PayPal/Auth/OAuthTokenCredential.php b/lib/PayPal/Auth/OAuthTokenCredential.php
index cd28348..96e49c7 100644
--- a/lib/PayPal/Auth/OAuthTokenCredential.php
+++ b/lib/PayPal/Auth/OAuthTokenCredential.php
@@ -1,118 +1,132 @@
-<?php
-
-namespace PayPal\Auth;
-
-/**
- * Oauth Token credential
- *
- */
-class OAuthTokenCredential {
-	
-	private static $expiryBufferTime = 120;
-	
-	private $logger;
-	
-	/**
-	 * Client ID as obtained from the developer portal
-	 */
-	private $clientId;
-	
-	/**
-	 * Client secret as obtained from the developer portal
-	 */
-	private $clientSecret;
-	
-	
-	/**
-	 * Generated Access Token
-	 */
-	private $accessToken;	
-	
-	/**
-	 * Seconds for with access token is valid
-	 */
-	private $tokenExpiresIn;
-	
-	/**
-	 * Last time (in milliseconds) when access token was generated
-	 */
-	private $tokenCreateTime;
-	
-	/**
-	 * 
-	 * @param string $clientId client id obtained from the developer portal
-	 * @param string $clientSecret client secret obtained from the developer portal
-	 */
-	public function __construct($clientId, $clientSecret) {
-		$this->clientId = $clientId;
-		$this->clientSecret = $clientSecret;
-		$this->logger = new \PPLoggingManager(__CLASS__);		
-	}
-	
-	/**
-	 * @return the accessToken
-	 */
-	public function getAccessToken() {		
-		// Check if Access Token is not null and has not expired.
-		// The API returns expiry time as a relative time unit 
-		// We use a buffer time when checking for token expiry to account
-		// for API call delays and any delay between the time the token is
-		// retrieved and subsequently used
-		if ($this->accessToken != null && 
-				(time() - $this->tokenCreateTime) > ($this->tokenExpiresIn - self::$expiryBufferTime)) {			
-				$this->accessToken = null;			
-		}
-		// If accessToken is Null, obtain a new token
-		if ($this->accessToken == null) {			
-			$this->generateAccessToken();
-		}
-		return $this->accessToken;
-	}
-	
-	/**
-	 * Generates a new access token
-	 */
-	private function generateAccessToken() {
-		return $this->generateOAuthToken(base64_encode($this->clientId . ":" . $this->clientSecret));		
-	}
-	
-	/**
-	 * Generate OAuth type token from Base64Client ID
-	 */
-	private function generateOAuthToken($base64ClientID) {
-							
-		$headers = array(
-			"Authorization" => "Basic " . $base64ClientID,
-			"Accept" => "*/*"
-		);		
-		$httpConfiguration = $this->getOAuthHttpConfiguration();
-		$httpConfiguration->setHeaders($headers);
-		
-		$connection = \PPConnectionManager::getInstance()->getConnection($httpConfiguration);		
-		$res = $connection->execute("grant_type=client_credentials");		
-		$jsonResponse = json_decode($res, true);
-		if($jsonResponse == NULL || 
-				!isset($jsonResponse["access_token"]) || !isset($jsonResponse["expires_in"]) ) {
-			$this->accessToken = NULL;
-			$this->tokenExpiresIn = NULL;	
-			$this->logger->warning("Could not generate new Access token. Invalid response from server: " . $jsonResponse);		
-		} else {
-			$this->accessToken = $jsonResponse["access_token"];
-			$this->tokenExpiresIn = $jsonResponse["expires_in"];
-		}
-		$this->tokenCreateTime = time();
-		return $this->accessToken;
-	}
-	
-	/*
-	 * Get HttpConfiguration object for OAuth API
-	*/
-	private function getOAuthHttpConfiguration() {
-		$configMgr = \PPConfigManager::getInstance();
-		
-		$baseEndpoint = ($configMgr->get("oauth.EndPoint") != '' && !is_array($configMgr->get("oauth.EndPoint"))) ? 
-			$configMgr->get("oauth.EndPoint") : $configMgr->get("service.EndPoint");
-		$baseEndpoint = rtrim(trim($baseEndpoint), '/');		 
-		return new \PPHttpConfig($baseEndpoint . "/v1/oauth2/token", "POST");
-	}
-}
+<?php
+
+namespace PayPal\Auth;
+
+/**
+ * Oauth Token credential
+ *
+ */
+use PayPal\Rest\RestHandler;
+
+use PayPal\Common\UserAgent;
+
+class OAuthTokenCredential {
+	
+	private static $expiryBufferTime = 120;
+	
+	private $logger;
+	
+	/**
+	 * Client ID as obtained from the developer portal
+	 */
+	private $clientId;
+	
+	/**
+	 * Client secret as obtained from the developer portal
+	 */
+	private $clientSecret;
+	
+	
+	/**
+	 * Generated Access Token
+	 */
+	private $accessToken;	
+	
+	/**
+	 * Seconds for with access token is valid
+	 */
+	private $tokenExpiresIn;
+	
+	/**
+	 * Last time (in milliseconds) when access token was generated
+	 */
+	private $tokenCreateTime;
+	
+	/**
+	 * 
+	 * @param string $clientId client id obtained from the developer portal
+	 * @param string $clientSecret client secret obtained from the developer portal
+	 */
+	public function __construct($clientId, $clientSecret) {
+		$this->clientId = $clientId;
+		$this->clientSecret = $clientSecret;
+		$this->logger = new \PPLoggingManager(__CLASS__);		
+	}
+	
+	/**
+	 * @return the accessToken
+	 */
+	public function getAccessToken($config) {		
+		// Check if Access Token is not null and has not expired.
+		// The API returns expiry time as a relative time unit 
+		// We use a buffer time when checking for token expiry to account
+		// for API call delays and any delay between the time the token is
+		// retrieved and subsequently used
+		if ($this->accessToken != null && 
+				(time() - $this->tokenCreateTime) > ($this->tokenExpiresIn - self::$expiryBufferTime)) {			
+				$this->accessToken = null;			
+		}
+		// If accessToken is Null, obtain a new token
+		if ($this->accessToken == null) {			
+			$this->_generateAccessToken($config);
+		}
+		return $this->accessToken;
+	}
+	
+	/**
+	 * Generates a new access token
+	 */
+	private function _generateAccessToken($config) {
+
+		$base64ClientID = base64_encode($this->clientId . ":" . $this->clientSecret);							
+		$headers = array(
+			"User-Agent" => \PPUserAgent::getValue(RestHandler::$sdkName, RestHandler::$sdkVersion),	
+			"Authorization" => "Basic " . $base64ClientID,
+			"Accept" => "*/*"
+		);		
+		$httpConfiguration = $this->getOAuthHttpConfiguration($config);
+		$httpConfiguration->setHeaders($headers);
+		
+		$connection = \PPConnectionManager::getInstance()->getConnection($httpConfiguration, $config);		
+		$res = $connection->execute("grant_type=client_credentials");		
+		$jsonResponse = json_decode($res, true);
+		if($jsonResponse == NULL || 
+				!isset($jsonResponse["access_token"]) || !isset($jsonResponse["expires_in"]) ) {
+			$this->accessToken = NULL;
+			$this->tokenExpiresIn = NULL;	
+			$this->logger->warning("Could not generate new Access token. Invalid response from server: " . $jsonResponse);		
+		} else {
+			$this->accessToken = $jsonResponse["access_token"];
+			$this->tokenExpiresIn = $jsonResponse["expires_in"];
+		}
+		$this->tokenCreateTime = time();
+		return $this->accessToken;
+	}
+	
+	/*
+	 * Get HttpConfiguration object for OAuth API
+	*/
+	private function getOAuthHttpConfiguration($config) {
+		if (isset($config['oauth.EndPoint'])) {
+			$baseEndpoint = $config['oauth.EndPoint'];
+		} else if (isset($config['service.EndPoint'])) {
+			$baseEndpoint = $config['service.EndPoint'];
+		} else if (isset($config['mode'])) {
+			switch (strtoupper($config['mode'])) {
+				case 'SANDBOX':
+					$baseEndpoint = \PPConstants::REST_SANDBOX_ENDPOINT;
+					break;
+				case 'LIVE':
+					$baseEndpoint = \PPConstants::REST_LIVE_ENDPOINT;
+					break;
+				default:
+					throw new \PPConfigurationException('The mode config parameter must be set to either sandbox/live');
+			}
+		} else {
+			throw new PPConfigurationException('You must set one of service.endpoint or mode parameters in your configuration');
+		}		
+		
+		$baseEndpoint = rtrim(trim($baseEndpoint), '/');		 
+		return new \PPHttpConfig($baseEndpoint . "/v1/oauth2/token", "POST");
+	}
+}
diff --git a/lib/PayPal/Common/ArrayUtil.php b/lib/PayPal/Common/ArrayUtil.php
deleted file mode 100644
index 315a2e4..0000000
--- a/lib/PayPal/Common/ArrayUtil.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-namespace PayPal\Common;
-
-class ArrayUtil {
-	
-	/**
-	 * 
-	 * @param array $arr
-	 * @return true if $arr is an associative array
-	 */
-	public static function isAssocArray(array $arr) {
-		foreach($arr as $k => $v) {
-			if(is_int($k)) {
-				return false;
-			}
-		}
-		return true;
-	}
-}
\ No newline at end of file
diff --git a/lib/PayPal/Common/Model.php b/lib/PayPal/Common/Model.php
deleted file mode 100644
index ff72c52..0000000
--- a/lib/PayPal/Common/Model.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php 
-
-namespace PayPal\Common;
-
-use PayPal\Api\Payer;
-
-/**
- * Generic Model class that all API domain classes extend
- * Stores all member data in a hashmap that enables easy 
- * JSON encoding/decoding
- */
-class Model {
-
-	private $_propMap = array();	
-		
-	public function __get($key) {
-		return $this->_propMap[$key];
-	}
-	
-	public function __set($key, $value) {
-		$this->_propMap[$key] = $value;
-	}
-	
-	public function __isset($key) {
-		return isset($this->_propMap[$key]);
-	}
-	
-	public function __unset($key) {
-		unset($this->_propMap[$key]);
-	}
-	
-	
-	private function _convertToArray($param) {
-		$ret = array();		
-		foreach($param as $k => $v) {
-			if($v instanceof Model ) {				
-				$ret[$k] = $v->toArray();
-			} else if (is_array($v)) {
-				$ret[$k] = $this->_convertToArray($v);
-			} else {
-				$ret[$k] = $v;
-			}
-		}
-		return $ret;
-	}
-	
-	public function fromArray($arr) {
-		
-		foreach($arr as $k => $v) {
-			if(is_array($v)) {
-				$clazz = ReflectionUtil::getPropertyClass(get_class($this), $k);
-				if(ArrayUtil::isAssocArray($v)) {							
-					$o = new $clazz();
-					$o->fromArray($v);
-					$setterFunc = "set".ucfirst($k);
-					$this->$setterFunc($o);
-				} else {
-					$setterFunc = "set".ucfirst($k);
-					$arr =  array();		
-					foreach($v as $nk => $nv) {
-						if(is_array($nv)) {
-							$o = new $clazz();
-							$o->fromArray($nv);
-							$arr[$nk] = $o;
-						} else {
-							$arr[$nk] = $nv;
-						}
-					}
-					$this->$setterFunc($arr);	//TODO: Cleaning up any current values in this case. Should be doing this allways
-				} 
-			}else {
-				$this->$k = $v;
-			}
-		}
-	}
-	
-	public function fromJson($json) {
-		$this->fromArray(json_decode($json, true));
-	}
-	
-	public function toArray() {
-		return $this->_convertToArray($this->_propMap);
-	}
-	
-	public function toJSON() {		
-		return json_encode($this->toArray());
-	}
-}
\ No newline at end of file
diff --git a/lib/PayPal/Common/ReflectionUtil.php b/lib/PayPal/Common/ReflectionUtil.php
deleted file mode 100644
index 3aa0fcd..0000000
--- a/lib/PayPal/Common/ReflectionUtil.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-namespace PayPal\Common;
-
-class ReflectionUtil {
-	
-	
-	/**
-	 * @var array|ReflectionMethod[]
-	 */
-	private static $propertiesRefl = array();
-	
-	/**
-	 * @var array|string[]
-	 */
-	private static $propertiesType = array();
-	
-	
-	/**
-	 * 
-	 * @param string $class
-	 * @param string $propertyName
-	 */
-	public static function getPropertyClass($class, $propertyName) {
-		
-		if (($annotations = self::propertyAnnotations($class, $propertyName)) && isset($annotations['param'])) {		
-// 			if (substr($annotations['param'], -2) === '[]') {
-// 				$param = substr($annotations['param'], 0, -2);
-// 			}
-			$param = $annotations['param'];
-		}
-
-		if(isset($param)) {
-			$anno = explode(' ', $param);
-			return $anno[0];
-		} else {
-			return 'string';
-		}
-	}
-	
-	
-	/**
-	 * @param string $class
-	 * @param string $propertyName
-	 * @throws RuntimeException
-	 * @return string
-	 */
-	public static function propertyAnnotations($class, $propertyName)
-	{
-		$class = is_object($class) ? get_class($class) : $class;
-		if (!class_exists('ReflectionProperty')) {
-			throw new RuntimeException("Property type of " . $class . "::{$propertyName} cannot be resolved");
-		}
-	
-		if ($annotations =& self::$propertiesType[$class][$propertyName]) {
-			return $annotations;
-		}
-	
-		$setterFunc = "set" . ucfirst($propertyName);
-		if (!($refl =& self::$propertiesRefl[$class][$propertyName])) {
-			$refl = new \ReflectionMethod($class, $setterFunc);
-		}
-	
-		// todo: smarter regexp
-		if (!preg_match_all('~\@([^\s@\(]+)[\t ]*(?:\(?([^\n@]+)\)?)?~i', $refl->getDocComment(), $annots, PREG_PATTERN_ORDER)) {
-			return NULL;
-		}
-		foreach ($annots[1] as $i => $annot) {
-			$annotations[strtolower($annot)] = empty($annots[2][$i]) ? TRUE : rtrim($annots[2][$i], " \t\n\r)");
-		}
-	
-		return $annotations;
-	}
-}
\ No newline at end of file
diff --git a/lib/PayPal/Common/UserAgent.php b/lib/PayPal/Common/UserAgent.php
deleted file mode 100644
index 99edf16..0000000
--- a/lib/PayPal/Common/UserAgent.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace PayPal\Common;
-
-define('SDK_NAME', 'rest-sdk-php');
-define('SDK_VERSION', '0.5.0');
-
-class UserAgent {
-
-	/**
-	 * Returns the value of the User-Agent header
-	 * Add environment values and php version numbers
-	 */
-	public static function getValue() {
-		
-		$featureList = array(
-				'lang=PHP',
-				'v=' . PHP_VERSION,
-				'bit=' . UserAgent::_getPHPBit(),
-				'os=' . str_replace(' ' , '_', php_uname('s') . ' ' . php_uname('r')),
-				'machine=' . php_uname('m')
-		);
-		if(defined('OPENSSL_VERSION_TEXT')) {
-			$opensslVersion = explode(' ', OPENSSL_VERSION_TEXT);
-			$featureList[] = 'openssl='. $opensslVersion[1];
-		}
-		if(function_exists('curl_version')) {
-			$curlVersion = curl_version();
-			$featureList[] = 'curl=' . $curlVersion['version'];
-		}
-		return sprintf("PayPalSDK/%s %s (%s)", SDK_NAME, SDK_VERSION, implode(';', $featureList));
-	}
-	
-	private static function _getPHPBit() {
-		switch(PHP_INT_SIZE) {
-			case 4:
-				return '32';
-			case 8:
-				return '64';
-			default:
-				return PHP_INT_SIZE;
-		}
-	}
-}
diff --git a/lib/PayPal/Rest/ApiContext.php b/lib/PayPal/Rest/ApiContext.php
index 890a10f..8cf1ae9 100644
--- a/lib/PayPal/Rest/ApiContext.php
+++ b/lib/PayPal/Rest/ApiContext.php
@@ -1,74 +1,74 @@
-<?php
-namespace PayPal\Rest;
-
-/**
- * 
- * Call level parameters such as
- * request id, credentials etc
- */
-class ApiContext {
-	
-	/**
-	 * OAuth Credentials to use for this call
-	 * @var PayPal/Api/OAuthTokenCredential
-	 */
-	private $credential;
-	
-	/**
-	 * Unique request id to be used for this call
-	 * The user can either generate one as per application
-	 * needs or let the SDK generate one
-	 * @var string
-	 */
-	private $requestId;
-	
-	
-	/**
-	 * 
-	 */
-	public function getCredential() {
-		return $this->credential;		
-	}
-	
-	public function getrequestId() {
-		if($this->requestId == null) {
-			$this->requestId = $this->generaterequestId();
-		}
-		return $this->requestId;
-	}
-	
-	/**
-	 * 
-	 * @param PayPal/Api/OAuthTokenCredential $credential
-	 * @param string $requestId
-	 */
-	public function __construct($credential, $requestId=null) {
-		$this->credential = $credential;
-		$this->requestId = $requestId;
-	}
-	
-	/**
-	 * Generates a unique per request id that
-	 * can be used to set the PayPal-Request-Id header
-	 * that is used for idemptency
-	 * @return string
-	 */
-	private function generateRequestId() {
-		
-		static $pid = -1;
-		static $addr = -1;
-		
-		if ($pid == -1) {
-			$pid = getmypid();
-		}
-		if ($addr == -1) {
-			if(array_key_exists('SERVER_ADDR', $_SERVER)) {
-				$addr = ip2long($_SERVER['SERVER_ADDR']);
-			} else {
-				$addr  = php_uname('n');
-			}
-		}
-		
-		return $addr . $pid . $_SERVER['REQUEST_TIME'] . mt_rand(0, 0xffff);
-	}
-}
+<?php
+namespace PayPal\Rest;
+
+/**
+ * 
+ * Call level parameters such as
+ * request id, credentials etc
+ */
+class ApiContext extends \PPApiContext {
+	
+	/**
+	 * OAuth Credentials to use for this call
+	 * @var PayPal/Api/OAuthTokenCredential
+	 */
+	private $credential;
+	
+	/**
+	 * Unique request id to be used for this call
+	 * The user can either generate one as per application
+	 * needs or let the SDK generate one
+	 * @var string
+	 */
+	private $requestId;
+	
+	/**
+	 * 
+	 */
+	public function getCredential() {
+		return $this->credential;		
+	}
+	
+	public function getrequestId() {
+		if($this->requestId == null) {
+			$this->requestId = $this->generateRequestId();
+		}
+		return $this->requestId;
+	}
+	
+	
+	/**
+	 * 
+	 * @param PayPal/Api/OAuthTokenCredential $credential
+	 * @param string $requestId
+	 */
+	public function __construct($credential, $requestId=null) {
+		$this->credential = $credential;
+		$this->requestId = $requestId;
+	}
+	
+	/**
+	 * Generates a unique per request id that
+	 * can be used to set the PayPal-Request-Id header
+	 * that is used for idemptency
+	 * @return string
+	 */
+	private function generateRequestId() {
+		
+		static $pid = -1;
+		static $addr = -1;
+		
+		if ($pid == -1) {
+			$pid = getmypid();
+		}
+		if ($addr == -1) {
+			if(array_key_exists('SERVER_ADDR', $_SERVER)) {
+				$addr = ip2long($_SERVER['SERVER_ADDR']);
+			} else {
+				$addr  = php_uname('n');
+			}
+		}
+		
+		return $addr . $pid . $_SERVER['REQUEST_TIME'] . mt_rand(0, 0xffff);
+	}
+}
diff --git a/lib/PayPal/Rest/Call.php b/lib/PayPal/Rest/Call.php
deleted file mode 100644
index 2a1fceb..0000000
--- a/lib/PayPal/Rest/Call.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-namespace PayPal\Rest;
-
-use PayPal\Auth\OAuthTokenCredential;
-
-use PayPal\Common\UserAgent;
-
-class Call {
-	
-	private $logger;
-	
-	public function __construct() {
-		$this->logger = new \PPLoggingManager(__CLASS__);
-	}
-
-	/**
-	 *
-	 * @param string $path
-	 * @param string $data
-	 * @param PayPal/Rest/ApiContext $apiContext
-	 * @param array $headers
-	 */
-	public function execute($path, $method, $data='', $apiContext, $headers=array()) {
-		$configMgr = \PPConfigManager::getInstance();
-
-		$credential = $apiContext->getCredential();
-		if($credential == NULL) {
-			// Try picking credentials from the config file
-			$credMgr = \PPCredentialManager::getInstance();
-			$credValues = $credMgr->getCredentialObject();
-			if(!is_array($credValues)) {
-				throw new \PPMissingCredentialException("Empty or invalid credentials passed");
-			}
-			$credential = new OAuthTokenCredential($credValues['clientId'], $credValues['clientSecret']);
-		}
-		if($credential == NULL || ! ($credential instanceof OAuthTokenCredential) ) {
-			throw new \PPInvalidCredentialException("Invalid credentials passed");	
-		}	
-			
-		$resourceUrl = rtrim( trim($configMgr->get('service.EndPoint')), '/') . $path;
-		$config = new \PPHttpConfig($resourceUrl, $method);
-		$headers += array(
-			'Content-Type' => 'application/json',
-			'User-Agent' => UserAgent::getValue()	
-		);
-		if(!is_null($credential) && $credential instanceof OAuthTokenCredential) {
-			$headers['Authorization'] = "Bearer " . $credential->getAccessToken();
-		}
-		if($method == 'POST' || $method == 'PUT') {
-			$headers['PayPal-Request-Id'] = $apiContext->getRequestId();
-		}
-		$config->setHeaders($headers);
-		$connection = new \PPHttpConnection($config);
-		$response = $connection->execute($data);
-		$this->logger->fine($response);
-		
-		return $response;
-	}
-}
diff --git a/lib/PayPal/Rest/RestHandler.php b/lib/PayPal/Rest/RestHandler.php
new file mode 100644
index 0000000..19f8c86
--- /dev/null
+++ b/lib/PayPal/Rest/RestHandler.php
@@ -0,0 +1,77 @@
+<?php
+namespace PayPal\Rest;
+
+use PayPal\Auth\OAuthTokenCredential;
+
+/**
+ * 
+ * API handler for all REST API calls
+ */
+class RestHandler implements \IPPHandler {
+
+	private $apiContext;
+	
+	public static $sdkName = "rest-sdk-php";	
+	public static $sdkVersion = "0.5.0";
+	
+	public function __construct($apiContext) {
+		$this->apiContext = $apiContext;
+	}
+	
+	public function handle($httpConfig, $request, $options) {
+		
+		$credential = $this->apiContext->getCredential();
+		$config = $this->apiContext->getConfig();
+		
+		if($credential == NULL) {
+			// Try picking credentials from the config file
+			$credMgr = \PPCredentialManager::getInstance($config);
+			$credValues = $credMgr->getCredentialObject();
+			if(!is_array($credValues)) {
+				throw new \PPMissingCredentialException("Empty or invalid credentials passed");
+			}
+			$credential = new OAuthTokenCredential($credValues['clientId'], $credValues['clientSecret']);
+		}
+		if($credential == NULL || ! ($credential instanceof OAuthTokenCredential) ) {
+			throw new \PPInvalidCredentialException("Invalid credentials passed");
+		}
+
+		
+		$httpConfig->setUrl(
+			rtrim( trim($this->_getEndpoint($config)), '/') . 
+				(isset($options['path']) ? $options['path'] : '')
+		);
+		
+		if(!array_key_exists("User-Agent", $httpConfig->getHeaders())) {
+			$httpConfig->addHeader("User-Agent", \PPUserAgent::getValue(self::$sdkName, self::$sdkVersion));
+		}		
+		if(!is_null($credential) && $credential instanceof OAuthTokenCredential) {
+			$httpConfig->addHeader('Authorization', "Bearer " . $credential->getAccessToken($config));
+		}
+		if($httpConfig->getMethod() == 'POST' || $httpConfig->getMethod() == 'PUT') {
+			$httpConfig->addHeader('PayPal-Request-Id', $this->apiContext->getRequestId());
+		}
+		
+	}
+	
+	private function _getEndpoint($config) {
+		if (isset($config['service.EndPoint'])) {
+			return $config['service.EndPoint'];
+		} else if (isset($config['mode'])) {
+			switch (strtoupper($config['mode'])) {
+				case 'SANDBOX':
+					return \PPConstants::REST_SANDBOX_ENDPOINT;
+					break;
+				case 'LIVE':
+					return \PPConstants::REST_LIVE_ENDPOINT;
+					break;
+				default:
+					throw new PPConfigurationException('The mode config parameter must be set to either sandbox/live');
+					break;
+			}
+		} else {
+			throw new PPConfigurationException('You must set one of service.endpoint or mode parameters in your configuration');
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/tests/PayPal/Test/Auth/OAuthTokenCredentialTest.php b/tests/PayPal/Test/Auth/OAuthTokenCredentialTest.php
index 962b42b..5597d03 100644
--- a/tests/PayPal/Test/Auth/OAuthTokenCredentialTest.php
+++ b/tests/PayPal/Test/Auth/OAuthTokenCredentialTest.php
@@ -1,33 +1,34 @@
-<?php
-
-// namespace PayPal\Test\Common;
-
-use PayPal\Auth\OAuthTokenCredential;
-use PayPal\Test\Constants;
-
-class OAuthTokenCredentialTest extends PHPUnit_Framework_TestCase {
-	
-	public function testGetAccessToken() {
-		$cred = new OAuthTokenCredential(Constants::CLIENT_ID, Constants::CLIENT_SECRET);
-		
-		$token = $cred->getAccessToken();		
-		$this->assertNotNull($token);
-		
-		// Check that we get the same token when issuing a new call before token expiry
-		$newToken = $cred->getAccessToken();
-		$this->assertNotNull($newToken);
-		$this->assertEquals($token, $newToken);
-		
-// 		sleep(60*8);
-// 		$newToken = $cred->getAccessToken();
-// 		$this->assertNotNull($newToken);
-// 		$this->assertNotEqual($token, $newToken);
-		
-	}
-	
-	public function testInvalidCredentials() {
-		$this->setExpectedException('\PPConnectionException');
-		$cred = new OAuthTokenCredential('dummy', 'secret');		
-		$this->assertNull($cred->getAccessToken());
-	}
+<?php
+
+// namespace PayPal\Test\Common;
+
+use PayPal\Auth\OAuthTokenCredential;
+use PayPal\Test\Constants;
+
+class OAuthTokenCredentialTest extends PHPUnit_Framework_TestCase {
+	
+	public function testGetAccessToken() {
+		$cred = new OAuthTokenCredential(Constants::CLIENT_ID, Constants::CLIENT_SECRET);
+		$config = \PPConfigManager::getInstance()->getConfigHashmap();
+		
+		$token = $cred->getAccessToken($config);		
+		$this->assertNotNull($token);
+		
+		// Check that we get the same token when issuing a new call before token expiry
+		$newToken = $cred->getAccessToken($config);
+		$this->assertNotNull($newToken);
+		$this->assertEquals($token, $newToken);
+		
+// 		sleep(60*8);
+// 		$newToken = $cred->getAccessToken();
+// 		$this->assertNotNull($newToken);
+// 		$this->assertNotEqual($token, $newToken);
+		
+	}
+	
+	public function testInvalidCredentials() {
+		$this->setExpectedException('\PPConnectionException');
+		$cred = new OAuthTokenCredential('dummy', 'secret');		
+		$this->assertNull($cred->getAccessToken(\PPConfigManager::getInstance()->getConfigHashmap()));
+	}
 }
\ No newline at end of file
diff --git a/tests/PayPal/Test/Common/ArrayUtilTest.php b/tests/PayPal/Test/Common/ArrayUtilTest.php
index c6c79ca..6dd2930 100644
--- a/tests/PayPal/Test/Common/ArrayUtilTest.php
+++ b/tests/PayPal/Test/Common/ArrayUtilTest.php
@@ -1,22 +1,21 @@
-<?php
-// namespace PayPal\Test\Common;
-
-use PayPal\Common\ArrayUtil;
-
-class ArrayUtilTest extends PHPUnit_Framework_TestCase {
-	
-	public function testIsAssocArray() {
-		
-		$arr = array(1, 2, 3);
-		$this->assertEquals(false, ArrayUtil::isAssocArray($arr));	
-		
-		$arr = array(
-			'name' => 'John Doe',
-			'City' => 'San Jose'
-		);
-		$this->assertEquals(true, ArrayUtil::isAssocArray($arr));
-		
-		$arr[] = 'CA';
-		$this->assertEquals(false, ArrayUtil::isAssocArray($arr));
-	}
-}
+<?php
+// namespace PayPal\Test\Common;
+
+
+class ArrayUtilTest extends PHPUnit_Framework_TestCase {
+	
+	public function testIsAssocArray() {
+		
+		$arr = array(1, 2, 3);
+		$this->assertEquals(false, PPArrayUtil::isAssocArray($arr));	
+		
+		$arr = array(
+			'name' => 'John Doe',
+			'City' => 'San Jose'
+		);
+		$this->assertEquals(true, PPArrayUtil::isAssocArray($arr));
+		
+		$arr[] = 'CA';
+		$this->assertEquals(false, PPArrayUtil::isAssocArray($arr));
+	}
+}
diff --git a/tests/PayPal/Test/Common/ModelTest.php b/tests/PayPal/Test/Common/ModelTest.php
index c810b7f..a25b900 100644
--- a/tests/PayPal/Test/Common/ModelTest.php
+++ b/tests/PayPal/Test/Common/ModelTest.php
@@ -1,135 +1,138 @@
-<?php 
-
-// namespace PayPal\Test\Common;
-
-use PayPal\Common\Model;
-
-class SimpleClass extends Model {
-
-	public function setName($name) {
-		$this->name = $name;
-	}
-	public function getName() {
-		return $this->name;
-	}
-	
-	public function setDescription($desc) {
-		$this->desc = $desc;
-	}
-	public function getDescription() {
-		return $this->desc;
-	}
-}
-
-class ArrayClass extends Model {
-
-	public function setName($name) {
-		$this->name = $name;
-	}
-	public function getName() {
-		return $this->name;
-	}
-
-	public function setDescription($desc) {
-		$this->desc = $desc;
-	}
-	public function getDescription() {
-		return $this->desc;
-	}
-	
-	public function setTags($tags) {
-		if(!is_array($tags)) {
-			$tags = array($tags);
-		}
-		$this->tags = $tags;
-	}
-	public function getTags() {
-		return $this->tags;
-	}
-}
-
-class NestedClass extends Model {
-	
-	public function setId($id) {
-		$this->id = $id;
-	}
-	public function getId() {
-		return $this->id;
-	}
-	
-	/**
-	 * 
-	 * @param ArrayClass $info
-	 */
-	public function setInfo($info) {
-		$this->info = $info;
-	}
-	public function getInfo() {
-		return $this->info;
-	}
-}
-
-class ChildClass extends SimpleClass {
-	
-}
-
-class ModelTest extends PHPUnit_Framework_TestCase {
-	
-	public function testSimpleClassConversion() {
-		$o = new SimpleClass();
-		$o->setName("test");
-		$o->setDescription("description");
-
-		$this->assertEquals("test", $o->getName());
-		$this->assertEquals("description", $o->getDescription());
-		
-		$json = $o->toJSON();		
-		$this->assertEquals('{"name":"test","desc":"description"}', $json);
-		
-		$newO = new SimpleClass();
-		$newO->fromJson($json);
-		$this->assertEquals($o, $newO);
-		
-	}
-	
-	
-	public function testArrayClassConversion() {
-		$o = new ArrayClass();
-		$o->setName("test");
-		$o->setDescription("description");
-		$o->setTags(array('payment', 'info', 'test'));
-		
-		$this->assertEquals("test", $o->getName());
-		$this->assertEquals("description", $o->getDescription());
-		$this->assertEquals(array('payment', 'info', 'test'), $o->getTags());
-		
-		$json = $o->toJSON();
-		$this->assertEquals('{"name":"test","desc":"description","tags":["payment","info","test"]}', $json);
-	
-		$newO = new ArrayClass();
-		$newO->fromJson($json);
-		$this->assertEquals($o, $newO);	
-	}
-	
-	public function testNestedClassConversion() {
-		$n = new ArrayClass();
-		$n->setName("test");
-		$n->setDescription("description");
-// 		$n->setTags(array('payment', 'info', 'test'));
-		$o = new NestedClass();
-		$o->setId('123');
-		$o->setInfo($n);
-		
-		$this->assertEquals("123", $o->getId());
-		$this->assertEquals("test", $o->getInfo()->getName());		
-// 		$this->assertEquals(array('payment', 'info', 'test'), $o->getInfo()->getTags());
-		
-		$json = $o->toJSON();
-// 		$this->assertEquals('{"id":"123","info":{"name":"test","desc":"description","tags":["payment","info","test"]}}', $json);
-		$this->assertEquals('{"id":"123","info":{"name":"test","desc":"description"}}', $json);
-		
-		$newO = new NestedClass();
-		$newO->fromJson($json);
-		$this->assertEquals($o, $newO);
-	}
-}
\ No newline at end of file
+<?php 
+
+// namespace PayPal\Test\Common;
+
+
+class SimpleClass extends \PPModel {
+
+	public function setName($name) {
+		$this->name = $name;
+	}
+	public function getName() {
+		return $this->name;
+	}
+	
+	public function setDescription($desc) {
+		$this->desc = $desc;
+	}
+	public function getDescription() {
+		return $this->desc;
+	}
+}
+
+class ArrayClass extends \PPModel {
+
+	public function setName($name) {
+		$this->name = $name;
+	}
+	public function getName() {
+		return $this->name;
+	}
+
+	public function setDescription($desc) {
+		$this->desc = $desc;
+	}
+	public function getDescription() {
+		return $this->desc;
+	}
+	
+	public function setTags($tags) {
+		if(!is_array($tags)) {
+			$tags = array($tags);
+		}
+		$this->tags = $tags;
+	}
+	public function getTags() {
+		return $this->tags;
+	}
+}
+
+class NestedClass extends \PPModel {
+	
+	public function setId($id) {
+		$this->id = $id;
+	}
+	public function getId() {
+		return $this->id;
+	}
+	
+	/**
+	 * 
+	 * @param ArrayClass $info
+	 */
+	public function setInfo($info) {
+		$this->info = $info;
+	}
+	/**
+	 * 
+	 * @return ArrayClass
+	 */
+	public function getInfo() {
+		return $this->info;
+	}
+}
+
+class ChildClass extends SimpleClass {
+	
+}
+
+class ModelTest extends PHPUnit_Framework_TestCase {
+	
+	public function testSimpleClassConversion() {
+		$o = new SimpleClass();
+		$o->setName("test");
+		$o->setDescription("description");
+
+		$this->assertEquals("test", $o->getName());
+		$this->assertEquals("description", $o->getDescription());
+		
+		$json = $o->toJSON();		
+		$this->assertEquals('{"name":"test","desc":"description"}', $json);
+		
+		$newO = new SimpleClass();
+		$newO->fromJson($json);
+		$this->assertEquals($o, $newO);
+		
+	}
+	
+	
+	public function testArrayClassConversion() {
+		$o = new ArrayClass();
+		$o->setName("test");
+		$o->setDescription("description");
+		$o->setTags(array('payment', 'info', 'test'));
+		
+		$this->assertEquals("test", $o->getName());
+		$this->assertEquals("description", $o->getDescription());
+		$this->assertEquals(array('payment', 'info', 'test'), $o->getTags());
+		
+		$json = $o->toJSON();
+		$this->assertEquals('{"name":"test","desc":"description","tags":["payment","info","test"]}', $json);
+	
+		$newO = new ArrayClass();
+		$newO->fromJson($json);
+		$this->assertEquals($o, $newO);	
+	}
+	
+	public function testNestedClassConversion() {
+		$n = new ArrayClass();
+		$n->setName("test");
+		$n->setDescription("description");
+// 		$n->setTags(array('payment', 'info', 'test'));
+		$o = new NestedClass();
+		$o->setId('123');
+		$o->setInfo($n);
+		
+		$this->assertEquals("123", $o->getId());
+		$this->assertEquals("test", $o->getInfo()->getName());		
+// 		$this->assertEquals(array('payment', 'info', 'test'), $o->getInfo()->getTags());
+		
+		$json = $o->toJSON();
+// 		$this->assertEquals('{"id":"123","info":{"name":"test","desc":"description","tags":["payment","info","test"]}}', $json);
+		$this->assertEquals('{"id":"123","info":{"name":"test","desc":"description"}}', $json);
+		
+		$newO = new NestedClass();
+		$newO->fromJson($json);
+		$this->assertEquals($o, $newO);
+	}
+}
diff --git a/tests/PayPal/Test/Common/UserAgentTest.php b/tests/PayPal/Test/Common/UserAgentTest.php
index 9436ab2..5bf8765 100644
--- a/tests/PayPal/Test/Common/UserAgentTest.php
+++ b/tests/PayPal/Test/Common/UserAgentTest.php
@@ -1,23 +1,26 @@
-<?php
-
-use PayPal\Common\UserAgent;
-
-class UserAgentTest extends PHPUnit_Framework_TestCase {
-	
-	public function testGetValue() {
-		$ua = UserAgent::getValue();
-		list($id, $version, $features) = sscanf($ua, "PayPalSDK/%s %s (%s)");
-		
-		// Check that we pass the useragent in the expected format
-		$this->assertNotNull($id);
-		$this->assertNotNull($version);
-		$this->assertNotNull($features);
-		
-		// Check that we pass in these mininal features
-		$this->assertThat($features, $this->stringContains("OS="));
-		$this->assertThat($features, $this->stringContains("Bit="));
-		$this->assertThat($features, $this->stringContains("Lang="));
-		$this->assertThat($features, $this->stringContains("V="));
-		$this->assertGreaterThan(5, count(explode(';', $features)));
-	}
+<?php
+
+use PayPal\Common\UserAgent;
+
+class UserAgentTest extends PHPUnit_Framework_TestCase {
+	
+	public function testGetValue() {
+		$ua = PPUserAgent::getValue("name", "version");
+		list($id, $version, $features) = sscanf($ua, "PayPalSDK/%s %s (%s)");
+		
+		// Check that we pass the useragent in the expected format
+		$this->assertNotNull($id);
+		$this->assertNotNull($version);
+		$this->assertNotNull($features);
+		
+		$this->assertEquals("name", $id);
+		$this->assertEquals("version", $version);
+		
+		// Check that we pass in these mininal features
+		$this->assertThat($features, $this->stringContains("OS="));
+		$this->assertThat($features, $this->stringContains("Bit="));
+		$this->assertThat($features, $this->stringContains("Lang="));
+		$this->assertThat($features, $this->stringContains("V="));
+		$this->assertGreaterThan(5, count(explode(';', $features)));
+	}
 }
\ No newline at end of file