diff --git a/src/models/eta.rs b/src/models/eta.rs
index 13e2abc..be5d312 100644
--- a/src/models/eta.rs
+++ b/src/models/eta.rs
@@ -51,7 +51,7 @@ pub struct Eta {
     #[serde(rename = "isFlt")]
     pub is_flt: String,
     pub flags: Option<String>,
-    pub lat: String,
-    pub lon: String,
-    pub heading: String,
+    pub lat: Option<String>,
+    pub lon: Option<String>,
+    pub heading: Option<String>,
 }
diff --git a/src/models/follow.rs b/src/models/follow.rs
index beb2e99..998fe37 100644
--- a/src/models/follow.rs
+++ b/src/models/follow.rs
@@ -9,9 +9,9 @@ pub struct FollowRequest {
 
 #[derive(Deserialize, Debug, Default)]
 pub struct Position {
-    pub lat: String,
-    pub lon: String,
-    pub heading: String,
+    pub lat: Option<String>,
+    pub lon: Option<String>,
+    pub heading: Option<String>,
 }
 
 #[derive(Deserialize, Debug)]
diff --git a/src/models/train.rs b/src/models/train.rs
index 3048aa8..6581f41 100644
--- a/src/models/train.rs
+++ b/src/models/train.rs
@@ -23,7 +23,7 @@ pub struct Train {
     #[serde(rename = "isDly")]
     pub is_dly: String,
     pub flags: Option<String>,
-    pub lat: String,
-    pub lon: String,
-    pub heading: String,
+    pub lat: Option<String>,
+    pub lon: Option<String>,
+    pub heading: Option<String>,
 }