diff --git a/build/libs/RobotBuilder-all.jar b/build/libs/RobotBuilder-all.jar
index d2f7285d..6bc64b8d 100644
Binary files a/build/libs/RobotBuilder-all.jar and b/build/libs/RobotBuilder-all.jar differ
diff --git a/src/main/java/robotbuilder/exporters/GenericExporter.java b/src/main/java/robotbuilder/exporters/GenericExporter.java
index b1a82218..33b5bba1 100644
--- a/src/main/java/robotbuilder/exporters/GenericExporter.java
+++ b/src/main/java/robotbuilder/exporters/GenericExporter.java
@@ -341,6 +341,9 @@ public Map<String, String> filterComponents(final String propertyName, RobotComp
                         mapping.put(component.getProperty(property).getValue().toString(), component.getSubsystem() + delimiter + component.getName() + delimiter2 + "Servo");
                     } else if (propertyName.equals("Channel (PWM)") && component.getBaseType().equals("Nidec Brushless")) {
                         mapping.put(component.getProperty(property).getValue().toString(), component.getSubsystem() + delimiter + component.getName() + delimiter2 + "Nidec Brushless");
+                    } else if (propertyName.equals("CAN ID")) {
+                        String type1 = component.getBase().toString();
+                        mapping.put(component.getProperty(property).getValue().toString(), component.getSubsystem() + delimiter + component.getName() + delimiter2 + type1);
                     } else {
                         mapping.put(component.getProperty(property).getValue().toString(), component.getSubsystem() + delimiter + component.getName());
                     }
diff --git a/src/main/resources/export/wiring/macros.vm b/src/main/resources/export/wiring/macros.vm
index f53932e4..68e47820 100644
--- a/src/main/resources/export/wiring/macros.vm
+++ b/src/main/resources/export/wiring/macros.vm
@@ -77,7 +77,8 @@
     <table><tr>
     <th class="pound">ID</th>
     <th>Subsystem</th>
-    <th>Device</th></tr>
+    <th>Device</th>
+    <th>Type</th></tr>
     #to_rows($ports)
     </table>
     #end
diff --git a/src/main/resources/export/wiring/wiring.html b/src/main/resources/export/wiring/wiring.html
index 996abd53..52b74bb5 100644
--- a/src/main/resources/export/wiring/wiring.html
+++ b/src/main/resources/export/wiring/wiring.html
@@ -4,7 +4,7 @@
     <style type="text/css" media="screen">
       table {
           text-align: left;
-          width: 400px;
+          width: 480px;
 
           border-top: 2px solid black;
           border-bottom: 2px solid black;