diff --git a/schemas/maker-v2.json b/schemas/maker-v2.json
index 1628069..de07ed3 100644
--- a/schemas/maker-v2.json
+++ b/schemas/maker-v2.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "id": "https://raw.githubusercontent.com/rrbaker/maker.json/master/schemas/schema-v1.json",
+  "id": "https://raw.githubusercontent.com/rrbaker/maker.json/master/schemas/schema-v2.json",
   "type": "object",
   "properties": {
     "name": {
@@ -111,9 +111,137 @@
       "description": "Main number for more information",
       "type": "string"
     },
-    "tools": {
-      "title": "Tools",
-      "type": "string"
+    "equipment": {
+      "title": "Equipment",
+      "description": "What equipment does your space provide access to?",
+      "type": "array",
+      "items": {
+        "entry": {
+          "type": "object",
+          "properties": {
+            "machine-type": {
+              "type": "string",
+              "enum": [
+                "2D Printer",
+                "2D Plotter",
+                "3D Printer",
+                "3D Scanner",
+                "Abrassive Waterjet",
+                "Abrassive Cut-Off Saw",
+                "Annealer",
+                "Arbor Press",
+                "Belt Sander",
+                "Belt-disc Sander",
+                "Belt Grinder",
+                "Bench Grinder",
+                "Brake",
+                "Buffing Wheel",
+                "Cabinet Saw",
+                "Centrifuge",
+                "Coal Forge",
+                "Coil Winder",
+                "Cold Saw",
+                "Shear-Brake-Slip Roll",
+                "Shear-Brake-Notch",
+                "Chop Saw",
+                "Coordinate Measuring Machine",
+                "Digital Projector",
+                "Disc Sander",
+                "Display",
+                "Drill Press",
+                "Embroidery Machine",
+                "Encapsulator",
+                "FIB (Focused Ion Beam) Machine",
+                "Furnace",
+                "Fume Hood",
+                "Function Generator",
+                "Glory Hole",
+                "Hardness Tester",
+                "Hot Mount Press",
+                "Hot Wire Cutter",
+                "Horizontal Band Saw",
+                "Impact Tester",
+                "Injection Molding Machine",
+                "Jig Saw",
+                "Jointer",
+                "Jointer-Planer",
+                "Kiln",
+                "Laser Cutter",
+                "Laser Machining",
+                "Lathe",
+                "Led Projector",
+                "Microscope",
+                "MIG (Metal Inert Gas) Machine",
+                "Mill",
+                "Mitre Saw",
+                "Mortiser",
+                "Notcher",
+                "Optical Comparator",
+                "Oscilloscope",
+                "Oxy Acetalyne Machine",
+                "Panel Saw",
+                "PVD Coating Machine",
+                "Pipe Bender",
+                "Pipe Warmer",
+                "Plasma Cleaner",
+                "Plasma Cutter",
+                "Planer",
+                "Polishing Wheel",
+                "Polisher",
+                "Power Supply",
+                "Press",
+                "Punch",
+                "Refolow Oven",
+                "Robot",
+                "Roll",
+                "Rolling Mill",
+                "Router (CNC)",
+                "Router Table",
+                "Sand Blaster",
+                "Saw",
+                "Scroll Saw",
+                "Serger",
+                "Sewing Machine",
+                "Shearing Machine",
+                "Short Throw Projector",
+                "Sink EDM (Electric Discharge Machine)",
+                "Slip Roll",
+                "Solder Station",
+                "Spindle-Sander",
+                "Spot-Welder",
+                "Strip Heater",
+                "Surface Grinder",
+                "Table Saw",
+                "Thermoformer",
+                "TIG (Tungsten Inert Gas) Welding",
+                "Tool Grinder",
+                "Tumbler",
+                "Ultrasonic Welder",
+                "Universal Testing Machine",
+                "Vertical Band Saw",
+                "Vinyl Cutter",
+                "Wire Bonder",
+                "Wire EDM (Electric Discharge Machine)",
+                "Wood Lathe"
+              ],
+            },
+            "brand": {
+              "oneOf": [
+                { "type": "string" },
+                { "type": "string", "enum": ["Selfbuild"] },
+              ]
+            },
+            "model": {
+              "oneOf": [
+                { "type": "string" },
+                { "type": "string", "enum": ["N/A"] },
+              ]
+            },
+            "material-compatibility": { "type": "string" },
+            "amount": { "type": "integer", "description": "How many of these machines or tools do you have?" },
+          }
+        }
+      }
     },
     "last-updated": {
       "title": "Last updated",