diff --git a/MobileConfiguration/Factories/Factory.cs b/MobileConfiguration/Factories/Factory.cs
index 512f340..ab33075 100644
--- a/MobileConfiguration/Factories/Factory.cs
+++ b/MobileConfiguration/Factories/Factory.cs
@@ -25,12 +25,13 @@ public static Models.MobileConfiguration ToMobileConfiguration(Configuration con
             {
                 Models.HostAddress hostAddressModel = new()
                 {
-                    Uri = configurationHostAddress.Uri, ServiceType = configurationHostAddress.ServiceType switch
+                    Uri = configurationHostAddress.Uri,
+                    ServiceType = configurationHostAddress.ServiceType switch
                     {
-                        ServiceType.EstateManagement => Models.ServiceType.EstateManagement,
-                        ServiceType.TransactionProcessorAcl => Models.ServiceType.TransactionProcessorAcl,
-                        ServiceType.VoucherManagementAcl => Models.ServiceType.VoucherManagementAcl,
-                        _ => Models.ServiceType.Security
+                        ServiceType.EstateManagement => (Int32)Models.ServiceType.EstateManagement,
+                        ServiceType.TransactionProcessorAcl => (Int32)Models.ServiceType.TransactionProcessorAcl,
+                        ServiceType.VoucherManagementAcl => (Int32)Models.ServiceType.VoucherManagementAcl,
+                        _ => (Int32)Models.ServiceType.Security
                     }
                 };
 
@@ -84,7 +85,7 @@ public static ConfigurationResponse ToConfigurationResponse(Models.MobileConfigu
                 {
                     Uri = configurationHostAddress.Uri,
                 };
-                hostAddress.ServiceType = configurationHostAddress.ServiceType switch
+                hostAddress.ServiceType = (Models.ServiceType)configurationHostAddress.ServiceType switch
                 {
                     Models.ServiceType.TransactionProcessorAcl => ServiceType.TransactionProcessorAcl,
                     _ => ServiceType.Security
diff --git a/MobileConfiguration/Models/Models.cs b/MobileConfiguration/Models/Models.cs
index e130bf8..af34520 100644
--- a/MobileConfiguration/Models/Models.cs
+++ b/MobileConfiguration/Models/Models.cs
@@ -20,7 +20,7 @@ public class MobileConfiguration
 
     public class HostAddress
     {
-        public ServiceType ServiceType { get; set; }
+        public Int32 ServiceType { get; set; }
 
         public String Uri { get; set; }
     }