diff --git a/src/NFT.net/NFT.net.csproj b/src/NFT.net/NFT.net.csproj
index 763108e..a7bd39f 100644
--- a/src/NFT.net/NFT.net.csproj
+++ b/src/NFT.net/NFT.net.csproj
@@ -7,7 +7,7 @@
 		<UseWindowsForms>true</UseWindowsForms>
 		<RootNamespace>Tedeschi.NFT</RootNamespace>
 		<AssemblyName>NFT.net</AssemblyName>
-		<Version>1.3.0</Version>
+		<Version>1.4.0</Version>
 		<Authors>Tedeschi</Authors>
 	</PropertyGroup>
 
diff --git a/src/NFT.net/Properties/PublishProfiles/FolderProfile.pubxml b/src/NFT.net/Properties/PublishProfiles/FolderProfile.pubxml
index 7f4e43d..0cb6063 100644
--- a/src/NFT.net/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/src/NFT.net/Properties/PublishProfiles/FolderProfile.pubxml
@@ -13,6 +13,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <SelfContained>true</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>
     <PublishReadyToRun>False</PublishReadyToRun>
-    <PublishTrimmed>False</PublishTrimmed>
+    <PublishTrimmed>True</PublishTrimmed>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/NFT.net/Services/Collection/CollectionService.cs b/src/NFT.net/Services/Collection/CollectionService.cs
index 9ec1201..88c5779 100644
--- a/src/NFT.net/Services/Collection/CollectionService.cs
+++ b/src/NFT.net/Services/Collection/CollectionService.cs
@@ -43,11 +43,30 @@ public void Create(string layersFolder, string outputFolder, int metadataType, s
             var collectionNumber = collectionInitialNumber;
             var metadataList = new List<Metadata>();
 
+            // Handle Images folder
             var imagesFoder = $"{outputFolder}{Path.DirectorySeparatorChar}{Constants.ImagesFolderName}";
 
-            if (!Directory.Exists(imagesFoder))
+            if (Directory.Exists(imagesFoder))
             {
-                Directory.CreateDirectory(imagesFoder);
+                Directory.Delete(imagesFoder, true);
+            }
+
+            Directory.CreateDirectory(imagesFoder);
+
+            // Handle Metadata folder
+            var metadataLocation = $"{outputFolder}{Path.DirectorySeparatorChar}{Constants.MetadataDefault.FolderName}";
+
+            if (Directory.Exists(metadataLocation))
+            {
+                Directory.Delete(metadataLocation, true);
+            }
+
+            // Handle Rarity folder
+            var rarityLocation = $"{outputFolder}{Path.DirectorySeparatorChar}{Constants.RarityDefault.FolderName}";
+
+            if (Directory.Exists(rarityLocation))
+            {
+                Directory.Delete(rarityLocation, true);
             }
 
             foreach (var item in imageDescriptors)