diff --git a/model_window.go b/model_window.go
index bf537af..a268976 100644
--- a/model_window.go
+++ b/model_window.go
@@ -5,15 +5,15 @@ import "encoding/json"
 type WindowID int
 
 type Window struct {
-	ID          WindowID     `json:"id"`
-	Title       string       `json:"title"`
-	AppID       string       `json:"app_id"`
-	PID         int          `json:"pid"`
-	WorkspaceID WorkspaceID  `json:"workspace_id"`
-	Urgent      bool         `json:"is_urgent"`
-	Floating    bool         `json:"is_floating"`
-	Focused     bool         `json:"is_focused"`
-	Layout      WindowLayout `json:"layout"`
+	ID          WindowID            `json:"id"`
+	Title       Option[string]      `json:"title"`
+	AppID       Option[string]      `json:"app_id"`
+	PID         Option[int]         `json:"pid"`
+	WorkspaceID Option[WorkspaceID] `json:"workspace_id"`
+	Urgent      bool                `json:"is_urgent"`
+	Floating    bool                `json:"is_floating"`
+	Focused     bool                `json:"is_focused"`
+	Layout      WindowLayout        `json:"layout"`
 }
 
 func (m Window) String() string {