diff --git a/packages/catalog-model/examples/acme/org.yaml b/packages/catalog-model/examples/acme/org.yaml
index 35dfa2633c..f0a5003f7c 100644
--- a/packages/catalog-model/examples/acme/org.yaml
+++ b/packages/catalog-model/examples/acme/org.yaml
@@ -6,6 +6,8 @@ metadata:
   links:
     - url: http://www.acme.com/
       name: Website
+    - url: https://meta.wikimedia.org/wiki/
+      name: Intranet
 spec:
   type: organization
   profile:
diff --git a/packages/catalog-model/examples/apis/petstore-api.yaml b/packages/catalog-model/examples/apis/petstore-api.yaml
index a314b4e255..4c18b16a16 100644
--- a/packages/catalog-model/examples/apis/petstore-api.yaml
+++ b/packages/catalog-model/examples/apis/petstore-api.yaml
@@ -6,6 +6,13 @@ metadata:
   tags:
     - store
     - rest
+  links:
+    - url: https://github.com/swagger-api/swagger-petstore
+      title: GitHub Repo
+      icon: github
+    - url: https://github.com/OAI/OpenAPI-Specification/blob/master/examples/v3.0/petstore.yaml
+      title: API Spec
+      code: code
 spec:
   type: openapi
   lifecycle: experimental
diff --git a/packages/catalog-model/examples/apis/swapi-graphql.yaml b/packages/catalog-model/examples/apis/swapi-graphql.yaml
index 85b0bda3a3..f3d924fc53 100644
--- a/packages/catalog-model/examples/apis/swapi-graphql.yaml
+++ b/packages/catalog-model/examples/apis/swapi-graphql.yaml
@@ -11,5 +11,1170 @@ spec:
   type: graphql
   lifecycle: production
   owner: team-b
-  definition:
-    $text: https://github.com/graphql/swapi-graphql/blob/master/schema.graphql
+  definition: |
+    schema {
+      query: Root
+    }
+
+    """A single film."""
+    type Film implements Node {
+      """The title of this film."""
+      title: String
+
+      """The episode number of this film."""
+      episodeID: Int
+
+      """The opening paragraphs at the beginning of this film."""
+      openingCrawl: String
+
+      """The name of the director of this film."""
+      director: String
+
+      """The name(s) of the producer(s) of this film."""
+      producers: [String]
+
+      """The ISO 8601 date format of film release at original creator country."""
+      releaseDate: String
+      speciesConnection(after: String, first: Int, before: String, last: Int): FilmSpeciesConnection
+      starshipConnection(after: String, first: Int, before: String, last: Int): FilmStarshipsConnection
+      vehicleConnection(after: String, first: Int, before: String, last: Int): FilmVehiclesConnection
+      characterConnection(after: String, first: Int, before: String, last: Int): FilmCharactersConnection
+      planetConnection(after: String, first: Int, before: String, last: Int): FilmPlanetsConnection
+
+      """The ISO 8601 date format of the time that this resource was created."""
+      created: String
+
+      """The ISO 8601 date format of the time that this resource was edited."""
+      edited: String
+
+      """The ID of an object"""
+      id: ID!
+    }
+
+    """A connection to a list of items."""
+    type FilmCharactersConnection {
+      """Information to aid in pagination."""
+      pageInfo: PageInfo!
+
+      """A list of edges."""
+      edges: [FilmCharactersEdge]
+
+      """
+      A count of the total number of objects in this connection, ignoring pagination.
+      This allows a client to fetch the first five objects by passing "5" as the
+      argument to "first", then fetch the total count so it could display "5 of 83",
+      for example.
+      """
+      totalCount: Int
+
+      """
+      A list of all of the objects returned in the connection. This is a convenience
+      field provided for quickly exploring the API; rather than querying for
+      "{ edges { node } }" when no edge data is needed, this field can be be used
+      instead. Note that when clients like Relay need to fetch the "cursor" field on
+      the edge to enable efficient pagination, this shortcut cannot be used, and the
+      full "{ edges { node } }" version should be used instead.
+      """
+      characters: [Person]
+    }
+
+    """An edge in a connection."""
+    type FilmCharactersEdge {
+      """The item at the end of the edge"""
+      node: Person
+
+      """A cursor for use in pagination"""
+      cursor: String!
+    }
+
+    """A connection to a list of items."""
+    type FilmPlanetsConnection {
+      """Information to aid in pagination."""
+      pageInfo: PageInfo!
+
+      """A list of edges."""
+      edges: [FilmPlanetsEdge]
+
+      """
+      A count of the total number of objects in this connection, ignoring pagination.
+      This allows a client to fetch the first five objects by passing "5" as the
+      argument to "first", then fetch the total count so it could display "5 of 83",
+      for example.
+      """
+      totalCount: Int
+
+      """
+      A list of all of the objects returned in the connection. This is a convenience
+      field provided for quickly exploring the API; rather than querying for
+      "{ edges { node } }" when no edge data is needed, this field can be be used
+      instead. Note that when clients like Relay need to fetch the "cursor" field on
+      the edge to enable efficient pagination, this shortcut cannot be used, and the
+      full "{ edges { node } }" version should be used instead.
+      """
+      planets: [Planet]
+    }
+
+    """An edge in a connection."""
+    type FilmPlanetsEdge {
+      """The item at the end of the edge"""
+      node: Planet
+
+      """A cursor for use in pagination"""
+      cursor: String!
+    }
+
+    """A connection to a list of items."""
+    type FilmsConnection {
+      """Information to aid in pagination."""
+      pageInfo: PageInfo!
+
+      """A list of edges."""
+      edges: [FilmsEdge]
+
+      """
+      A count of the total number of objects in this connection, ignoring pagination.
+      This allows a client to fetch the first five objects by passing "5" as the
+      argument to "first", then fetch the total count so it could display "5 of 83",
+      for example.
+      """
+      totalCount: Int
+
+      """
+      A list of all of the objects returned in the connection. This is a convenience
+      field provided for quickly exploring the API; rather than querying for
+      "{ edges { node } }" when no edge data is needed, this field can be be used
+      instead. Note that when clients like Relay need to fetch the "cursor" field on
+      the edge to enable efficient pagination, this shortcut cannot be used, and the
+      full "{ edges { node } }" version should be used instead.
+      """
+      films: [Film]
+    }
+
+    """An edge in a connection."""
+    type FilmsEdge {
+      """The item at the end of the edge"""
+      node: Film
+
+      """A cursor for use in pagination"""
+      cursor: String!
+    }
+
+    """A connection to a list of items."""
+    type FilmSpeciesConnection {
+      """Information to aid in pagination."""
+      pageInfo: PageInfo!
+
+      """A list of edges."""
+      edges: [FilmSpeciesEdge]
+
+      """
+      A count of the total number of objects in this connection, ignoring pagination.
+      This allows a client to fetch the first five objects by passing "5" as the
+      argument to "first", then fetch the total count so it could display "5 of 83",
+      for example.
+      """
+      totalCount: Int
+
+      """
+      A list of all of the objects returned in the connection. This is a convenience
+      field provided for quickly exploring the API; rather than querying for
+      "{ edges { node } }" when no edge data is needed, this field can be be used
+      instead. Note that when clients like Relay need to fetch the "cursor" field on
+      the edge to enable efficient pagination, this shortcut cannot be used, and the
+      full "{ edges { node } }" version should be used instead.
+      """
+      species: [Species]
+    }
+
+    """An edge in a connection."""
+    type FilmSpeciesEdge {
+      """The item at the end of the edge"""
+      node: Species
+
+      """A cursor for use in pagination"""
+      cursor: String!
+    }
+
+    """A connection to a list of items."""
+    type FilmStarshipsConnection {
+      """Information to aid in pagination."""
+      pageInfo: PageInfo!
+
+      """A list of edges."""
+      edges: [FilmStarshipsEdge]
+
+      """
+      A count of the total number of objects in this connection, ignoring pagination.
+      This allows a client to fetch the first five objects by passing "5" as the
+      argument to "first", then fetch the total count so it could display "5 of 83",
+      for example.
+      """
+      totalCount: Int
+
+      """
+      A list of all of the objects returned in the connection. This is a convenience
+      field provided for quickly exploring the API; rather than querying for
+      "{ edges { node } }" when no edge data is needed, this field can be be used
+      instead. Note that when clients like Relay need to fetch the "cursor" field on
+      the edge to enable efficient pagination, this shortcut cannot be used, and the
+      full "{ edges { node } }" version should be used instead.
+      """
+      starships: [Starship]
+    }
+
+    """An edge in a connection."""
+    type FilmStarshipsEdge {
+      """The item at the end of the edge"""
+      node: Starship
+
+      """A cursor for use in pagination"""
+      cursor: String!
+    }
+
+    """A connection to a list of items."""
+    type FilmVehiclesConnection {
+      """Information to aid in pagination."""
+      pageInfo: PageInfo!
+
+      """A list of edges."""
+      edges: [FilmVehiclesEdge]
+
+      """
+      A count of the total number of objects in this connection, ignoring pagination.
+      This allows a client to fetch the first five objects by passing "5" as the
+      argument to "first", then fetch the total count so it could display "5 of 83",
+      for example.
+      """
+      totalCount: Int
+
+      """
+      A list of all of the objects returned in the connection. This is a convenience
+      field provided for quickly exploring the API; rather than querying for
+      "{ edges { node } }" when no edge data is needed, this field can be be used
+      instead. Note that when clients like Relay need to fetch the "cursor" field on
+      the edge to enable efficient pagination, this shortcut cannot be used, and the
+      full "{ edges { node } }" version should be used instead.
+      """
+      vehicles: [Vehicle]
+    }
+
+    """An edge in a connection."""
+    type FilmVehiclesEdge {
+      """The item at the end of the edge"""
+      node: Vehicle
+
+      """A cursor for use in pagination"""
+      cursor: String!
+    }
+
+    """An object with an ID"""
+    interface Node {
+      """The id of the object."""
+      id: ID!
+    }
+
+    """Information about pagination in a connection."""
+    type PageInfo {
+      """When paginating forwards, are there more items?"""
+      hasNextPage: Boolean!
+
+      """When paginating backwards, are there more items?"""
+      hasPreviousPage: Boolean!
+
+      """When paginating backwards, the cursor to continue."""
+      startCursor: String
+
+      """When paginating forwards, the cursor to continue."""
+      endCursor: String
+    }
+
+    """A connection to a list of items."""
+    type PeopleConnection {
+      """Information to aid in pagination."""
+      pageInfo: PageInfo!
+
+      """A list of edges."""
+      edges: [PeopleEdge]
+
+      """
+      A count of the total number of objects in this connection, ignoring pagination.
+      This allows a client to fetch the first five objects by passing "5" as the
+      argument to "first", then fetch the total count so it could display "5 of 83",
+      for example.
+      """
+      totalCount: Int
+
+      """
+      A list of all of the objects returned in the connection. This is a convenience
+      field provided for quickly exploring the API; rather than querying for
+      "{ edges { node } }" when no edge data is needed, this field can be be used
+      instead. Note that when clients like Relay need to fetch the "cursor" field on
+      the edge to enable efficient pagination, this shortcut cannot be used, and the
+      full "{ edges { node } }" version should be used instead.
+      """
+      people: [Person]
+    }
+
+    """An edge in a connection."""
+    type PeopleEdge {
+      """The item at the end of the edge"""
+      node: Person
+
+      """A cursor for use in pagination"""
+      cursor: String!
+    }
+
+    """An individual person or character within the Star Wars universe."""
+    type Person implements Node {
+      """The name of this person."""
+      name: String
+
+      """
+      The birth year of the person, using the in-universe standard of BBY or ABY -
+      Before the Battle of Yavin or After the Battle of Yavin. The Battle of Yavin is
+      a battle that occurs at the end of Star Wars episode IV: A New Hope.
+      """
+      birthYear: String
+
+      """
+      The eye color of this person. Will be "unknown" if not known or "n/a" if the
+      person does not have an eye.
+      """
+      eyeColor: String
+
+      """
+      The gender of this person. Either "Male", "Female" or "unknown",
+      "n/a" if the person does not have a gender.
+      """
+      gender: String
+
+      """
+      The hair color of this person. Will be "unknown" if not known or "n/a" if the
+      person does not have hair.
+      """
+      hairColor: String
+
+      """The height of the person in centimeters."""
+      height: Int
+
+      """The mass of the person in kilograms."""
+      mass: Float
+
+      """The skin color of this person."""
+      skinColor: String
+
+      """A planet that this person was born on or inhabits."""
+      homeworld: Planet
+      filmConnection(after: String, first: Int, before: String, last: Int): PersonFilmsConnection
+
+      """The species that this person belongs to, or null if unknown."""
+      species: Species
+      starshipConnection(after: String, first: Int, before: String, last: Int): PersonStarshipsConnection
+      vehicleConnection(after: String, first: Int, before: String, last: Int): PersonVehiclesConnection
+
+      """The ISO 8601 date format of the time that this resource was created."""
+      created: String
+
+      """The ISO 8601 date format of the time that this resource was edited."""
+      edited: String
+
+      """The ID of an object"""
+      id: ID!
+    }
+
+    """A connection to a list of items."""
+    type PersonFilmsConnection {
+      """Information to aid in pagination."""
+      pageInfo: PageInfo!
+
+      """A list of edges."""
+      edges: [PersonFilmsEdge]
+
+      """
+      A count of the total number of objects in this connection, ignoring pagination.
+      This allows a client to fetch the first five objects by passing "5" as the
+      argument to "first", then fetch the total count so it could display "5 of 83",
+      for example.
+      """
+      totalCount: Int
+
+      """
+      A list of all of the objects returned in the connection. This is a convenience
+      field provided for quickly exploring the API; rather than querying for
+      "{ edges { node } }" when no edge data is needed, this field can be be used
+      instead. Note that when clients like Relay need to fetch the "cursor" field on
+      the edge to enable efficient pagination, this shortcut cannot be used, and the
+      full "{ edges { node } }" version should be used instead.
+      """
+      films: [Film]
+    }
+
+    """An edge in a connection."""
+    type PersonFilmsEdge {
+      """The item at the end of the edge"""
+      node: Film
+
+      """A cursor for use in pagination"""
+      cursor: String!
+    }
+
+    """A connection to a list of items."""
+    type PersonStarshipsConnection {
+      """Information to aid in pagination."""
+      pageInfo: PageInfo!
+
+      """A list of edges."""
+      edges: [PersonStarshipsEdge]
+
+      """
+      A count of the total number of objects in this connection, ignoring pagination.
+      This allows a client to fetch the first five objects by passing "5" as the
+      argument to "first", then fetch the total count so it could display "5 of 83",
+      for example.
+      """
+      totalCount: Int
+
+      """
+      A list of all of the objects returned in the connection. This is a convenience
+      field provided for quickly exploring the API; rather than querying for
+      "{ edges { node } }" when no edge data is needed, this field can be be used
+      instead. Note that when clients like Relay need to fetch the "cursor" field on
+      the edge to enable efficient pagination, this shortcut cannot be used, and the
+      full "{ edges { node } }" version should be used instead.
+      """
+      starships: [Starship]
+    }
+
+    """An edge in a connection."""
+    type PersonStarshipsEdge {
+      """The item at the end of the edge"""
+      node: Starship
+
+      """A cursor for use in pagination"""
+      cursor: String!
+    }
+
+    """A connection to a list of items."""
+    type PersonVehiclesConnection {
+      """Information to aid in pagination."""
+      pageInfo: PageInfo!
+
+      """A list of edges."""
+      edges: [PersonVehiclesEdge]
+
+      """
+      A count of the total number of objects in this connection, ignoring pagination.
+      This allows a client to fetch the first five objects by passing "5" as the
+      argument to "first", then fetch the total count so it could display "5 of 83",
+      for example.
+      """
+      totalCount: Int
+
+      """
+      A list of all of the objects returned in the connection. This is a convenience
+      field provided for quickly exploring the API; rather than querying for
+      "{ edges { node } }" when no edge data is needed, this field can be be used
+      instead. Note that when clients like Relay need to fetch the "cursor" field on
+      the edge to enable efficient pagination, this shortcut cannot be used, and the
+      full "{ edges { node } }" version should be used instead.
+      """
+      vehicles: [Vehicle]
+    }
+
+    """An edge in a connection."""
+    type PersonVehiclesEdge {
+      """The item at the end of the edge"""
+      node: Vehicle
+
+      """A cursor for use in pagination"""
+      cursor: String!
+    }
+
+    """
+    A large mass, planet or planetoid in the Star Wars Universe, at the time of
+    0 ABY.
+    """
+    type Planet implements Node {
+      """The name of this planet."""
+      name: String
+
+      """The diameter of this planet in kilometers."""
+      diameter: Int
+
+      """
+      The number of standard hours it takes for this planet to complete a single
+      rotation on its axis.
+      """
+      rotationPeriod: Int
+
+      """
+      The number of standard days it takes for this planet to complete a single orbit
+      of its local star.
+      """
+      orbitalPeriod: Int
+
+      """
+      A number denoting the gravity of this planet, where "1" is normal or 1 standard
+      G. "2" is twice or 2 standard Gs. "0.5" is half or 0.5 standard Gs.
+      """
+      gravity: String
+
+      """The average population of sentient beings inhabiting this planet."""
+      population: Float
+
+      """The climates of this planet."""
+      climates: [String]
+
+      """The terrains of this planet."""
+      terrains: [String]
+
+      """
+      The percentage of the planet surface that is naturally occuring water or bodies
+      of water.
+      """
+      surfaceWater: Float
+      residentConnection(after: String, first: Int, before: String, last: Int): PlanetResidentsConnection
+      filmConnection(after: String, first: Int, before: String, last: Int): PlanetFilmsConnection
+
+      """The ISO 8601 date format of the time that this resource was created."""
+      created: String
+
+      """The ISO 8601 date format of the time that this resource was edited."""
+      edited: String
+
+      """The ID of an object"""
+      id: ID!
+    }
+
+    """A connection to a list of items."""
+    type PlanetFilmsConnection {
+      """Information to aid in pagination."""
+      pageInfo: PageInfo!
+
+      """A list of edges."""
+      edges: [PlanetFilmsEdge]
+
+      """
+      A count of the total number of objects in this connection, ignoring pagination.
+      This allows a client to fetch the first five objects by passing "5" as the
+      argument to "first", then fetch the total count so it could display "5 of 83",
+      for example.
+      """
+      totalCount: Int
+
+      """
+      A list of all of the objects returned in the connection. This is a convenience
+      field provided for quickly exploring the API; rather than querying for
+      "{ edges { node } }" when no edge data is needed, this field can be be used
+      instead. Note that when clients like Relay need to fetch the "cursor" field on
+      the edge to enable efficient pagination, this shortcut cannot be used, and the
+      full "{ edges { node } }" version should be used instead.
+      """
+      films: [Film]
+    }
+
+    """An edge in a connection."""
+    type PlanetFilmsEdge {
+      """The item at the end of the edge"""
+      node: Film
+
+      """A cursor for use in pagination"""
+      cursor: String!
+    }
+
+    """A connection to a list of items."""
+    type PlanetResidentsConnection {
+      """Information to aid in pagination."""
+      pageInfo: PageInfo!
+
+      """A list of edges."""
+      edges: [PlanetResidentsEdge]
+
+      """
+      A count of the total number of objects in this connection, ignoring pagination.
+      This allows a client to fetch the first five objects by passing "5" as the
+      argument to "first", then fetch the total count so it could display "5 of 83",
+      for example.
+      """
+      totalCount: Int
+
+      """
+      A list of all of the objects returned in the connection. This is a convenience
+      field provided for quickly exploring the API; rather than querying for
+      "{ edges { node } }" when no edge data is needed, this field can be be used
+      instead. Note that when clients like Relay need to fetch the "cursor" field on
+      the edge to enable efficient pagination, this shortcut cannot be used, and the
+      full "{ edges { node } }" version should be used instead.
+      """
+      residents: [Person]
+    }
+
+    """An edge in a connection."""
+    type PlanetResidentsEdge {
+      """The item at the end of the edge"""
+      node: Person
+
+      """A cursor for use in pagination"""
+      cursor: String!
+    }
+
+    """A connection to a list of items."""
+    type PlanetsConnection {
+      """Information to aid in pagination."""
+      pageInfo: PageInfo!
+
+      """A list of edges."""
+      edges: [PlanetsEdge]
+
+      """
+      A count of the total number of objects in this connection, ignoring pagination.
+      This allows a client to fetch the first five objects by passing "5" as the
+      argument to "first", then fetch the total count so it could display "5 of 83",
+      for example.
+      """
+      totalCount: Int
+
+      """
+      A list of all of the objects returned in the connection. This is a convenience
+      field provided for quickly exploring the API; rather than querying for
+      "{ edges { node } }" when no edge data is needed, this field can be be used
+      instead. Note that when clients like Relay need to fetch the "cursor" field on
+      the edge to enable efficient pagination, this shortcut cannot be used, and the
+      full "{ edges { node } }" version should be used instead.
+      """
+      planets: [Planet]
+    }
+
+    """An edge in a connection."""
+    type PlanetsEdge {
+      """The item at the end of the edge"""
+      node: Planet
+
+      """A cursor for use in pagination"""
+      cursor: String!
+    }
+
+    type Root {
+      allFilms(after: String, first: Int, before: String, last: Int): FilmsConnection
+      film(id: ID, filmID: ID): Film
+      allPeople(after: String, first: Int, before: String, last: Int): PeopleConnection
+      person(id: ID, personID: ID): Person
+      allPlanets(after: String, first: Int, before: String, last: Int): PlanetsConnection
+      planet(id: ID, planetID: ID): Planet
+      allSpecies(after: String, first: Int, before: String, last: Int): SpeciesConnection
+      species(id: ID, speciesID: ID): Species
+      allStarships(after: String, first: Int, before: String, last: Int): StarshipsConnection
+      starship(id: ID, starshipID: ID): Starship
+      allVehicles(after: String, first: Int, before: String, last: Int): VehiclesConnection
+      vehicle(id: ID, vehicleID: ID): Vehicle
+
+      """Fetches an object given its ID"""
+      node(
+        """The ID of an object"""
+        id: ID!
+      ): Node
+    }
+
+    """A type of person or character within the Star Wars Universe."""
+    type Species implements Node {
+      """The name of this species."""
+      name: String
+
+      """The classification of this species, such as "mammal" or "reptile"."""
+      classification: String
+
+      """The designation of this species, such as "sentient"."""
+      designation: String
+
+      """The average height of this species in centimeters."""
+      averageHeight: Float
+
+      """The average lifespan of this species in years, null if unknown."""
+      averageLifespan: Int
+
+      """
+      Common eye colors for this species, null if this species does not typically
+      have eyes.
+      """
+      eyeColors: [String]
+
+      """
+      Common hair colors for this species, null if this species does not typically
+      have hair.
+      """
+      hairColors: [String]
+
+      """
+      Common skin colors for this species, null if this species does not typically
+      have skin.
+      """
+      skinColors: [String]
+
+      """The language commonly spoken by this species."""
+      language: String
+
+      """A planet that this species originates from."""
+      homeworld: Planet
+      personConnection(after: String, first: Int, before: String, last: Int): SpeciesPeopleConnection
+      filmConnection(after: String, first: Int, before: String, last: Int): SpeciesFilmsConnection
+
+      """The ISO 8601 date format of the time that this resource was created."""
+      created: String
+
+      """The ISO 8601 date format of the time that this resource was edited."""
+      edited: String
+
+      """The ID of an object"""
+      id: ID!
+    }
+
+    """A connection to a list of items."""
+    type SpeciesConnection {
+      """Information to aid in pagination."""
+      pageInfo: PageInfo!
+
+      """A list of edges."""
+      edges: [SpeciesEdge]
+
+      """
+      A count of the total number of objects in this connection, ignoring pagination.
+      This allows a client to fetch the first five objects by passing "5" as the
+      argument to "first", then fetch the total count so it could display "5 of 83",
+      for example.
+      """
+      totalCount: Int
+
+      """
+      A list of all of the objects returned in the connection. This is a convenience
+      field provided for quickly exploring the API; rather than querying for
+      "{ edges { node } }" when no edge data is needed, this field can be be used
+      instead. Note that when clients like Relay need to fetch the "cursor" field on
+      the edge to enable efficient pagination, this shortcut cannot be used, and the
+      full "{ edges { node } }" version should be used instead.
+      """
+      species: [Species]
+    }
+
+    """An edge in a connection."""
+    type SpeciesEdge {
+      """The item at the end of the edge"""
+      node: Species
+
+      """A cursor for use in pagination"""
+      cursor: String!
+    }
+
+    """A connection to a list of items."""
+    type SpeciesFilmsConnection {
+      """Information to aid in pagination."""
+      pageInfo: PageInfo!
+
+      """A list of edges."""
+      edges: [SpeciesFilmsEdge]
+
+      """
+      A count of the total number of objects in this connection, ignoring pagination.
+      This allows a client to fetch the first five objects by passing "5" as the
+      argument to "first", then fetch the total count so it could display "5 of 83",
+      for example.
+      """
+      totalCount: Int
+
+      """
+      A list of all of the objects returned in the connection. This is a convenience
+      field provided for quickly exploring the API; rather than querying for
+      "{ edges { node } }" when no edge data is needed, this field can be be used
+      instead. Note that when clients like Relay need to fetch the "cursor" field on
+      the edge to enable efficient pagination, this shortcut cannot be used, and the
+      full "{ edges { node } }" version should be used instead.
+      """
+      films: [Film]
+    }
+
+    """An edge in a connection."""
+    type SpeciesFilmsEdge {
+      """The item at the end of the edge"""
+      node: Film
+
+      """A cursor for use in pagination"""
+      cursor: String!
+    }
+
+    """A connection to a list of items."""
+    type SpeciesPeopleConnection {
+      """Information to aid in pagination."""
+      pageInfo: PageInfo!
+
+      """A list of edges."""
+      edges: [SpeciesPeopleEdge]
+
+      """
+      A count of the total number of objects in this connection, ignoring pagination.
+      This allows a client to fetch the first five objects by passing "5" as the
+      argument to "first", then fetch the total count so it could display "5 of 83",
+      for example.
+      """
+      totalCount: Int
+
+      """
+      A list of all of the objects returned in the connection. This is a convenience
+      field provided for quickly exploring the API; rather than querying for
+      "{ edges { node } }" when no edge data is needed, this field can be be used
+      instead. Note that when clients like Relay need to fetch the "cursor" field on
+      the edge to enable efficient pagination, this shortcut cannot be used, and the
+      full "{ edges { node } }" version should be used instead.
+      """
+      people: [Person]
+    }
+
+    """An edge in a connection."""
+    type SpeciesPeopleEdge {
+      """The item at the end of the edge"""
+      node: Person
+
+      """A cursor for use in pagination"""
+      cursor: String!
+    }
+
+    """A single transport craft that has hyperdrive capability."""
+    type Starship implements Node {
+      """The name of this starship. The common name, such as "Death Star"."""
+      name: String
+
+      """
+      The model or official name of this starship. Such as "T-65 X-wing" or "DS-1
+      Orbital Battle Station".
+      """
+      model: String
+
+      """
+      The class of this starship, such as "Starfighter" or "Deep Space Mobile
+      Battlestation"
+      """
+      starshipClass: String
+
+      """The manufacturers of this starship."""
+      manufacturers: [String]
+
+      """The cost of this starship new, in galactic credits."""
+      costInCredits: Float
+
+      """The length of this starship in meters."""
+      length: Float
+
+      """The number of personnel needed to run or pilot this starship."""
+      crew: String
+
+      """The number of non-essential people this starship can transport."""
+      passengers: String
+
+      """
+      The maximum speed of this starship in atmosphere. null if this starship is
+      incapable of atmosphering flight.
+      """
+      maxAtmospheringSpeed: Int
+
+      """The class of this starships hyperdrive."""
+      hyperdriveRating: Float
+
+      """
+      The Maximum number of Megalights this starship can travel in a standard hour.
+      A "Megalight" is a standard unit of distance and has never been defined before
+      within the Star Wars universe. This figure is only really useful for measuring
+      the difference in speed of starships. We can assume it is similar to AU, the
+      distance between our Sun (Sol) and Earth.
+      """
+      MGLT: Int
+
+      """The maximum number of kilograms that this starship can transport."""
+      cargoCapacity: Float
+
+      """
+      The maximum length of time that this starship can provide consumables for its
+      entire crew without having to resupply.
+      """
+      consumables: String
+      pilotConnection(after: String, first: Int, before: String, last: Int): StarshipPilotsConnection
+      filmConnection(after: String, first: Int, before: String, last: Int): StarshipFilmsConnection
+
+      """The ISO 8601 date format of the time that this resource was created."""
+      created: String
+
+      """The ISO 8601 date format of the time that this resource was edited."""
+      edited: String
+
+      """The ID of an object"""
+      id: ID!
+    }
+
+    """A connection to a list of items."""
+    type StarshipFilmsConnection {
+      """Information to aid in pagination."""
+      pageInfo: PageInfo!
+
+      """A list of edges."""
+      edges: [StarshipFilmsEdge]
+
+      """
+      A count of the total number of objects in this connection, ignoring pagination.
+      This allows a client to fetch the first five objects by passing "5" as the
+      argument to "first", then fetch the total count so it could display "5 of 83",
+      for example.
+      """
+      totalCount: Int
+
+      """
+      A list of all of the objects returned in the connection. This is a convenience
+      field provided for quickly exploring the API; rather than querying for
+      "{ edges { node } }" when no edge data is needed, this field can be be used
+      instead. Note that when clients like Relay need to fetch the "cursor" field on
+      the edge to enable efficient pagination, this shortcut cannot be used, and the
+      full "{ edges { node } }" version should be used instead.
+      """
+      films: [Film]
+    }
+
+    """An edge in a connection."""
+    type StarshipFilmsEdge {
+      """The item at the end of the edge"""
+      node: Film
+
+      """A cursor for use in pagination"""
+      cursor: String!
+    }
+
+    """A connection to a list of items."""
+    type StarshipPilotsConnection {
+      """Information to aid in pagination."""
+      pageInfo: PageInfo!
+
+      """A list of edges."""
+      edges: [StarshipPilotsEdge]
+
+      """
+      A count of the total number of objects in this connection, ignoring pagination.
+      This allows a client to fetch the first five objects by passing "5" as the
+      argument to "first", then fetch the total count so it could display "5 of 83",
+      for example.
+      """
+      totalCount: Int
+
+      """
+      A list of all of the objects returned in the connection. This is a convenience
+      field provided for quickly exploring the API; rather than querying for
+      "{ edges { node } }" when no edge data is needed, this field can be be used
+      instead. Note that when clients like Relay need to fetch the "cursor" field on
+      the edge to enable efficient pagination, this shortcut cannot be used, and the
+      full "{ edges { node } }" version should be used instead.
+      """
+      pilots: [Person]
+    }
+
+    """An edge in a connection."""
+    type StarshipPilotsEdge {
+      """The item at the end of the edge"""
+      node: Person
+
+      """A cursor for use in pagination"""
+      cursor: String!
+    }
+
+    """A connection to a list of items."""
+    type StarshipsConnection {
+      """Information to aid in pagination."""
+      pageInfo: PageInfo!
+
+      """A list of edges."""
+      edges: [StarshipsEdge]
+
+      """
+      A count of the total number of objects in this connection, ignoring pagination.
+      This allows a client to fetch the first five objects by passing "5" as the
+      argument to "first", then fetch the total count so it could display "5 of 83",
+      for example.
+      """
+      totalCount: Int
+
+      """
+      A list of all of the objects returned in the connection. This is a convenience
+      field provided for quickly exploring the API; rather than querying for
+      "{ edges { node } }" when no edge data is needed, this field can be be used
+      instead. Note that when clients like Relay need to fetch the "cursor" field on
+      the edge to enable efficient pagination, this shortcut cannot be used, and the
+      full "{ edges { node } }" version should be used instead.
+      """
+      starships: [Starship]
+    }
+
+    """An edge in a connection."""
+    type StarshipsEdge {
+      """The item at the end of the edge"""
+      node: Starship
+
+      """A cursor for use in pagination"""
+      cursor: String!
+    }
+
+    """A single transport craft that does not have hyperdrive capability"""
+    type Vehicle implements Node {
+      """
+      The name of this vehicle. The common name, such as "Sand Crawler" or "Speeder
+      bike".
+      """
+      name: String
+
+      """
+      The model or official name of this vehicle. Such as "All-Terrain Attack
+      Transport".
+      """
+      model: String
+
+      """The class of this vehicle, such as "Wheeled" or "Repulsorcraft"."""
+      vehicleClass: String
+
+      """The manufacturers of this vehicle."""
+      manufacturers: [String]
+
+      """The cost of this vehicle new, in Galactic Credits."""
+      costInCredits: Float
+
+      """The length of this vehicle in meters."""
+      length: Float
+
+      """The number of personnel needed to run or pilot this vehicle."""
+      crew: String
+
+      """The number of non-essential people this vehicle can transport."""
+      passengers: String
+
+      """The maximum speed of this vehicle in atmosphere."""
+      maxAtmospheringSpeed: Int
+
+      """The maximum number of kilograms that this vehicle can transport."""
+      cargoCapacity: Float
+
+      """
+      The maximum length of time that this vehicle can provide consumables for its
+      entire crew without having to resupply.
+      """
+      consumables: String
+      pilotConnection(after: String, first: Int, before: String, last: Int): VehiclePilotsConnection
+      filmConnection(after: String, first: Int, before: String, last: Int): VehicleFilmsConnection
+
+      """The ISO 8601 date format of the time that this resource was created."""
+      created: String
+
+      """The ISO 8601 date format of the time that this resource was edited."""
+      edited: String
+
+      """The ID of an object"""
+      id: ID!
+    }
+
+    """A connection to a list of items."""
+    type VehicleFilmsConnection {
+      """Information to aid in pagination."""
+      pageInfo: PageInfo!
+
+      """A list of edges."""
+      edges: [VehicleFilmsEdge]
+
+      """
+      A count of the total number of objects in this connection, ignoring pagination.
+      This allows a client to fetch the first five objects by passing "5" as the
+      argument to "first", then fetch the total count so it could display "5 of 83",
+      for example.
+      """
+      totalCount: Int
+
+      """
+      A list of all of the objects returned in the connection. This is a convenience
+      field provided for quickly exploring the API; rather than querying for
+      "{ edges { node } }" when no edge data is needed, this field can be be used
+      instead. Note that when clients like Relay need to fetch the "cursor" field on
+      the edge to enable efficient pagination, this shortcut cannot be used, and the
+      full "{ edges { node } }" version should be used instead.
+      """
+      films: [Film]
+    }
+
+    """An edge in a connection."""
+    type VehicleFilmsEdge {
+      """The item at the end of the edge"""
+      node: Film
+
+      """A cursor for use in pagination"""
+      cursor: String!
+    }
+
+    """A connection to a list of items."""
+    type VehiclePilotsConnection {
+      """Information to aid in pagination."""
+      pageInfo: PageInfo!
+
+      """A list of edges."""
+      edges: [VehiclePilotsEdge]
+
+      """
+      A count of the total number of objects in this connection, ignoring pagination.
+      This allows a client to fetch the first five objects by passing "5" as the
+      argument to "first", then fetch the total count so it could display "5 of 83",
+      for example.
+      """
+      totalCount: Int
+
+      """
+      A list of all of the objects returned in the connection. This is a convenience
+      field provided for quickly exploring the API; rather than querying for
+      "{ edges { node } }" when no edge data is needed, this field can be be used
+      instead. Note that when clients like Relay need to fetch the "cursor" field on
+      the edge to enable efficient pagination, this shortcut cannot be used, and the
+      full "{ edges { node } }" version should be used instead.
+      """
+      pilots: [Person]
+    }
+
+    """An edge in a connection."""
+    type VehiclePilotsEdge {
+      """The item at the end of the edge"""
+      node: Person
+
+      """A cursor for use in pagination"""
+      cursor: String!
+    }
+
+    """A connection to a list of items."""
+    type VehiclesConnection {
+      """Information to aid in pagination."""
+      pageInfo: PageInfo!
+
+      """A list of edges."""
+      edges: [VehiclesEdge]
+
+      """
+      A count of the total number of objects in this connection, ignoring pagination.
+      This allows a client to fetch the first five objects by passing "5" as the
+      argument to "first", then fetch the total count so it could display "5 of 83",
+      for example.
+      """
+      totalCount: Int
+
+      """
+      A list of all of the objects returned in the connection. This is a convenience
+      field provided for quickly exploring the API; rather than querying for
+      "{ edges { node } }" when no edge data is needed, this field can be be used
+      instead. Note that when clients like Relay need to fetch the "cursor" field on
+      the edge to enable efficient pagination, this shortcut cannot be used, and the
+      full "{ edges { node } }" version should be used instead.
+      """
+      vehicles: [Vehicle]
+    }
+
+    """An edge in a connection."""
+    type VehiclesEdge {
+      """The item at the end of the edge"""
+      node: Vehicle
+
+      """A cursor for use in pagination"""
+      cursor: String!
+    }
diff --git a/packages/catalog-model/examples/components/artist-lookup-component.yaml b/packages/catalog-model/examples/components/artist-lookup-component.yaml
index 3fc516ece9..fbf28d7fcb 100644
--- a/packages/catalog-model/examples/components/artist-lookup-component.yaml
+++ b/packages/catalog-model/examples/components/artist-lookup-component.yaml
@@ -6,6 +6,12 @@ metadata:
   tags:
     - java
     - data
+  links:
+    - url: https://example.com/apm/artists-lookup
+      title: APM
+      icon: dashboard
+    - url: https://example.com/logs/artists-lookup
+      title: Logs
 spec:
   type: service
   lifecycle: experimental
diff --git a/packages/catalog-model/examples/domains/artists-domain.yaml b/packages/catalog-model/examples/domains/artists-domain.yaml
index 7ac4ba66a1..2a74425791 100644
--- a/packages/catalog-model/examples/domains/artists-domain.yaml
+++ b/packages/catalog-model/examples/domains/artists-domain.yaml
@@ -4,7 +4,10 @@ metadata:
   name: artists
   description: Everything related to artists
   links:
-    - url: http://example.com/domain/readme
-      title: Artists Domain Readme
+    - url: http://example.com/domain/artists/
+      title: Domain Readme
+    - url: http://example.com/domains/artists/dashboard
+      title: Domain Metrics Dashboard
+      icon: dashboard
 spec:
   owner: team-a