diff --git a/plugins/catalog-graphql/src/schema.gql b/plugins/catalog-graphql/src/schema.gql
index 5b2ee51db0..02abffa09e 100644
--- a/plugins/catalog-graphql/src/schema.gql
+++ b/plugins/catalog-graphql/src/schema.gql
@@ -8,14 +8,19 @@ type EntityMetadataAnnotation {
 
 type EntityMetadata {
   name: String!
-  namespace: String
+  namespace: String!
   annotations: JSONObject
+  annotation(name: String): JSON
+  labels: JSONObject
+  uid: String!
+  etag: String!
+  generation: Int!
 }
 
 type CatalogEntity {
-  apiVersion: String
+  apiVersion: String!
   kind: String!
-  metadata: EntityMetadata
+  metadata: EntityMetadata!
 }
 
 type CatalogQuery {