diff --git a/proto/keyaccessgrants/key_access_grants.proto b/proto/keyaccessgrants/key_access_grants.proto
index ceadb0f2ce..42cf74403b 100644
--- a/proto/keyaccessgrants/key_access_grants.proto
+++ b/proto/keyaccessgrants/key_access_grants.proto
@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package keyaccessgrants;
 
-import "attributes/attributes.proto";
 import "buf/validate/validate.proto";
 import "common/common.proto";
 import "google/api/annotations.proto";
@@ -36,9 +35,7 @@ message GetKeyAccessGrantResponse {
   KeyAccessGrants grants = 1;
 }
 
-message ListKeyAccessGrantsRequest {
-  common.ResourceSelector selector = 1;
-}
+message ListKeyAccessGrantsRequest {}
 message ListKeyAccessGrantsResponse {
   repeated KeyAccessGrants grants = 1;
 }
diff --git a/proto/resourcemapping/resource_mapping.proto b/proto/resourcemapping/resource_mapping.proto
index 5439920bad..28c075be05 100644
--- a/proto/resourcemapping/resource_mapping.proto
+++ b/proto/resourcemapping/resource_mapping.proto
@@ -2,28 +2,48 @@ syntax = "proto3";
 
 package resourcemapping;
 
-import "attributes/attributes.proto";
 import "buf/validate/validate.proto";
 import "common/common.proto";
 import "google/api/annotations.proto";
 
 /*
-   Access Control Resource Encodings (ACRE).  Structures supporting Resources and Attributes mappings
+   # Resource Mappings (aka Access Control Resource Encodings aka ACRE):  Structures supporting Resources and Attributes mappings
 
-*/
+   ## Examples
 
-/*
-   Map one or more domain specific terms (synonyms) to an attribute value by reference.
+   ### Where
+
+   attributeId is an id of the following attribute
+
+     FQN: http://demo.com/attr/Classification/value/Confidential
+     UUID: 12345678-1234-1234-1234-123456789012
+
+   ### Request
 
-   Example:
-   attributeValueRef: ref http://demo.com/attr/Classification/value/Confidential
-   synonymRef:
-     terms: ["CONFIDENTIAL", "CONTROLLED UNCLASSIFIED", "OFFICIAL-SENSITIVE", "CUI", "C"]
+     grpcurl -plaintext -d @ localhost:9000 resourcemapping.ResourceMappingService/CreateResourceMapping <<EOM
+       {
+         "mapping": {
+           "name": "Classification",
+           "attribute_value_id": "12345678-1234-1234-1234-123456789012",
+           "terms": ["CONFIDENTIAL", "CONTROLLED UNCLASSIFIED", "OFFICIAL-SENSITIVE", "CUI", "C"]
+         }
+       }
+     EOM
 
-   Example 2:
-   attributeValueRef: ref to http://demo.com/attr/Classification/Confidential
-   synonymRef:
-     terms: ["OFFICIAL-SENSITIVE"]
+   ### Response
+
+     {
+       "mapping": {
+         "metadata": {
+           "id": "12345678-1234-1234-1234-123456789012",
+           "created_at": "2020-01-01T00:00:00Z",
+           "updated_at": "2020-01-01T00:00:00Z"
+         },
+         "name": "Classification",
+         "attribute_value_id": "12345678-1234-1234-1234-123456789012",
+         "terms": ["CONFIDENTIAL", "CONTROLLED UNCLASSIFIED", "OFFICIAL-SENSITIVE", "CUI", "C"]
+       }
+     }
 
 */
 message ResourceMapping {
@@ -40,16 +60,14 @@ message ResourceMapping {
    Resource Mappings
 */
 
-message ListResourceMappingsRequest {
-  common.ResourceSelector selector = 1;
-}
+message ListResourceMappingsRequest {}
 
 message ListResourceMappingsResponse {
   repeated ResourceMapping mappings = 1;
 }
 
 message GetResourceMappingRequest {
-  int32 id = 1 [(buf.validate.field).required = true];
+  string id = 1 [(buf.validate.field).required = true];
 }
 
 message GetResourceMappingResponse {
@@ -72,159 +90,32 @@ message DeleteResourceMappingRequest {
 }
 message DeleteResourceMappingResponse {}
 
-/*
-   Synonyms
-*/
-
-message ListResourceSynonymsRequest {
-  common.ResourceSelector selector = 1;
-}
-
-message ListResourceSynonymsResponse {
-  repeated Synonyms synonyms = 1;
-}
-
-message GetResourceSynonymRequest {
-  int32 id = 1 [(buf.validate.field).required = true];
-}
-
-message GetResourceSynonymResponse {
-  Synonyms synonym = 1;
-}
-
-message CreateResourceSynonymRequest {
-  Synonyms synonym = 1 [(buf.validate.field).required = true];
-}
-message CreateResourceSynonymResponse {}
-
-message UpdateResourceSynonymRequest {
-  int32 id = 1 [(buf.validate.field).required = true];
-  Synonyms synonym = 2 [(buf.validate.field).required = true];
-}
-message UpdateResourceSynonymResponse {}
-
-message DeleteResourceSynonymRequest {
-  int32 id = 1 [(buf.validate.field).required = true];
-}
-message DeleteResourceSynonymResponse {}
-
-/*
-   Resource Groups
-*/
-message ListResourceGroupsRequest {
-  common.ResourceSelector selector = 1;
-}
-
-message ListResourceGroupsResponse {
-  repeated ResourceGroup groups = 1;
-}
-
-message GetResourceGroupRequest {
-  int32 id = 1 [(buf.validate.field).required = true];
-}
-
-message GetResourceGroupResponse {
-  ResourceGroup group = 1;
-}
-
-message CreateResourceGroupRequest {
-  ResourceGroup group = 1 [(buf.validate.field).required = true];
-}
-message CreateResourceGroupResponse {}
-
-message UpdateResourceGroupRequest {
-  int32 id = 1 [(buf.validate.field).required = true];
-  ResourceGroup group = 2 [(buf.validate.field).required = true];
-}
-message UpdateResourceGroupResponse {}
-
-message DeleteResourceGroupRequest {
-  int32 id = 1 [(buf.validate.field).required = true];
-}
-message DeleteResourceGroupResponse {}
-
 service ResourceEncodingService {
   /*
      Resource Mappings
   */
   rpc ListResourceMappings(ListResourceMappingsRequest) returns (ListResourceMappingsResponse) {
-    option (google.api.http) = {get: "/v1/encoding/resource/mappings"};
+    option (google.api.http) = {get: "/resource-mappings"};
   }
   rpc GetResourceMapping(GetResourceMappingRequest) returns (GetResourceMappingResponse) {
-    option (google.api.http) = {get: "/v1/encoding/resource/mappings/{id}"};
+    option (google.api.http) = {get: "/resource-mappings/{id}"};
   }
 
   rpc CreateResourceMapping(CreateResourceMappingRequest) returns (CreateResourceMappingResponse) {
     option (google.api.http) = {
-      post: "/v1/encoding/resource/mappings"
+      post: "/resource-mappings"
       body: "mapping"
     };
   }
 
   rpc UpdateResourceMapping(UpdateResourceMappingRequest) returns (UpdateResourceMappingResponse) {
     option (google.api.http) = {
-      post: "/v1/encoding/resource/mappings/{id}"
+      post: "/resource-mappings/{id}"
       body: "mapping"
     };
   }
 
   rpc DeleteResourceMapping(DeleteResourceMappingRequest) returns (DeleteResourceMappingResponse) {
-    option (google.api.http) = {delete: "/v1/encoding/resource/mappings/{id}"};
-  }
-
-  /*
-     Synonyms
-  */
-  rpc ListResourceSynonyms(ListResourceSynonymsRequest) returns (ListResourceSynonymsResponse) {
-    option (google.api.http) = {get: "/v1/encoding/resource/synonyms"};
-  }
-  rpc GetResourceSynonym(GetResourceSynonymRequest) returns (GetResourceSynonymResponse) {
-    option (google.api.http) = {get: "/v1/encoding/resource/synonyms/{id}"};
-  }
-
-  rpc CreateResourceSynonym(CreateResourceSynonymRequest) returns (CreateResourceSynonymResponse) {
-    option (google.api.http) = {
-      post: "/v1/encoding/resource/synonyms"
-      body: "synonym"
-    };
-  }
-
-  rpc UpdateResourceSynonym(UpdateResourceSynonymRequest) returns (UpdateResourceSynonymResponse) {
-    option (google.api.http) = {
-      post: "/v1/encoding/resource/synonyms/{id}"
-      body: "synonym"
-    };
-  }
-
-  rpc DeleteResourceSynonym(DeleteResourceSynonymRequest) returns (DeleteResourceSynonymResponse) {
-    option (google.api.http) = {delete: "/v1/encoding/resource/synonyms/{id}"};
-  }
-
-  /*
-     Resource Groups
-  */
-  rpc ListResourceGroups(ListResourceGroupsRequest) returns (ListResourceGroupsResponse) {
-    option (google.api.http) = {get: "/v1/encoding/resource/groups"};
-  }
-  rpc GetResourceGroup(GetResourceGroupRequest) returns (GetResourceGroupResponse) {
-    option (google.api.http) = {get: "/v1/encoding/resource/groups/{id}"};
-  }
-
-  rpc CreateResourceGroup(CreateResourceGroupRequest) returns (CreateResourceGroupResponse) {
-    option (google.api.http) = {
-      post: "/v1/encoding/resource/groups"
-      body: "group"
-    };
-  }
-
-  rpc UpdateResourceGroup(UpdateResourceGroupRequest) returns (UpdateResourceGroupResponse) {
-    option (google.api.http) = {
-      post: "/v1/encoding/resource/groups/{id}"
-      body: "group"
-    };
-  }
-
-  rpc DeleteResourceGroup(DeleteResourceGroupRequest) returns (DeleteResourceGroupResponse) {
-    option (google.api.http) = {delete: "/v1/encoding/resource/groups/{id}"};
+    option (google.api.http) = {delete: "/resource-mappings/{id}"};
   }
 }
diff --git a/proto/subjectmapping/subject_mapping.proto b/proto/subjectmapping/subject_mapping.proto
index 89e4cff6ff..a0d446502d 100644
--- a/proto/subjectmapping/subject_mapping.proto
+++ b/proto/subjectmapping/subject_mapping.proto
@@ -2,28 +2,59 @@ syntax = "proto3";
 
 package subjectmapping;
 
-import "attributes/attributes.proto";
 import "buf/validate/validate.proto";
 import "common/common.proto";
 import "google/api/annotations.proto";
 
 /*
-   Access Control Subject Encoding (ACSE):  Structures supporting the mapping of Subjects and Attributes (e.g. Entitlement)
-*/
-
-/**
-   Define a mapping of an subject attribute to subject using a rule:
-   <subject.subjectAttribute> <operator IN/NOT_IN> [subjectValue]
-
-   Example subject mapping of a subject with nationality = CZE entitled to attribute relto:ZCE
-   From Existing Policy: "http://demo.com/attr/relto/value/CZE": {"nationality": ["CZE"]}
-   To Subject Mapping Policy:
+   # Subject Mapping (aka Access Control Subject Encoding aka ACSE):  Structures supporting the mapping of Subjects and Attributes (e.g. Entitlement)
+
+   ## Examples
+
+   ### Where:
+
+     - attribute_value_id represents the following attribute
+       - FQN: "http://demo.com/attr/relto/value/CZE"
+       - UUID: "12345678-1234-1234-1234-123456789012"
+
+   ### Request
+
+   ```bash
+   grpcurl -plaintext -d '{
+     "subject_mapping": {
+       "metadata": {
+         "description": "subject mapping 1",
+           "labels": {
+             "test-label": "test-value"
+           }
+       },
+       "attribute_value_id": "12345678-1234-1234-1234-123456789012",
+       "subject_attribute": "nationality",
+       "subject_values": ["CZE"],
+       "operator": "IN"
+     }
+   }' localhost:8080 SubjectMappingService.CreateSubjectMapping
+   ```
+
+   ### Response
+
+   ```
    {
-     attributeValueFQN: "http://demo.com/attr/relto/value/CZE"
-     subjectAttribute: "nationality"
-     subjectValues: ["CZE"]
-     operator: "IN"
+     "subject_mapping": {
+       "metadata": {
+         "id": "12345678-2222-1234-1234-123456789012",
+         "description": "subject mapping 1",
+         "labels": {
+           "test-label": "test-value"
+         }
+       },
+       "attribute_value_id": "12345678-1234-1234-1234-123456789012",
+       "subject_attribute": "nationality",
+       "subject_values": ["CZE"],
+       "operator": "IN"
+     }
    }
+   ```
 
 */
 message SubjectMapping {
@@ -55,15 +86,13 @@ message SubjectMapping {
 }
 
 message GetSubjectMappingRequest {
-  int32 id = 1 [(buf.validate.field).required = true];
+  string id = 1 [(buf.validate.field).required = true];
 }
 message GetSubjectMappingResponse {
   SubjectMapping subject_mapping = 1;
 }
 
-message ListSubjectMappingsRequest {
-  common.ResourceSelector selector = 1;
-}
+message ListSubjectMappingsRequest {}
 message ListSubjectMappingsResponse {
   repeated SubjectMapping subject_mappings = 1;
 }
@@ -74,39 +103,39 @@ message CreateSubjectMappingRequest {
 message CreateSubjectMappingResponse {}
 
 message UpdateSubjectMappingRequest {
-  int32 id = 1 [(buf.validate.field).required = true];
+  string id = 1 [(buf.validate.field).required = true];
   SubjectMapping subject_mapping = 2 [(buf.validate.field).required = true];
 }
 message UpdateSubjectMappingResponse {}
 
 message DeleteSubjectMappingRequest {
-  int32 id = 1 [(buf.validate.field).required = true];
+  string id = 1 [(buf.validate.field).required = true];
 }
 message DeleteSubjectMappingResponse {}
 
-service SubjectEncodingService {
+service SubjectMappingService {
   rpc ListSubjectMappings(ListSubjectMappingsRequest) returns (ListSubjectMappingsResponse) {
-    option (google.api.http) = {get: "/v1/encoding/subject/mappings"};
+    option (google.api.http) = {get: "/subject-mappings"};
   }
   rpc GetSubjectMapping(GetSubjectMappingRequest) returns (GetSubjectMappingResponse) {
-    option (google.api.http) = {get: "/v1/encoding/subject/mappings/{id}"};
+    option (google.api.http) = {get: "/subject-mappings/{id}"};
   }
 
   rpc CreateSubjectMapping(CreateSubjectMappingRequest) returns (CreateSubjectMappingResponse) {
     option (google.api.http) = {
-      post: "/v1/encoding/subject/mappings"
+      post: "/subject-mappings"
       body: "subject_mapping"
     };
   }
 
   rpc UpdateSubjectMapping(UpdateSubjectMappingRequest) returns (UpdateSubjectMappingResponse) {
     option (google.api.http) = {
-      post: "/v1/encoding/subject/mappings/{id}"
+      post: "/subject-mappings/{id}"
       body: "subject_mapping"
     };
   }
 
   rpc DeleteSubjectMapping(DeleteSubjectMappingRequest) returns (DeleteSubjectMappingResponse) {
-    option (google.api.http) = {delete: "/v1/encoding/subjects/mappings/{id}"};
+    option (google.api.http) = {delete: "/subject-mappings/{id}"};
   }
 }