diff --git a/internal/api/graphql/graph/queryCollection/issue/listIssues.graphql b/internal/api/graphql/graph/queryCollection/issue/listIssues.graphql
index 9ace4ac1..318e8b22 100644
--- a/internal/api/graphql/graph/queryCollection/issue/listIssues.graphql
+++ b/internal/api/graphql/graph/queryCollection/issue/listIssues.graphql
@@ -10,10 +10,10 @@ query ($filter: IssueFilter, $first: Int, $after: String) {
         totalCount
         edges {
             node {
-				id
-				primaryName
+               id
+               primaryName
                 type
-				description
+                description
                 metadata {
                     created_at
                     created_by
diff --git a/internal/entity/activity.go b/internal/entity/activity.go
index 356dffbb..6a48e8d5 100644
--- a/internal/entity/activity.go
+++ b/internal/entity/activity.go
@@ -53,11 +53,9 @@ type ActivityHasIssue struct {
 }
 
 type ActivityAggregations struct {
-	Metadata
 }
 
 type ActivityFilter struct {
-	Metadata
 	Paginated
 	Status      []*string `json:"status"`
 	ServiceName []*string `json:"service_name"`
diff --git a/internal/entity/common.go b/internal/entity/common.go
index 4cf90236..044c9413 100644
--- a/internal/entity/common.go
+++ b/internal/entity/common.go
@@ -93,7 +93,6 @@ type ResultList struct {
 }
 
 type ListOptions struct {
-	Metadata
 	ShowTotalCount      bool `json:"show_total_count"`
 	ShowPageInfo        bool `json:"show_page_info"`
 	IncludeAggregations bool `json:"include_aggregations"`
@@ -108,7 +107,6 @@ func NewListOptions() *ListOptions {
 }
 
 type PageInfo struct {
-	Metadata
 	HasNextPage     *bool   `json:"has_next_page,omitempty"`
 	HasPreviousPage *bool   `json:"has_previous_page,omitempty"`
 	IsValidPage     *bool   `json:"is_valid_page,omitempty"`
@@ -120,7 +118,6 @@ type PageInfo struct {
 }
 
 type Page struct {
-	Metadata
 	After      *string `json:"after,omitempty"`
 	PageNumber *int    `json:"page_number,omitempty"`
 	IsCurrent  bool    `json:"is_current,omitempty"`
@@ -134,13 +131,11 @@ type List[T interface{}] struct {
 }
 
 type TimeFilter struct {
-	Metadata
 	After  time.Time `json:"after"`
 	Before time.Time `json:"before"`
 }
 
 type Paginated struct {
-	Metadata
 	First *int   `json:"first"`
 	After *int64 `json:"from"`
 }
@@ -152,7 +147,6 @@ func MaxPaginated() Paginated {
 }
 
 type Severity struct {
-	Metadata
 	Value string
 	Score float64
 	Cvss  Cvss
@@ -194,7 +188,6 @@ func NewSeverity(url string) Severity {
 }
 
 type Cvss struct {
-	Metadata
 	Vector        string
 	Base          *metric.Base
 	Temporal      *metric.Temporal
diff --git a/internal/entity/component.go b/internal/entity/component.go
index b10dbe09..cdbf16a4 100644
--- a/internal/entity/component.go
+++ b/internal/entity/component.go
@@ -17,7 +17,6 @@ type ComponentResult struct {
 }
 
 type ComponentFilter struct {
-	Metadata
 	Paginated
 	Name               []*string `json:"name"`
 	Id                 []*int64  `json:"id"`
@@ -25,5 +24,4 @@ type ComponentFilter struct {
 }
 
 type ComponentAggregations struct {
-	Metadata
 }
diff --git a/internal/entity/component_instance.go b/internal/entity/component_instance.go
index 5340766e..6b674f86 100644
--- a/internal/entity/component_instance.go
+++ b/internal/entity/component_instance.go
@@ -4,7 +4,6 @@
 package entity
 
 type ComponentInstanceFilter struct {
-	Metadata
 	Paginated
 	IssueMatchId       []*int64 `json:"issue_match_id"`
 	ServiceId          []*int64 `json:"service_id"`
@@ -13,7 +12,6 @@ type ComponentInstanceFilter struct {
 }
 
 type ComponentInstanceAggregations struct {
-	Metadata
 }
 
 type ComponentInstanceResult struct {
diff --git a/internal/entity/component_version.go b/internal/entity/component_version.go
index 06cb7fd7..8e1aa880 100644
--- a/internal/entity/component_version.go
+++ b/internal/entity/component_version.go
@@ -4,7 +4,6 @@
 package entity
 
 type ComponentVersionFilter struct {
-	Metadata
 	Paginated
 	Id          []*int64  `json:"id"`
 	IssueId     []*int64  `json:"issue_id"`
@@ -13,7 +12,6 @@ type ComponentVersionFilter struct {
 }
 
 type ComponentVersionAggregations struct {
-	Metadata
 }
 
 type ComponentVersionResult struct {
diff --git a/internal/entity/evidence.go b/internal/entity/evidence.go
index e68f93fb..ae6becf5 100644
--- a/internal/entity/evidence.go
+++ b/internal/entity/evidence.go
@@ -55,7 +55,6 @@ type Evidence struct {
 }
 
 type EvidenceFilter struct {
-	Metadata
 	Paginated
 	Id           []*int64 `json:"id"`
 	ActivityId   []*int64 `json:"activity_id"`
@@ -63,7 +62,6 @@ type EvidenceFilter struct {
 	UserId       []*int64 `json:"user_id"`
 }
 type EvidenceAggregations struct {
-	Metadata
 }
 
 type EvidenceResult struct {
diff --git a/internal/entity/issue.go b/internal/entity/issue.go
index abf3b66e..abd03e5c 100644
--- a/internal/entity/issue.go
+++ b/internal/entity/issue.go
@@ -8,7 +8,6 @@ import (
 )
 
 type IssueWithAggregations struct {
-	Metadata
 	IssueAggregations
 	Issue
 }
@@ -51,7 +50,6 @@ type IssueResult struct {
 }
 
 type IssueFilter struct {
-	Metadata
 	Paginated
 	PrimaryName                     []*string   `json:"primary_name"`
 	ServiceName                     []*string   `json:"service_name"`
@@ -68,7 +66,6 @@ type IssueFilter struct {
 }
 
 type IssueAggregations struct {
-	Metadata
 	Activites                     int64
 	IssueMatches                  int64
 	AffectedServices              int64
@@ -91,13 +88,11 @@ type Issue struct {
 }
 
 type IssueCount struct {
-	Metadata
 	Count int64     `json:"count"`
 	Type  IssueType `json:"type"`
 }
 
 type IssueTypeCounts struct {
-	Metadata
 	VulnerabilityCount   int64 `json:"vulnerability_count"`
 	PolicyViolationCount int64 `json:"policy_violation_count"`
 	SecurityEventCount   int64 `json:"security_event_count"`
diff --git a/internal/entity/issue_match.go b/internal/entity/issue_match.go
index 8206ad49..f4860364 100644
--- a/internal/entity/issue_match.go
+++ b/internal/entity/issue_match.go
@@ -55,7 +55,6 @@ type IssueMatch struct {
 }
 
 type IssueMatchFilter struct {
-	Metadata
 	Paginated
 	Id                  []*int64  `json:"id"`
 	AffectedServiceName []*string `json:"affected_service_name"`
diff --git a/internal/entity/issue_match_change.go b/internal/entity/issue_match_change.go
index 69122b36..bbcd54a5 100644
--- a/internal/entity/issue_match_change.go
+++ b/internal/entity/issue_match_change.go
@@ -40,7 +40,6 @@ type IssueMatchChange struct {
 }
 
 type IssueMatchChangeFilter struct {
-	Metadata
 	Paginated
 	Id           []*int64  `json:"id"`
 	ActivityId   []*int64  `json:"activity_id"`
diff --git a/internal/entity/issue_repository.go b/internal/entity/issue_repository.go
index cef0b830..77b79783 100644
--- a/internal/entity/issue_repository.go
+++ b/internal/entity/issue_repository.go
@@ -13,7 +13,6 @@ type BaseIssueRepository struct {
 }
 
 type IssueRepositoryFilter struct {
-	Metadata
 	Paginated
 	Id          []*int64  `json:"id"`
 	ServiceId   []*int64  `json:"service_id"`
@@ -35,7 +34,6 @@ func NewIssueRepositoryFilter() *IssueRepositoryFilter {
 }
 
 type IssueRepositoryAggregations struct {
-	Metadata
 }
 
 type IssueRepository struct {
diff --git a/internal/entity/issue_variant.go b/internal/entity/issue_variant.go
index 8408894e..08144a0c 100644
--- a/internal/entity/issue_variant.go
+++ b/internal/entity/issue_variant.go
@@ -16,7 +16,6 @@ type IssueVariant struct {
 }
 
 type IssueVariantFilter struct {
-	Metadata
 	Paginated
 	Id                []*int64  `json:"id"`
 	SecondaryName     []*string `json:"secondary_name"`
@@ -42,7 +41,6 @@ func NewIssueVariantFilter() *IssueVariantFilter {
 }
 
 type IssueVariantAggregations struct {
-	Metadata
 }
 
 type IssueVariantResult struct {
diff --git a/internal/entity/service.go b/internal/entity/service.go
index 865d6804..db836ec0 100644
--- a/internal/entity/service.go
+++ b/internal/entity/service.go
@@ -15,11 +15,9 @@ type BaseService struct {
 }
 
 type ServiceAggregations struct {
-	Metadata
 }
 
 type ServiceFilter struct {
-	Metadata
 	Paginated
 	SupportGroupName    []*string `json:"support_group_name"`
 	Id                  []*int64  `json:"id"`
diff --git a/internal/entity/severity.go b/internal/entity/severity.go
index 83e88b96..ca9e7541 100644
--- a/internal/entity/severity.go
+++ b/internal/entity/severity.go
@@ -4,7 +4,6 @@
 package entity
 
 type SeverityFilter struct {
-	Metadata
 	IssueMatchId []*int64 `json:"issue_match_id"`
 	IssueId      []*int64 `json:"issue_id"`
 }
diff --git a/internal/entity/support_group.go b/internal/entity/support_group.go
index eb307517..5aaf5acb 100644
--- a/internal/entity/support_group.go
+++ b/internal/entity/support_group.go
@@ -10,7 +10,6 @@ type SupportGroup struct {
 }
 
 type SupportGroupFilter struct {
-	Metadata
 	Paginated
 	Id        []*int64  `json:"id"`
 	ServiceId []*int64  `json:"service_id"`
@@ -19,7 +18,6 @@ type SupportGroupFilter struct {
 }
 
 type SupportGroupAggregations struct {
-	Metadata
 }
 
 type SupportGroupResult struct {
diff --git a/internal/entity/user.go b/internal/entity/user.go
index da53a7ac..4f373bcd 100644
--- a/internal/entity/user.go
+++ b/internal/entity/user.go
@@ -20,7 +20,6 @@ type User struct {
 }
 
 type UserFilter struct {
-	Metadata
 	Paginated
 	Name           []*string  `json:"name"`
 	UniqueUserID   []*string  `json:"uniqueUserId"`
@@ -31,7 +30,6 @@ type UserFilter struct {
 }
 
 type UserAggregations struct {
-	Metadata
 }
 
 type UserResult struct {