diff --git a/SpeckleConnector/Connector/Record/Collection/ProjectCollection.cpp b/SpeckleConnector/Connector/Record/Collection/ProjectCollection.cpp
index 44ded4a..ca4239c 100644
--- a/SpeckleConnector/Connector/Record/Collection/ProjectCollection.cpp
+++ b/SpeckleConnector/Connector/Record/Collection/ProjectCollection.cpp
@@ -154,7 +154,7 @@ bool ProjectCollection::fillInventory(active::serialise::Inventory& inventory) c
 	base::fillInventory(inventory);
 	inventory.merge(Inventory{
 		{
-			{ Identity{fieldID[finishProxyID]}, finishProxyID, m_finishProxies.size(), std::nullopt },
+			{ Identity{fieldID[finishProxyID]}, finishProxyID, 100, std::nullopt },
 		},
 	}.withType(&typeid(ProjectCollection)));
 	return true;
diff --git a/SpeckleLib/Speckle/Record/Attribute/Attribute.cpp b/SpeckleLib/Speckle/Record/Attribute/Attribute.cpp
index dba0b12..eece72d 100644
--- a/SpeckleLib/Speckle/Record/Attribute/Attribute.cpp
+++ b/SpeckleLib/Speckle/Record/Attribute/Attribute.cpp
@@ -3,6 +3,7 @@
 #include "Speckle/Database/BIMAttributeDatabase.h"
 #include "Speckle/Environment/Addon.h"
 #include "Speckle/Environment/Project.h"
+#include "Speckle/Serialise/Types/Str256.h"
 
 using namespace active::serialise;
 using namespace speckle::database;
@@ -77,8 +78,9 @@ Cargo::Unique Attribute::getCargo(const Inventory::Item& item) const {
 	using namespace active::serialise;
 	switch (item.index) {
 		case nameID:
-			//return std::make_unique<active::serialise::ContainerWrap>(*body);
-			return std::make_unique<StringWrap>(getHead().name);
+#ifdef ARCHICAD
+			return std::make_unique<ValueWrap<Str256>>(reinterpret_cast<const Str256&>(getHead().name));
+#endif
 		default:
 			return nullptr;	//Requested an unknown index
 	}
diff --git a/SpeckleLib/Speckle/Record/Attribute/Finish.cpp b/SpeckleLib/Speckle/Record/Attribute/Finish.cpp
index 49976db..7f2221b 100644
--- a/SpeckleLib/Speckle/Record/Attribute/Finish.cpp
+++ b/SpeckleLib/Speckle/Record/Attribute/Finish.cpp
@@ -148,7 +148,7 @@ Finish::Finish(const ModelerAPI::Material& material) {
  	source: The object to copy
   --------------------------------------------------------------------*/
 Finish::Finish(const Finish& source) : base{source} {
-	m_data = source.m_data ? std::make_unique<Data>(*m_data) : nullptr;
+	m_data = source.m_data ? std::make_unique<Data>(*source.m_data) : nullptr;
 } //Finish::Finish
 
 
diff --git a/SpeckleLib/SpeckleLib17.vcxproj b/SpeckleLib/SpeckleLib17.vcxproj
index 73d3154..b7c224e 100644
--- a/SpeckleLib/SpeckleLib17.vcxproj
+++ b/SpeckleLib/SpeckleLib17.vcxproj
@@ -80,7 +80,8 @@
     <ClInclude Include="Speckle\Serialise\Detached\Storage\DetachedMemoryStore.h" />
     <ClInclude Include="Speckle\Serialise\Detached\Storage\DetachedObjectStore.h" />
     <ClInclude Include="Speckle\Serialise\JSBase\JSBaseTransport.h" />
-    <ClInclude Include="Speckle\Serialise\Units\LengthUnit.h" />
+    <ClInclude Include="Speckle\Serialise\Types\Str256.h" />
+    <ClInclude Include="Speckle\Serialise\Types\Units\LengthUnit.h" />
     <ClInclude Include="Speckle\SpeckleResource.h" />
     <ClInclude Include="Speckle\Utility\Exception.h" />
     <ClInclude Include="Speckle\Utility\Guid.h" />
@@ -127,7 +128,7 @@
     <ClCompile Include="Speckle\Serialise\Detached\DetachedWrap.cpp" />
     <ClCompile Include="Speckle\Serialise\Detached\DetachmentManager.cpp" />
     <ClCompile Include="Speckle\Serialise\JSBase\JSBaseTransport.cpp" />
-    <ClCompile Include="Speckle\Serialise\Units\LengthUnit.cpp" />
+    <ClCompile Include="Speckle\Serialise\Types\Units\LengthUnit.cpp" />
     <ClCompile Include="Speckle\Utility\Guid.cpp" />
     <ClCompile Include="Speckle\Utility\Guid64.cpp" />
     <ClCompile Include="Speckle\Utility\String.cpp" />
diff --git a/SpeckleLib/SpeckleLib17.vcxproj.filters b/SpeckleLib/SpeckleLib17.vcxproj.filters
index 458d545..3331655 100644
--- a/SpeckleLib/SpeckleLib17.vcxproj.filters
+++ b/SpeckleLib/SpeckleLib17.vcxproj.filters
@@ -83,9 +83,6 @@
     <Filter Include="Speckle\Serialise\Detached\Storage">
       <UniqueIdentifier>{cb77e795-e8d8-4e31-9773-dd32beb694d3}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Speckle\Serialise\Units">
-      <UniqueIdentifier>{7d5ec9ba-bc7e-412c-9b14-16c37b183409}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Speckle\Database\Storage\ArchicadDBase\Attribute">
       <UniqueIdentifier>{490a65bd-28e3-4282-bb33-67823e81e825}</UniqueIdentifier>
     </Filter>
@@ -95,6 +92,12 @@
     <Filter Include="Speckle\Serialise\Collection">
       <UniqueIdentifier>{b5733e9f-b72a-4162-9fc7-8feeec594e5b}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Speckle\Serialise\Types">
+      <UniqueIdentifier>{b992941c-66d5-4f16-89b2-82e27a22e229}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Speckle\Serialise\Types\Units">
+      <UniqueIdentifier>{7f43d4ea-b876-4587-a646-90eab81f7976}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Speckle\Environment\Addon.h">
@@ -277,9 +280,6 @@
     <ClInclude Include="Speckle\Serialise\Detached\Storage\DetachedObjectStore.h">
       <Filter>Speckle\Serialise\Detached\Storage</Filter>
     </ClInclude>
-    <ClInclude Include="Speckle\Serialise\Units\LengthUnit.h">
-      <Filter>Speckle\Serialise\Units</Filter>
-    </ClInclude>
     <ClInclude Include="Speckle\Database\BIMAttributeDatabase.h">
       <Filter>Speckle\Database</Filter>
     </ClInclude>
@@ -301,6 +301,12 @@
     <ClInclude Include="Speckle\Serialise\Collection\FinishProxy.h">
       <Filter>Speckle\Serialise\Collection</Filter>
     </ClInclude>
+    <ClInclude Include="Speckle\Serialise\Types\Str256.h">
+      <Filter>Speckle\Serialise\Types</Filter>
+    </ClInclude>
+    <ClInclude Include="Speckle\Serialise\Types\Units\LengthUnit.h">
+      <Filter>Speckle\Serialise\Types\Units</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Speckle\Environment\Addon.cpp">
@@ -411,9 +417,6 @@
     <ClCompile Include="Speckle\Serialise\Detached\DetachmentManager.cpp">
       <Filter>Speckle\Serialise\Detached</Filter>
     </ClCompile>
-    <ClCompile Include="Speckle\Serialise\Units\LengthUnit.cpp">
-      <Filter>Speckle\Serialise\Units</Filter>
-    </ClCompile>
     <ClCompile Include="Speckle\Database\BIMAttributeDatabase.cpp">
       <Filter>Speckle\Database</Filter>
     </ClCompile>
@@ -429,6 +432,9 @@
     <ClCompile Include="Speckle\Record\Attribute\Storey.cpp">
       <Filter>Speckle\Record\Attribute</Filter>
     </ClCompile>
+    <ClCompile Include="Speckle\Serialise\Types\Units\LengthUnit.cpp">
+      <Filter>Speckle\Serialise\Types\Units</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Text Include="Speckle\CMakeLists.txt">