diff --git a/Example/Podfile.lock b/Example/Podfile.lock
index a2ec3b2..57b8b43 100644
--- a/Example/Podfile.lock
+++ b/Example/Podfile.lock
@@ -38,7 +38,7 @@ PODS:
   - NSString-Helper (1.0.6)
   - nv-ios-http-status (0.0.1)
   - PEAR-FileManager-iOS (1.3.1)
-  - PNObject (2.0):
+  - PNObject (2.2):
     - AFNetworking
     - CodFis-Helper
     - DDDKeychainWrapper
@@ -85,7 +85,7 @@ SPEC CHECKSUMS:
   NSString-Helper: 389265918b2a4c5b0d09f0e03c607e8e5e254dd7
   nv-ios-http-status: b6c2b5fc8656cc19e0d3000dadce2080b99d0e2f
   PEAR-FileManager-iOS: 3bc403f68a53483f5629aa822f4649e40275c4d3
-  PNObject: 1f79df2779559eaad82d9a345bc300eeb947a5d8
+  PNObject: e661098f83a93745abc594aad793506891ef7498
   PureLayout: 4d550abe49a94f24c2808b9b95db9131685fe4cd
   RZDataBinding: 6981e90ddaae2f5e02028323b1043f8c31013109
   Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66
diff --git a/Example/Pods/Local Podspecs/PNObject.podspec.json b/Example/Pods/Local Podspecs/PNObject.podspec.json
index 30e3c60..ef0c9ad 100644
--- a/Example/Pods/Local Podspecs/PNObject.podspec.json	
+++ b/Example/Pods/Local Podspecs/PNObject.podspec.json	
@@ -1,6 +1,6 @@
 {
   "name": "PNObject",
-  "version": "2.0",
+  "version": "2.2",
   "summary": "PNObject is a simple replica of the more complex ParseObject",
   "homepage": "https://github.com/giuseppenucifora/PNObject",
   "license": {
@@ -12,7 +12,7 @@
   },
   "source": {
     "git": "https://github.com/giuseppenucifora/PNObject.git",
-    "tag": "2.0"
+    "tag": "2.2"
   },
   "platforms": {
     "ios": "8.0"
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
index a2ec3b2..57b8b43 100644
--- a/Example/Pods/Manifest.lock
+++ b/Example/Pods/Manifest.lock
@@ -38,7 +38,7 @@ PODS:
   - NSString-Helper (1.0.6)
   - nv-ios-http-status (0.0.1)
   - PEAR-FileManager-iOS (1.3.1)
-  - PNObject (2.0):
+  - PNObject (2.2):
     - AFNetworking
     - CodFis-Helper
     - DDDKeychainWrapper
@@ -85,7 +85,7 @@ SPEC CHECKSUMS:
   NSString-Helper: 389265918b2a4c5b0d09f0e03c607e8e5e254dd7
   nv-ios-http-status: b6c2b5fc8656cc19e0d3000dadce2080b99d0e2f
   PEAR-FileManager-iOS: 3bc403f68a53483f5629aa822f4649e40275c4d3
-  PNObject: 1f79df2779559eaad82d9a345bc300eeb947a5d8
+  PNObject: e661098f83a93745abc594aad793506891ef7498
   PureLayout: 4d550abe49a94f24c2808b9b95db9131685fe4cd
   RZDataBinding: 6981e90ddaae2f5e02028323b1043f8c31013109
   Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66
diff --git a/PNObject.podspec b/PNObject.podspec
index a88101f..d3506af 100644
--- a/PNObject.podspec
+++ b/PNObject.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
 s.name             = 'PNObject'
-s.version          = '2.1'
+s.version          = '2.2'
 s.summary          = 'PNObject is a simple replica of the more complex ParseObject'
 
 
diff --git a/PNObject/Classes/PNObject+PNObjectPOSTConnection.m b/PNObject/Classes/PNObject+PNObjectPOSTConnection.m
index a8a1bbc..18ff279 100644
--- a/PNObject/Classes/PNObject+PNObjectPOSTConnection.m
+++ b/PNObject/Classes/PNObject+PNObjectPOSTConnection.m
@@ -53,7 +53,7 @@
                         success:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSDictionary * _Nullable responseObject))success
                         failure:(nullable void (^)(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error))failure {
     
-    if ([[PNObjectConfig sharedInstance] currentOauthUserCredential] && ![[[PNObjectConfig sharedInstance] currentOauthUserCredential] isExpired]) {
+    if([[PNObjectConfig sharedInstance] setCredentialTokenForOauthMode:oauthMode]){
         
         [[[PNObjectConfig sharedInstance] manager] POST:[[[PNObjectConfig sharedInstance] endPointUrl] stringByAppendingFormat:@"%@",endPoint]  parameters:parameters progress:uploadProgress success:^(NSURLSessionDataTask *task, id responseObject) {
             
@@ -81,9 +81,9 @@
         }];
     }
     else {
-        [[PNObjectConfig sharedInstance] refreshTokenWithBlockSuccess:^(BOOL refreshSuccess) {
+        [[PNObjectConfig sharedInstance] refreshTokenForOauthMode:oauthMode retries:MAX_RETRIES WithBlockSuccess:^(BOOL refreshSuccess) {
             
-            return [self POSTWithEndpointAction:endPoint parameters:parameters retries:retries-1 progress:uploadProgress success:success failure:failure];
+            return [self POSTWithEndpointAction:endPoint oauthMode:oauthMode parameters:parameters retries:retries-1 progress:uploadProgress success:success failure:failure];
         } failure:^(NSError * _Nonnull error) {
             
             if (failure) {