diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/ISwitch.java b/diylc/diylc-core/src/main/java/org/diylc/core/ISwitch.java
index c1fdbb91..b4999a3e 100644
--- a/diylc/diylc-core/src/main/java/org/diylc/core/ISwitch.java
+++ b/diylc/diylc-core/src/main/java/org/diylc/core/ISwitch.java
@@ -28,7 +28,7 @@ import java.awt.*;
  * 
  * @author Branislav Stojkovic
  */
-public interface ISwitch {
+public interface ISwitch extends IContinuity {
 
   Color[] POLE_COLORS = new Color[] {
       Color.decode("#FFD1DC"), // Pastel Pink
@@ -74,4 +74,11 @@ public interface ISwitch {
   default Boolean getHighlightConnectedTerminals() {
     return false;
   }
+
+  default boolean arePointsConnected(int index1, int index2) {
+    if (getSelectedPosition() == null) {
+      return false;
+    }
+    return arePointsConnected(index1, index2, getSelectedPosition());
+  }
 }
diff --git a/diylc/diylc-library/src/main/java/org/diylc/components/guitar/Freeway3x3_03.java b/diylc/diylc-library/src/main/java/org/diylc/components/guitar/Freeway3x3_03.java
index c91c7d39..0fc7420f 100644
--- a/diylc/diylc-library/src/main/java/org/diylc/components/guitar/Freeway3x3_03.java
+++ b/diylc/diylc-library/src/main/java/org/diylc/components/guitar/Freeway3x3_03.java
@@ -66,8 +66,7 @@ import static org.diylc.utils.SwitchUtils.getConnectedTerminals;
     zOrder = IDIYComponent.COMPONENT, instanceNamePrefix = "SW",
     keywordPolicy = KeywordPolicy.SHOW_TAG, keywordTag = "Guitar Wiring Diagram",
     transformer = Freeway3x3_03Transformer.class, enableCache = true)
-public class Freeway3x3_03 extends AbstractTransparentComponent<Void> implements ISwitch,
-    IContinuity {
+public class Freeway3x3_03 extends AbstractTransparentComponent<Void> implements ISwitch {
 
   private static final Logger LOG = Logger.getLogger(Freeway3x3_03.class);
 
@@ -491,12 +490,4 @@ public class Freeway3x3_03 extends AbstractTransparentComponent<Void> implements
     }
     return false;
   }
-
-  @Override
-  public boolean arePointsConnected(int index1, int index2) {
-    if (this.selectedPosition == null) {
-      return false;
-    }
-    return arePointsConnected(index1, index2, this.selectedPosition);
-  }
 }
diff --git a/diylc/diylc-library/src/main/java/org/diylc/components/guitar/LeverSwitch.java b/diylc/diylc-library/src/main/java/org/diylc/components/guitar/LeverSwitch.java
index 7458989b..d61ae98e 100644
--- a/diylc/diylc-library/src/main/java/org/diylc/components/guitar/LeverSwitch.java
+++ b/diylc/diylc-library/src/main/java/org/diylc/components/guitar/LeverSwitch.java
@@ -56,7 +56,7 @@ import static org.diylc.utils.SwitchUtils.getConnectedTerminals;
     description = "Strat-style lever switch", zOrder = IDIYComponent.COMPONENT,
     instanceNamePrefix = "SW", keywordPolicy = KeywordPolicy.SHOW_TAG,
     keywordTag = "Guitar Wiring Diagram", transformer = AngledComponentTransformer.class)
-public class LeverSwitch extends AbstractAngledComponent<LeverSwitch.LeverSwitchType> implements ISwitch, IContinuity {
+public class LeverSwitch extends AbstractAngledComponent<LeverSwitch.LeverSwitchType> implements ISwitch {
 
   private static final long serialVersionUID = 1L;
 
@@ -444,14 +444,6 @@ public class LeverSwitch extends AbstractAngledComponent<LeverSwitch.LeverSwitch
     return false;
   }
 
-  @Override
-  public boolean arePointsConnected(int index1, int index2) {
-    if (this.selectedPosition == null) {
-      return false;
-    }
-    return arePointsConnected(index1, index2, this.selectedPosition);
-  }
-  
   @Override
   public boolean canPointMoveFreely(int pointIndex) {
     return false;
diff --git a/diylc/diylc-library/src/main/java/org/diylc/components/guitar/SchallerMegaSwitch.java b/diylc/diylc-library/src/main/java/org/diylc/components/guitar/SchallerMegaSwitch.java
index eddca74a..2da6b3bb 100644
--- a/diylc/diylc-library/src/main/java/org/diylc/components/guitar/SchallerMegaSwitch.java
+++ b/diylc/diylc-library/src/main/java/org/diylc/components/guitar/SchallerMegaSwitch.java
@@ -60,8 +60,7 @@ import static org.diylc.utils.SwitchUtils.getConnectedTerminals;
     author = "Branislav Stojkovic", description = "Several variations of Schaller Megaswitch",
     zOrder = IDIYComponent.COMPONENT, instanceNamePrefix = "SW",
     keywordPolicy = KeywordPolicy.SHOW_TAG, keywordTag = "Guitar Wiring Diagram", transformer = AngledComponentTransformer.class)
-public class SchallerMegaSwitch extends AbstractAngledComponent<String> implements ISwitch,
-    IContinuity {
+public class SchallerMegaSwitch extends AbstractAngledComponent<String> implements ISwitch {
 
   private static final long serialVersionUID = 1L;
 
@@ -544,14 +543,6 @@ public class SchallerMegaSwitch extends AbstractAngledComponent<String> implemen
     
     return false;   
   }
-
-  @Override
-  public boolean arePointsConnected(int index1, int index2) {
-    if (this.selectedPosition == null) {
-      return false;
-    }
-    return arePointsConnected(index1, index2, this.selectedPosition);
-  }
   
   @Override
   public String getControlPointNodeName(int index) {