diff --git a/openmetadata-spec/src/main/antlr4/org/openmetadata/schema/EntityLink.g4 b/openmetadata-spec/src/main/antlr4/org/openmetadata/schema/EntityLink.g4
index 2f092aaa6a1..654576840a6 100644
--- a/openmetadata-spec/src/main/antlr4/org/openmetadata/schema/EntityLink.g4
+++ b/openmetadata-spec/src/main/antlr4/org/openmetadata/schema/EntityLink.g4
@@ -28,16 +28,90 @@ RESERVED_START
     ;
 
 ENTITY_TYPE
-    : 'table' | 'database' | 'databaseSchema' | 'metrics' | 'dashboard' | 'pipeline'
-    | 'chart' | 'report' | 'topic' | 'mlmodel' | 'bot' | 'THREAD' | 'location'
-    | 'glossary' | 'glossaryTerm' | 'tag' | 'classification' | 'type'
-    | 'testDefinition' | 'testSuite' | 'testCase' | 'dashboardDataModel'
+    : 'table'
+    | 'topic'
+    | 'classification'
+    | 'dashboard'
+    | 'pipeline'
+    | 'database'
+    | 'databaseSchema'
+    | 'glossary'
+    | 'glossaryTerm'
+    | 'databaseService'
+    | 'messagingService'
+    | 'metadataService'
+    | 'dashboardService'
+    | 'pipelineService'
+    | 'mlmodelService'
+    | 'storageService'
+    | 'searchService'
+    | 'webhook'
+    | 'mlmodel'
+    | 'type'
+    | 'team'
+    | 'user'
+    | 'bot'
+    | 'role'
+    | 'policy'
+    | 'testSuite'
+    | 'testCase'
+    | 'dataInsightChart'
+    | 'kpi'
+    | 'alert'
+    | 'container'
+    | 'tag'
+    | 'dashboardDataModel'
+    | 'subscription'
+    | 'chart'
+    | 'domain'
+    | 'dataProduct'
+    | 'sampleData'
+    | 'storedProcedure'
+    | 'searchIndex'
+    | 'appMarketPlaceDefinition'
+    | 'app'
+    | 'persona'
+    | 'docStore'
+    | 'Page'
+    | 'KnowLedgePanels'
+    | 'govern'
+    | 'all'
+    | 'customMetric'
     ;
 
 ENTITY_FIELD
-    : 'columns' | 'description' | 'tags' | 'tasks'
+    : 'description'
+    | 'columns'
+    | 'schemaFields'
+    | 'tags'
+    | 'tasks'
+    | 'mlFeatures'
+    | 'schemaText'
+    | 'owner'
+    | 'reviewers'
+    | 'synonyms'
+    | 'relatedTerms'
+    | 'references'
+    | 'extension'
+    | 'displayName'
+    | 'name'
+    | 'messageSchema'
+    | 'charts'
+    | 'dataModel'
+    | 'constraint'
+    | 'tableConstraints'
+    | 'partitions'
+    | 'replicationFactor'
+    | 'sourceUrl'
+    | 'mutuallyExclusive'
+    | 'experts'
+    | 'fields'
+    | 'followers'
+    | 'appConfiguration'
     ;
 
+    
+
 NAME_OR_FQN
     : ~(':')+ ('>')*? ~(':'|'>')+
     ;