diff --git a/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/features/AbstractConnectionRouter.java b/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/features/AbstractConnectionRouter.java
index 0d5f5f9..da46eb1 100644
--- a/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/features/AbstractConnectionRouter.java
+++ b/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/features/AbstractConnectionRouter.java
@@ -30,7 +30,7 @@
 	
 	public enum Direction { UP, DOWN, LEFT, RIGHT, NONE };
 
-	IFeatureProvider fp;
+	protected IFeatureProvider fp;
 
 	public AbstractConnectionRouter(IFeatureProvider fp) {
 		this.fp = fp;
diff --git a/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/features/DefaultConnectionRouter.java b/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/features/DefaultConnectionRouter.java
index 4e07dfb..a7ce564 100644
--- a/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/features/DefaultConnectionRouter.java
+++ b/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/features/DefaultConnectionRouter.java
@@ -57,8 +57,8 @@
 
 	protected List<ContainerShape> allShapes;
 	Connection connection;
-	ContainerShape source;
-	ContainerShape target;
+	protected ContainerShape source;
+	protected ContainerShape target;
 	protected Anchor sourceAnchor, targetAnchor;
 	
 	public DefaultConnectionRouter(IFeatureProvider fp) {
diff --git a/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/features/ManhattanConnectionRouter.java b/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/features/ManhattanConnectionRouter.java
index 6ac3cfe..1702cf6 100644
--- a/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/features/ManhattanConnectionRouter.java
+++ b/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/features/ManhattanConnectionRouter.java
@@ -57,7 +57,7 @@
  * the connection is cleaned up when it's done, so we don't want to allow
  * this class to be subclassed.
  */
-public final class ManhattanConnectionRouter extends BendpointConnectionRouter {
+public class ManhattanConnectionRouter extends BendpointConnectionRouter {
 
 	protected LineSegment sourceTopEdge;
 	protected LineSegment sourceBottomEdge;