diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.kt
index b91e4ef8..6fb57223 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.kt
@@ -1,5 +1,6 @@
 /* ownCloud Android Library is available under MIT license
  *
+ *   @author Christian Schabesberger
  *   @author masensio
  *   @author David A. Velasco
  *   @author David González Verdugo
@@ -73,6 +74,7 @@ import java.util.ArrayList
  * Status codes:
  * 100 - successful
  *
+ * @author Christian Schabesberger
  * @author masensio
  * @author David A. Velasco
  * @author David González Verdugo
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/services/ShareeService.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/services/ShareeService.kt
index ab6d9e83..95983ec5 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/services/ShareeService.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/services/ShareeService.kt
@@ -1,6 +1,7 @@
 /**
  * ownCloud Android client application
  *
+ * @author Christian Schabesberger
  * @author David González Verdugo
  *
  * Copyright (C) 2020 ownCloud GmbH.
@@ -22,13 +23,12 @@ package com.owncloud.android.lib.resources.shares.services
 
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.lib.resources.Service
-import org.json.JSONObject
-import java.util.ArrayList
+import com.owncloud.android.lib.resources.shares.responses.ShareeOcsResponse
 
 interface ShareeService : Service {
     fun getSharees(
         searchString: String,
         page: Int,
         perPage: Int
-    ): RemoteOperationResult<ArrayList<JSONObject>>
+    ): RemoteOperationResult<ShareeOcsResponse>
 }
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/services/implementation/OCShareeService.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/services/implementation/OCShareeService.kt
index 370ef34b..1ba7e0cb 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/services/implementation/OCShareeService.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/services/implementation/OCShareeService.kt
@@ -23,6 +23,7 @@ package com.owncloud.android.lib.resources.shares.services.implementation
 import com.owncloud.android.lib.common.OwnCloudClient
 import com.owncloud.android.lib.common.operations.RemoteOperationResult
 import com.owncloud.android.lib.resources.shares.GetRemoteShareesOperation
+import com.owncloud.android.lib.resources.shares.responses.ShareeOcsResponse
 import com.owncloud.android.lib.resources.shares.services.ShareeService
 import org.json.JSONObject
 import java.util.ArrayList
@@ -33,7 +34,7 @@ class OCShareeService(override val client: OwnCloudClient) :
         searchString: String,
         page: Int,
         perPage: Int
-    ): RemoteOperationResult<ArrayList<JSONObject>> =
+    ): RemoteOperationResult<ShareeOcsResponse> =
         GetRemoteShareesOperation(
             searchString,
             page,