diff --git a/tocalls.yaml b/tocalls.yaml
index 8f74761..fc1c5a0 100644
--- a/tocalls.yaml
+++ b/tocalls.yaml
@@ -134,6 +134,16 @@ mice:
    model: FTM-510D
    class: rig
 
+ - suffix: "_6"
+   vendor: Yaesu
+   model: FTX-1
+   class: rig
+
+ - suffix: "_7"
+   vendor: Yaesu
+   model: FTM-310D
+   class: rig
+
  - suffix: "_)"
    vendor: Yaesu
    model: FTM-100D
@@ -191,7 +201,7 @@ mice:
  - suffix: "[1"
    vendor: Open Source
    model: APRSdroid
-   class: software
+   class: app
    os: Android
 
 #
@@ -2147,7 +2157,12 @@ tocalls:
    vendor: Yaesu
    model: FTM-300D
    class: rig
-   
+
+ - tocall: APY310
+   vendor: Yaesu
+   model: FTM-310D
+   class: rig
+
  - tocall: APY400
    vendor: Yaesu
    model: FTM-400
@@ -2168,6 +2183,11 @@ tocalls:
    model: Python APRS
    class: software
 
+ - tocall: APYX01
+   vendor: Yaesu
+   model: FTX-1
+   class: rig
+
  - tocall: "APZ*"
    vendor: Unknown
    model: Experimental