diff --git a/AutoMapProperty/AutoMapProperty.cs b/AutoMapProperty/AutoMapProperty.cs
index 0d1b9a2..267eba2 100644
--- a/AutoMapProperty/AutoMapProperty.cs
+++ b/AutoMapProperty/AutoMapProperty.cs
@@ -560,14 +560,18 @@ namespace AutoMapProperty
                 //Add the appropriate ToHashSet or ToSet or ToCollection or ToList
                 if (ToType.Name.Contains("Set"))
                     sb.Append(@".ToHashSet()");
+                else if (ToType.TypeKind == TypeKind.Array)
+                    sb.Append(@".ToArray()");
                 else
                     sb.Append(@".ToList()");
 
-                sb.Append(" : new ");
+                sb.Append(" : ");
                 if (ToType.Name.Contains("Set"))
-                    sb.Append("HashSet<").Append(GetFullString(concreteToType)).Append(">()");
+                    sb.Append("new HashSet<").Append(GetFullString(concreteToType)).Append(">()");
+                else if (ToType.TypeKind == TypeKind.Array)
+                    sb.Append("Array.Empty<").Append(GetFullString(concreteToType)).Append(">()");
                 else
-                    sb.Append("List<").Append(GetFullString(concreteToType)).Append(">()");
+                    sb.Append("new List<").Append(GetFullString(concreteToType)).Append(">()");
 
                 sb.Append(")");
             }
@@ -671,14 +675,18 @@ namespace AutoMapProperty
                 //Add the appropriate ToHashSet or ToSet or ToCollection or ToList
                 if (FromType.Name.Contains("Set"))
                     sb.Append(@".ToHashSet()");
+                else if (FromType.TypeKind == TypeKind.Array)
+                    sb.Append(@".ToArray()");
                 else
                     sb.Append(@".ToList()");
 
-                sb.Append(" : new ");
+                sb.Append(" : ");
                 if (FromType.Name.Contains("Set"))
-                    sb.Append("HashSet<").Append(GetFullString(concreteFromType)).Append(">()");
+                    sb.Append("new HashSet<").Append(GetFullString(concreteFromType)).Append(">()");
+                else if (FromType.TypeKind == TypeKind.Array)
+                    sb.Append("Array.Empty<").Append(GetFullString(concreteFromType)).Append(">()");
                 else
-                    sb.Append("List<").Append(GetFullString(concreteFromType)).Append(">()");
+                    sb.Append("new List<").Append(GetFullString(concreteFromType)).Append(">()");
 
                 sb.Append(")");
             }