diff --git a/cs3/app/registry/v1beta1/registry_api.proto b/cs3/app/registry/v1beta1/registry_api.proto
index 3620f314..30e1a2e6 100644
--- a/cs3/app/registry/v1beta1/registry_api.proto
+++ b/cs3/app/registry/v1beta1/registry_api.proto
@@ -53,8 +53,14 @@ service RegistryAPI {
   // Returns the app providers that are capable of handling this resource info.
   // MUST return CODE_NOT_FOUND if no providers are available.
   rpc GetAppProviders(GetAppProvidersRequest) returns (GetAppProvidersResponse);
+  // Registers a new app provider to the registry.
+  rpc AddAppProvider(AddAppProviderRequest) returns (AddAppProviderResponse);
   // Returns a list of the available app providers known by this registry.
   rpc ListAppProviders(ListAppProvidersRequest) returns (ListAppProvidersResponse);
+  // Returns the default app provider which serves a specified mime type.
+  rpc GetDefaultAppProviderForMimeType(GetDefaultAppProviderForMimeTypeRequest) returns (GetDefaultAppProviderForMimeTypeResponse);
+  // Sets the default app provider for a specified mime type.
+  rpc SetDefaultAppProviderForMimeType(SetDefaultAppProviderForMimeTypeRequest) returns (SetDefaultAppProviderForMimeTypeResponse);
 }
 
 message GetAppProvidersRequest {
@@ -78,6 +84,24 @@ message GetAppProvidersResponse {
   repeated ProviderInfo providers = 3;
 }
 
+message AddAppProviderRequest {
+  // OPTIONAL.
+  // Opaque information.
+  cs3.types.v1beta1.Opaque opaque = 1;
+  // REQUIRED.
+  // The app provider to be registered.
+  ProviderInfo provider = 2;
+}
+
+message AddAppProviderResponse {
+  // REQUIRED.
+  // The response status.
+  cs3.rpc.v1beta1.Status status = 1;
+  // OPTIONAL.
+  // Opaque information.
+  cs3.types.v1beta1.Opaque opaque = 2;
+}
+
 message ListAppProvidersRequest {
   // OPTIONAL.
   // Opaque information.
@@ -85,17 +109,8 @@ message ListAppProvidersRequest {
   // REQUIRED.
   // Represents a filter to apply to the request.
   message Filter {
-    // The filter to apply.
-    enum Type {
-      TYPE_INVALID = 0;
-      TYPE_MIME_TYPE = 1;
-    }
-    // REQUIRED.
-    Type type = 2;
-    oneof term {
-      // if present, the response MUST list all known app providers for the given mimetype.
-      string mime_type = 3;
-    }
+    // if present, the response MUST list all known app providers for the given mimetype.
+    string mime_type = 1;
   }
   // OPTIONAL.
   // The list of filters to apply if any.
@@ -113,3 +128,45 @@ message ListAppProvidersResponse {
   // The list of app providers this registry knows about.
   repeated ProviderInfo providers = 3;
 }
+
+message GetDefaultAppProviderForMimeTypeRequest {
+  // OPTIONAL.
+  // Opaque information.
+  cs3.types.v1beta1.Opaque opaque = 1;
+  // REQUIRED.
+  // The mimetype for which the default app has to be returned.
+  string mime_type = 2;
+}
+
+message GetDefaultAppProviderForMimeTypeResponse {
+  // REQUIRED.
+  // The response status.
+  cs3.rpc.v1beta1.Status status = 1;
+  // OPTIONAL.
+  // Opaque information.
+  cs3.types.v1beta1.Opaque opaque = 2;
+  // REQUIRED.
+  // The default app provider for the specified mime type.
+  ProviderInfo provider = 3;
+}
+
+message SetDefaultAppProviderForMimeTypeRequest {
+  // OPTIONAL.
+  // Opaque information.
+  cs3.types.v1beta1.Opaque opaque = 1;
+  // REQUIRED.
+  // The mimetype for which the default app has to be returned.
+  string mime_type = 2;
+  // REQUIRED.
+  // The app provider to be marked as default for the specified mime type.
+  ProviderInfo provider = 3;
+}
+
+message SetDefaultAppProviderForMimeTypeResponse {
+  // REQUIRED.
+  // The response status.
+  cs3.rpc.v1beta1.Status status = 1;
+  // OPTIONAL.
+  // Opaque information.
+  cs3.types.v1beta1.Opaque opaque = 2;
+}
diff --git a/cs3/app/registry/v1beta1/resources.proto b/cs3/app/registry/v1beta1/resources.proto
index 73ac1af4..0f65c2e6 100644
--- a/cs3/app/registry/v1beta1/resources.proto
+++ b/cs3/app/registry/v1beta1/resources.proto
@@ -43,8 +43,11 @@ message ProviderInfo {
   // For example, tcp://localhost:1099.
   string address = 3;
   // OPTIONAL.
+  // A human-readable name of the app provider.
+  string name = 4;
+  // OPTIONAL.
   // Information to describe the functionalities
   // offered by the app provider. Meant to be read
   // by humans.
-  string description = 4;
+  string description = 5;
 }
diff --git a/cs3/gateway/v1beta1/gateway_api.proto b/cs3/gateway/v1beta1/gateway_api.proto
index 4338ee57..8e49fb78 100644
--- a/cs3/gateway/v1beta1/gateway_api.proto
+++ b/cs3/gateway/v1beta1/gateway_api.proto
@@ -287,8 +287,14 @@ service GatewayAPI {
   // Returns the app providers that are capable of handling this resource info.
   // MUST return CODE_NOT_FOUND if no providers are available.
   rpc GetAppProviders(cs3.app.registry.v1beta1.GetAppProvidersRequest) returns (cs3.app.registry.v1beta1.GetAppProvidersResponse);
+  // Registers a new app provider to the registry.
+  rpc AddAppProvider(cs3.app.registry.v1beta1.AddAppProviderRequest) returns (cs3.app.registry.v1beta1.AddAppProviderResponse);
   // Returns a list of the available app providers known by this registry.
   rpc ListAppProviders(cs3.app.registry.v1beta1.ListAppProvidersRequest) returns (cs3.app.registry.v1beta1.ListAppProvidersResponse);
+  // Returns the default app provider which serves a specified mime type.
+  rpc GetDefaultAppProviderForMimeType(cs3.app.registry.v1beta1.GetDefaultAppProviderForMimeTypeRequest) returns (cs3.app.registry.v1beta1.GetDefaultAppProviderForMimeTypeResponse);
+  // Sets the default app provider for a specified mime type.
+  rpc SetDefaultAppProviderForMimeType(cs3.app.registry.v1beta1.SetDefaultAppProviderForMimeTypeRequest) returns (cs3.app.registry.v1beta1.SetDefaultAppProviderForMimeTypeResponse);
   // *****************************************************************/
   // ************************ USER PROVIDER **************************/
   // *****************************************************************/
diff --git a/docs/index.html b/docs/index.html
index 6da9113b..220be4c6 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -539,6 +539,14 @@ <h2>Table of Contents</h2>
             <a href="#cs3%2fapp%2fregistry%2fv1beta1%2fregistry_api.proto">cs3/app/registry/v1beta1/registry_api.proto</a>
             <ul>
               
+                <li>
+                  <a href="#cs3.app.registry.v1beta1.AddAppProviderRequest"><span class="badge">M</span>AddAppProviderRequest</a>
+                </li>
+              
+                <li>
+                  <a href="#cs3.app.registry.v1beta1.AddAppProviderResponse"><span class="badge">M</span>AddAppProviderResponse</a>
+                </li>
+              
                 <li>
                   <a href="#cs3.app.registry.v1beta1.GetAppProvidersRequest"><span class="badge">M</span>GetAppProvidersRequest</a>
                 </li>
@@ -547,6 +555,14 @@ <h2>Table of Contents</h2>
                   <a href="#cs3.app.registry.v1beta1.GetAppProvidersResponse"><span class="badge">M</span>GetAppProvidersResponse</a>
                 </li>
               
+                <li>
+                  <a href="#cs3.app.registry.v1beta1.GetDefaultAppProviderForMimeTypeRequest"><span class="badge">M</span>GetDefaultAppProviderForMimeTypeRequest</a>
+                </li>
+              
+                <li>
+                  <a href="#cs3.app.registry.v1beta1.GetDefaultAppProviderForMimeTypeResponse"><span class="badge">M</span>GetDefaultAppProviderForMimeTypeResponse</a>
+                </li>
+              
                 <li>
                   <a href="#cs3.app.registry.v1beta1.ListAppProvidersRequest"><span class="badge">M</span>ListAppProvidersRequest</a>
                 </li>
@@ -559,13 +575,17 @@ <h2>Table of Contents</h2>
                   <a href="#cs3.app.registry.v1beta1.ListAppProvidersResponse"><span class="badge">M</span>ListAppProvidersResponse</a>
                 </li>
               
+                <li>
+                  <a href="#cs3.app.registry.v1beta1.SetDefaultAppProviderForMimeTypeRequest"><span class="badge">M</span>SetDefaultAppProviderForMimeTypeRequest</a>
+                </li>
               
                 <li>
-                  <a href="#cs3.app.registry.v1beta1.ListAppProvidersRequest.Filter.Type"><span class="badge">E</span>ListAppProvidersRequest.Filter.Type</a>
+                  <a href="#cs3.app.registry.v1beta1.SetDefaultAppProviderForMimeTypeResponse"><span class="badge">M</span>SetDefaultAppProviderForMimeTypeResponse</a>
                 </li>
               
               
               
+              
                 <li>
                   <a href="#cs3.app.registry.v1beta1.RegistryAPI"><span class="badge">S</span>RegistryAPI</a>
                 </li>
@@ -3049,11 +3069,32 @@ <h3 id="cs3.gateway.v1beta1.GatewayAPI">GatewayAPI</h3>
 MUST return CODE_NOT_FOUND if no providers are available.</p></td>
               </tr>
             
+              <tr>
+                <td>AddAppProvider</td>
+                <td><a href="#cs3.app.registry.v1beta1.AddAppProviderRequest">.cs3.app.registry.v1beta1.AddAppProviderRequest</a></td>
+                <td><a href="#cs3.app.registry.v1beta1.AddAppProviderResponse">.cs3.app.registry.v1beta1.AddAppProviderResponse</a></td>
+                <td><p>Registers a new app provider to the registry.</p></td>
+              </tr>
+            
               <tr>
                 <td>ListAppProviders</td>
                 <td><a href="#cs3.app.registry.v1beta1.ListAppProvidersRequest">.cs3.app.registry.v1beta1.ListAppProvidersRequest</a></td>
                 <td><a href="#cs3.app.registry.v1beta1.ListAppProvidersResponse">.cs3.app.registry.v1beta1.ListAppProvidersResponse</a></td>
-                <td><p>Returns a list of the available app providers known by this registry.
+                <td><p>Returns a list of the available app providers known by this registry.</p></td>
+              </tr>
+            
+              <tr>
+                <td>GetDefaultAppProviderForMimeType</td>
+                <td><a href="#cs3.app.registry.v1beta1.GetDefaultAppProviderForMimeTypeRequest">.cs3.app.registry.v1beta1.GetDefaultAppProviderForMimeTypeRequest</a></td>
+                <td><a href="#cs3.app.registry.v1beta1.GetDefaultAppProviderForMimeTypeResponse">.cs3.app.registry.v1beta1.GetDefaultAppProviderForMimeTypeResponse</a></td>
+                <td><p>Returns the default app provider which serves a specified mime type.</p></td>
+              </tr>
+            
+              <tr>
+                <td>SetDefaultAppProviderForMimeType</td>
+                <td><a href="#cs3.app.registry.v1beta1.SetDefaultAppProviderForMimeTypeRequest">.cs3.app.registry.v1beta1.SetDefaultAppProviderForMimeTypeRequest</a></td>
+                <td><a href="#cs3.app.registry.v1beta1.SetDefaultAppProviderForMimeTypeResponse">.cs3.app.registry.v1beta1.SetDefaultAppProviderForMimeTypeResponse</a></td>
+                <td><p>Sets the default app provider for a specified mime type.
 
 *****************************************************************/
 ************************ USER PROVIDER **************************/
@@ -5322,6 +5363,72 @@ <h2 id="cs3/app/registry/v1beta1/registry_api.proto">cs3/app/registry/v1beta1/re
       <p></p>
 
       
+        <h3 id="cs3.app.registry.v1beta1.AddAppProviderRequest">AddAppProviderRequest</h3>
+        <p></p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>opaque</td>
+                  <td><a href="#cs3.types.v1beta1.Opaque">cs3.types.v1beta1.Opaque</a></td>
+                  <td></td>
+                  <td><p>OPTIONAL.
+Opaque information. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>provider</td>
+                  <td><a href="#cs3.app.registry.v1beta1.ProviderInfo">ProviderInfo</a></td>
+                  <td></td>
+                  <td><p>REQUIRED.
+The app provider to be registered. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="cs3.app.registry.v1beta1.AddAppProviderResponse">AddAppProviderResponse</h3>
+        <p></p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>status</td>
+                  <td><a href="#cs3.rpc.v1beta1.Status">cs3.rpc.v1beta1.Status</a></td>
+                  <td></td>
+                  <td><p>REQUIRED.
+The response status. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>opaque</td>
+                  <td><a href="#cs3.types.v1beta1.Opaque">cs3.types.v1beta1.Opaque</a></td>
+                  <td></td>
+                  <td><p>OPTIONAL.
+Opaque information. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
+
+        
+      
         <h3 id="cs3.app.registry.v1beta1.GetAppProvidersRequest">GetAppProvidersRequest</h3>
         <p></p>
 
@@ -5396,6 +5503,80 @@ <h3 id="cs3.app.registry.v1beta1.GetAppProvidersResponse">GetAppProvidersRespons
 
         
       
+        <h3 id="cs3.app.registry.v1beta1.GetDefaultAppProviderForMimeTypeRequest">GetDefaultAppProviderForMimeTypeRequest</h3>
+        <p></p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>opaque</td>
+                  <td><a href="#cs3.types.v1beta1.Opaque">cs3.types.v1beta1.Opaque</a></td>
+                  <td></td>
+                  <td><p>OPTIONAL.
+Opaque information. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>mime_type</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>REQUIRED.
+The mimetype for which the default app has to be returned. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
+
+        
+      
+        <h3 id="cs3.app.registry.v1beta1.GetDefaultAppProviderForMimeTypeResponse">GetDefaultAppProviderForMimeTypeResponse</h3>
+        <p></p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>status</td>
+                  <td><a href="#cs3.rpc.v1beta1.Status">cs3.rpc.v1beta1.Status</a></td>
+                  <td></td>
+                  <td><p>REQUIRED.
+The response status. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>opaque</td>
+                  <td><a href="#cs3.types.v1beta1.Opaque">cs3.types.v1beta1.Opaque</a></td>
+                  <td></td>
+                  <td><p>OPTIONAL.
+Opaque information. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>provider</td>
+                  <td><a href="#cs3.app.registry.v1beta1.ProviderInfo">ProviderInfo</a></td>
+                  <td></td>
+                  <td><p>REQUIRED.
+The default app provider for the specified mime type. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
+
+        
+      
         <h3 id="cs3.app.registry.v1beta1.ListAppProvidersRequest">ListAppProvidersRequest</h3>
         <p></p>
 
@@ -5439,13 +5620,6 @@ <h3 id="cs3.app.registry.v1beta1.ListAppProvidersRequest.Filter">ListAppProvider
             </thead>
             <tbody>
               
-                <tr>
-                  <td>type</td>
-                  <td><a href="#cs3.app.registry.v1beta1.ListAppProvidersRequest.Filter.Type">ListAppProvidersRequest.Filter.Type</a></td>
-                  <td></td>
-                  <td><p>REQUIRED. </p></td>
-                </tr>
-              
                 <tr>
                   <td>mime_type</td>
                   <td><a href="#string">string</a></td>
@@ -5501,30 +5675,81 @@ <h3 id="cs3.app.registry.v1beta1.ListAppProvidersResponse">ListAppProvidersRespo
 
         
       
+        <h3 id="cs3.app.registry.v1beta1.SetDefaultAppProviderForMimeTypeRequest">SetDefaultAppProviderForMimeTypeRequest</h3>
+        <p></p>
 
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>opaque</td>
+                  <td><a href="#cs3.types.v1beta1.Opaque">cs3.types.v1beta1.Opaque</a></td>
+                  <td></td>
+                  <td><p>OPTIONAL.
+Opaque information. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>mime_type</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>REQUIRED.
+The mimetype for which the default app has to be returned. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>provider</td>
+                  <td><a href="#cs3.app.registry.v1beta1.ProviderInfo">ProviderInfo</a></td>
+                  <td></td>
+                  <td><p>REQUIRED.
+The app provider to be marked as default for the specified mime type. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
+
+        
       
-        <h3 id="cs3.app.registry.v1beta1.ListAppProvidersRequest.Filter.Type">ListAppProvidersRequest.Filter.Type</h3>
-        <p>The filter to apply.</p>
-        <table class="enum-table">
-          <thead>
-            <tr><td>Name</td><td>Number</td><td>Description</td></tr>
-          </thead>
-          <tbody>
-            
-              <tr>
-                <td>TYPE_INVALID</td>
-                <td>0</td>
-                <td><p></p></td>
-              </tr>
-            
-              <tr>
-                <td>TYPE_MIME_TYPE</td>
-                <td>1</td>
-                <td><p></p></td>
-              </tr>
-            
-          </tbody>
-        </table>
+        <h3 id="cs3.app.registry.v1beta1.SetDefaultAppProviderForMimeTypeResponse">SetDefaultAppProviderForMimeTypeResponse</h3>
+        <p></p>
+
+        
+          <table class="field-table">
+            <thead>
+              <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>
+            </thead>
+            <tbody>
+              
+                <tr>
+                  <td>status</td>
+                  <td><a href="#cs3.rpc.v1beta1.Status">cs3.rpc.v1beta1.Status</a></td>
+                  <td></td>
+                  <td><p>REQUIRED.
+The response status. </p></td>
+                </tr>
+              
+                <tr>
+                  <td>opaque</td>
+                  <td><a href="#cs3.types.v1beta1.Opaque">cs3.types.v1beta1.Opaque</a></td>
+                  <td></td>
+                  <td><p>OPTIONAL.
+Opaque information. </p></td>
+                </tr>
+              
+            </tbody>
+          </table>
+
+          
+
+        
+      
+
       
 
       
@@ -5546,6 +5771,13 @@ <h3 id="cs3.app.registry.v1beta1.RegistryAPI">RegistryAPI</h3>
 MUST return CODE_NOT_FOUND if no providers are available.</p></td>
               </tr>
             
+              <tr>
+                <td>AddAppProvider</td>
+                <td><a href="#cs3.app.registry.v1beta1.AddAppProviderRequest">AddAppProviderRequest</a></td>
+                <td><a href="#cs3.app.registry.v1beta1.AddAppProviderResponse">AddAppProviderResponse</a></td>
+                <td><p>Registers a new app provider to the registry.</p></td>
+              </tr>
+            
               <tr>
                 <td>ListAppProviders</td>
                 <td><a href="#cs3.app.registry.v1beta1.ListAppProvidersRequest">ListAppProvidersRequest</a></td>
@@ -5553,6 +5785,20 @@ <h3 id="cs3.app.registry.v1beta1.RegistryAPI">RegistryAPI</h3>
                 <td><p>Returns a list of the available app providers known by this registry.</p></td>
               </tr>
             
+              <tr>
+                <td>GetDefaultAppProviderForMimeType</td>
+                <td><a href="#cs3.app.registry.v1beta1.GetDefaultAppProviderForMimeTypeRequest">GetDefaultAppProviderForMimeTypeRequest</a></td>
+                <td><a href="#cs3.app.registry.v1beta1.GetDefaultAppProviderForMimeTypeResponse">GetDefaultAppProviderForMimeTypeResponse</a></td>
+                <td><p>Returns the default app provider which serves a specified mime type.</p></td>
+              </tr>
+            
+              <tr>
+                <td>SetDefaultAppProviderForMimeType</td>
+                <td><a href="#cs3.app.registry.v1beta1.SetDefaultAppProviderForMimeTypeRequest">SetDefaultAppProviderForMimeTypeRequest</a></td>
+                <td><a href="#cs3.app.registry.v1beta1.SetDefaultAppProviderForMimeTypeResponse">SetDefaultAppProviderForMimeTypeResponse</a></td>
+                <td><p>Sets the default app provider for a specified mime type.</p></td>
+              </tr>
+            
           </tbody>
         </table>
 
@@ -5600,6 +5846,14 @@ <h3 id="cs3.app.registry.v1beta1.ProviderInfo">ProviderInfo</h3>
 For example, tcp://localhost:1099. </p></td>
                 </tr>
               
+                <tr>
+                  <td>name</td>
+                  <td><a href="#string">string</a></td>
+                  <td></td>
+                  <td><p>OPTIONAL.
+A human-readable name of the app provider. </p></td>
+                </tr>
+              
                 <tr>
                   <td>description</td>
                   <td><a href="#string">string</a></td>
diff --git a/proto.lock b/proto.lock
index 87da1c3f..48e26eb9 100644
--- a/proto.lock
+++ b/proto.lock
@@ -1,33 +1,46 @@
 {
   "definitions": [
     {
-      "protopath": "cs3:/:app:/:provider:/:v1beta1:/:provider_api.proto",
+      "protopath": "cs3:/:admin:/:group:/:v1beta1:/:group_api.proto",
       "def": {
-        "enums": [
+        "messages": [
           {
-            "name": "OpenFileInAppProviderRequest.ViewMode",
-            "enum_fields": [
+            "name": "CreateGroupRequest",
+            "fields": [
               {
-                "name": "VIEW_MODE_INVALID"
+                "id": 1,
+                "name": "opaque",
+                "type": "cs3.types.v1beta1.Opaque"
               },
               {
-                "name": "VIEW_MODE_VIEW_ONLY",
-                "integer": 1
+                "id": 2,
+                "name": "group",
+                "type": "cs3.identity.group.v1beta1.Group"
+              }
+            ]
+          },
+          {
+            "name": "CreateGroupResponse",
+            "fields": [
+              {
+                "id": 1,
+                "name": "status",
+                "type": "cs3.rpc.v1beta1.Status"
               },
               {
-                "name": "VIEW_MODE_READ_ONLY",
-                "integer": 2
+                "id": 2,
+                "name": "opaque",
+                "type": "cs3.types.v1beta1.Opaque"
               },
               {
-                "name": "VIEW_MODE_READ_WRITE",
-                "integer": 3
+                "id": 3,
+                "name": "group",
+                "type": "cs3.identity.group.v1beta1.Group"
               }
             ]
-          }
-        ],
-        "messages": [
+          },
           {
-            "name": "OpenFileInAppProviderRequest",
+            "name": "DeleteGroupRequest",
             "fields": [
               {
                 "id": 1,
@@ -36,23 +49,48 @@
               },
               {
                 "id": 2,
-                "name": "resource_info",
-                "type": "storage.provider.v1beta1.ResourceInfo"
+                "name": "group_id",
+                "type": "cs3.identity.group.v1beta1.GroupId"
+              }
+            ]
+          },
+          {
+            "name": "DeleteGroupResponse",
+            "fields": [
+              {
+                "id": 1,
+                "name": "status",
+                "type": "cs3.rpc.v1beta1.Status"
               },
               {
-                "id": 3,
-                "name": "view_mode",
-                "type": "ViewMode"
+                "id": 2,
+                "name": "opaque",
+                "type": "cs3.types.v1beta1.Opaque"
+              }
+            ]
+          },
+          {
+            "name": "AddUserToGroupRequest",
+            "fields": [
+              {
+                "id": 1,
+                "name": "user_id",
+                "type": "cs3.identity.user.v1beta1.UserId"
               },
               {
-                "id": 4,
-                "name": "access_token",
-                "type": "string"
+                "id": 2,
+                "name": "group_id",
+                "type": "cs3.identity.group.v1beta1.GroupId"
+              },
+              {
+                "id": 3,
+                "name": "opaque",
+                "type": "cs3.types.v1beta1.Opaque"
               }
             ]
           },
           {
-            "name": "OpenFileInAppProviderResponse",
+            "name": "AddUserToGroupResponse",
             "fields": [
               {
                 "id": 1,
@@ -63,49 +101,97 @@
                 "id": 2,
                 "name": "opaque",
                 "type": "cs3.types.v1beta1.Opaque"
+              }
+            ]
+          },
+          {
+            "name": "RemoveUserFromGroupRequest",
+            "fields": [
+              {
+                "id": 1,
+                "name": "user_id",
+                "type": "cs3.identity.user.v1beta1.UserId"
+              },
+              {
+                "id": 2,
+                "name": "group_id",
+                "type": "cs3.identity.group.v1beta1.GroupId"
               },
               {
                 "id": 3,
-                "name": "app_provider_url",
-                "type": "string"
+                "name": "opaque",
+                "type": "cs3.types.v1beta1.Opaque"
+              }
+            ]
+          },
+          {
+            "name": "RemoveUserFromGroupResponse",
+            "fields": [
+              {
+                "id": 1,
+                "name": "status",
+                "type": "cs3.rpc.v1beta1.Status"
+              },
+              {
+                "id": 2,
+                "name": "opaque",
+                "type": "cs3.types.v1beta1.Opaque"
               }
             ]
           }
         ],
         "services": [
           {
-            "name": "ProviderAPI",
+            "name": "GroupAPI",
             "rpcs": [
               {
-                "name": "OpenFileInAppProvider",
-                "in_type": "OpenFileInAppProviderRequest",
-                "out_type": "OpenFileInAppProviderResponse"
+                "name": "CreateGroup",
+                "in_type": "CreateGroupRequest",
+                "out_type": "CreateGroupResponse"
+              },
+              {
+                "name": "DeleteGroup",
+                "in_type": "DeleteGroupRequest",
+                "out_type": "DeleteGroupResponse"
+              },
+              {
+                "name": "AddUserToGroup",
+                "in_type": "AddUserToGroupRequest",
+                "out_type": "AddUserToGroupResponse"
+              },
+              {
+                "name": "RemoveUserFromGroup",
+                "in_type": "RemoveUserFromGroupRequest",
+                "out_type": "RemoveUserFromGroupResponse"
               }
             ]
           }
         ],
         "imports": [
           {
-            "path": "cs3/rpc/v1beta1/status.proto"
+            "path": "cs3/identity/group/v1beta1/resources.proto"
           },
           {
-            "path": "cs3/storage/provider/v1beta1/resources.proto"
+            "path": "cs3/identity/user/v1beta1/resources.proto"
+          },
+          {
+            "path": "cs3/rpc/v1beta1/status.proto"
           },
           {
             "path": "cs3/types/v1beta1/types.proto"
           }
         ],
         "package": {
-          "name": "cs3.app.provider.v1beta1"
+          "name": "cs3.admin.group.v1beta1"
         },
         "options": [
           {
             "name": "csharp_namespace",
-            "value": "Cs3.App.Provider.V1Beta1"
+            "value": "Cs3.Admin.Group.V1Beta1"
           },
           {
             "name": "go_package",
-            "value": "providerv1beta1"
+            "value": "groupv1beta1"
           },
           {
             "name": "java_multiple_files",
@@ -113,29 +199,29 @@
           },
           {
             "name": "java_outer_classname",
-            "value": "ProviderApiProto"
+            "value": "GroupApiProto"
           },
           {
             "name": "java_package",
-            "value": "com.cs3.app.provider.v1beta1"
+            "value": "com.cs3.admin.group.v1beta1"
           },
           {
             "name": "objc_class_prefix",
-            "value": "CAP"
+            "value": "CAG"
           },
           {
             "name": "php_namespace",
-            "value": "Cs3\\\\App\\\\Provider\\\\V1Beta1"
+            "value": "Cs3\\\\Admin\\\\Group\\\\V1Beta1"
           }
         ]
       }
     },
     {
-      "protopath": "cs3:/:app:/:registry:/:v1beta1:/:registry_api.proto",
+      "protopath": "cs3:/:admin:/:user:/:v1beta1:/:user_api.proto",
       "def": {
         "messages": [
           {
-            "name": "GetAppProvidersRequest",
+            "name": "CreateUserRequest",
             "fields": [
               {
                 "id": 1,
@@ -144,13 +230,13 @@
               },
               {
                 "id": 2,
-                "name": "resource_info",
-                "type": "storage.provider.v1beta1.ResourceInfo"
+                "name": "user",
+                "type": "cs3.identity.user.v1beta1.User"
               }
             ]
           },
           {
-            "name": "GetAppProvidersResponse",
+            "name": "CreateUserResponse",
             "fields": [
               {
                 "id": 1,
@@ -164,24 +250,28 @@
               },
               {
                 "id": 3,
-                "name": "providers",
-                "type": "ProviderInfo",
-                "is_repeated": true
+                "name": "user",
+                "type": "cs3.identity.user.v1beta1.User"
               }
             ]
           },
           {
-            "name": "ListAppProvidersRequest",
+            "name": "DeleteUserRequest",
             "fields": [
               {
                 "id": 1,
                 "name": "opaque",
                 "type": "cs3.types.v1beta1.Opaque"
+              },
+              {
+                "id": 2,
+                "name": "user_id",
+                "type": "cs3.identity.user.v1beta1.UserId"
               }
             ]
           },
           {
-            "name": "ListAppProvidersResponse",
+            "name": "DeleteUserResponse",
             "fields": [
               {
                 "id": 1,
@@ -192,58 +282,751 @@
                 "id": 2,
                 "name": "opaque",
                 "type": "cs3.types.v1beta1.Opaque"
-              },
-              {
-                "id": 3,
-                "name": "providers",
-                "type": "ProviderInfo",
-                "is_repeated": true
               }
             ]
           }
         ],
         "services": [
           {
-            "name": "RegistryAPI",
+            "name": "UserAPI",
             "rpcs": [
               {
-                "name": "GetAppProviders",
-                "in_type": "GetAppProvidersRequest",
-                "out_type": "GetAppProvidersResponse"
+                "name": "CreateUser",
+                "in_type": "CreateUserRequest",
+                "out_type": "CreateUserResponse"
+              },
+              {
+                "name": "DeleteUser",
+                "in_type": "DeleteUserRequest",
+                "out_type": "DeleteUserResponse"
+              }
+            ]
+          }
+        ],
+        "imports": [
+          {
+            "path": "cs3/identity/user/v1beta1/resources.proto"
+          },
+          {
+            "path": "cs3/rpc/v1beta1/status.proto"
+          },
+          {
+            "path": "cs3/types/v1beta1/types.proto"
+          }
+        ],
+        "package": {
+          "name": "cs3.admin.user.v1beta1"
+        },
+        "options": [
+          {
+            "name": "csharp_namespace",
+            "value": "Cs3.Admin.User.V1Beta1"
+          },
+          {
+            "name": "go_package",
+            "value": "userv1beta1"
+          },
+          {
+            "name": "java_multiple_files",
+            "value": "true"
+          },
+          {
+            "name": "java_outer_classname",
+            "value": "UserApiProto"
+          },
+          {
+            "name": "java_package",
+            "value": "com.cs3.admin.user.v1beta1"
+          },
+          {
+            "name": "objc_class_prefix",
+            "value": "CAU"
+          },
+          {
+            "name": "php_namespace",
+            "value": "Cs3\\\\Admin\\\\User\\\\V1Beta1"
+          }
+        ]
+      }
+    },
+    {
+      "protopath": "cs3:/:app:/:provider:/:v1beta1:/:provider_api.proto",
+      "def": {
+        "enums": [
+          {
+            "name": "OpenInAppRequest.ViewMode",
+            "enum_fields": [
+              {
+                "name": "VIEW_MODE_INVALID"
+              },
+              {
+                "name": "VIEW_MODE_VIEW_ONLY",
+                "integer": 1
+              },
+              {
+                "name": "VIEW_MODE_READ_ONLY",
+                "integer": 2
+              },
+              {
+                "name": "VIEW_MODE_READ_WRITE",
+                "integer": 3
+              }
+            ]
+          },
+          {
+            "name": "OpenFileInAppProviderRequest.ViewMode",
+            "enum_fields": [
+              {
+                "name": "VIEW_MODE_INVALID"
+              },
+              {
+                "name": "VIEW_MODE_VIEW_ONLY",
+                "integer": 1
+              },
+              {
+                "name": "VIEW_MODE_READ_ONLY",
+                "integer": 2
+              },
+              {
+                "name": "VIEW_MODE_READ_WRITE",
+                "integer": 3
+              }
+            ]
+          }
+        ],
+        "messages": [
+          {
+            "name": "OpenInAppRequest",
+            "fields": [
+              {
+                "id": 1,
+                "name": "opaque",
+                "type": "cs3.types.v1beta1.Opaque"
+              },
+              {
+                "id": 2,
+                "name": "resource_info",
+                "type": "storage.provider.v1beta1.ResourceInfo"
+              },
+              {
+                "id": 3,
+                "name": "view_mode",
+                "type": "ViewMode"
+              },
+              {
+                "id": 4,
+                "name": "access_token",
+                "type": "string"
+              },
+              {
+                "id": 5,
+                "name": "app",
+                "type": "string"
+              }
+            ]
+          },
+          {
+            "name": "OpenInAppResponse",
+            "fields": [
+              {
+                "id": 1,
+                "name": "status",
+                "type": "cs3.rpc.v1beta1.Status"
+              },
+              {
+                "id": 2,
+                "name": "opaque",
+                "type": "cs3.types.v1beta1.Opaque"
+              },
+              {
+                "id": 3,
+                "name": "app_url",
+                "type": "string"
+              }
+            ]
+          },
+          {
+            "name": "OpenFileInAppProviderRequest",
+            "fields": [
+              {
+                "id": 1,
+                "name": "opaque",
+                "type": "cs3.types.v1beta1.Opaque"
+              },
+              {
+                "id": 2,
+                "name": "resource_info",
+                "type": "storage.provider.v1beta1.ResourceInfo"
+              },
+              {
+                "id": 3,
+                "name": "view_mode",
+                "type": "ViewMode"
+              },
+              {
+                "id": 4,
+                "name": "access_token",
+                "type": "string"
+              }
+            ]
+          },
+          {
+            "name": "OpenFileInAppProviderResponse",
+            "fields": [
+              {
+                "id": 1,
+                "name": "status",
+                "type": "cs3.rpc.v1beta1.Status"
+              },
+              {
+                "id": 2,
+                "name": "opaque",
+                "type": "cs3.types.v1beta1.Opaque"
+              },
+              {
+                "id": 3,
+                "name": "app_provider_url",
+                "type": "string"
+              }
+            ]
+          }
+        ],
+        "services": [
+          {
+            "name": "ProviderAPI",
+            "rpcs": [
+              {
+                "name": "OpenFileInAppProvider",
+                "in_type": "OpenFileInAppProviderRequest",
+                "out_type": "OpenFileInAppProviderResponse"
+              },
+              {
+                "name": "OpenInApp",
+                "in_type": "OpenInAppRequest",
+                "out_type": "OpenInAppResponse"
+              }
+            ]
+          }
+        ],
+        "imports": [
+          {
+            "path": "cs3/rpc/v1beta1/status.proto"
+          },
+          {
+            "path": "cs3/storage/provider/v1beta1/resources.proto"
+          },
+          {
+            "path": "cs3/types/v1beta1/types.proto"
+          }
+        ],
+        "package": {
+          "name": "cs3.app.provider.v1beta1"
+        },
+        "options": [
+          {
+            "name": "csharp_namespace",
+            "value": "Cs3.App.Provider.V1Beta1"
+          },
+          {
+            "name": "go_package",
+            "value": "providerv1beta1"
+          },
+          {
+            "name": "java_multiple_files",
+            "value": "true"
+          },
+          {
+            "name": "java_outer_classname",
+            "value": "ProviderApiProto"
+          },
+          {
+            "name": "java_package",
+            "value": "com.cs3.app.provider.v1beta1"
+          },
+          {
+            "name": "objc_class_prefix",
+            "value": "CAP"
+          },
+          {
+            "name": "php_namespace",
+            "value": "Cs3\\\\App\\\\Provider\\\\V1Beta1"
+          }
+        ]
+      }
+    },
+    {
+      "protopath": "cs3:/:app:/:registry:/:v1beta1:/:registry_api.proto",
+      "def": {
+        "messages": [
+          {
+            "name": "GetAppProvidersRequest",
+            "fields": [
+              {
+                "id": 1,
+                "name": "opaque",
+                "type": "cs3.types.v1beta1.Opaque"
+              },
+              {
+                "id": 2,
+                "name": "resource_info",
+                "type": "storage.provider.v1beta1.ResourceInfo"
+              }
+            ]
+          },
+          {
+            "name": "GetAppProvidersResponse",
+            "fields": [
+              {
+                "id": 1,
+                "name": "status",
+                "type": "cs3.rpc.v1beta1.Status"
+              },
+              {
+                "id": 2,
+                "name": "opaque",
+                "type": "cs3.types.v1beta1.Opaque"
+              },
+              {
+                "id": 3,
+                "name": "providers",
+                "type": "ProviderInfo",
+                "is_repeated": true
+              }
+            ]
+          },
+          {
+            "name": "AddAppProviderRequest",
+            "fields": [
+              {
+                "id": 1,
+                "name": "opaque",
+                "type": "cs3.types.v1beta1.Opaque"
+              },
+              {
+                "id": 2,
+                "name": "provider",
+                "type": "ProviderInfo"
+              }
+            ]
+          },
+          {
+            "name": "AddAppProviderResponse",
+            "fields": [
+              {
+                "id": 1,
+                "name": "status",
+                "type": "cs3.rpc.v1beta1.Status"
+              },
+              {
+                "id": 2,
+                "name": "opaque",
+                "type": "cs3.types.v1beta1.Opaque"
+              }
+            ]
+          },
+          {
+            "name": "ListAppProvidersRequest",
+            "fields": [
+              {
+                "id": 1,
+                "name": "opaque",
+                "type": "cs3.types.v1beta1.Opaque"
+              },
+              {
+                "id": 2,
+                "name": "filters",
+                "type": "Filter",
+                "is_repeated": true
+              }
+            ],
+            "messages": [
+              {
+                "name": "Filter",
+                "fields": [
+                  {
+                    "id": 1,
+                    "name": "mime_type",
+                    "type": "string"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "name": "ListAppProvidersResponse",
+            "fields": [
+              {
+                "id": 1,
+                "name": "status",
+                "type": "cs3.rpc.v1beta1.Status"
+              },
+              {
+                "id": 2,
+                "name": "opaque",
+                "type": "cs3.types.v1beta1.Opaque"
+              },
+              {
+                "id": 3,
+                "name": "providers",
+                "type": "ProviderInfo",
+                "is_repeated": true
+              }
+            ]
+          }
+        ],
+        "services": [
+          {
+            "name": "RegistryAPI",
+            "rpcs": [
+              {
+                "name": "GetAppProviders",
+                "in_type": "GetAppProvidersRequest",
+                "out_type": "GetAppProvidersResponse"
+              },
+              {
+                "name": "ListAppProviders",
+                "in_type": "ListAppProvidersRequest",
+                "out_type": "ListAppProvidersResponse"
+              }
+            ]
+          }
+        ],
+        "imports": [
+          {
+            "path": "cs3/app/registry/v1beta1/resources.proto"
+          },
+          {
+            "path": "cs3/rpc/v1beta1/status.proto"
+          },
+          {
+            "path": "cs3/storage/provider/v1beta1/resources.proto"
+          },
+          {
+            "path": "cs3/types/v1beta1/types.proto"
+          }
+        ],
+        "package": {
+          "name": "cs3.app.registry.v1beta1"
+        },
+        "options": [
+          {
+            "name": "csharp_namespace",
+            "value": "Cs3.App.Registry.V1Beta1"
+          },
+          {
+            "name": "go_package",
+            "value": "registryv1beta1"
+          },
+          {
+            "name": "java_multiple_files",
+            "value": "true"
+          },
+          {
+            "name": "java_outer_classname",
+            "value": "RegistryApiProto"
+          },
+          {
+            "name": "java_package",
+            "value": "com.cs3.app.registry.v1beta1"
+          },
+          {
+            "name": "objc_class_prefix",
+            "value": "CAR"
+          },
+          {
+            "name": "php_namespace",
+            "value": "Cs3\\\\App\\\\Registry\\\\V1Beta1"
+          }
+        ]
+      }
+    },
+    {
+      "protopath": "cs3:/:app:/:registry:/:v1beta1:/:resources.proto",
+      "def": {
+        "messages": [
+          {
+            "name": "ProviderInfo",
+            "fields": [
+              {
+                "id": 1,
+                "name": "opaque",
+                "type": "cs3.types.v1beta1.Opaque"
+              },
+              {
+                "id": 2,
+                "name": "mime_types",
+                "type": "string",
+                "is_repeated": true
+              },
+              {
+                "id": 3,
+                "name": "address",
+                "type": "string"
+              },
+              {
+                "id": 4,
+                "name": "name",
+                "type": "string"
+              },
+              {
+                "id": 5,
+                "name": "description",
+                "type": "string"
+              }
+            ]
+          }
+        ],
+        "imports": [
+          {
+            "path": "cs3/types/v1beta1/types.proto"
+          }
+        ],
+        "package": {
+          "name": "cs3.app.registry.v1beta1"
+        },
+        "options": [
+          {
+            "name": "csharp_namespace",
+            "value": "Cs3.App.Registry.V1Beta1"
+          },
+          {
+            "name": "go_package",
+            "value": "registryv1beta1"
+          },
+          {
+            "name": "java_multiple_files",
+            "value": "true"
+          },
+          {
+            "name": "java_outer_classname",
+            "value": "ResourcesProto"
+          },
+          {
+            "name": "java_package",
+            "value": "com.cs3.app.registry.v1beta1"
+          },
+          {
+            "name": "objc_class_prefix",
+            "value": "CAR"
+          },
+          {
+            "name": "php_namespace",
+            "value": "Cs3\\\\App\\\\Registry\\\\V1Beta1"
+          }
+        ]
+      }
+    },
+    {
+      "protopath": "cs3:/:auth:/:applications:/:v1beta1:/:applications_api.proto",
+      "def": {
+        "messages": [
+          {
+            "name": "GenerateAppPasswordRequest",
+            "fields": [
+              {
+                "id": 1,
+                "name": "opaque",
+                "type": "cs3.types.v1beta1.Opaque"
+              },
+              {
+                "id": 3,
+                "name": "label",
+                "type": "string"
+              },
+              {
+                "id": 4,
+                "name": "expiration",
+                "type": "cs3.types.v1beta1.Timestamp"
+              }
+            ],
+            "maps": [
+              {
+                "key_type": "string",
+                "field": {
+                  "id": 2,
+                  "name": "token_scope",
+                  "type": "cs3.auth.provider.v1beta1.Scope"
+                }
+              }
+            ]
+          },
+          {
+            "name": "GenerateAppPasswordResponse",
+            "fields": [
+              {
+                "id": 1,
+                "name": "status",
+                "type": "cs3.rpc.v1beta1.Status"
+              },
+              {
+                "id": 2,
+                "name": "opaque",
+                "type": "cs3.types.v1beta1.Opaque"
+              },
+              {
+                "id": 3,
+                "name": "app_password",
+                "type": "AppPassword"
+              }
+            ]
+          },
+          {
+            "name": "ListAppPasswordsRequest",
+            "fields": [
+              {
+                "id": 1,
+                "name": "opaque",
+                "type": "cs3.types.v1beta1.Opaque"
+              }
+            ]
+          },
+          {
+            "name": "ListAppPasswordsResponse",
+            "fields": [
+              {
+                "id": 1,
+                "name": "status",
+                "type": "cs3.rpc.v1beta1.Status"
+              },
+              {
+                "id": 2,
+                "name": "opaque",
+                "type": "cs3.types.v1beta1.Opaque"
+              },
+              {
+                "id": 3,
+                "name": "app_passwords",
+                "type": "AppPassword",
+                "is_repeated": true
+              }
+            ]
+          },
+          {
+            "name": "InvalidateAppPasswordRequest",
+            "fields": [
+              {
+                "id": 1,
+                "name": "opaque",
+                "type": "cs3.types.v1beta1.Opaque"
+              },
+              {
+                "id": 2,
+                "name": "password",
+                "type": "string"
+              }
+            ]
+          },
+          {
+            "name": "InvalidateAppPasswordResponse",
+            "fields": [
+              {
+                "id": 1,
+                "name": "status",
+                "type": "cs3.rpc.v1beta1.Status"
+              },
+              {
+                "id": 2,
+                "name": "opaque",
+                "type": "cs3.types.v1beta1.Opaque"
+              }
+            ]
+          },
+          {
+            "name": "GetAppPasswordRequest",
+            "fields": [
+              {
+                "id": 1,
+                "name": "opaque",
+                "type": "cs3.types.v1beta1.Opaque"
+              },
+              {
+                "id": 2,
+                "name": "user",
+                "type": "cs3.identity.user.v1beta1.UserId"
+              },
+              {
+                "id": 3,
+                "name": "password",
+                "type": "string"
+              }
+            ]
+          },
+          {
+            "name": "GetAppPasswordResponse",
+            "fields": [
+              {
+                "id": 1,
+                "name": "status",
+                "type": "cs3.rpc.v1beta1.Status"
+              },
+              {
+                "id": 2,
+                "name": "opaque",
+                "type": "cs3.types.v1beta1.Opaque"
+              },
+              {
+                "id": 3,
+                "name": "app_password",
+                "type": "AppPassword"
+              }
+            ]
+          }
+        ],
+        "services": [
+          {
+            "name": "ApplicationsAPI",
+            "rpcs": [
+              {
+                "name": "GenerateAppPassword",
+                "in_type": "GenerateAppPasswordRequest",
+                "out_type": "GenerateAppPasswordResponse"
+              },
+              {
+                "name": "ListAppPasswords",
+                "in_type": "ListAppPasswordsRequest",
+                "out_type": "ListAppPasswordsResponse"
+              },
+              {
+                "name": "InvalidateAppPassword",
+                "in_type": "InvalidateAppPasswordRequest",
+                "out_type": "InvalidateAppPasswordResponse"
               },
               {
-                "name": "ListAppProviders",
-                "in_type": "ListAppProvidersRequest",
-                "out_type": "ListAppProvidersResponse"
+                "name": "GetAppPassword",
+                "in_type": "GetAppPasswordRequest",
+                "out_type": "GetAppPasswordResponse"
               }
             ]
           }
         ],
         "imports": [
           {
-            "path": "cs3/app/registry/v1beta1/resources.proto"
+            "path": "cs3/auth/applications/v1beta1/resources.proto"
           },
           {
-            "path": "cs3/rpc/v1beta1/status.proto"
+            "path": "cs3/auth/provider/v1beta1/resources.proto"
           },
           {
-            "path": "cs3/storage/provider/v1beta1/resources.proto"
+            "path": "cs3/identity/user/v1beta1/resources.proto"
+          },
+          {
+            "path": "cs3/rpc/v1beta1/status.proto"
           },
           {
             "path": "cs3/types/v1beta1/types.proto"
           }
         ],
         "package": {
-          "name": "cs3.app.registry.v1beta1"
+          "name": "cs3.auth.applications.v1beta1"
         },
         "options": [
           {
             "name": "csharp_namespace",
-            "value": "Cs3.App.Registry.V1Beta1"
+            "value": "Cs3.Auth.Applications.V1Beta1"
           },
           {
             "name": "go_package",
-            "value": "registryv1beta1"
+            "value": "applicationsv1beta1"
           },
           {
             "name": "java_multiple_files",
@@ -251,70 +1034,95 @@
           },
           {
             "name": "java_outer_classname",
-            "value": "RegistryApiProto"
+            "value": "ApplicationsApiProto"
           },
           {
             "name": "java_package",
-            "value": "com.cs3.app.registry.v1beta1"
+            "value": "com.cs3.auth.applications.v1beta1"
           },
           {
             "name": "objc_class_prefix",
-            "value": "CAR"
+            "value": "CAA"
           },
           {
             "name": "php_namespace",
-            "value": "Cs3\\\\App\\\\Registry\\\\V1Beta1"
+            "value": "Cs3\\\\Auth\\\\Applications\\\\V1Beta1"
           }
         ]
       }
     },
     {
-      "protopath": "cs3:/:app:/:registry:/:v1beta1:/:resources.proto",
+      "protopath": "cs3:/:auth:/:applications:/:v1beta1:/:resources.proto",
       "def": {
         "messages": [
           {
-            "name": "ProviderInfo",
+            "name": "AppPassword",
             "fields": [
               {
                 "id": 1,
-                "name": "opaque",
-                "type": "cs3.types.v1beta1.Opaque"
-              },
-              {
-                "id": 2,
-                "name": "mime_types",
-                "type": "string",
-                "is_repeated": true
+                "name": "password",
+                "type": "string"
               },
               {
                 "id": 3,
-                "name": "address",
+                "name": "label",
                 "type": "string"
               },
               {
                 "id": 4,
-                "name": "description",
-                "type": "string"
+                "name": "user",
+                "type": "cs3.identity.user.v1beta1.UserId"
+              },
+              {
+                "id": 5,
+                "name": "expiration",
+                "type": "cs3.types.v1beta1.Timestamp"
+              },
+              {
+                "id": 6,
+                "name": "ctime",
+                "type": "cs3.types.v1beta1.Timestamp"
+              },
+              {
+                "id": 7,
+                "name": "utime",
+                "type": "cs3.types.v1beta1.Timestamp"
+              }
+            ],
+            "maps": [
+              {
+                "key_type": "string",
+                "field": {
+                  "id": 2,
+                  "name": "token_scope",
+                  "type": "cs3.auth.provider.v1beta1.Scope"
+                }
               }
             ]
           }
         ],
         "imports": [
+          {
+            "path": "cs3/auth/provider/v1beta1/resources.proto"
+          },
+          {
+            "path": "cs3/identity/user/v1beta1/resources.proto"
+          },
           {
             "path": "cs3/types/v1beta1/types.proto"
           }
         ],
         "package": {
-          "name": "cs3.app.registry.v1beta1"
+          "name": "cs3.auth.applications.v1beta1"
         },
         "options": [
           {
             "name": "csharp_namespace",
-            "value": "Cs3.App.Registry.V1Beta1"
+            "value": "Cs3.Auth.Applications.V1Beta1"
           },
           {
             "name": "go_package",
-            "value": "registryv1beta1"
+            "value": "applicationsv1beta1"
           },
           {
             "name": "java_multiple_files",
@@ -326,15 +1134,15 @@
           },
           {
             "name": "java_package",
-            "value": "com.cs3.app.registry.v1beta1"
+            "value": "com.cs3.auth.applications.v1beta1"
           },
           {
             "name": "objc_class_prefix",
-            "value": "CAR"
+            "value": "CAA"
           },
           {
             "name": "php_namespace",
-            "value": "Cs3\\\\App\\\\Registry\\\\V1Beta1"
+            "value": "Cs3\\\\Auth\\\\Applications\\\\V1Beta1"
           }
         ]
       }
@@ -376,6 +1184,16 @@
                 "name": "user",
                 "type": "cs3.identity.user.v1beta1.User"
               }
+            ],
+            "maps": [
+              {
+                "key_type": "string",
+                "field": {
+                  "id": 3,
+                  "name": "token_scope",
+                  "type": "Scope"
+                }
+              }
             ]
           }
         ],
@@ -392,6 +1210,9 @@
           }
         ],
         "imports": [
+          {
+            "path": "cs3/auth/provider/v1beta1/resources.proto"
+          },
           {
             "path": "cs3/identity/user/v1beta1/resources.proto"
           },
@@ -437,6 +1258,104 @@
         ]
       }
     },
+    {
+      "protopath": "cs3:/:auth:/:provider:/:v1beta1:/:resources.proto",
+      "def": {
+        "enums": [
+          {
+            "name": "Role",
+            "enum_fields": [
+              {
+                "name": "ROLE_INVALID"
+              },
+              {
+                "name": "ROLE_OWNER",
+                "integer": 1
+              },
+              {
+                "name": "ROLE_LEGACY",
+                "integer": 2
+              },
+              {
+                "name": "ROLE_VIEWER",
+                "integer": 3
+              },
+              {
+                "name": "ROLE_EDITOR",
+                "integer": 4
+              },
+              {
+                "name": "ROLE_FILE_EDITOR",
+                "integer": 5
+              },
+              {
+                "name": "ROLE_COOWNER",
+                "integer": 6
+              },
+              {
+                "name": "ROLE_UPLOADER",
+                "integer": 7
+              }
+            ]
+          }
+        ],
+        "messages": [
+          {
+            "name": "Scope",
+            "fields": [
+              {
+                "id": 1,
+                "name": "resource",
+                "type": "cs3.types.v1beta1.OpaqueEntry"
+              },
+              {
+                "id": 2,
+                "name": "role",
+                "type": "Role"
+              }
+            ]
+          }
+        ],
+        "imports": [
+          {
+            "path": "cs3/types/v1beta1/types.proto"
+          }
+        ],
+        "package": {
+          "name": "cs3.auth.provider.v1beta1"
+        },
+        "options": [
+          {
+            "name": "csharp_namespace",
+            "value": "Cs3.Auth.Provider.V1Beta1"
+          },
+          {
+            "name": "go_package",
+            "value": "providerv1beta1"
+          },
+          {
+            "name": "java_multiple_files",
+            "value": "true"
+          },
+          {
+            "name": "java_outer_classname",
+            "value": "ResourcesProto"
+          },
+          {
+            "name": "java_package",
+            "value": "com.cs3.auth.provider.v1beta1"
+          },
+          {
+            "name": "objc_class_prefix",
+            "value": "CAP"
+          },
+          {
+            "name": "php_namespace",
+            "value": "Cs3\\\\Auth\\\\Provider\\\\V1Beta1"
+          }
+        ]
+      }
+    },
     {
       "protopath": "cs3:/:auth:/:registry:/:v1beta1:/:registry_api.proto",
       "def": {
@@ -645,6 +1564,26 @@
       "protopath": "cs3:/:gateway:/:v1beta1:/:gateway_api.proto",
       "def": {
         "enums": [
+          {
+            "name": "OpenInAppRequest.ViewMode",
+            "enum_fields": [
+              {
+                "name": "VIEW_MODE_INVALID"
+              },
+              {
+                "name": "VIEW_MODE_VIEW_ONLY",
+                "integer": 1
+              },
+              {
+                "name": "VIEW_MODE_READ_ONLY",
+                "integer": 2
+              },
+              {
+                "name": "VIEW_MODE_READ_WRITE",
+                "integer": 3
+              }
+            ]
+          },
           {
             "name": "OpenFileInAppProviderRequest.ViewMode",
             "enum_fields": [
@@ -895,6 +1834,31 @@
               }
             ]
           },
+          {
+            "name": "OpenInAppRequest",
+            "fields": [
+              {
+                "id": 1,
+                "name": "opaque",
+                "type": "cs3.types.v1beta1.Opaque"
+              },
+              {
+                "id": 2,
+                "name": "ref",
+                "type": "storage.provider.v1beta1.Reference"
+              },
+              {
+                "id": 3,
+                "name": "view_mode",
+                "type": "ViewMode"
+              },
+              {
+                "id": 4,
+                "name": "app",
+                "type": "string"
+              }
+            ]
+          },
           {
             "name": "OpenFileInAppProviderRequest",
             "fields": [
@@ -930,6 +1894,26 @@
                 "in_type": "WhoAmIRequest",
                 "out_type": "WhoAmIResponse"
               },
+              {
+                "name": "GenerateAppPassword",
+                "in_type": "cs3.auth.applications.v1beta1.GenerateAppPasswordRequest",
+                "out_type": "cs3.auth.applications.v1beta1.GenerateAppPasswordResponse"
+              },
+              {
+                "name": "ListAppPasswords",
+                "in_type": "cs3.auth.applications.v1beta1.ListAppPasswordsRequest",
+                "out_type": "cs3.auth.applications.v1beta1.ListAppPasswordsResponse"
+              },
+              {
+                "name": "InvalidateAppPassword",
+                "in_type": "cs3.auth.applications.v1beta1.InvalidateAppPasswordRequest",
+                "out_type": "cs3.auth.applications.v1beta1.InvalidateAppPasswordResponse"
+              },
+              {
+                "name": "GetAppPassword",
+                "in_type": "cs3.auth.applications.v1beta1.GetAppPasswordRequest",
+                "out_type": "cs3.auth.applications.v1beta1.GetAppPasswordResponse"
+              },
               {
                 "name": "CreateContainer",
                 "in_type": "cs3.storage.provider.v1beta1.CreateContainerRequest",
@@ -1052,6 +2036,11 @@
                 "in_type": "cs3.storage.provider.v1beta1.DeleteStorageSpaceRequest",
                 "out_type": "cs3.storage.provider.v1beta1.DeleteStorageSpaceResponse"
               },
+              {
+                "name": "OpenInApp",
+                "in_type": "OpenInAppRequest",
+                "out_type": "cs3.app.provider.v1beta1.OpenInAppResponse"
+              },
               {
                 "name": "OpenFileInAppProvider",
                 "in_type": "OpenFileInAppProviderRequest",
@@ -1312,6 +2301,9 @@
           {
             "path": "cs3/app/registry/v1beta1/registry_api.proto"
           },
+          {
+            "path": "cs3/auth/applications/v1beta1/applications_api.proto"
+          },
           {
             "path": "cs3/auth/registry/v1beta1/registry_api.proto"
           },
@@ -1888,6 +2880,44 @@
     {
       "protopath": "cs3:/:identity:/:user:/:v1beta1:/:resources.proto",
       "def": {
+        "enums": [
+          {
+            "name": "UserType",
+            "enum_fields": [
+              {
+                "name": "USER_TYPE_INVALID"
+              },
+              {
+                "name": "USER_TYPE_PRIMARY",
+                "integer": 1
+              },
+              {
+                "name": "USER_TYPE_SECONDARY",
+                "integer": 2
+              },
+              {
+                "name": "USER_TYPE_SERVICE",
+                "integer": 3
+              },
+              {
+                "name": "USER_TYPE_APPLICATION",
+                "integer": 4
+              },
+              {
+                "name": "USER_TYPE_GUEST",
+                "integer": 5
+              },
+              {
+                "name": "USER_TYPE_FEDERATED",
+                "integer": 6
+              },
+              {
+                "name": "USER_TYPE_LIGHTWEIGHT",
+                "integer": 7
+              }
+            ]
+          }
+        ],
         "messages": [
           {
             "name": "UserId",
@@ -1901,6 +2931,11 @@
                 "id": 2,
                 "name": "opaque_id",
                 "type": "string"
+              },
+              {
+                "id": 3,
+                "name": "type",
+                "type": "UserType"
               }
             ]
           },
@@ -3511,6 +4546,11 @@
                 "id": 2,
                 "name": "opaque",
                 "type": "cs3.types.v1beta1.Opaque"
+              },
+              {
+                "id": 3,
+                "name": "share",
+                "type": "Share"
               }
             ]
           },
@@ -3723,6 +4763,11 @@
                 "id": 2,
                 "name": "opaque",
                 "type": "cs3.types.v1beta1.Opaque"
+              },
+              {
+                "id": 3,
+                "name": "share",
+                "type": "ReceivedShare"
               }
             ]
           },