diff --git a/pkg/tokens/v1/tokens_v1.pb.go b/pkg/tokens/v1/tokens_v1.pb.go
index 62680a1..ca207d9 100644
--- a/pkg/tokens/v1/tokens_v1.pb.go
+++ b/pkg/tokens/v1/tokens_v1.pb.go
@@ -170,15 +170,60 @@ func (x *TokenValue) GetToken() string {
 	return ""
 }
 
-type TokenPermissions struct {
+type MethodList struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
+	Methods       []string               `protobuf:"bytes,1,rep,name=methods,proto3" json:"methods,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
 
+func (x *MethodList) Reset() {
+	*x = MethodList{}
+	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[3]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *MethodList) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MethodList) ProtoMessage() {}
+
+func (x *MethodList) ProtoReflect() protoreflect.Message {
+	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[3]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use MethodList.ProtoReflect.Descriptor instead.
+func (*MethodList) Descriptor() ([]byte, []int) {
+	return file_tokens_v1_tokens_v1_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *MethodList) GetMethods() []string {
+	if x != nil {
+		return x.Methods
+	}
+	return nil
+}
+
+type TokenPermissions struct {
+	state                protoimpl.MessageState `protogen:"open.v1"`
+	AvailabiePermissions map[string]*MethodList `protobuf:"bytes,1,rep,name=availabie_permissions,json=availabiePermissions,proto3" json:"availabie_permissions,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	unknownFields        protoimpl.UnknownFields
+	sizeCache            protoimpl.SizeCache
+}
+
 func (x *TokenPermissions) Reset() {
 	*x = TokenPermissions{}
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[3]
+	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[4]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -190,7 +235,7 @@ func (x *TokenPermissions) String() string {
 func (*TokenPermissions) ProtoMessage() {}
 
 func (x *TokenPermissions) ProtoReflect() protoreflect.Message {
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[3]
+	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[4]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -203,7 +248,14 @@ func (x *TokenPermissions) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TokenPermissions.ProtoReflect.Descriptor instead.
 func (*TokenPermissions) Descriptor() ([]byte, []int) {
-	return file_tokens_v1_tokens_v1_proto_rawDescGZIP(), []int{3}
+	return file_tokens_v1_tokens_v1_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *TokenPermissions) GetAvailabiePermissions() map[string]*MethodList {
+	if x != nil {
+		return x.AvailabiePermissions
+	}
+	return nil
 }
 
 type CreateTokenRequest struct {
@@ -216,7 +268,7 @@ type CreateTokenRequest struct {
 
 func (x *CreateTokenRequest) Reset() {
 	*x = CreateTokenRequest{}
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[4]
+	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[5]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -228,7 +280,7 @@ func (x *CreateTokenRequest) String() string {
 func (*CreateTokenRequest) ProtoMessage() {}
 
 func (x *CreateTokenRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[4]
+	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[5]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -241,7 +293,7 @@ func (x *CreateTokenRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CreateTokenRequest.ProtoReflect.Descriptor instead.
 func (*CreateTokenRequest) Descriptor() ([]byte, []int) {
-	return file_tokens_v1_tokens_v1_proto_rawDescGZIP(), []int{4}
+	return file_tokens_v1_tokens_v1_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *CreateTokenRequest) GetTokenMetadata() *TokenMetadata {
@@ -267,7 +319,7 @@ type CreateTokenResponse struct {
 
 func (x *CreateTokenResponse) Reset() {
 	*x = CreateTokenResponse{}
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[5]
+	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[6]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -279,7 +331,7 @@ func (x *CreateTokenResponse) String() string {
 func (*CreateTokenResponse) ProtoMessage() {}
 
 func (x *CreateTokenResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[5]
+	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[6]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -292,7 +344,7 @@ func (x *CreateTokenResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CreateTokenResponse.ProtoReflect.Descriptor instead.
 func (*CreateTokenResponse) Descriptor() ([]byte, []int) {
-	return file_tokens_v1_tokens_v1_proto_rawDescGZIP(), []int{5}
+	return file_tokens_v1_tokens_v1_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *CreateTokenResponse) GetTokenValue() *TokenValue {
@@ -313,7 +365,7 @@ type UpdateTokenRequest struct {
 
 func (x *UpdateTokenRequest) Reset() {
 	*x = UpdateTokenRequest{}
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[6]
+	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[7]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -325,7 +377,7 @@ func (x *UpdateTokenRequest) String() string {
 func (*UpdateTokenRequest) ProtoMessage() {}
 
 func (x *UpdateTokenRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[6]
+	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[7]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -338,7 +390,7 @@ func (x *UpdateTokenRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UpdateTokenRequest.ProtoReflect.Descriptor instead.
 func (*UpdateTokenRequest) Descriptor() ([]byte, []int) {
-	return file_tokens_v1_tokens_v1_proto_rawDescGZIP(), []int{6}
+	return file_tokens_v1_tokens_v1_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *UpdateTokenRequest) GetTokenUuid() *TokenUUID {
@@ -373,7 +425,7 @@ type UpdateTokenResponse struct {
 
 func (x *UpdateTokenResponse) Reset() {
 	*x = UpdateTokenResponse{}
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[7]
+	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[8]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -385,7 +437,7 @@ func (x *UpdateTokenResponse) String() string {
 func (*UpdateTokenResponse) ProtoMessage() {}
 
 func (x *UpdateTokenResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[7]
+	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[8]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -398,7 +450,7 @@ func (x *UpdateTokenResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UpdateTokenResponse.ProtoReflect.Descriptor instead.
 func (*UpdateTokenResponse) Descriptor() ([]byte, []int) {
-	return file_tokens_v1_tokens_v1_proto_rawDescGZIP(), []int{7}
+	return file_tokens_v1_tokens_v1_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *UpdateTokenResponse) GetTokenUuid() *TokenUUID {
@@ -431,7 +483,7 @@ type ForceTokenExpirationRequest struct {
 
 func (x *ForceTokenExpirationRequest) Reset() {
 	*x = ForceTokenExpirationRequest{}
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[8]
+	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[9]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -443,7 +495,7 @@ func (x *ForceTokenExpirationRequest) String() string {
 func (*ForceTokenExpirationRequest) ProtoMessage() {}
 
 func (x *ForceTokenExpirationRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[8]
+	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[9]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -456,7 +508,7 @@ func (x *ForceTokenExpirationRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ForceTokenExpirationRequest.ProtoReflect.Descriptor instead.
 func (*ForceTokenExpirationRequest) Descriptor() ([]byte, []int) {
-	return file_tokens_v1_tokens_v1_proto_rawDescGZIP(), []int{8}
+	return file_tokens_v1_tokens_v1_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *ForceTokenExpirationRequest) GetTokenUuid() *TokenUUID {
@@ -475,7 +527,7 @@ type RegenerateTokenRequest struct {
 
 func (x *RegenerateTokenRequest) Reset() {
 	*x = RegenerateTokenRequest{}
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[9]
+	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[10]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -487,7 +539,7 @@ func (x *RegenerateTokenRequest) String() string {
 func (*RegenerateTokenRequest) ProtoMessage() {}
 
 func (x *RegenerateTokenRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[9]
+	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[10]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -500,7 +552,7 @@ func (x *RegenerateTokenRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RegenerateTokenRequest.ProtoReflect.Descriptor instead.
 func (*RegenerateTokenRequest) Descriptor() ([]byte, []int) {
-	return file_tokens_v1_tokens_v1_proto_rawDescGZIP(), []int{9}
+	return file_tokens_v1_tokens_v1_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *RegenerateTokenRequest) GetTokenUuid() *TokenUUID {
@@ -519,7 +571,7 @@ type RegenerateTokenResponse struct {
 
 func (x *RegenerateTokenResponse) Reset() {
 	*x = RegenerateTokenResponse{}
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[10]
+	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[11]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -531,7 +583,7 @@ func (x *RegenerateTokenResponse) String() string {
 func (*RegenerateTokenResponse) ProtoMessage() {}
 
 func (x *RegenerateTokenResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[10]
+	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[11]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -544,7 +596,7 @@ func (x *RegenerateTokenResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RegenerateTokenResponse.ProtoReflect.Descriptor instead.
 func (*RegenerateTokenResponse) Descriptor() ([]byte, []int) {
-	return file_tokens_v1_tokens_v1_proto_rawDescGZIP(), []int{10}
+	return file_tokens_v1_tokens_v1_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *RegenerateTokenResponse) GetTokenValue() *TokenValue {
@@ -563,7 +615,7 @@ type GetTokenRequest struct {
 
 func (x *GetTokenRequest) Reset() {
 	*x = GetTokenRequest{}
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[11]
+	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[12]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -575,7 +627,7 @@ func (x *GetTokenRequest) String() string {
 func (*GetTokenRequest) ProtoMessage() {}
 
 func (x *GetTokenRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[11]
+	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[12]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -588,7 +640,7 @@ func (x *GetTokenRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetTokenRequest.ProtoReflect.Descriptor instead.
 func (*GetTokenRequest) Descriptor() ([]byte, []int) {
-	return file_tokens_v1_tokens_v1_proto_rawDescGZIP(), []int{11}
+	return file_tokens_v1_tokens_v1_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *GetTokenRequest) GetTokenUuid() *TokenUUID {
@@ -609,7 +661,7 @@ type GetTokenResponse struct {
 
 func (x *GetTokenResponse) Reset() {
 	*x = GetTokenResponse{}
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[12]
+	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[13]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -621,7 +673,7 @@ func (x *GetTokenResponse) String() string {
 func (*GetTokenResponse) ProtoMessage() {}
 
 func (x *GetTokenResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[12]
+	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[13]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -634,7 +686,7 @@ func (x *GetTokenResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetTokenResponse.ProtoReflect.Descriptor instead.
 func (*GetTokenResponse) Descriptor() ([]byte, []int) {
-	return file_tokens_v1_tokens_v1_proto_rawDescGZIP(), []int{12}
+	return file_tokens_v1_tokens_v1_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *GetTokenResponse) GetTokenUuid() *TokenUUID {
@@ -669,7 +721,7 @@ type ListTokensResponse struct {
 
 func (x *ListTokensResponse) Reset() {
 	*x = ListTokensResponse{}
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[13]
+	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[14]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -681,7 +733,7 @@ func (x *ListTokensResponse) String() string {
 func (*ListTokensResponse) ProtoMessage() {}
 
 func (x *ListTokensResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[13]
+	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[14]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -694,7 +746,7 @@ func (x *ListTokensResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListTokensResponse.ProtoReflect.Descriptor instead.
 func (*ListTokensResponse) Descriptor() ([]byte, []int) {
-	return file_tokens_v1_tokens_v1_proto_rawDescGZIP(), []int{13}
+	return file_tokens_v1_tokens_v1_proto_rawDescGZIP(), []int{14}
 }
 
 func (x *ListTokensResponse) GetTokenUuid() *TokenUUID {
@@ -718,104 +770,16 @@ func (x *ListTokensResponse) GetTokenPermissions() *TokenPermissions {
 	return nil
 }
 
-type MethodList struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	Methods       []string               `protobuf:"bytes,1,rep,name=methods,proto3" json:"methods,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *MethodList) Reset() {
-	*x = MethodList{}
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[14]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *MethodList) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*MethodList) ProtoMessage() {}
-
-func (x *MethodList) ProtoReflect() protoreflect.Message {
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[14]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use MethodList.ProtoReflect.Descriptor instead.
-func (*MethodList) Descriptor() ([]byte, []int) {
-	return file_tokens_v1_tokens_v1_proto_rawDescGZIP(), []int{14}
-}
-
-func (x *MethodList) GetMethods() []string {
-	if x != nil {
-		return x.Methods
-	}
-	return nil
-}
-
-type Permissions struct {
-	state                protoimpl.MessageState `protogen:"open.v1"`
-	AvailabiePermissions map[string]*MethodList `protobuf:"bytes,1,rep,name=availabie_permissions,json=availabiePermissions,proto3" json:"availabie_permissions,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	unknownFields        protoimpl.UnknownFields
-	sizeCache            protoimpl.SizeCache
-}
-
-func (x *Permissions) Reset() {
-	*x = Permissions{}
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[15]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *Permissions) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Permissions) ProtoMessage() {}
-
-func (x *Permissions) ProtoReflect() protoreflect.Message {
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[15]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Permissions.ProtoReflect.Descriptor instead.
-func (*Permissions) Descriptor() ([]byte, []int) {
-	return file_tokens_v1_tokens_v1_proto_rawDescGZIP(), []int{15}
-}
-
-func (x *Permissions) GetAvailabiePermissions() map[string]*MethodList {
-	if x != nil {
-		return x.AvailabiePermissions
-	}
-	return nil
-}
-
 type ListPermissionsResponse struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
-	Permissions   *Permissions           `protobuf:"bytes,1,opt,name=permissions,proto3" json:"permissions,omitempty"`
+	Permissions   *TokenPermissions      `protobuf:"bytes,1,opt,name=permissions,proto3" json:"permissions,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
 
 func (x *ListPermissionsResponse) Reset() {
 	*x = ListPermissionsResponse{}
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[16]
+	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[15]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -827,7 +791,7 @@ func (x *ListPermissionsResponse) String() string {
 func (*ListPermissionsResponse) ProtoMessage() {}
 
 func (x *ListPermissionsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[16]
+	mi := &file_tokens_v1_tokens_v1_proto_msgTypes[15]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -840,10 +804,10 @@ func (x *ListPermissionsResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListPermissionsResponse.ProtoReflect.Descriptor instead.
 func (*ListPermissionsResponse) Descriptor() ([]byte, []int) {
-	return file_tokens_v1_tokens_v1_proto_rawDescGZIP(), []int{16}
+	return file_tokens_v1_tokens_v1_proto_rawDescGZIP(), []int{15}
 }
 
-func (x *ListPermissionsResponse) GetPermissions() *Permissions {
+func (x *ListPermissionsResponse) GetPermissions() *TokenPermissions {
 	if x != nil {
 		return x.Permissions
 	}
@@ -863,8 +827,15 @@ const file_tokens_v1_tokens_v1_proto_rawDesc = "" +
 	"\x04uuid\x18\x01 \x01(\tR\x04uuid\"\"\n" +
 	"\n" +
 	"TokenValue\x12\x14\n" +
-	"\x05token\x18\x01 \x01(\tR\x05token\"\x12\n" +
-	"\x10TokenPermissions\"\x9f\x01\n" +
+	"\x05token\x18\x01 \x01(\tR\x05token\"&\n" +
+	"\n" +
+	"MethodList\x12\x18\n" +
+	"\amethods\x18\x01 \x03(\tR\amethods\"\xde\x01\n" +
+	"\x10TokenPermissions\x12j\n" +
+	"\x15availabie_permissions\x18\x01 \x03(\v25.tokens.v1.TokenPermissions.AvailabiePermissionsEntryR\x14availabiePermissions\x1a^\n" +
+	"\x19AvailabiePermissionsEntry\x12\x10\n" +
+	"\x03key\x18\x01 \x01(\tR\x03key\x12+\n" +
+	"\x05value\x18\x02 \x01(\v2\x15.tokens.v1.MethodListR\x05value:\x028\x01\"\x9f\x01\n" +
 	"\x12CreateTokenRequest\x12?\n" +
 	"\x0etoken_metadata\x18\x01 \x01(\v2\x18.tokens.v1.TokenMetadataR\rtokenMetadata\x12H\n" +
 	"\x11token_permissions\x18\x02 \x01(\v2\x1b.tokens.v1.TokenPermissionsR\x10tokenPermissions\"M\n" +
@@ -902,17 +873,9 @@ const file_tokens_v1_tokens_v1_proto_rawDesc = "" +
 	"\n" +
 	"token_uuid\x18\x01 \x01(\v2\x14.tokens.v1.TokenUUIDR\ttokenUuid\x12?\n" +
 	"\x0etoken_metadata\x18\x02 \x01(\v2\x18.tokens.v1.TokenMetadataR\rtokenMetadata\x12H\n" +
-	"\x11token_permissions\x18\x03 \x01(\v2\x1b.tokens.v1.TokenPermissionsR\x10tokenPermissions\"&\n" +
-	"\n" +
-	"MethodList\x12\x18\n" +
-	"\amethods\x18\x01 \x03(\tR\amethods\"\xd4\x01\n" +
-	"\vPermissions\x12e\n" +
-	"\x15availabie_permissions\x18\x01 \x03(\v20.tokens.v1.Permissions.AvailabiePermissionsEntryR\x14availabiePermissions\x1a^\n" +
-	"\x19AvailabiePermissionsEntry\x12\x10\n" +
-	"\x03key\x18\x01 \x01(\tR\x03key\x12+\n" +
-	"\x05value\x18\x02 \x01(\v2\x15.tokens.v1.MethodListR\x05value:\x028\x01\"S\n" +
-	"\x17ListPermissionsResponse\x128\n" +
-	"\vpermissions\x18\x01 \x01(\v2\x16.tokens.v1.PermissionsR\vpermissions2\xc8\x04\n" +
+	"\x11token_permissions\x18\x03 \x01(\v2\x1b.tokens.v1.TokenPermissionsR\x10tokenPermissions\"X\n" +
+	"\x17ListPermissionsResponse\x12=\n" +
+	"\vpermissions\x18\x01 \x01(\v2\x1b.tokens.v1.TokenPermissionsR\vpermissions2\xc8\x04\n" +
 	"\rTokensService\x12N\n" +
 	"\vCreateToken\x12\x1d.tokens.v1.CreateTokenRequest\x1a\x1e.tokens.v1.CreateTokenResponse\"\x00\x12N\n" +
 	"\vUpdateToken\x12\x1d.tokens.v1.UpdateTokenRequest\x1a\x1e.tokens.v1.UpdateTokenResponse\"\x00\x12X\n" +
@@ -935,67 +898,66 @@ func file_tokens_v1_tokens_v1_proto_rawDescGZIP() []byte {
 	return file_tokens_v1_tokens_v1_proto_rawDescData
 }
 
-var file_tokens_v1_tokens_v1_proto_msgTypes = make([]protoimpl.MessageInfo, 18)
+var file_tokens_v1_tokens_v1_proto_msgTypes = make([]protoimpl.MessageInfo, 17)
 var file_tokens_v1_tokens_v1_proto_goTypes = []any{
 	(*TokenMetadata)(nil),               // 0: tokens.v1.TokenMetadata
 	(*TokenUUID)(nil),                   // 1: tokens.v1.TokenUUID
 	(*TokenValue)(nil),                  // 2: tokens.v1.TokenValue
-	(*TokenPermissions)(nil),            // 3: tokens.v1.TokenPermissions
-	(*CreateTokenRequest)(nil),          // 4: tokens.v1.CreateTokenRequest
-	(*CreateTokenResponse)(nil),         // 5: tokens.v1.CreateTokenResponse
-	(*UpdateTokenRequest)(nil),          // 6: tokens.v1.UpdateTokenRequest
-	(*UpdateTokenResponse)(nil),         // 7: tokens.v1.UpdateTokenResponse
-	(*ForceTokenExpirationRequest)(nil), // 8: tokens.v1.ForceTokenExpirationRequest
-	(*RegenerateTokenRequest)(nil),      // 9: tokens.v1.RegenerateTokenRequest
-	(*RegenerateTokenResponse)(nil),     // 10: tokens.v1.RegenerateTokenResponse
-	(*GetTokenRequest)(nil),             // 11: tokens.v1.GetTokenRequest
-	(*GetTokenResponse)(nil),            // 12: tokens.v1.GetTokenResponse
-	(*ListTokensResponse)(nil),          // 13: tokens.v1.ListTokensResponse
-	(*MethodList)(nil),                  // 14: tokens.v1.MethodList
-	(*Permissions)(nil),                 // 15: tokens.v1.Permissions
-	(*ListPermissionsResponse)(nil),     // 16: tokens.v1.ListPermissionsResponse
-	nil,                                 // 17: tokens.v1.Permissions.AvailabiePermissionsEntry
-	(*timestamppb.Timestamp)(nil),       // 18: google.protobuf.Timestamp
-	(*emptypb.Empty)(nil),               // 19: google.protobuf.Empty
+	(*MethodList)(nil),                  // 3: tokens.v1.MethodList
+	(*TokenPermissions)(nil),            // 4: tokens.v1.TokenPermissions
+	(*CreateTokenRequest)(nil),          // 5: tokens.v1.CreateTokenRequest
+	(*CreateTokenResponse)(nil),         // 6: tokens.v1.CreateTokenResponse
+	(*UpdateTokenRequest)(nil),          // 7: tokens.v1.UpdateTokenRequest
+	(*UpdateTokenResponse)(nil),         // 8: tokens.v1.UpdateTokenResponse
+	(*ForceTokenExpirationRequest)(nil), // 9: tokens.v1.ForceTokenExpirationRequest
+	(*RegenerateTokenRequest)(nil),      // 10: tokens.v1.RegenerateTokenRequest
+	(*RegenerateTokenResponse)(nil),     // 11: tokens.v1.RegenerateTokenResponse
+	(*GetTokenRequest)(nil),             // 12: tokens.v1.GetTokenRequest
+	(*GetTokenResponse)(nil),            // 13: tokens.v1.GetTokenResponse
+	(*ListTokensResponse)(nil),          // 14: tokens.v1.ListTokensResponse
+	(*ListPermissionsResponse)(nil),     // 15: tokens.v1.ListPermissionsResponse
+	nil,                                 // 16: tokens.v1.TokenPermissions.AvailabiePermissionsEntry
+	(*timestamppb.Timestamp)(nil),       // 17: google.protobuf.Timestamp
+	(*emptypb.Empty)(nil),               // 18: google.protobuf.Empty
 }
 var file_tokens_v1_tokens_v1_proto_depIdxs = []int32{
-	18, // 0: tokens.v1.TokenMetadata.expires_at:type_name -> google.protobuf.Timestamp
-	0,  // 1: tokens.v1.CreateTokenRequest.token_metadata:type_name -> tokens.v1.TokenMetadata
-	3,  // 2: tokens.v1.CreateTokenRequest.token_permissions:type_name -> tokens.v1.TokenPermissions
-	2,  // 3: tokens.v1.CreateTokenResponse.token_value:type_name -> tokens.v1.TokenValue
-	1,  // 4: tokens.v1.UpdateTokenRequest.token_uuid:type_name -> tokens.v1.TokenUUID
-	0,  // 5: tokens.v1.UpdateTokenRequest.token_metadata:type_name -> tokens.v1.TokenMetadata
-	3,  // 6: tokens.v1.UpdateTokenRequest.token_permissions:type_name -> tokens.v1.TokenPermissions
-	1,  // 7: tokens.v1.UpdateTokenResponse.token_uuid:type_name -> tokens.v1.TokenUUID
-	0,  // 8: tokens.v1.UpdateTokenResponse.token_metadata:type_name -> tokens.v1.TokenMetadata
-	3,  // 9: tokens.v1.UpdateTokenResponse.token_permissions:type_name -> tokens.v1.TokenPermissions
-	1,  // 10: tokens.v1.ForceTokenExpirationRequest.token_uuid:type_name -> tokens.v1.TokenUUID
-	1,  // 11: tokens.v1.RegenerateTokenRequest.token_uuid:type_name -> tokens.v1.TokenUUID
-	2,  // 12: tokens.v1.RegenerateTokenResponse.token_value:type_name -> tokens.v1.TokenValue
-	1,  // 13: tokens.v1.GetTokenRequest.token_uuid:type_name -> tokens.v1.TokenUUID
-	1,  // 14: tokens.v1.GetTokenResponse.token_uuid:type_name -> tokens.v1.TokenUUID
-	0,  // 15: tokens.v1.GetTokenResponse.token_metadata:type_name -> tokens.v1.TokenMetadata
-	3,  // 16: tokens.v1.GetTokenResponse.token_permissions:type_name -> tokens.v1.TokenPermissions
-	1,  // 17: tokens.v1.ListTokensResponse.token_uuid:type_name -> tokens.v1.TokenUUID
-	0,  // 18: tokens.v1.ListTokensResponse.token_metadata:type_name -> tokens.v1.TokenMetadata
-	3,  // 19: tokens.v1.ListTokensResponse.token_permissions:type_name -> tokens.v1.TokenPermissions
-	17, // 20: tokens.v1.Permissions.availabie_permissions:type_name -> tokens.v1.Permissions.AvailabiePermissionsEntry
-	15, // 21: tokens.v1.ListPermissionsResponse.permissions:type_name -> tokens.v1.Permissions
-	14, // 22: tokens.v1.Permissions.AvailabiePermissionsEntry.value:type_name -> tokens.v1.MethodList
-	4,  // 23: tokens.v1.TokensService.CreateToken:input_type -> tokens.v1.CreateTokenRequest
-	6,  // 24: tokens.v1.TokensService.UpdateToken:input_type -> tokens.v1.UpdateTokenRequest
-	8,  // 25: tokens.v1.TokensService.ForceTokenExpiration:input_type -> tokens.v1.ForceTokenExpirationRequest
-	9,  // 26: tokens.v1.TokensService.RegenerateToken:input_type -> tokens.v1.RegenerateTokenRequest
-	11, // 27: tokens.v1.TokensService.GetToken:input_type -> tokens.v1.GetTokenRequest
-	19, // 28: tokens.v1.TokensService.ListTokens:input_type -> google.protobuf.Empty
-	19, // 29: tokens.v1.TokensService.ListPermissions:input_type -> google.protobuf.Empty
-	5,  // 30: tokens.v1.TokensService.CreateToken:output_type -> tokens.v1.CreateTokenResponse
-	7,  // 31: tokens.v1.TokensService.UpdateToken:output_type -> tokens.v1.UpdateTokenResponse
-	19, // 32: tokens.v1.TokensService.ForceTokenExpiration:output_type -> google.protobuf.Empty
-	10, // 33: tokens.v1.TokensService.RegenerateToken:output_type -> tokens.v1.RegenerateTokenResponse
-	12, // 34: tokens.v1.TokensService.GetToken:output_type -> tokens.v1.GetTokenResponse
-	13, // 35: tokens.v1.TokensService.ListTokens:output_type -> tokens.v1.ListTokensResponse
-	16, // 36: tokens.v1.TokensService.ListPermissions:output_type -> tokens.v1.ListPermissionsResponse
+	17, // 0: tokens.v1.TokenMetadata.expires_at:type_name -> google.protobuf.Timestamp
+	16, // 1: tokens.v1.TokenPermissions.availabie_permissions:type_name -> tokens.v1.TokenPermissions.AvailabiePermissionsEntry
+	0,  // 2: tokens.v1.CreateTokenRequest.token_metadata:type_name -> tokens.v1.TokenMetadata
+	4,  // 3: tokens.v1.CreateTokenRequest.token_permissions:type_name -> tokens.v1.TokenPermissions
+	2,  // 4: tokens.v1.CreateTokenResponse.token_value:type_name -> tokens.v1.TokenValue
+	1,  // 5: tokens.v1.UpdateTokenRequest.token_uuid:type_name -> tokens.v1.TokenUUID
+	0,  // 6: tokens.v1.UpdateTokenRequest.token_metadata:type_name -> tokens.v1.TokenMetadata
+	4,  // 7: tokens.v1.UpdateTokenRequest.token_permissions:type_name -> tokens.v1.TokenPermissions
+	1,  // 8: tokens.v1.UpdateTokenResponse.token_uuid:type_name -> tokens.v1.TokenUUID
+	0,  // 9: tokens.v1.UpdateTokenResponse.token_metadata:type_name -> tokens.v1.TokenMetadata
+	4,  // 10: tokens.v1.UpdateTokenResponse.token_permissions:type_name -> tokens.v1.TokenPermissions
+	1,  // 11: tokens.v1.ForceTokenExpirationRequest.token_uuid:type_name -> tokens.v1.TokenUUID
+	1,  // 12: tokens.v1.RegenerateTokenRequest.token_uuid:type_name -> tokens.v1.TokenUUID
+	2,  // 13: tokens.v1.RegenerateTokenResponse.token_value:type_name -> tokens.v1.TokenValue
+	1,  // 14: tokens.v1.GetTokenRequest.token_uuid:type_name -> tokens.v1.TokenUUID
+	1,  // 15: tokens.v1.GetTokenResponse.token_uuid:type_name -> tokens.v1.TokenUUID
+	0,  // 16: tokens.v1.GetTokenResponse.token_metadata:type_name -> tokens.v1.TokenMetadata
+	4,  // 17: tokens.v1.GetTokenResponse.token_permissions:type_name -> tokens.v1.TokenPermissions
+	1,  // 18: tokens.v1.ListTokensResponse.token_uuid:type_name -> tokens.v1.TokenUUID
+	0,  // 19: tokens.v1.ListTokensResponse.token_metadata:type_name -> tokens.v1.TokenMetadata
+	4,  // 20: tokens.v1.ListTokensResponse.token_permissions:type_name -> tokens.v1.TokenPermissions
+	4,  // 21: tokens.v1.ListPermissionsResponse.permissions:type_name -> tokens.v1.TokenPermissions
+	3,  // 22: tokens.v1.TokenPermissions.AvailabiePermissionsEntry.value:type_name -> tokens.v1.MethodList
+	5,  // 23: tokens.v1.TokensService.CreateToken:input_type -> tokens.v1.CreateTokenRequest
+	7,  // 24: tokens.v1.TokensService.UpdateToken:input_type -> tokens.v1.UpdateTokenRequest
+	9,  // 25: tokens.v1.TokensService.ForceTokenExpiration:input_type -> tokens.v1.ForceTokenExpirationRequest
+	10, // 26: tokens.v1.TokensService.RegenerateToken:input_type -> tokens.v1.RegenerateTokenRequest
+	12, // 27: tokens.v1.TokensService.GetToken:input_type -> tokens.v1.GetTokenRequest
+	18, // 28: tokens.v1.TokensService.ListTokens:input_type -> google.protobuf.Empty
+	18, // 29: tokens.v1.TokensService.ListPermissions:input_type -> google.protobuf.Empty
+	6,  // 30: tokens.v1.TokensService.CreateToken:output_type -> tokens.v1.CreateTokenResponse
+	8,  // 31: tokens.v1.TokensService.UpdateToken:output_type -> tokens.v1.UpdateTokenResponse
+	18, // 32: tokens.v1.TokensService.ForceTokenExpiration:output_type -> google.protobuf.Empty
+	11, // 33: tokens.v1.TokensService.RegenerateToken:output_type -> tokens.v1.RegenerateTokenResponse
+	13, // 34: tokens.v1.TokensService.GetToken:output_type -> tokens.v1.GetTokenResponse
+	14, // 35: tokens.v1.TokensService.ListTokens:output_type -> tokens.v1.ListTokensResponse
+	15, // 36: tokens.v1.TokensService.ListPermissions:output_type -> tokens.v1.ListPermissionsResponse
 	30, // [30:37] is the sub-list for method output_type
 	23, // [23:30] is the sub-list for method input_type
 	23, // [23:23] is the sub-list for extension type_name
@@ -1014,7 +976,7 @@ func file_tokens_v1_tokens_v1_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: unsafe.Slice(unsafe.StringData(file_tokens_v1_tokens_v1_proto_rawDesc), len(file_tokens_v1_tokens_v1_proto_rawDesc)),
 			NumEnums:      0,
-			NumMessages:   18,
+			NumMessages:   17,
 			NumExtensions: 0,
 			NumServices:   1,
 		},