diff --git a/subt_ign/src/ConnectionHelper.cc b/subt_ign/src/ConnectionHelper.cc
index c4ccb058..f7f64cfc 100644
--- a/subt_ign/src/ConnectionHelper.cc
+++ b/subt_ign/src/ConnectionHelper.cc
@@ -72,21 +72,32 @@ std::map<std::string, std::vector<ignition::math::Vector3d>>
     {"Urban Large Room Split Lights", {{0, -20, 0}, {-20, 0, 0}, {0, 20, 0}}},
     {"Cave Starting Area", {{12.5, 0, 0}}},
     {"Cave Straight 01", {{0, 12.5, 0}, {0, -12.5, 0}}},
+    {"Cave Straight 01 Lights", {{0, 12.5, 0}, {0, -12.5, 0}}},
     {"Cave Straight 02", {{0, 12.5, 0}, {0, -12.5, 0}}},
+    {"Cave Straight 02 Lights", {{0, 12.5, 0}, {0, -12.5, 0}}},
     {"Cave Straight 03", {{0, 12.5, 0}, {0, -12.5, 0}}},
     {"Cave Straight 04", {{0, 12.5, 0}, {0, -12.5, 0}}},
+    {"Cave Straight 04 Lights", {{0, 12.5, 0}, {0, -12.5, 0}}},
     {"Cave Straight 05", {{0, 12.5, 0}, {0, -12.5, 0}}},
+    {"Cave Straight 05 Lights", {{0, 12.5, 0}, {0, -12.5, 0}}},
     {"Cave Corner 01", {{-12.5, 0, 0}, {0, 12.5, 0}}},
+    {"Cave Corner 01 Lights", {{-12.5, 0, 0}, {0, 12.5, 0}}},
     {"Cave Corner 02", {{-12.5, 0, 0}, {0, 12.5, 0}}},
+    {"Cave Corner 02 Lights", {{-12.5, 0, 0}, {0, 12.5, 0}}},
     {"Cave 3 Way 01", {{12.5, 0, 0}, {-12.5, 0, 0}, {0, 12.5, 0}}},
+    {"Cave 3 Way 01 Lights", {{12.5, 0, 0}, {-12.5, 0, 0}, {0, 12.5, 0}}},
     {"Cave Elevation", {{0, 12.5, 0}, {0, -12.5, 10}}},
+    {"Cave Elevation Lights", {{0, 12.5, 0}, {0, -12.5, 10}}},
     {"Cave Vertical Shaft", {{0, 12.5, 20}, {0, -12.5, 0}}},
+    {"Cave Vertical Shaft Lights", {{0, 12.5, 20}, {0, -12.5, 0}}},
     {"Cave Cavern Split 01", {{0, 25, 25}, {12.5, 0, 0}, {-12.5, 0, 0}}},
     {"Cave Cavern Split 02", {{12.5, 0, 0}, {-12.5, 0, 0}}},
     {"Cave Corner 30", {{12.5, 0, 0}, {0, 12.5, 0}}},
     {"Cave Corner 30F", {{-12.5, 0, 0}, {0, 12.5, 0}}},
     {"Cave Corner 30 D", {{12.5, 0, 0}, {0, 12.5, 0}}},
-    {"Cave Corner 30F D", {{12.5, 0, 0}, {0, -12.5, 0}}}
+    {"Cave Corner 30 D Lights", {{12.5, 0, 0}, {0, 12.5, 0}}},
+    {"Cave Corner 30F D", {{12.5, 0, 0}, {0, -12.5, 0}}},
+    {"Cave Corner 30F D Lights", {{12.5, 0, 0}, {0, -12.5, 0}}}
   };
 
 std::map<std::string, subt::ConnectionHelper::ConnectionType>
@@ -133,21 +144,32 @@ std::map<std::string, subt::ConnectionHelper::ConnectionType>
     {"Urban Large Room Split Lights", subt::ConnectionHelper::TURN},
     {"Cave Starting Area", subt::ConnectionHelper::STRAIGHT},
     {"Cave Straight 01", subt::ConnectionHelper::STRAIGHT},
+    {"Cave Straight 01 Lights", subt::ConnectionHelper::STRAIGHT},
     {"Cave Straight 02", subt::ConnectionHelper::STRAIGHT},
+    {"Cave Straight 02 Lights", subt::ConnectionHelper::STRAIGHT},
     {"Cave Straight 03", subt::ConnectionHelper::STRAIGHT},
     {"Cave Straight 04", subt::ConnectionHelper::STRAIGHT},
+    {"Cave Straight 04 Lights", subt::ConnectionHelper::STRAIGHT},
     {"Cave Straight 05", subt::ConnectionHelper::STRAIGHT},
+    {"Cave Straight 05 Lights", subt::ConnectionHelper::STRAIGHT},
     {"Cave Corner 01", subt::ConnectionHelper::TURN},
+    {"Cave Corner 01 Lights", subt::ConnectionHelper::TURN},
     {"Cave Corner 02", subt::ConnectionHelper::TURN},
+    {"Cave Corner 02 Lights", subt::ConnectionHelper::TURN},
     {"Cave 3 Way 01", subt::ConnectionHelper::TURN},
+    {"Cave 3 Way 01 Lights", subt::ConnectionHelper::TURN},
     {"Cave Elevation", subt::ConnectionHelper::STRAIGHT},
+    {"Cave Elevation Lights", subt::ConnectionHelper::STRAIGHT},
     {"Cave Vertical Shaft", subt::ConnectionHelper::STRAIGHT},
+    {"Cave Vertical Shaft Lights", subt::ConnectionHelper::STRAIGHT},
     {"Cave Cavern Split 01", subt::ConnectionHelper::TURN},
     {"Cave Cavern Split 02", subt::ConnectionHelper::STRAIGHT},
     {"Cave Corner 30", subt::ConnectionHelper::TURN},
     {"Cave Corner 30F", subt::ConnectionHelper::TURN},
     {"Cave Corner 30 D", subt::ConnectionHelper::TURN},
-    {"Cave Corner 30F D", subt::ConnectionHelper::TURN}
+    {"Cave Corner 30 D Lights", subt::ConnectionHelper::TURN},
+    {"Cave Corner 30F D", subt::ConnectionHelper::TURN},
+    {"Cave Corner 30F D Lights", subt::ConnectionHelper::TURN}
   };
 
 using namespace ignition;