diff --git a/dev/packages/example/aws-1.0.0/dataset/billing/manifest.yml b/dev/packages/example/aws-1.0.0/dataset/billing/manifest.yml
index 3bdd2c31c..49bfcce2a 100644
--- a/dev/packages/example/aws-1.0.0/dataset/billing/manifest.yml
+++ b/dev/packages/example/aws-1.0.0/dataset/billing/manifest.yml
@@ -1,5 +1,5 @@
 title: AWS Billing metrics
-release: ga
+release: beta
 type: metrics
 
 # List of supported streams. There can be multiple stream definitions for different input types.
diff --git a/dev/packages/example/aws-1.0.0/dataset/dynamodb/manifest.yml b/dev/packages/example/aws-1.0.0/dataset/dynamodb/manifest.yml
index 07190f57d..3bf64dbb8 100644
--- a/dev/packages/example/aws-1.0.0/dataset/dynamodb/manifest.yml
+++ b/dev/packages/example/aws-1.0.0/dataset/dynamodb/manifest.yml
@@ -1,11 +1,11 @@
-title: AWS Dynamo metrics
-release: ga
+title: AWS dynamodb metrics
+release: beta
 type: metrics
 
 streams:
   - input: aws/metrics
-    title: AWS billing metrics
-    description: AWS billing metrics
+    title: AWS dynamodb metrics
+    description: AWS dynamodb metrics
     vars:
       - name: period
         description: Collection frequency for dynamodb metrics.
diff --git a/dev/packages/example/aws-1.0.0/dataset/lambda/manifest.yml b/dev/packages/example/aws-1.0.0/dataset/lambda/manifest.yml
index 48e78024b..41f3d0feb 100644
--- a/dev/packages/example/aws-1.0.0/dataset/lambda/manifest.yml
+++ b/dev/packages/example/aws-1.0.0/dataset/lambda/manifest.yml
@@ -1,5 +1,5 @@
 title: AWS lambda metrics
-release: ga
+release: beta
 type: metrics
 
 streams:
diff --git a/dev/packages/example/aws-1.0.0/dataset/natgateway/agent/stream/stream.yml b/dev/packages/example/aws-1.0.0/dataset/natgateway/agent/stream/stream.yml
new file mode 100644
index 000000000..836db12fe
--- /dev/null
+++ b/dev/packages/example/aws-1.0.0/dataset/natgateway/agent/stream/stream.yml
@@ -0,0 +1,4 @@
+input: aws/metrics
+period: {{period}}
+metricsets: natgateway
+dataset: aws.natgateway
diff --git a/dev/packages/example/aws-1.0.0/dataset/natgateway/fields/fields.yml b/dev/packages/example/aws-1.0.0/dataset/natgateway/fields/fields.yml
new file mode 100644
index 000000000..e9d6a1f1c
--- /dev/null
+++ b/dev/packages/example/aws-1.0.0/dataset/natgateway/fields/fields.yml
@@ -0,0 +1,6 @@
+- name: aws.natgateway
+  type: group
+  description: >
+    `vpn` contains the metrics from Cloudwatch to track usage of natgateway related resources.
+  release: beta
+  fields:
diff --git a/dev/packages/example/aws-1.0.0/dataset/natgateway/manifest.yml b/dev/packages/example/aws-1.0.0/dataset/natgateway/manifest.yml
new file mode 100644
index 000000000..f651a4c65
--- /dev/null
+++ b/dev/packages/example/aws-1.0.0/dataset/natgateway/manifest.yml
@@ -0,0 +1,14 @@
+title: AWS natgateway metrics
+release: beta
+type: metrics
+
+streams:
+  - input: aws/metrics
+    title: AWS natgateway metrics
+    description: AWS natgateway metrics
+    enabled: false
+    vars:
+      - name: period
+        description: Collection frequency for natgateway metrics.
+        type: period
+        default: 1m
diff --git a/dev/packages/example/aws-1.0.0/dataset/sns/manifest.yml b/dev/packages/example/aws-1.0.0/dataset/sns/manifest.yml
index 37a60433e..e08921950 100644
--- a/dev/packages/example/aws-1.0.0/dataset/sns/manifest.yml
+++ b/dev/packages/example/aws-1.0.0/dataset/sns/manifest.yml
@@ -1,5 +1,5 @@
 title: AWS sns metrics
-release: ga
+release: beta
 type: metrics
 
 streams:
diff --git a/dev/packages/example/aws-1.0.0/dataset/transitgateway/agent/stream/stream.yml b/dev/packages/example/aws-1.0.0/dataset/transitgateway/agent/stream/stream.yml
new file mode 100644
index 000000000..a1d172ec2
--- /dev/null
+++ b/dev/packages/example/aws-1.0.0/dataset/transitgateway/agent/stream/stream.yml
@@ -0,0 +1,4 @@
+input: aws/metrics
+period: {{period}}
+metricsets: transitgateway
+dataset: aws.transitgateway
diff --git a/dev/packages/example/aws-1.0.0/dataset/transitgateway/fields/fields.yml b/dev/packages/example/aws-1.0.0/dataset/transitgateway/fields/fields.yml
new file mode 100644
index 000000000..ec0430d2d
--- /dev/null
+++ b/dev/packages/example/aws-1.0.0/dataset/transitgateway/fields/fields.yml
@@ -0,0 +1,6 @@
+- name: aws.transitgateway
+  type: group
+  description: >
+    `vpn` contains the metrics from Cloudwatch to track usage of transit gateway related resources.
+  release: beta
+  fields:
diff --git a/dev/packages/example/aws-1.0.0/dataset/transitgateway/manifest.yml b/dev/packages/example/aws-1.0.0/dataset/transitgateway/manifest.yml
new file mode 100644
index 000000000..cfa78d2fd
--- /dev/null
+++ b/dev/packages/example/aws-1.0.0/dataset/transitgateway/manifest.yml
@@ -0,0 +1,14 @@
+title: AWS transitgateway metrics
+release: beta
+type: metrics
+
+streams:
+  - input: aws/metrics
+    title: AWS transitgateway metrics
+    description: AWS transitgateway metrics
+    enabled: false
+    vars:
+      - name: period
+        description: Collection frequency for transitgateway metrics.
+        type: period
+        default: 1m
diff --git a/dev/packages/example/aws-1.0.0/dataset/usage/manifest.yml b/dev/packages/example/aws-1.0.0/dataset/usage/manifest.yml
index 9c3bfd01a..aea302620 100644
--- a/dev/packages/example/aws-1.0.0/dataset/usage/manifest.yml
+++ b/dev/packages/example/aws-1.0.0/dataset/usage/manifest.yml
@@ -1,5 +1,5 @@
 title: AWS usage metrics
-release: ga
+release: beta
 type: metrics
 
 streams:
@@ -8,6 +8,6 @@ streams:
     description: AWS usage metrics
     vars:
       - name: period
-        description: Collection frequency usage elb metrics.
+        description: Collection frequency for usage metrics.
         type: period
         default: 1m
diff --git a/dev/packages/example/aws-1.0.0/dataset/vpc/fields/fields.yml b/dev/packages/example/aws-1.0.0/dataset/vpc/fields/fields.yml
deleted file mode 100644
index 1e4654e31..000000000
--- a/dev/packages/example/aws-1.0.0/dataset/vpc/fields/fields.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- name: aws.vpc
-  type: group
-  description: >
-    `vpc` contains the metrics from Cloudwatch to track usage of VPC related resources.
-  release: beta
-  fields:
diff --git a/dev/packages/example/aws-1.0.0/dataset/vpc/manifest.yml b/dev/packages/example/aws-1.0.0/dataset/vpc/manifest.yml
deleted file mode 100644
index bdbb157df..000000000
--- a/dev/packages/example/aws-1.0.0/dataset/vpc/manifest.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-title: AWS usage metrics
-release: ga
-type: metrics
-
-streams:
-  - input: aws/metrics
-    title: AWS usage metrics
-    description: AWS usage metrics
-    enabled: false
-    vars:
-      - name: period
-        description: Collection frequency usage elb metrics.
-        type: period
-        default: 1m
diff --git a/dev/packages/example/aws-1.0.0/dataset/vpc/agent/stream/stream.yml b/dev/packages/example/aws-1.0.0/dataset/vpn/agent/stream/stream.yml
similarity index 53%
rename from dev/packages/example/aws-1.0.0/dataset/vpc/agent/stream/stream.yml
rename to dev/packages/example/aws-1.0.0/dataset/vpn/agent/stream/stream.yml
index ee551036a..fcc05573c 100644
--- a/dev/packages/example/aws-1.0.0/dataset/vpc/agent/stream/stream.yml
+++ b/dev/packages/example/aws-1.0.0/dataset/vpn/agent/stream/stream.yml
@@ -1,4 +1,4 @@
 input: aws/metrics
 period: {{period}}
-metricsets: vpc
-dataset: aws.vpc
+metricsets: vpn
+dataset: aws.vpn
diff --git a/dev/packages/example/aws-1.0.0/dataset/vpn/fields/fields.yml b/dev/packages/example/aws-1.0.0/dataset/vpn/fields/fields.yml
new file mode 100644
index 000000000..d74df9290
--- /dev/null
+++ b/dev/packages/example/aws-1.0.0/dataset/vpn/fields/fields.yml
@@ -0,0 +1,6 @@
+- name: aws.vpn
+  type: group
+  description: >
+    `vpn` contains the metrics from Cloudwatch to track usage of VPN related resources.
+  release: beta
+  fields:
diff --git a/dev/packages/example/aws-1.0.0/dataset/vpn/manifest.yml b/dev/packages/example/aws-1.0.0/dataset/vpn/manifest.yml
new file mode 100644
index 000000000..d50530484
--- /dev/null
+++ b/dev/packages/example/aws-1.0.0/dataset/vpn/manifest.yml
@@ -0,0 +1,14 @@
+title: AWS vpn metrics
+release: beta
+type: metrics
+
+streams:
+  - input: aws/metrics
+    title: AWS vpn metrics
+    description: AWS vpn metrics
+    enabled: false
+    vars:
+      - name: period
+        description: Collection frequency for vpn metrics.
+        type: period
+        default: 1m