diff --git a/SpeckleLib/SpeckleLib17.vcxproj b/SpeckleLib/SpeckleLib17.vcxproj
index fcc59b7..04db11b 100644
--- a/SpeckleLib/SpeckleLib17.vcxproj
+++ b/SpeckleLib/SpeckleLib17.vcxproj
@@ -72,6 +72,7 @@
     <ClInclude Include="Speckle\Primitive\Mesh\Mesh.h" />
     <ClInclude Include="Speckle\Record\Attribute\Attribute.h" />
     <ClInclude Include="Speckle\Record\Attribute\Finish.h" />
+    <ClInclude Include="Speckle\Record\Attribute\Material.h" />
     <ClInclude Include="Speckle\Record\Attribute\Storey.h" />
     <ClInclude Include="Speckle\Record\Classification\Classified.h" />
     <ClInclude Include="Speckle\Record\Credentials\Account.h" />
@@ -93,6 +94,11 @@
     <ClInclude Include="Speckle\Record\Element\Interface\SegmentedColumn.h" />
     <ClInclude Include="Speckle\Record\Element\Memo.h" />
     <ClInclude Include="Speckle\Record\Element\ModelElement.h" />
+    <ClInclude Include="Speckle\Record\Element\Quants\MaterialQuantity.h" />
+    <ClInclude Include="Speckle\Record\Element\Quants\MaterialWrap.h" />
+    <ClInclude Include="Speckle\Record\Element\Quants\Surveyor.h" />
+    <ClInclude Include="Speckle\Record\Element\Setting\Conversion.h" />
+    <ClInclude Include="Speckle\Record\Element\Setting\TypeSetting.h" />
     <ClInclude Include="Speckle\Record\Property\Group.h" />
     <ClInclude Include="Speckle\Record\Property\Propertied.h" />
     <ClInclude Include="Speckle\Record\Property\Property.h" />
@@ -156,6 +162,7 @@
     <ClCompile Include="Speckle\Primitive\Mesh\Mesh.cpp" />
     <ClCompile Include="Speckle\Record\Attribute\Attribute.cpp" />
     <ClCompile Include="Speckle\Record\Attribute\Finish.cpp" />
+    <ClCompile Include="Speckle\Record\Attribute\Material.cpp" />
     <ClCompile Include="Speckle\Record\Attribute\Storey.cpp" />
     <ClCompile Include="Speckle\Record\Classification\Classified.cpp" />
     <ClCompile Include="Speckle\Record\Credentials\Account.cpp" />
@@ -177,6 +184,10 @@
     <ClCompile Include="Speckle\Record\Element\Interface\SegmentedColumn.cpp" />
     <ClCompile Include="Speckle\Record\Element\Memo.cpp" />
     <ClCompile Include="Speckle\Record\Element\ModelElement.cpp" />
+    <ClCompile Include="Speckle\Record\Element\Quants\MaterialQuantity.cpp" />
+    <ClCompile Include="Speckle\Record\Element\Quants\MaterialWrap.cpp" />
+    <ClCompile Include="Speckle\Record\Element\Quants\Surveyor.cpp" />
+    <ClCompile Include="Speckle\Record\Element\Setting\TypeSetting.cpp" />
     <ClCompile Include="Speckle\Record\Property\Group.cpp" />
     <ClCompile Include="Speckle\Record\Property\Propertied.cpp" />
     <ClCompile Include="Speckle\Record\Property\Property.cpp" />
diff --git a/SpeckleLib/SpeckleLib17.vcxproj.filters b/SpeckleLib/SpeckleLib17.vcxproj.filters
index 5975d49..0079ada 100644
--- a/SpeckleLib/SpeckleLib17.vcxproj.filters
+++ b/SpeckleLib/SpeckleLib17.vcxproj.filters
@@ -116,6 +116,12 @@
     <Filter Include="Speckle\Database\Storage\ArchicadDBase\Property">
       <UniqueIdentifier>{f9b0554b-d0a5-40c0-ac20-22032dc8f30c}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Speckle\Record\Element\Setting">
+      <UniqueIdentifier>{453f429b-4ca8-400b-b60c-df80c6d0ec5f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Speckle\Record\Element\Quants">
+      <UniqueIdentifier>{c05efdee-e236-4db7-9338-a982c9cc673f}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Speckle\Environment\Addon.h">
@@ -421,6 +427,24 @@
     <ClInclude Include="Speckle\Event\Subscriber\ElementSubscriber.h">
       <Filter>Speckle\Event\Subscriber</Filter>
     </ClInclude>
+    <ClInclude Include="Speckle\Record\Attribute\Material.h">
+      <Filter>Speckle\Record\Attribute</Filter>
+    </ClInclude>
+    <ClInclude Include="Speckle\Record\Element\Quants\MaterialQuantity.h">
+      <Filter>Speckle\Record\Element\Quants</Filter>
+    </ClInclude>
+    <ClInclude Include="Speckle\Record\Element\Quants\MaterialWrap.h">
+      <Filter>Speckle\Record\Element\Quants</Filter>
+    </ClInclude>
+    <ClInclude Include="Speckle\Record\Element\Quants\Surveyor.h">
+      <Filter>Speckle\Record\Element\Quants</Filter>
+    </ClInclude>
+    <ClInclude Include="Speckle\Record\Element\Setting\Conversion.h">
+      <Filter>Speckle\Record\Element\Setting</Filter>
+    </ClInclude>
+    <ClInclude Include="Speckle\Record\Element\Setting\TypeSetting.h">
+      <Filter>Speckle\Record\Element\Setting</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Speckle\Environment\Addon.cpp">
@@ -642,6 +666,21 @@
     <ClCompile Include="Speckle\Event\Subscriber\ElementSubscriber.cpp">
       <Filter>Speckle\Event\Subscriber</Filter>
     </ClCompile>
+    <ClCompile Include="Speckle\Record\Attribute\Material.cpp">
+      <Filter>Speckle\Record\Attribute</Filter>
+    </ClCompile>
+    <ClCompile Include="Speckle\Record\Element\Quants\MaterialQuantity.cpp">
+      <Filter>Speckle\Record\Element\Quants</Filter>
+    </ClCompile>
+    <ClCompile Include="Speckle\Record\Element\Quants\MaterialWrap.cpp">
+      <Filter>Speckle\Record\Element\Quants</Filter>
+    </ClCompile>
+    <ClCompile Include="Speckle\Record\Element\Quants\Surveyor.cpp">
+      <Filter>Speckle\Record\Element\Quants</Filter>
+    </ClCompile>
+    <ClCompile Include="Speckle\Record\Element\Setting\TypeSetting.cpp">
+      <Filter>Speckle\Record\Element\Setting</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Text Include="Speckle\CMakeLists.txt">