diff --git a/lab5/nerdlets/my-nerdlet/nr1.json b/lab5/nerdlets/my-nerdlet/nr1.json
index 14d05d6..d8c968e 100644
--- a/lab5/nerdlets/my-nerdlet/nr1.json
+++ b/lab5/nerdlets/my-nerdlet/nr1.json
@@ -3,11 +3,12 @@
     "id": "lab5-nerdlet",
     "displayName": "NerdGraph Nerdlet",
     "description": "Explore using NerdGraph in Nerdlet.",
-    "entities": [
-        {
-            "domain": "APM",
-            "type": "APPLICATION"
-        }
-    ],
-    "actionCategory": "monitor"
+    "context": {
+        "entities": [
+            {
+                "domain": "APM",
+                "type": "APPLICATION"
+            }
+        ]
+    }
 }
\ No newline at end of file
diff --git a/lab7/INSTRUCTIONS.md b/lab7/INSTRUCTIONS.md
index 9f1b2ac..fe163c7 100644
--- a/lab7/INSTRUCTIONS.md
+++ b/lab7/INSTRUCTIONS.md
@@ -20,13 +20,14 @@ Load the prequisites and follow the setup instructions in [Setup](../SETUP.md).
 cd lab7
 nr1 nerdpack:uuid -gf
 npm install
+nr1 nerdpack:serve
 ```
 
 ## Step 1: Accessing the Nerdlet
 
 You'll notice that this `Nerdlet` doesn't have a corresponding `Launcher`, so we're going to need to find it.
 
-1. Open the file `lab7/nerdlets/my-nerdlet/nr1.json` and check out the contents. They look like the following. There are two attributes we want to pay attention to: `entities` and `actionCategory`.
+1. Open the file `lab7/nerdlets/my-nerdlet/nr1.json` and check out the contents. They look like the following. Pay attention to the `context` attribute:
 
 ```json
 {
@@ -34,8 +35,14 @@ You'll notice that this `Nerdlet` doesn't have a corresponding `Launcher`, so we
     "id": "my-nerdlet",
     "description": "Describe me",
     "displayName": "Lab 7: Custom Data",
-    "entities": [{"domain": "BROWSER", "type": "APPLICATION"}],
-    "actionCategory": "monitor"
+    "context": {
+        "entities": [
+            {
+                "domain": "BROWSER",
+                "type": "APPLICATION"
+            }
+        ]
+    }
 }
 ```
 
@@ -217,4 +224,5 @@ export default class MyNerdlet extends React.Component {
 # For Consideration / Discussion
 
 * What other types of data might you chose to intermingle with performance data?
-* Does it make sense why the `Lab 7: Custom Data` Nerdlet was only displaying for `Browser Application` instances? FYI, a value of `entities: [*]` makes a Nerdlet available for all Entity Types.
+* Does it make sense why the `Lab 7: Custom Data` Nerdlet was only displaying for `Browser Application` instances?
+* Read more about how to attach a Nerdlet to your entities in [our documentation](https://developer.newrelic.com/build-apps/attach-nerdlet-to-entities/).
diff --git a/lab7/nerdlets/my-nerdlet/nr1.json b/lab7/nerdlets/my-nerdlet/nr1.json
index 3d1660a..ffb7f37 100644
--- a/lab7/nerdlets/my-nerdlet/nr1.json
+++ b/lab7/nerdlets/my-nerdlet/nr1.json
@@ -3,6 +3,12 @@
     "id": "my-nerdlet",
     "description": "Describe me",
     "displayName": "Lab 7: Custom Data",
-    "entities": [{"domain": "BROWSER", "type": "APPLICATION"}],
-    "actionCategory": "monitor"
-}
+    "context": {
+        "entities": [
+            {
+                "domain": "BROWSER",
+                "type": "APPLICATION"
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/lab8/INSTRUCTIONS.md b/lab8/INSTRUCTIONS.md
index eef9b0a..bb3d8de 100644
--- a/lab8/INSTRUCTIONS.md
+++ b/lab8/INSTRUCTIONS.md
@@ -39,7 +39,7 @@ So let's get started!
 
 For the purposes of expediency, this lab provides a lot more working code than some of the previous exercises. Please take a moment to review the following files.
 
-1. Open the file `lab8/nerdlets/my-nerdlet/nr1.json` and check out the contents. They look like the following. There are two attributes we want to pay attention to: `entities` and `actionCategory`.
+1. Open the file `lab8/nerdlets/my-nerdlet/nr1.json` and check out the contents. They look like the following. Pay attention to the `context` attribute.
 
 Just like in [`lab7`](../lab7/INSTRUCTIONS.md), we're going to access this Nerdlet via the `Entity Explorer`.
 
@@ -49,8 +49,14 @@ Just like in [`lab7`](../lab7/INSTRUCTIONS.md), we're going to access this Nerdl
     "id": "my-nerdlet",
     "description": "Describe me",
     "displayName": "Lab 8: Location Performance",
-    "entities": [{"domain": "BROWSER", "type": "APPLICATION"}],
-    "actionCategory": "monitor"
+    "context": {
+        "entities": [
+            {
+                "domain": "BROWSER",
+                "type": "APPLICATION"
+            }
+        ]
+    }
 }
 ```
 
diff --git a/lab8/nerdlets/my-nerdlet/nr1.json b/lab8/nerdlets/my-nerdlet/nr1.json
index 3e76bdf..37d2700 100644
--- a/lab8/nerdlets/my-nerdlet/nr1.json
+++ b/lab8/nerdlets/my-nerdlet/nr1.json
@@ -3,6 +3,12 @@
     "id": "my-nerdlet",
     "description": "Describe me",
     "displayName": "Lab 8: Location Performance",
-    "entities": [{"domain": "BROWSER", "type": "APPLICATION"}],
-    "actionCategory": "monitor"
-}
+    "context": {
+        "entities": [
+            {
+                "domain": "BROWSER",
+                "type": "APPLICATION"
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/lab9/nerdlets/my-nerdlet/nr1.json b/lab9/nerdlets/my-nerdlet/nr1.json
index 6c2299c..6c7f4de 100644
--- a/lab9/nerdlets/my-nerdlet/nr1.json
+++ b/lab9/nerdlets/my-nerdlet/nr1.json
@@ -3,6 +3,16 @@
     "id": "my-nerdlet",
     "description": "Describe me",
     "displayName": "Lab 9: Perf. Compare",
-    "entities": [{"domain": "BROWSER", "type": "APPLICATION"}, { "domain": "APM",  "type": "APPLICATION" }],
-    "actionCategory": "monitor"
-}
+    "context": {
+        "entities": [
+            {
+                "domain": "BROWSER",
+                "type": "APPLICATION"
+            },
+            {
+                "domain": "APM",
+                "type": "APPLICATION"
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/screenshots/lab7_screen00.png b/screenshots/lab7_screen00.png
index c334500..ea3145a 100644
Binary files a/screenshots/lab7_screen00.png and b/screenshots/lab7_screen00.png differ