diff --git a/README.md b/README.md
index a15660f..8ff306f 100644
--- a/README.md
+++ b/README.md
@@ -11,9 +11,9 @@ The following data payloads are the supported events and formats for Equinix Obs
 <!-- CATALOG_GENERATION_START -->
 |Product|Schemas|Types|
 |-|-|-|
-|Equinix Fabric ChangeAlert|[JSON](https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/events/fabric/v1/ChangeAlert.json)|<br>Data Type:<br>`equinix.events.fabric.v1.ChangeAlert`<br>CloudEvent Type(s):<br>`equinix.fabric.connection.status.up`</br>`equinix.fabric.connection.status.down`</br>`equinix.fabric.connection.bgp_ipv4_status.up`</br>`equinix.fabric.connection.bgp_ipv4_status.down`</br>`equinix.fabric.connection.bgp_ipv6_status.up`</br>`equinix.fabric.connection.bgp_ipv6_status.down`</br>`equinix.fabric.port.status.up`</br>`equinix.fabric.port.status.down`</br>|
-|Equinix Fabric ChangeEvent|[JSON](https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/events/fabric/v1/ChangeEvent.json)|<br>Data Type:<br>`equinix.events.fabric.v1.ChangeEvent`<br>CloudEvent Type(s):<br>`equinix.fabric.connection.status.up`</br>`equinix.fabric.connection.status.down`</br>`equinix.fabric.connection.state.draft`</br>`equinix.fabric.connection.state.cancelled`</br>`equinix.fabric.connection.state.pending`</br>`equinix.fabric.connection.state.provisioning`</br>`equinix.fabric.connection.state.provisioned`</br>`equinix.fabric.connection.state.active`</br>`equinix.fabric.connection.state.reprovisioning`</br>`equinix.fabric.connection.state.deprovisioning`</br>`equinix.fabric.connection.state.deprovisioned`</br>`equinix.fabric.connection.state.failed`</br>`equinix.fabric.connection.routing_protocol_state.provisioning`</br>`equinix.fabric.connection.routing_protocol_state.provisioned`</br>`equinix.fabric.connection.routing_protocol_state.reprovisioning`</br>`equinix.fabric.connection.routing_protocol_state.deprovisioning`</br>`equinix.fabric.connection.routing_protocol_state.deprovisioned`</br>`equinix.fabric.connection.routing_protocol_state.failed`</br>`equinix.fabric.connection.bgp_ipv4_status.up`</br>`equinix.fabric.connection.bgp_ipv4_status.down`</br>`equinix.fabric.connection.bgp_ipv6_status.up`</br>`equinix.fabric.connection.bgp_ipv6_status.down`</br>`equinix.fabric.connection.bgp_ipv4_session.established`</br>`equinix.fabric.connection.bgp_ipv4_session.connect`</br>`equinix.fabric.connection.bgp_ipv4_session.opensent`</br>`equinix.fabric.connection.bgp_ipv4_session.openconfirm`</br>`equinix.fabric.connection.bgp_ipv4_session.active`</br>`equinix.fabric.connection.bgp_ipv4_session.idle`</br>`equinix.fabric.connection.bgp_ipv6_session.established`</br>`equinix.fabric.connection.bgp_ipv6_session.connect`</br>`equinix.fabric.connection.bgp_ipv6_session.opensent`</br>`equinix.fabric.connection.bgp_ipv6_session.openconfirm`</br>`equinix.fabric.connection.bgp_ipv6_session.active`</br>`equinix.fabric.connection.bgp_ipv6_session.idle`</br>`equinix.fabric.connection.reset_bgp_ipv4.succeeded`</br>`equinix.fabric.connection.reset_bgp_ipv4.failed`</br>`equinix.fabric.connection.reset_bgp_ipv6.succeeded`</br>`equinix.fabric.connection.reset_bgp_ipv6.failed`</br>`equinix.fabric.connection.clear_bgp_ipv4.succeeded`</br>`equinix.fabric.connection.clear_bgp_ipv4.failed`</br>`equinix.fabric.connection.clear_bgp_ipv6.succeeded`</br>`equinix.fabric.connection.clear_bgp_ipv6.failed`</br>`equinix.fabric.connection.clear_bgp_ipv4_inbound.succeeded`</br>`equinix.fabric.connection.clear_bgp_ipv4_inbound.failed`</br>`equinix.fabric.connection.clear_bgp_ipv6_inbound.succeeded`</br>`equinix.fabric.connection.clear_bgp_ipv6_inbound.failed`</br>`equinix.fabric.route_filter.state.provisioning`</br>`equinix.fabric.route_filter.state.provisioned`</br>`equinix.fabric.route_filter.state.reprovisioning`</br>`equinix.fabric.route_filter.state.deprovisioning`</br>`equinix.fabric.route_filter.state.deprovisioned`</br>`equinix.fabric.route_filter.state.not_provisioned`</br>`equinix.fabric.route_filter.state.not_deprovisioned`</br>`equinix.fabric.route_filter.rule_state.provisioning`</br>`equinix.fabric.route_filter.rule_state.provisionined`</br>`equinix.fabric.route_filter.rule_state.reprovisioning`</br>`equinix.fabric.route_filter.rule_state.deprovisioning`</br>`equinix.fabric.route_filter.rule_state.deprovisioned`</br>`equinix.fabric.route_filter.rule_state.not_provisioned`</br>`equinix.fabric.route_filter.rule_state.not_deprovisioned`</br>`equinix.fabric.route_filter.status.pending_bgp_configuration`</br>`equinix.fabric.route_filter.status.attaching`</br>`equinix.fabric.route_filter.status.attached`</br>`equinix.fabric.route_filter.status.detaching`</br>`equinix.fabric.route_filter.status.detached`</br>`equinix.fabric.route_filter.status.failed`</br>`equinix.fabric.port.status.up`</br>`equinix.fabric.port.status.down`</br>`equinix.fabric.port.state.pending`</br>`equinix.fabric.port.state.provisioning`</br>`equinix.fabric.port.state.provisioned`</br>`equinix.fabric.port.state.active`</br>`equinix.fabric.port.state.inactive`</br>`equinix.fabric.port.state.deprovisioning`</br>`equinix.fabric.port.state.deprovisioned`</br>`equinix.fabric.port.state.failed`</br>`equinix.fabric.port.state.to_be_added`</br>`equinix.fabric.port.state.to_be_deleted`</br>`equinix.fabric.port.state.added`</br>`equinix.fabric.port.state.deleted`</br>`equinix.fabric.router.state.provisioning`</br>`equinix.fabric.router.state.provisioned`</br>`equinix.fabric.router.state.locked`</br>`equinix.fabric.router.state.deprovisioning`</br>`equinix.fabric.router.state.deprovisioned`</br>`equinix.fabric.router.state.not_provisioned`</br>`equinix.fabric.router.state.not_deprovisioned`</br>`equinix.fabric.router.bgp_session_status_update.pending`</br>`equinix.fabric.router.bgp_session_status_update.succeeded`</br>`equinix.fabric.router.bgp_session_status_update.failed`</br>`equinix.fabric.router.route_table_entry_update.pending`</br>`equinix.fabric.router.route_table_entry_update.succeeded`</br>`equinix.fabric.router.route_table_entry_update.failed`</br>`equinix.fabric.router.received_route_entry_update.pending`</br>`equinix.fabric.router.received_route_entry_update.succeeded`</br>`equinix.fabric.router.received_route_entry_update.failed`</br>`equinix.fabric.router.advertised_route_entry_update.pending`</br>`equinix.fabric.router.advertised_route_entry_update.succeeded`</br>`equinix.fabric.router.advertised_route_entry_update.failed`</br>`equinix.fabric.network.state.active`</br>`equinix.fabric.network.state.inactive`</br>`equinix.fabric.network.state.deleted`</br>`equinix.fabric.time_service.state.pending_configuration`</br>`equinix.fabric.time_service.state.provisioning`</br>`equinix.fabric.time_service.state.provisioned`</br>`equinix.fabric.time_service.state.deprovisioning`</br>`equinix.fabric.time_service.state.deprovisioned`</br>`equinix.fabric.time_service.state.configuring_failed`</br>`equinix.fabric.time_service.state.provisioning_failed`</br>`equinix.fabric.time_service.state.deprovisioning_failed`</br>`equinix.fabric.time_service.state.configuring`</br>`equinix.fabric.time_service.state.cancelled`</br>`equinix.fabric.service_token.state.active`</br>`equinix.fabric.service_token.state.inactive`</br>`equinix.fabric.service_token.state.expired`</br>`equinix.fabric.service_token.state.deleted`</br>`equinix.fabric.service_profile.state.pending_approval`</br>`equinix.fabric.service_profile.state.rejected`</br>`equinix.fabric.service_profile.state.active`</br>`equinix.fabric.service_profile.state.deleted`</br>`equinix.fabric.stream.state.provisioning`</br>`equinix.fabric.stream.state.provisioned`</br>`equinix.fabric.stream.state.deprovisioning`</br>`equinix.fabric.stream.state.deprovisioned`</br>`equinix.fabric.stream.state.failed`</br>`equinix.fabric.stream.resource_status.attaching`</br>`equinix.fabric.stream.resource_status.attached`</br>`equinix.fabric.stream.resource_status.detaching`</br>`equinix.fabric.stream.resource_status.detached`</br>`equinix.fabric.stream.resource_status.failed`</br>`equinix.fabric.stream_subscription.state.provisioning`</br>`equinix.fabric.stream_subscription.state.provisioned`</br>`equinix.fabric.stream_subscription.state.deprovisioning`</br>`equinix.fabric.stream_subscription.state.deprovisioned`</br>`equinix.fabric.stream_subscription.state.failed`</br>|
-|Equinix Fabric MetricAlert|[JSON](https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/events/fabric/v1/MetricAlert.json)|<br>Data Type:<br>`equinix.events.fabric.v1.MetricAlert`<br>CloudEvent Type(s):<br>`equinix.fabric.router.routes_ipv4_installed.utilization`</br>`equinix.fabric.router.routes_ipv6_installed.utilization`</br>|
-|Equinix Fabric MetricEvent|[JSON](https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/events/fabric/v1/MetricEvent.json)|<br>Data Type:<br>`equinix.events.fabric.v1.MetricEvent`<br>CloudEvent Type(s):<br>`equinix.fabric.connection.bandwidth_rx.usage`</br>`equinix.fabric.connection.bandwidth_tx.usage`</br>`equinix.fabric.port.bandwidth_rx.usage`</br>`equinix.fabric.port.bandwidth_tx.usage`</br>`equinix.fabric.port.frames_erred_rx.count`</br>`equinix.fabric.port.frames_erred_tx.count`</br>`equinix.fabric.port.frames_dropped_rx.count`</br>`equinix.fabric.port.frames_dropped_tx.count`</br>`equinix.fabric.router.routes_ipv4_installed.utilization`</br>`equinix.fabric.router.routes_ipv6_installed.utilization`</br>`equinix.fabric.metro.{:asideMetroCode}_{:zsideMetroCode}.latency`</br>`equinix.fabric.metric`</br>|
+|Equinix Fabric ChangeAlert|[JSON](https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/events/fabric/v1/ChangeAlert.json)|<br>Data Type:<br>`equinix.events.fabric.v1.ChangeAlert`<br>CloudEvent Type(s):<br></br>|
+|Equinix Fabric ChangeEvent|[JSON](https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/events/fabric/v1/ChangeEvent.json)|<br>Data Type:<br>`equinix.events.fabric.v1.ChangeEvent`<br>CloudEvent Type(s):<br>`equinix.fabric.router.state.provisioning`</br>`equinix.fabric.router.state.provisioned`</br>`equinix.fabric.router.state.reprovisioning`</br>`equinix.fabric.router.state.deprovisioning`</br>`equinix.fabric.router.state.deprovisioned`</br>`equinix.fabric.router.state.failed`</br>`equinix.fabric.router.state.not_provisioned`</br>`equinix.fabric.router.state.not_deprovisioned`</br>`equinix.fabric.port.state.provisioned`</br>`equinix.fabric.port.state.deprovisioned`</br>`equinix.fabric.port.state.failed`</br>`equinix.fabric.port.status.up`</br>`equinix.fabric.port.status.down`</br>`equinix.fabric.service_token.state.inactive`</br>`equinix.fabric.service_token.state.deleted`</br>`equinix.fabric.service_token.attribute.changed`</br>`equinix.fabric.connection.state.pending`</br>`equinix.fabric.connection.state.pending_interface_configuration`</br>`equinix.fabric.connection.state.provisioning`</br>`equinix.fabric.connection.state.provisioned`</br>`equinix.fabric.connection.state.deprovisioning`</br>`equinix.fabric.connection.state.deprovisioned`</br>`equinix.fabric.connection.state.pending_approval`</br>`equinix.fabric.connection.attribute.changed`</br>`equinix.fabric.connection.status.up`</br>`equinix.fabric.connection.status.down`</br>`equinix.fabric.connection.bgpipv4_session_status.established`</br>`equinix.fabric.connection.bgpipv4_session_status.idle`</br>`equinix.fabric.connection.bgpipv4_session_status.connect`</br>`equinix.fabric.connection.bgpipv6_session_status.established`</br>`equinix.fabric.connection.bgpipv6_session_status.idle`</br>`equinix.fabric.connection.bgpipv6_session_status.connect`</br>`equinix.fabric.network.state.provisioning`</br>`equinix.fabric.network.state.provisioned`</br>`equinix.fabric.network.state.deprovisioning`</br>`equinix.fabric.network.state.deprovisioned`</br>|
+|Equinix Fabric MetricAlert|[JSON](https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/events/fabric/v1/MetricAlert.json)|<br>Data Type:<br>`equinix.events.fabric.v1.MetricAlert`<br>CloudEvent Type(s):<br></br>|
+|Equinix Fabric MetricEvent|[JSON](https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/events/fabric/v1/MetricEvent.json)|<br>Data Type:<br>`equinix.events.fabric.v1.MetricEvent`<br>CloudEvent Type(s):<br>`equinix.fabric.metric`</br><br>Metric Type(s):<br>`equinix.fabric.port.packets_erred_rx.count`</br>`equinix.fabric.port.packets_erred_tx.count`</br>`equinix.fabric.port.packets_dropped_rx.count`</br>`equinix.fabric.port.packets_dropped_tx.count`</br>`equinix.fabric.metro.{:asideMetroCode}_{:zsideMetroCode}.latency`</br>`equinix.fabric.connection.bandwidth_rx.usage`</br>`equinix.fabric.connection.bandwidth_tx.usage`</br>`equinix.fabric.port.bandwidth_rx.usage`</br>`equinix.fabric.port.bandwidth_tx.usage`</br>|
 
 <!-- CATALOG_GENERATION_END -->
diff --git a/jsonschema/catalog.json b/jsonschema/catalog.json
index 83ef878..f303b6a 100644
--- a/jsonschema/catalog.json
+++ b/jsonschema/catalog.json
@@ -8,16 +8,7 @@
             "name": "ChangeAlert",
             "description": "The data within all ChangeAlert events.",
             "datatype": "equinix.events.fabric.v1.ChangeAlert",
-            "cloudeventTypes": [
-                "equinix.fabric.connection.status.up",
-                "equinix.fabric.connection.status.down",
-                "equinix.fabric.connection.bgp_ipv4_status.up",
-                "equinix.fabric.connection.bgp_ipv4_status.down",
-                "equinix.fabric.connection.bgp_ipv6_status.up",
-                "equinix.fabric.connection.bgp_ipv6_status.down",
-                "equinix.fabric.port.status.up",
-                "equinix.fabric.port.status.down"
-            ]
+            "cloudeventTypes": []
         },
         {
             "url": "https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/events/fabric/v1/ChangeEvent.json",
@@ -26,141 +17,42 @@
             "description": "The data within all ChangeEvent events.",
             "datatype": "equinix.events.fabric.v1.ChangeEvent",
             "cloudeventTypes": [
-                "equinix.fabric.connection.status.up",
-                "equinix.fabric.connection.status.down",
-                "equinix.fabric.connection.state.draft",
-                "equinix.fabric.connection.state.cancelled",
-                "equinix.fabric.connection.state.pending",
-                "equinix.fabric.connection.state.provisioning",
-                "equinix.fabric.connection.state.provisioned",
-                "equinix.fabric.connection.state.active",
-                "equinix.fabric.connection.state.reprovisioning",
-                "equinix.fabric.connection.state.deprovisioning",
-                "equinix.fabric.connection.state.deprovisioned",
-                "equinix.fabric.connection.state.failed",
-                "equinix.fabric.connection.routing_protocol_state.provisioning",
-                "equinix.fabric.connection.routing_protocol_state.provisioned",
-                "equinix.fabric.connection.routing_protocol_state.reprovisioning",
-                "equinix.fabric.connection.routing_protocol_state.deprovisioning",
-                "equinix.fabric.connection.routing_protocol_state.deprovisioned",
-                "equinix.fabric.connection.routing_protocol_state.failed",
-                "equinix.fabric.connection.bgp_ipv4_status.up",
-                "equinix.fabric.connection.bgp_ipv4_status.down",
-                "equinix.fabric.connection.bgp_ipv6_status.up",
-                "equinix.fabric.connection.bgp_ipv6_status.down",
-                "equinix.fabric.connection.bgp_ipv4_session.established",
-                "equinix.fabric.connection.bgp_ipv4_session.connect",
-                "equinix.fabric.connection.bgp_ipv4_session.opensent",
-                "equinix.fabric.connection.bgp_ipv4_session.openconfirm",
-                "equinix.fabric.connection.bgp_ipv4_session.active",
-                "equinix.fabric.connection.bgp_ipv4_session.idle",
-                "equinix.fabric.connection.bgp_ipv6_session.established",
-                "equinix.fabric.connection.bgp_ipv6_session.connect",
-                "equinix.fabric.connection.bgp_ipv6_session.opensent",
-                "equinix.fabric.connection.bgp_ipv6_session.openconfirm",
-                "equinix.fabric.connection.bgp_ipv6_session.active",
-                "equinix.fabric.connection.bgp_ipv6_session.idle",
-                "equinix.fabric.connection.reset_bgp_ipv4.succeeded",
-                "equinix.fabric.connection.reset_bgp_ipv4.failed",
-                "equinix.fabric.connection.reset_bgp_ipv6.succeeded",
-                "equinix.fabric.connection.reset_bgp_ipv6.failed",
-                "equinix.fabric.connection.clear_bgp_ipv4.succeeded",
-                "equinix.fabric.connection.clear_bgp_ipv4.failed",
-                "equinix.fabric.connection.clear_bgp_ipv6.succeeded",
-                "equinix.fabric.connection.clear_bgp_ipv6.failed",
-                "equinix.fabric.connection.clear_bgp_ipv4_inbound.succeeded",
-                "equinix.fabric.connection.clear_bgp_ipv4_inbound.failed",
-                "equinix.fabric.connection.clear_bgp_ipv6_inbound.succeeded",
-                "equinix.fabric.connection.clear_bgp_ipv6_inbound.failed",
-                "equinix.fabric.route_filter.state.provisioning",
-                "equinix.fabric.route_filter.state.provisioned",
-                "equinix.fabric.route_filter.state.reprovisioning",
-                "equinix.fabric.route_filter.state.deprovisioning",
-                "equinix.fabric.route_filter.state.deprovisioned",
-                "equinix.fabric.route_filter.state.not_provisioned",
-                "equinix.fabric.route_filter.state.not_deprovisioned",
-                "equinix.fabric.route_filter.rule_state.provisioning",
-                "equinix.fabric.route_filter.rule_state.provisionined",
-                "equinix.fabric.route_filter.rule_state.reprovisioning",
-                "equinix.fabric.route_filter.rule_state.deprovisioning",
-                "equinix.fabric.route_filter.rule_state.deprovisioned",
-                "equinix.fabric.route_filter.rule_state.not_provisioned",
-                "equinix.fabric.route_filter.rule_state.not_deprovisioned",
-                "equinix.fabric.route_filter.status.pending_bgp_configuration",
-                "equinix.fabric.route_filter.status.attaching",
-                "equinix.fabric.route_filter.status.attached",
-                "equinix.fabric.route_filter.status.detaching",
-                "equinix.fabric.route_filter.status.detached",
-                "equinix.fabric.route_filter.status.failed",
-                "equinix.fabric.port.status.up",
-                "equinix.fabric.port.status.down",
-                "equinix.fabric.port.state.pending",
-                "equinix.fabric.port.state.provisioning",
-                "equinix.fabric.port.state.provisioned",
-                "equinix.fabric.port.state.active",
-                "equinix.fabric.port.state.inactive",
-                "equinix.fabric.port.state.deprovisioning",
-                "equinix.fabric.port.state.deprovisioned",
-                "equinix.fabric.port.state.failed",
-                "equinix.fabric.port.state.to_be_added",
-                "equinix.fabric.port.state.to_be_deleted",
-                "equinix.fabric.port.state.added",
-                "equinix.fabric.port.state.deleted",
                 "equinix.fabric.router.state.provisioning",
                 "equinix.fabric.router.state.provisioned",
-                "equinix.fabric.router.state.locked",
+                "equinix.fabric.router.state.reprovisioning",
                 "equinix.fabric.router.state.deprovisioning",
                 "equinix.fabric.router.state.deprovisioned",
+                "equinix.fabric.router.state.failed",
                 "equinix.fabric.router.state.not_provisioned",
                 "equinix.fabric.router.state.not_deprovisioned",
-                "equinix.fabric.router.bgp_session_status_update.pending",
-                "equinix.fabric.router.bgp_session_status_update.succeeded",
-                "equinix.fabric.router.bgp_session_status_update.failed",
-                "equinix.fabric.router.route_table_entry_update.pending",
-                "equinix.fabric.router.route_table_entry_update.succeeded",
-                "equinix.fabric.router.route_table_entry_update.failed",
-                "equinix.fabric.router.received_route_entry_update.pending",
-                "equinix.fabric.router.received_route_entry_update.succeeded",
-                "equinix.fabric.router.received_route_entry_update.failed",
-                "equinix.fabric.router.advertised_route_entry_update.pending",
-                "equinix.fabric.router.advertised_route_entry_update.succeeded",
-                "equinix.fabric.router.advertised_route_entry_update.failed",
-                "equinix.fabric.network.state.active",
-                "equinix.fabric.network.state.inactive",
-                "equinix.fabric.network.state.deleted",
-                "equinix.fabric.time_service.state.pending_configuration",
-                "equinix.fabric.time_service.state.provisioning",
-                "equinix.fabric.time_service.state.provisioned",
-                "equinix.fabric.time_service.state.deprovisioning",
-                "equinix.fabric.time_service.state.deprovisioned",
-                "equinix.fabric.time_service.state.configuring_failed",
-                "equinix.fabric.time_service.state.provisioning_failed",
-                "equinix.fabric.time_service.state.deprovisioning_failed",
-                "equinix.fabric.time_service.state.configuring",
-                "equinix.fabric.time_service.state.cancelled",
-                "equinix.fabric.service_token.state.active",
+                "equinix.fabric.port.state.provisioned",
+                "equinix.fabric.port.state.deprovisioned",
+                "equinix.fabric.port.state.failed",
+                "equinix.fabric.port.status.up",
+                "equinix.fabric.port.status.down",
                 "equinix.fabric.service_token.state.inactive",
-                "equinix.fabric.service_token.state.expired",
                 "equinix.fabric.service_token.state.deleted",
-                "equinix.fabric.service_profile.state.pending_approval",
-                "equinix.fabric.service_profile.state.rejected",
-                "equinix.fabric.service_profile.state.active",
-                "equinix.fabric.service_profile.state.deleted",
-                "equinix.fabric.stream.state.provisioning",
-                "equinix.fabric.stream.state.provisioned",
-                "equinix.fabric.stream.state.deprovisioning",
-                "equinix.fabric.stream.state.deprovisioned",
-                "equinix.fabric.stream.state.failed",
-                "equinix.fabric.stream.resource_status.attaching",
-                "equinix.fabric.stream.resource_status.attached",
-                "equinix.fabric.stream.resource_status.detaching",
-                "equinix.fabric.stream.resource_status.detached",
-                "equinix.fabric.stream.resource_status.failed",
-                "equinix.fabric.stream_subscription.state.provisioning",
-                "equinix.fabric.stream_subscription.state.provisioned",
-                "equinix.fabric.stream_subscription.state.deprovisioning",
-                "equinix.fabric.stream_subscription.state.deprovisioned",
-                "equinix.fabric.stream_subscription.state.failed"
+                "equinix.fabric.service_token.attribute.changed",
+                "equinix.fabric.connection.state.pending",
+                "equinix.fabric.connection.state.pending_interface_configuration",
+                "equinix.fabric.connection.state.provisioning",
+                "equinix.fabric.connection.state.provisioned",
+                "equinix.fabric.connection.state.deprovisioning",
+                "equinix.fabric.connection.state.deprovisioned",
+                "equinix.fabric.connection.state.pending_approval",
+                "equinix.fabric.connection.attribute.changed",
+                "equinix.fabric.connection.status.up",
+                "equinix.fabric.connection.status.down",
+                "equinix.fabric.connection.bgpipv4_session_status.established",
+                "equinix.fabric.connection.bgpipv4_session_status.idle",
+                "equinix.fabric.connection.bgpipv4_session_status.connect",
+                "equinix.fabric.connection.bgpipv6_session_status.established",
+                "equinix.fabric.connection.bgpipv6_session_status.idle",
+                "equinix.fabric.connection.bgpipv6_session_status.connect",
+                "equinix.fabric.network.state.provisioning",
+                "equinix.fabric.network.state.provisioned",
+                "equinix.fabric.network.state.deprovisioning",
+                "equinix.fabric.network.state.deprovisioned"
             ]
         },
         {
@@ -169,10 +61,7 @@
             "name": "MetricAlert",
             "description": "The data within all MetricAlert events.",
             "datatype": "equinix.events.fabric.v1.MetricAlert",
-            "cloudeventTypes": [
-                "equinix.fabric.router.routes_ipv4_installed.utilization",
-                "equinix.fabric.router.routes_ipv6_installed.utilization"
-            ]
+            "cloudeventTypes": []
         },
         {
             "url": "https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/events/fabric/v1/MetricEvent.json",
@@ -181,18 +70,18 @@
             "description": "The data within all MetricEvent events.",
             "datatype": "equinix.events.fabric.v1.MetricEvent",
             "cloudeventTypes": [
+                "equinix.fabric.metric"
+            ],
+            "metricNames": [
+                "equinix.fabric.port.packets_erred_rx.count",
+                "equinix.fabric.port.packets_erred_tx.count",
+                "equinix.fabric.port.packets_dropped_rx.count",
+                "equinix.fabric.port.packets_dropped_tx.count",
+                "equinix.fabric.metro.{:asideMetroCode}_{:zsideMetroCode}.latency",
                 "equinix.fabric.connection.bandwidth_rx.usage",
                 "equinix.fabric.connection.bandwidth_tx.usage",
                 "equinix.fabric.port.bandwidth_rx.usage",
-                "equinix.fabric.port.bandwidth_tx.usage",
-                "equinix.fabric.port.frames_erred_rx.count",
-                "equinix.fabric.port.frames_erred_tx.count",
-                "equinix.fabric.port.frames_dropped_rx.count",
-                "equinix.fabric.port.frames_dropped_tx.count",
-                "equinix.fabric.router.routes_ipv4_installed.utilization",
-                "equinix.fabric.router.routes_ipv6_installed.utilization",
-                "equinix.fabric.metro.{:asideMetroCode}_{:zsideMetroCode}.latency",
-                "equinix.fabric.metric"
+                "equinix.fabric.port.bandwidth_tx.usage"
             ]
         }
     ]
diff --git a/scripts/generate_json_catalog.py b/scripts/generate_json_catalog.py
index ae11f41..114f148 100644
--- a/scripts/generate_json_catalog.py
+++ b/scripts/generate_json_catalog.py
@@ -9,14 +9,17 @@ def retrieve_json_schemas():
             if file.endswith('.json') and file != "catalog.json":
                 with open(root + "/" + file, "r") as eventFile:
                     data = json.load(eventFile)
-                    json_schemas.append({
+                    newItem = {
                         "url": data["$id"],
                         "product": data["product"],
                         "name": data["name"],
-                        "description": data["definitions"][data["name"]]["description"],
+                        "description": data["definitions"]["Data"]["description"],
                         "datatype": data["datatype"],
                         "cloudeventTypes": data["cloudeventTypes"]
-                    })
+                    }
+                    if "metricNames" in data:
+                        newItem["metricNames"] = data["metricNames"]
+                    json_schemas.append(newItem)
     json_schemas.sort(key=lambda x: x["url"])
     return json_schemas
 
diff --git a/scripts/generate_readme_event_catalog.py b/scripts/generate_readme_event_catalog.py
index 410158b..32fa4c1 100644
--- a/scripts/generate_readme_event_catalog.py
+++ b/scripts/generate_readme_event_catalog.py
@@ -3,7 +3,11 @@
 
 def table_row(schema):
     cloudEventTypes = "</br>".join(map(lambda x: f"`{x}`", schema["cloudeventTypes"]))
-    return f"|{schema["product"]}|[JSON]({schema["url"]})|<br>Data Type:<br>`{schema["datatype"]}`<br>CloudEvent Type(s):<br>{cloudEventTypes}</br>|"
+    metrics = ""
+    if "metricNames" in schema:
+        metricNames = "</br>".join(map(lambda x: f"`{x}`", schema["metricNames"]))
+        metrics = f"<br>Metric Type(s):<br>{metricNames}</br>"
+    return f"|{schema["product"]}|[JSON]({schema["url"]})|<br>Data Type:<br>`{schema["datatype"]}`<br>CloudEvent Type(s):<br>{cloudEventTypes}</br>{metrics}|"
 
 def replace_readme_catalog():
     readme_path = os.path.dirname(os.path.abspath(__file__)) + "/../README.md"