diff --git a/cs3/gateway/v1beta1/resources.proto b/cs3/gateway/v1beta1/resources.proto
index a10ed69e..2cf2edba 100644
--- a/cs3/gateway/v1beta1/resources.proto
+++ b/cs3/gateway/v1beta1/resources.proto
@@ -28,7 +28,6 @@ option java_package = "com.cs3.gateway.v1beta1";
 option objc_class_prefix = "CGX";
 option php_namespace = "Cs3\\Gateway\\V1Beta1";
 
-import "cs3/rpc/v1beta1/status.proto";
 import "cs3/storage/provider/v1beta1/resources.proto";
 import "cs3/types/v1beta1/types.proto";
 
diff --git a/cs3/ocm/invite/v1beta1/resources.proto b/cs3/ocm/invite/v1beta1/resources.proto
index dbe282c0..398f470b 100644
--- a/cs3/ocm/invite/v1beta1/resources.proto
+++ b/cs3/ocm/invite/v1beta1/resources.proto
@@ -29,7 +29,6 @@ option objc_class_prefix = "COI";
 option php_namespace = "Cs3\\Ocm\\Invite\\V1Beta1";
 
 import "cs3/identity/user/v1beta1/resources.proto";
-import "cs3/storage/provider/v1beta1/resources.proto";
 import "cs3/types/v1beta1/types.proto";
 
 // InviteToken is used to invite users and groups from other sync'n'share
diff --git a/cs3/storage/registry/v1beta1/registry_api.proto b/cs3/storage/registry/v1beta1/registry_api.proto
index d743b05b..db918765 100644
--- a/cs3/storage/registry/v1beta1/registry_api.proto
+++ b/cs3/storage/registry/v1beta1/registry_api.proto
@@ -53,7 +53,7 @@ service RegistryAPI {
   // Returns the storage provider that is reponsible for the given
   // resource reference.
   // MUST return CODE_NOT_FOUND if the reference does not exist.
-  rpc GetStorageProvider(GetStorageProviderRequest) returns (GetStorageProviderResponse);
+  rpc GetStorageProviders(GetStorageProvidersRequest) returns (GetStorageProvidersResponse);
   // Returns a list of the available storage providers known by this registry.
   rpc ListStorageProviders(ListStorageProvidersRequest) returns (ListStorageProvidersResponse);
   // Gets the user home storage provider.
@@ -81,7 +81,7 @@ message GetHomeResponse {
   cs3.storage.registry.v1beta1.ProviderInfo provider = 3;
 }
 
-message GetStorageProviderRequest {
+message GetStorageProvidersRequest {
   // OPTIONAL.
   // Opaque information.
   cs3.types.v1beta1.Opaque opaque = 1;
@@ -90,7 +90,7 @@ message GetStorageProviderRequest {
   cs3.storage.provider.v1beta1.Reference ref = 2;
 }
 
-message GetStorageProviderResponse {
+message GetStorageProvidersResponse {
   // REQUIRED.
   // The response status.
   cs3.rpc.v1beta1.Status status = 1;
@@ -98,8 +98,8 @@ message GetStorageProviderResponse {
   // Opaque information.
   cs3.types.v1beta1.Opaque opaque = 2;
   // REQUIRED.
-  // The storage provider handling the requested storage resource.
-  cs3.storage.registry.v1beta1.ProviderInfo provider = 3;
+  // The storage providers handling the requested storage resource.
+  repeated cs3.storage.registry.v1beta1.ProviderInfo providers = 3;
 }
 
 message ListStorageProvidersRequest {
diff --git a/docs/index.html b/docs/index.html
index d082755c..47db8e25 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1635,11 +1635,11 @@ <h2>Table of Contents</h2>
                 </li>
               
                 <li>
-                  <a href="#cs3.storage.registry.v1beta1.GetStorageProviderRequest"><span class="badge">M</span>GetStorageProviderRequest</a>
+                  <a href="#cs3.storage.registry.v1beta1.GetStorageProvidersRequest"><span class="badge">M</span>GetStorageProvidersRequest</a>
                 </li>
               
                 <li>
-                  <a href="#cs3.storage.registry.v1beta1.GetStorageProviderResponse"><span class="badge">M</span>GetStorageProviderResponse</a>
+                  <a href="#cs3.storage.registry.v1beta1.GetStorageProvidersResponse"><span class="badge">M</span>GetStorageProvidersResponse</a>
                 </li>
               
                 <li>
@@ -14353,7 +14353,7 @@ <h3 id="cs3.storage.registry.v1beta1.GetHomeResponse">GetHomeResponse</h3>
 
         
       
-        <h3 id="cs3.storage.registry.v1beta1.GetStorageProviderRequest">GetStorageProviderRequest</h3>
+        <h3 id="cs3.storage.registry.v1beta1.GetStorageProvidersRequest">GetStorageProvidersRequest</h3>
         <p></p>
 
         
@@ -14386,7 +14386,7 @@ <h3 id="cs3.storage.registry.v1beta1.GetStorageProviderRequest">GetStorageProvid
 
         
       
-        <h3 id="cs3.storage.registry.v1beta1.GetStorageProviderResponse">GetStorageProviderResponse</h3>
+        <h3 id="cs3.storage.registry.v1beta1.GetStorageProvidersResponse">GetStorageProvidersResponse</h3>
         <p></p>
 
         
@@ -14413,11 +14413,11 @@ <h3 id="cs3.storage.registry.v1beta1.GetStorageProviderResponse">GetStorageProvi
                 </tr>
               
                 <tr>
-                  <td>provider</td>
+                  <td>providers</td>
                   <td><a href="#cs3.storage.registry.v1beta1.ProviderInfo">ProviderInfo</a></td>
-                  <td></td>
+                  <td>repeated</td>
                   <td><p>REQUIRED.
-The storage provider handling the requested storage resource. </p></td>
+The storage providers handling the requested storage resource. </p></td>
                 </tr>
               
             </tbody>
@@ -14510,9 +14510,9 @@ <h3 id="cs3.storage.registry.v1beta1.RegistryAPI">RegistryAPI</h3>
           <tbody>
             
               <tr>
-                <td>GetStorageProvider</td>
-                <td><a href="#cs3.storage.registry.v1beta1.GetStorageProviderRequest">GetStorageProviderRequest</a></td>
-                <td><a href="#cs3.storage.registry.v1beta1.GetStorageProviderResponse">GetStorageProviderResponse</a></td>
+                <td>GetStorageProviders</td>
+                <td><a href="#cs3.storage.registry.v1beta1.GetStorageProvidersRequest">GetStorageProvidersRequest</a></td>
+                <td><a href="#cs3.storage.registry.v1beta1.GetStorageProvidersResponse">GetStorageProvidersResponse</a></td>
                 <td><p>Returns the storage provider that is reponsible for the given
 resource reference.
 MUST return CODE_NOT_FOUND if the reference does not exist.</p></td>
diff --git a/proto.lock b/proto.lock
index 0a23fe36..7a236817 100644
--- a/proto.lock
+++ b/proto.lock
@@ -1461,9 +1461,6 @@
           }
         ],
         "imports": [
-          {
-            "path": "cs3/rpc/v1beta1/status.proto"
-          },
           {
             "path": "cs3/storage/provider/v1beta1/resources.proto"
           },
@@ -2709,9 +2706,6 @@
           {
             "path": "cs3/identity/user/v1beta1/resources.proto"
           },
-          {
-            "path": "cs3/storage/provider/v1beta1/resources.proto"
-          },
           {
             "path": "cs3/types/v1beta1/types.proto"
           }
@@ -4344,6 +4338,11 @@
                 "id": 3,
                 "name": "share",
                 "type": "PublicShare"
+              },
+              {
+                "id": 4,
+                "name": "password_hash",
+                "type": "string"
               }
             ]
           },
@@ -4384,6 +4383,11 @@
                 "id": 3,
                 "name": "share",
                 "type": "PublicShare"
+              },
+              {
+                "id": 4,
+                "name": "password_hash",
+                "type": "string"
               }
             ]
           }
@@ -7089,6 +7093,11 @@
                 "id": 5,
                 "name": "mtime",
                 "type": "uint64"
+              },
+              {
+                "id": 6,
+                "name": "etag",
+                "type": "string"
               }
             ]
           },
@@ -7340,7 +7349,7 @@
             ]
           },
           {
-            "name": "GetStorageProviderRequest",
+            "name": "GetStorageProvidersRequest",
             "fields": [
               {
                 "id": 1,
@@ -7355,7 +7364,7 @@
             ]
           },
           {
-            "name": "GetStorageProviderResponse",
+            "name": "GetStorageProvidersResponse",
             "fields": [
               {
                 "id": 1,
@@ -7369,8 +7378,9 @@
               },
               {
                 "id": 3,
-                "name": "provider",
-                "type": "cs3.storage.registry.v1beta1.ProviderInfo"
+                "name": "providers",
+                "type": "cs3.storage.registry.v1beta1.ProviderInfo",
+                "is_repeated": true
               }
             ]
           },
@@ -7411,9 +7421,9 @@
             "name": "RegistryAPI",
             "rpcs": [
               {
-                "name": "GetStorageProvider",
-                "in_type": "GetStorageProviderRequest",
-                "out_type": "GetStorageProviderResponse"
+                "name": "GetStorageProviders",
+                "in_type": "GetStorageProvidersRequest",
+                "out_type": "GetStorageProvidersResponse"
               },
               {
                 "name": "ListStorageProviders",