diff --git a/swagger/sdrangel/api/swagger/include/ADSBDemod.yaml b/swagger/sdrangel/api/swagger/include/ADSBDemod.yaml
index da23a93f3..53aa0c807 100644
--- a/swagger/sdrangel/api/swagger/include/ADSBDemod.yaml
+++ b/swagger/sdrangel/api/swagger/include/ADSBDemod.yaml
@@ -126,3 +126,30 @@ ADSBDemodReport:
     targetRange:
       type: number
       format: float
+    aircraftState:
+      type: array
+      items:
+        $ref: "http://swgserver:8081/api/swagger/include/ADSBDemod.yaml#/ADSBDemodAircraftState"
+
+ADSBDemodAircraftState:
+  properties:
+    icao:
+      description: "24-bit hex ICAO identifier"
+      type: string
+    callsign:
+      description: "Callsign (E.g. BAW123)"
+      type: string
+    latitude:
+      description: "Latitude of aircraft in degrees"
+      type: number
+      format: float
+    longitude:
+      description: "Longitude of aircraft in degrees"
+      type: number
+      format: float
+    altitude:
+      description: "Altitude of aircraft in feet"
+      type: integer
+    groundSpeed:
+      description: "Groundspeed of aircraft in knots"
+      type: integer
diff --git a/swagger/sdrangel/api/swagger/include/FreqScanner.yaml b/swagger/sdrangel/api/swagger/include/FreqScanner.yaml
index 34b669e46..d2bb0c510 100644
--- a/swagger/sdrangel/api/swagger/include/FreqScanner.yaml
+++ b/swagger/sdrangel/api/swagger/include/FreqScanner.yaml
@@ -10,19 +10,10 @@ FreqScannerSettings:
     threshold:
       type: number
       format: float
-    m_frequencies:
+    frequencies:
       type: array
       items:
-        type: integer
-        format: int64
-    m_enabled:
-      type: array
-      items:
-        type: integer
-    m_notes:
-      type: array
-      items:
-        type: string
+        $ref: "http://swgserver:8081/api/swagger/include/FreqScanner.yaml#/FreqScannerFrequency"
     channel:
       type: string
     scanTime:
@@ -68,3 +59,13 @@ FreqScannerReport:
   properties:
     channelSampleRate:
       type: integer
+
+FreqScannerFrequency:
+  properties:
+    frequency:
+      type: integer
+      format: int64
+    enabled:
+      type: integer
+    notes:
+      type: string