diff --git a/sensors/aviation/sensorhub-utils-aero/build.gradle b/sensors/aviation/sensorhub-utils-aero/build.gradle
index 91436fe76..d3105a4f3 100644
--- a/sensors/aviation/sensorhub-utils-aero/build.gradle
+++ b/sensors/aviation/sensorhub-utils-aero/build.gradle
@@ -3,6 +3,7 @@ ext.details = 'Common classes for use in aviation applications (e.g. aircraft st
 version = '1.0.0'
 
 dependencies {
+  implementation 'org.locationtech.jts:jts-core:1.19.0'
   implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion
   implementation project(':sensorhub-process-geoloc')
 }
diff --git a/sensors/aviation/sensorhub-utils-aero/src/main/java/org/sensorhub/utils/aero/INavDatabase.java b/sensors/aviation/sensorhub-utils-aero/src/main/java/org/sensorhub/utils/aero/INavDatabase.java
index 14781f82e..1c8befaca 100644
--- a/sensors/aviation/sensorhub-utils-aero/src/main/java/org/sensorhub/utils/aero/INavDatabase.java
+++ b/sensors/aviation/sensorhub-utils-aero/src/main/java/org/sensorhub/utils/aero/INavDatabase.java
@@ -18,6 +18,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.TimeoutException;
+import org.locationtech.jts.geom.Polygon;
 import org.sensorhub.api.ISensorHub;
 import org.sensorhub.api.common.SensorHubException;
 import org.sensorhub.impl.module.ModuleRegistry;
@@ -46,11 +47,28 @@ public interface INavDbWaypoint extends IWaypoint
     {
         public String getName();
     }
-    
-    
+ 
+
+    public interface INavDbShape
+    {
+        public String getName();
+        public Polygon getGeom();
+    }
+ 
+
+    public interface INavDbRoute
+    {
+        public String getName();
+        public List<String> getFixes();
+    }
+
+
     public boolean isReady();
     
-    
+
+    public String getDbPath();
+ 
+
     /**
      * @return The AIRAC date of the loaded database or null if unknown
      */
@@ -64,8 +82,23 @@ public interface INavDbWaypoint extends IWaypoint
     
     
     public Collection<? extends INavDbWaypoint> getAllWaypoints();
+
+
+    public Collection<? extends INavDbRoute> getAllAirways();
+
+
+    public Collection<? extends INavDbRoute> getAllSids();
+
+
+    public Collection<? extends INavDbRoute> getAllStars();
+
+
+    public Collection<? extends INavDbShape> getAllSuas();
+
+
+    public Collection<? extends INavDbShape> getAllFirs();
     
-    
+
     public IDecodedRoute decodeRoute(String codedRouteString);