diff --git a/src/net/refractions/udig/catalog/neo4j/findpath/GenerateLineStringNetworkOp.java b/src/net/refractions/udig/catalog/neo4j/findpath/GenerateLineStringNetworkOp.java
index b9e71e8..c96455b 100644
--- a/src/net/refractions/udig/catalog/neo4j/findpath/GenerateLineStringNetworkOp.java
+++ b/src/net/refractions/udig/catalog/neo4j/findpath/GenerateLineStringNetworkOp.java
@@ -37,7 +37,7 @@ public void op(Display display, Object target, IProgressMonitor monitor) throws
 		Neo4jSpatialGeoResource geoResource = (Neo4jSpatialGeoResource) target;
 		Neo4jSpatialDataStore dataStore = (Neo4jSpatialDataStore) geoResource.service().getDataStore(monitor);
 		SpatialDatabaseService spatialDatabase = dataStore.getSpatialDatabaseService();
-		Layer layer = spatialDatabase.getLayer(geoResource.getTypeName());
+		DefaultLayer layer = (DefaultLayer) spatialDatabase.getLayer(geoResource.getTypeName());
 
 		if (layer == null) {
 			Activator.log("Layer NOT found: " + layer);
@@ -45,7 +45,7 @@ public void op(Display display, Object target, IProgressMonitor monitor) throws
 			return;
 		} 
 		
-		Integer geomType = layer.getGeometryType();
+		Integer geomType = layer.getOrGuessGeometryType();
 		if (geomType == null) {
 			Activator.openError(display, "Error creating Network", "Unable to read Layer Geometry Type");
 			return;			
diff --git a/src/net/refractions/udig/catalog/neo4j/findpath/WayPointTool.java b/src/net/refractions/udig/catalog/neo4j/findpath/WayPointTool.java
index 1bd0f22..067c405 100644
--- a/src/net/refractions/udig/catalog/neo4j/findpath/WayPointTool.java
+++ b/src/net/refractions/udig/catalog/neo4j/findpath/WayPointTool.java
@@ -14,7 +14,7 @@
 import org.eclipse.jface.action.IStatusLineManager;
 import org.eclipse.swt.widgets.Display;
 import org.neo4j.gis.spatial.Constants;
-import org.neo4j.gis.spatial.Layer;
+import org.neo4j.gis.spatial.DefaultLayer;
 import org.neo4j.gis.spatial.SpatialDatabaseRecord;
 import org.neo4j.gis.spatial.SpatialDatabaseService;
 import org.neo4j.gis.spatial.geotools.data.Neo4jSpatialDataStore;
@@ -62,9 +62,9 @@ public void onMousePressed(MapMouseEvent evt) {
 		SpatialDatabaseService spatialDatabase = dataStore.getSpatialDatabaseService();
 		Transaction tx = spatialDatabase.getDatabase().beginTx();
 		try {
-			Layer layer = spatialDatabase.getLayer(getContext().getSelectedLayer().getName());
+			DefaultLayer layer = (DefaultLayer) spatialDatabase.getLayer(getContext().getSelectedLayer().getName());
 
-			Integer geomType = layer.getGeometryType();
+			Integer geomType = layer.getOrGuessGeometryType();
 			if (geomType == null) {
 				Activator.openError(display, "Error creating WayPoint", "Unable to read Layer Geometry Type");
 				return;