diff --git a/ExportDXF/ExportDXF.csproj b/ExportDXF/ExportDXF.csproj
index 5c63235..36dae7d 100644
--- a/ExportDXF/ExportDXF.csproj
+++ b/ExportDXF/ExportDXF.csproj
@@ -57,7 +57,7 @@
     <GenerateManifests>true</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <SignManifests>true</SignManifests>
+    <SignManifests>false</SignManifests>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="SolidWorks.Interop.sldworks, Version=24.1.0.45, Culture=neutral, PublicKeyToken=7c4797c3e4eeac03, processorArchitecture=MSIL">
diff --git a/ExportDXF/Forms/MainForm.cs b/ExportDXF/Forms/MainForm.cs
index c288398..707576b 100644
--- a/ExportDXF/Forms/MainForm.cs
+++ b/ExportDXF/Forms/MainForm.cs
@@ -278,7 +278,7 @@ namespace ExportDXF.Forms
                 if (worker.CancellationPending)
                     break;
 
-                var fileName = prefix + item.Name + ".dxf";
+                var fileName = prefix + item.PartNo + ".dxf";
                 var savepath = Path.Combine(savePath, fileName);
                 var part = item.Component.GetModelDoc2() as PartDoc;
 
@@ -405,7 +405,28 @@ namespace ExportDXF.Forms
                 Print("Item numbers are in the " + Helper.GetNumWithSuffix(itemNoColumnIndex + 1) + " column.");
             }
 
-            var isBOMPartsOnly = bom.BomFeature.TableType == (int)swBomType_e.swBomType_PartsOnly;
+			var qtyColumnIndex = table.IndexOfColumnType(swTableColumnTypes_e.swBomTableColumnType_Quantity);
+			if (qtyColumnIndex == -1)
+			{
+				Print("Error: Quantity column not found.");
+				return null;
+			}
+
+			var descriptionColumnIndex = table.IndexOfColumnTitle("Description");
+			if (descriptionColumnIndex == -1)
+			{
+				Print("Error: Description column not found.");
+				return null;
+			}
+
+			var partNoColumnIndex = table.IndexOfColumnType(swTableColumnTypes_e.swBomTableColumnType_PartNumber);
+			if (partNoColumnIndex == -1)
+			{
+				Print("Error: Part number column not found.");
+				return null;
+			}
+
+			var isBOMPartsOnly = bom.BomFeature.TableType == (int)swBomType_e.swBomType_PartsOnly;
 
             for (int rowIndex = 0; rowIndex < table.RowCount; rowIndex++)
             {
@@ -423,25 +444,30 @@ namespace ExportDXF.Forms
                     .GroupBy(c => c.ReferencedConfiguration)
                     .Select(group => group.First());
 
-                var itemNumber = table.Text[rowIndex, itemNoColumnIndex].PadLeft(2, '0');
-                var rev = 'A';
+                //var itemNumber = table.Text[rowIndex, itemNoColumnIndex].PadLeft(2, '0');
+                //var rev = 'A';
 
                 if (distinctComponents.Count() > 1)
                 {
-                    foreach (var comp in distinctComponents)
-                    {
-                        items.Add(new Item
-                        {
-                            Name = itemNumber + rev++,
-                            Component = comp
-                        });
-                    }
+					throw new NotImplementedException();
+
+                    //foreach (var comp in distinctComponents)
+                    //{
+                    //    items.Add(new Item
+                    //    {
+                    //        Name = itemNumber + rev++,
+                    //        Component = comp
+                    //    });
+                    //}
                 }
                 else
                 {
-                    items.Add(new Item
-                    {
-                        Name = itemNumber,
+					items.Add(new Item
+					{
+						PartNo = table.DisplayedText[rowIndex, partNoColumnIndex],
+						Quantity = int.Parse(table.DisplayedText[rowIndex, qtyColumnIndex]),
+						Description = table.DisplayedText[rowIndex, descriptionColumnIndex],
+						ItemNo = table.DisplayedText[rowIndex, itemNoColumnIndex].PadLeft(2, '0'),
                         Component = distinctComponents.First()
                     });
                 }
@@ -473,7 +499,7 @@ namespace ExportDXF.Forms
 
                 list.Add(new Item
                 {
-                    Name = name,
+                    PartNo = name,
                     Quantity = group.Count(),
                     Component = component
                 });
diff --git a/ExportDXF/Item.cs b/ExportDXF/Item.cs
index 1f23434..f37acb5 100644
--- a/ExportDXF/Item.cs
+++ b/ExportDXF/Item.cs
@@ -4,10 +4,14 @@ namespace ExportDXF
 {
 	public class Item
     {
-        public string Name { get; set; }
+		public string ItemNo { get; set; }
+
+		public string PartNo { get; set; }
 
         public int Quantity { get; set; }
 
-        public Component2 Component { get; set; }
+		public string Description { get; set; }
+
+		public Component2 Component { get; set; }
     }
 }