diff --git a/src/HassModel/NetDeamon.HassModel/Internal/HassObjectMapper.cs b/src/HassModel/NetDeamon.HassModel/Internal/HassObjectMapper.cs
index ddceca4e..03693a04 100644
--- a/src/HassModel/NetDeamon.HassModel/Internal/HassObjectMapper.cs
+++ b/src/HassModel/NetDeamon.HassModel/Internal/HassObjectMapper.cs
@@ -120,8 +120,17 @@ public static EntityRegistration Map(this HassEntity hassEntity, IHaRegistryNavi
             Device = device,
             Labels = hassEntity.Labels.Select(registry.GetLabel).OfType<Label>().ToList(),
             Platform = hassEntity.Platform,
-            Options = new EntityOptions(hassEntity.Options)
+            Options = hassEntity.Options?.Map()
         };
     }
 
+    private static EntityOptions Map(this HassEntityOptions entityOptions)
+    {
+        return new EntityOptions { ConversationOptions = entityOptions.Conversation?.Map() };
+    }
+
+    private static ConversationOptions Map(this HassEntityConversationOptions options)
+    {
+        return new ConversationOptions { ShouldExpose = options.ShouldExpose };
+    }
 }
diff --git a/src/HassModel/NetDeamon.HassModel/Registry/ConversationOptions.cs b/src/HassModel/NetDeamon.HassModel/Registry/ConversationOptions.cs
index 9a2f421e..d68c7f66 100644
--- a/src/HassModel/NetDeamon.HassModel/Registry/ConversationOptions.cs
+++ b/src/HassModel/NetDeamon.HassModel/Registry/ConversationOptions.cs
@@ -1,28 +1,12 @@
-namespace NetDaemon.HassModel.Entities
+namespace NetDaemon.HassModel.Entities;
+
+/// <summary>
+/// The options related to Assist/Conversation Assistants
+/// </summary>
+public record ConversationOptions
 {
     /// <summary>
-    /// The options related to Assist/Conversation Assistants
+    /// If the entity should be available to voice/ai assistants
     /// </summary>
-    public record ConversationOptions
-    {
-        /// <summary>
-        /// If the entity should be available to voice/ai assistants
-        /// </summary>
-        public bool? ShouldExpose { get; init; }
-
-        /// <summary>
-        /// Default Constructor
-        /// </summary>
-        public ConversationOptions() { }
-
-        /// <summary>
-        /// Conversion from Websocket/API Model
-        /// </summary>
-        /// <param name="entityConversationOpts"></param>
-        public ConversationOptions(HassEntityConversationOptions entityConversationOpts)
-        {
-            ShouldExpose = entityConversationOpts.ShouldExpose;
-        }
-    }
-
+    public bool? ShouldExpose { get; init; }
 }
diff --git a/src/HassModel/NetDeamon.HassModel/Registry/EntityOptions.cs b/src/HassModel/NetDeamon.HassModel/Registry/EntityOptions.cs
index 97ef0b21..ecf0a981 100644
--- a/src/HassModel/NetDeamon.HassModel/Registry/EntityOptions.cs
+++ b/src/HassModel/NetDeamon.HassModel/Registry/EntityOptions.cs
@@ -9,18 +9,5 @@ public record EntityOptions
     /// The Assist/Conversation options for a registration entity
     /// </summary>
     public ConversationOptions? ConversationOptions { get; init; }
-
-    /// <summary>
-    /// Conversion from Websocket/API Model
-    /// </summary>
-    /// <param name="entityOpts"></param>
-    public EntityOptions(HassEntityOptions? entityOpts)
-    {
-        if (entityOpts?.Conversation == null)
-            ConversationOptions = new ConversationOptions();
-        else
-            ConversationOptions = new ConversationOptions(entityOpts.Conversation);
-                
-    }
 }