diff --git a/SDK/backendlessAPI/Classes/UserService/UserService.m b/SDK/backendlessAPI/Classes/UserService/UserService.m
index 8218966b..91d69cd1 100644
--- a/SDK/backendlessAPI/Classes/UserService/UserService.m
+++ b/SDK/backendlessAPI/Classes/UserService/UserService.m
@@ -46,7 +46,6 @@
 static NSString *METHOD_REGISTER = @"register";
 static NSString *METHOD_UPDATE = @"update";
 static NSString *METHOD_LOGIN = @"login";
-static NSString *METHOD_FIND_BY_ID = @"findById";
 static NSString *METHOD_LOGOUT = @"logout";
 static NSString *METHOD_RESTORE_PASSWORD = @"restorePassword";
 static NSString *METHOD_DESCRIBE_USER_CLASS = @"describeUserClass";
@@ -172,10 +171,7 @@ -(BackendlessUser *)login:(NSString *)login password:(NSString *)password {
 }
 
 -(BackendlessUser *)findById:(NSString *)objectId {
-    if (!objectId || ![objectId length])
-        return [backendless throwFault:FAULT_NO_USER_ID];
-    NSArray *args = @[objectId, @[]];
-    return [invoker invokeSync:SERVER_USER_SERVICE_PATH method:METHOD_FIND_BY_ID args:args];
+    return [[backendless.data of:[BackendlessUser class]] findById:objectId];
 }
 
 -(id)logout {
@@ -296,11 +292,7 @@ -(void)login:(NSString *)login password:(NSString *)password response:(void(^)(B
 }
 
 -(void)findById:(NSString *)objectId response:(void(^)(BackendlessUser *))responseBlock error:(void(^)(Fault *))errorBlock {
-    id<IResponder>responder = [ResponderBlocksContext responderBlocksContext:responseBlock error:errorBlock];
-    if (!objectId || ![objectId length])
-        return [responder errorHandler:FAULT_NO_USER_ID];
-    NSArray *args = @[objectId, @[]];
-    [invoker invokeAsync:SERVER_USER_SERVICE_PATH method:METHOD_FIND_BY_ID args:args responder:responder];
+    [[backendless.data of:[BackendlessUser class]] findById:objectId response:responseBlock error:errorBlock];
 }
 
 -(void)logout:(void(^)(id))responseBlock error:(void(^)(Fault *))errorBlock {
@@ -366,7 +358,7 @@ -(void)resendEmailConfirmation:(NSString *)email response:(void(^)(id))responseB
 }
 
 // methods of social easy logins
-// TWitter
+// Twitter
 -(void)easyLoginWithTwitterFieldsMapping:(NSDictionary<NSString*,NSString*> *)fieldsMapping {
     id<IResponder>responder = nil;
     Responder *_responder = [Responder responder:self selResponseHandler:@selector(easyLoginResponder:) selErrorHandler:@selector(easyLoginError:)];
diff --git a/SDK/ios/backendless/backendless.a b/SDK/ios/backendless/backendless.a
index 8056b23f..5bc83925 100644
Binary files a/SDK/ios/backendless/backendless.a and b/SDK/ios/backendless/backendless.a differ
diff --git a/SDK/lib/backendless/backendless.a b/SDK/lib/backendless/backendless.a
index c3e7372a..0a5345da 100644
Binary files a/SDK/lib/backendless/backendless.a and b/SDK/lib/backendless/backendless.a differ
diff --git a/SDK/osx/backendless/libbackendless-mac.a b/SDK/osx/backendless/libbackendless-mac.a
index 4c7eb930..ab1d3224 100644
Binary files a/SDK/osx/backendless/libbackendless-mac.a and b/SDK/osx/backendless/libbackendless-mac.a differ