diff --git a/GSA_Adapter/CRUD/Create.cs b/GSA_Adapter/CRUD/Create.cs
index 1983234c..94dfb9d3 100644
--- a/GSA_Adapter/CRUD/Create.cs
+++ b/GSA_Adapter/CRUD/Create.cs
@@ -75,13 +75,15 @@ protected override bool ICreate<T>(IEnumerable<T> objects, ActionConfig actionCo
 
         /***************************************************/
 
+#if GSA_10_1
         private bool CreateMaterials(IEnumerable<IMaterialFragment> materials)
         {
             bool success = true;
             foreach (IMaterialFragment material in materials)
             {
-                int index = m_gsaCom.GwaCommand("HIGHEST, " + Convert.ToGsaString(material.GetType())) + 1;
-                this.SetAdapterId(material, index);
+                string type = Convert.ToGsaString(material.GetType());
+                int index = m_gsaCom.GwaCommand("HIGHEST, " + type) + 1;
+                this.SetAdapterId(material, $"{type.Split('_').Last()}:{index}");
                 success &= ComCall(Convert.IToGsaString(material, index.ToString()));
             }
             return success;
@@ -89,6 +91,8 @@ private bool CreateMaterials(IEnumerable<IMaterialFragment> materials)
 
         /***************************************************/
 
+#endif
+
         private bool CreateObject(BH.oM.Base.IBHoMObject obj)
         {
             return ComCall(Convert.IToGsaString(obj, GetAdapterId<int>(obj).ToString()));
diff --git a/GSA_Adapter/CRUD/Read.cs b/GSA_Adapter/CRUD/Read.cs
index 3147533e..662d9b2e 100644
--- a/GSA_Adapter/CRUD/Read.cs
+++ b/GSA_Adapter/CRUD/Read.cs
@@ -105,27 +105,7 @@ protected override IEnumerable<IBHoMObject> IRead(Type type, IList indices, Acti
 
         public List<IMaterialFragment> ReadMaterials(List<string> ids = null)
         {
-            return ReadMaterials(ids, false);
-        }
-
-        /***************************************************/
-
-        public List<IMaterialFragment> ReadMaterials(List<string> ids = null, bool includeStandard = false)
-        {
-            List<IMaterialFragment> materials = ReadMaterialDictionary(ids, includeStandard).Select(x => x.Value).ToList();
-
-            if (ids != null && ids.Count != 0)
-                materials = materials.Where(x => ids.Contains(x.GSAId().ToString())).ToList();
-
-            return materials;
-        }
-
-        public Dictionary<string, IMaterialFragment> ReadMaterialDictionary(List<string> ids = null, bool includeStandard = false)
-        {
-            //List<IMaterialFragment> materials = ReadMaterials(null, false);
             List<IMaterialFragment> materials = new List<IMaterialFragment>();
-            List<string> keys = new List<string>();
-            Dictionary<string, IMaterialFragment> materialDictionary = new Dictionary<string, IMaterialFragment>();
 
 #if GSA_10_1
             string allProps = m_gsaCom.GwaCommand("GET_ALL, MAT_ANAL.1").ToString();
@@ -141,31 +121,33 @@ public Dictionary<string, IMaterialFragment> ReadMaterialDictionary(List<string>
             string allProps = m_gsaCom.GwaCommand("GET_ALL, MAT").ToString();
 #endif
             string[] matArr = string.IsNullOrWhiteSpace(allProps) ? new string[0] : allProps.Split('\n');
-            matArr = matArr.Where(x => !string.IsNullOrWhiteSpace(x)).ToArray();
+            matArr = matArr.Where(x => !string.IsNullOrWhiteSpace(x)).Distinct().ToArray();
 
             if (ids == null)
                 materials = matArr.Select(x => Convert.FromGsaMaterial(x)).Where(x => x != null).ToList();
             else
                 materials = matArr.Where(x => ids.Contains(x.Split(',')[1])).Select(x => Convert.FromGsaMaterial(x)).Where(x => x != null).ToList();
 
-            if (includeStandard)
-                materials.AddRange(GetStandardGsaMaterials());
+            return materials;
+        }
 
-            for (int i = 0; i < materials.Count(); i++)
-            {
+        /***************************************************/
+
+        public Dictionary<string, IMaterialFragment> ReadMaterialDictionary(List<string> ids = null, bool includeStandard = false)
+        {
 #if GSA_10_1
-                string key = matArr[i].Split(("_.").ToCharArray())[1] + ":" + materials[i].GSAId();
+            Dictionary<string, IMaterialFragment> materials = GetCachedOrReadAsDictionary<string, IMaterialFragment>(ids);
 #else
-                string key = GetAdapterId(materials[i]).ToString();
+            Dictionary<string, IMaterialFragment> materials = GetCachedOrReadAsDictionary<int, IMaterialFragment>(ids?.Select(x => int.Parse(x)).ToList()).ToDictionary(x => x.Key.ToString(), x => x.Value);
 #endif
-                if (!keys.Contains(key))
+            if (includeStandard)
+            {
+                foreach (IMaterialFragment standardMaterial in GetStandardGsaMaterials())
                 {
-                    keys.Add(key);
-                    materialDictionary.Add(key, materials[i]);
+                    materials[standardMaterial.Name] = standardMaterial;
                 }
             }
-
-            return materialDictionary;
+            return materials;
         }
 
         /***************************************************/
@@ -189,22 +171,16 @@ public List<Loadcase> ReadLoadCases(List<string> ids = null)
 
         public List<Bar> ReadBars(List<string> ids = null)
         {
-            //int[] potentialBeamRefs = GenerateIndices(ids, typeof(Bar));
-
-            //GsaElement[] gsaElements = new GsaElement[potentialBeamRefs.Length];
-            //m_gsaCom.Elements(potentialBeamRefs, out gsaElements);
 #if GSA_10_1
-            string allNodes = m_gsaCom.GwaCommand("GET_ALL, EL.4").ToString();
+            string allBars = m_gsaCom.GwaCommand("GET_ALL, EL.4").ToString();
 #else
-            string allNodes = m_gsaCom.GwaCommand("GET_ALL, EL.2").ToString();
+            string allBars = m_gsaCom.GwaCommand("GET_ALL, EL.2").ToString();
 #endif
-            string[] barArr = string.IsNullOrWhiteSpace(allNodes) ? new string[0] : allNodes.Split('\n');
+            string[] barArr = string.IsNullOrWhiteSpace(allBars) ? new string[0] : allBars.Split('\n');
 
-            List<ISectionProperty> secPropList = ReadSectionProperties();
-            List<Node> nodeList = ReadNodes();
 
-            Dictionary<string, ISectionProperty> secProps = secPropList.Where(x => x != null).ToDictionary(x => GetAdapterId<int>(x).ToString());
-            Dictionary<string, Node> nodes = nodeList.ToDictionary(x => GetAdapterId<int>(x).ToString());
+            Dictionary<int, ISectionProperty> secProps = GetCachedOrReadAsDictionary<int, ISectionProperty>();
+            Dictionary<int, Node> nodes = GetCachedOrReadAsDictionary<int, Node>();
 
             return Convert.FromGsaBars(barArr, secProps, nodes, ids);
         }
@@ -224,8 +200,7 @@ public List<LoadCombination> ReadLoadCombinations(List<string> ids = null)
                     analList.Add(anal);
             }
 
-            List<Loadcase> lCaseList = ReadLoadCases();
-            Dictionary<string, Loadcase> lCases = lCaseList.ToDictionary(x => x.Number.ToString());
+            Dictionary<int, Loadcase> lCases = GetCachedOrReadAsDictionary<int, Loadcase>();
 
             if (ids == null)
                 lComabinations = analList.Select(x => Convert.FromGsaAnalTask(x, lCases)).ToList();
@@ -366,11 +341,8 @@ public List<FEMesh> ReadFEMesh(List<string> ids = null)
             GsaElement[] gsaElements = new GsaElement[potentialMeshRefs.Length];
             m_gsaCom.Elements(potentialMeshRefs, out gsaElements);
 
-            List<ISurfaceProperty> secPropList = ReadProperty2d();
-            List<Node> nodeList = ReadNodes();
-
-            Dictionary<string, ISurfaceProperty> props = secPropList.Where(x => x != null).ToDictionary(x => GetAdapterId<int>(x).ToString());
-            Dictionary<string, Node> nodes = nodeList.ToDictionary(x => GetAdapterId<int>(x).ToString());
+            Dictionary<int, ISurfaceProperty> props = GetCachedOrReadAsDictionary<int, ISurfaceProperty>();
+            Dictionary<int, Node> nodes = GetCachedOrReadAsDictionary<int, Node>();
 
             return Convert.FromGsaFEMesh(gsaElements, props, nodes);
         }
@@ -392,11 +364,8 @@ public List<LinkConstraint> ReadLinkConstraint(List<string> ids = null)
 
         public List<RigidLink> ReadRigidLink(List<string> ids = null)
         {
-            List<LinkConstraint> constraintList = ReadLinkConstraint(null);
-            List<Node> nodeList = ReadNodes();
-
-            Dictionary<string, LinkConstraint> constraints = constraintList.ToDictionary(x => GetAdapterId<int>(x).ToString());
-            Dictionary<string, Node> nodes = nodeList.ToDictionary(x => GetAdapterId<int>(x).ToString());
+            Dictionary<int, LinkConstraint> constraints = GetCachedOrReadAsDictionary<int, LinkConstraint>();
+            Dictionary<int, Node> nodes = GetCachedOrReadAsDictionary<int, Node>();
 
             int[] potentialBeamRefs = GenerateIndices(ids, typeof(RigidLink));
             GsaElement[] gsaElements = new GsaElement[potentialBeamRefs.Length];
@@ -414,19 +383,14 @@ public List<RigidLink> ReadRigidLink(List<string> ids = null)
 
         public List<Spacer> ReadSpacers(List<string> ids = null)
         {
-            List<Node> nodeList = ReadNodes();
-            List<SpacerProperty> spacerProps = ReadSpacerProperties();
-
-            Dictionary<string, Node> nodes = nodeList.ToDictionary(x => GetAdapterId<int>(x).ToString());
-            Dictionary<string, SpacerProperty> secProps = spacerProps.Where(x => x != null).ToDictionary(x => GetAdapterId<int>(x).ToString());
+            Dictionary<int, Node> nodes = GetCachedOrReadAsDictionary<int, Node>();
+            Dictionary<int, SpacerProperty> secProps = GetCachedOrReadAsDictionary<int,SpacerProperty>();
 
             int[] potentialBeamRefs = GenerateIndices(ids, typeof(Spacer));
             GsaElement[] gsaElements = new GsaElement[potentialBeamRefs.Length];
             m_gsaCom.Elements(potentialBeamRefs, out gsaElements);
 
             return Convert.FromGsaSpacers(gsaElements, secProps, nodes);
-
- 
         }
 
         /***************************************/
@@ -469,6 +433,7 @@ private int[] GenerateIndices(List<string> ids, Type elementType)
 
         private List<IMaterialFragment> GetStandardGsaMaterials()
         {
+#if !GSA_10_1
             List<IMaterialFragment> materials = new List<IMaterialFragment>();
             materials.Add(new Steel() { Name = "STEEL" });
             materials.Add(new Concrete() { Name = "CONC_SHORT" });
@@ -481,6 +446,10 @@ private List<IMaterialFragment> GetStandardGsaMaterials()
             }
 
             return materials;
+#else
+            return new List<IMaterialFragment>();
+#endif
+
         }
 
         /***************************************************/
diff --git a/GSA_Adapter/CRUD/Update.cs b/GSA_Adapter/CRUD/Update.cs
index 626c3ac0..6c8821c1 100644
--- a/GSA_Adapter/CRUD/Update.cs
+++ b/GSA_Adapter/CRUD/Update.cs
@@ -27,6 +27,8 @@
 using BH.Engine.Adapter;
 using BH.oM.Adapters.GSA;
 using BH.Engine.Adapters.GSA;
+using BH.oM.Structure.MaterialFragments;
+using System.Linq;
 
 namespace BH.Adapter.GSA
 {
@@ -73,6 +75,18 @@ private bool Update(IEnumerable<FEMesh> objects, ActionConfig actionConfig = nul
         }
 
         /***************************************************/
+
+#if GSA_10_1
+        private bool Update(IEnumerable<IMaterialFragment> materials, ActionConfig actionConfig = null) 
+        {
+            bool success = true;
+            foreach (IMaterialFragment material in materials)
+            {
+                success &= ComCall(Convert.IToGsaString(material, material.MaterialId()));
+            }
+            return success;
+        }
+#endif
     }
 }
 
diff --git a/GSA_Adapter/Convert/FromGsa/Elements/Bar.cs b/GSA_Adapter/Convert/FromGsa/Elements/Bar.cs
index 18f6f732..c5ea7b39 100644
--- a/GSA_Adapter/Convert/FromGsa/Elements/Bar.cs
+++ b/GSA_Adapter/Convert/FromGsa/Elements/Bar.cs
@@ -43,7 +43,7 @@ public static partial class Convert
         /**** Public Methods                            ****/
         /***************************************************/
 
-        public static List<Bar> FromGsaBars(IEnumerable<GsaElement> gsaElements, Dictionary<string, ISectionProperty> secProps, Dictionary<string, Node> nodes)
+        public static List<Bar> FromGsaBars(IEnumerable<GsaElement> gsaElements, Dictionary<int, ISectionProperty> secProps, Dictionary<int, Node> nodes)
         {
             List<Bar> barList = new List<Bar>();
 
@@ -71,8 +71,8 @@ public static List<Bar> FromGsaBars(IEnumerable<GsaElement> gsaElements, Diction
                 }
 
                 Node n1, n2;
-                nodes.TryGetValue(gsaBar.Topo[0].ToString(), out n1);
-                nodes.TryGetValue(gsaBar.Topo[1].ToString(), out n2);
+                nodes.TryGetValue(gsaBar.Topo[0], out n1);
+                nodes.TryGetValue(gsaBar.Topo[1], out n2);
 
                 Bar bar = new Bar { StartNode = n1, EndNode = n2 };
                 bar.ApplyTaggedName(gsaBar.Name);
@@ -82,7 +82,7 @@ public static List<Bar> FromGsaBars(IEnumerable<GsaElement> gsaElements, Diction
                 bar.OrientationAngle = gsaBar.Beta;
 
                 ISectionProperty prop;
-                secProps.TryGetValue(gsaBar.Property.ToString(), out prop);
+                secProps.TryGetValue(gsaBar.Property, out prop);
 
                 bar.SectionProperty = prop;
 
@@ -97,7 +97,7 @@ public static List<Bar> FromGsaBars(IEnumerable<GsaElement> gsaElements, Diction
 
         /***************************************************/
 
-        public static List<Bar> FromGsaBars(IEnumerable<string> gsaStrings, Dictionary<string, ISectionProperty> secProps, Dictionary<string, Node> nodes, List<string> ids)
+        public static List<Bar> FromGsaBars(IEnumerable<string> gsaStrings, Dictionary<int, ISectionProperty> secProps, Dictionary<int, Node> nodes, List<string> ids)
         {
             List<Bar> barList = new List<Bar>();
 
@@ -135,15 +135,15 @@ public static List<Bar> FromGsaBars(IEnumerable<string> gsaStrings, Dictionary<s
 
                 Bar bar = new Bar()
                 {
-                    StartNode = nodes[arr[7]],
-                    EndNode = nodes[arr[8]],
+                    StartNode = nodes[int.Parse(arr[7])],
+                    EndNode = nodes[int.Parse(arr[8])],
                     FEAType = feType,
                 };
 
                 bar.ApplyTaggedName(arr[2]);
 
                 ISectionProperty prop;
-                if (secProps.TryGetValue(arr[5], out prop))
+                if (secProps.TryGetValue(int.Parse(arr[5]), out prop))
                     bar.SectionProperty = prop;
 
                 if (arr.Length > 10)
diff --git a/GSA_Adapter/Convert/FromGsa/Elements/FEMesh.cs b/GSA_Adapter/Convert/FromGsa/Elements/FEMesh.cs
index c5b749e1..bfe88e58 100644
--- a/GSA_Adapter/Convert/FromGsa/Elements/FEMesh.cs
+++ b/GSA_Adapter/Convert/FromGsa/Elements/FEMesh.cs
@@ -41,7 +41,7 @@ public static partial class Convert
         /**** Public Methods                            ****/
         /***************************************************/
 
-        public static List<FEMesh> FromGsaFEMesh(IEnumerable<GsaElement> gsaElements, Dictionary<string, ISurfaceProperty> props, Dictionary<string, Node> nodes)
+        public static List<FEMesh> FromGsaFEMesh(IEnumerable<GsaElement> gsaElements, Dictionary<int, ISurfaceProperty> props, Dictionary<int, Node> nodes)
         {
             List<FEMesh> meshList = new List<FEMesh>();
 
@@ -61,12 +61,12 @@ public static List<FEMesh> FromGsaFEMesh(IEnumerable<GsaElement> gsaElements, Di
                 FEMeshFace face = new FEMeshFace() { NodeListIndices = Enumerable.Range(0, gsaMesh.NumTopo).ToList(), OrientationAngle = gsaMesh.Beta * System.Math.PI / 180  };
                 face.SetAdapterId(typeof(GSAId), id);
                 ISurfaceProperty property;
-                props.TryGetValue(gsaMesh.Property.ToString(), out property);
+                props.TryGetValue(gsaMesh.Property, out property);
 
                 FEMesh mesh = new FEMesh()
                 {
                     Faces = new List<FEMeshFace>() { face },
-                    Nodes = gsaMesh.Topo.Select(x => nodes[x.ToString()]).ToList(),
+                    Nodes = gsaMesh.Topo.Select(x => nodes[x]).ToList(),
                     Property = property
                 };
 
diff --git a/GSA_Adapter/Convert/FromGsa/Elements/RigidLink.cs b/GSA_Adapter/Convert/FromGsa/Elements/RigidLink.cs
index 3dc2c76d..473afd01 100644
--- a/GSA_Adapter/Convert/FromGsa/Elements/RigidLink.cs
+++ b/GSA_Adapter/Convert/FromGsa/Elements/RigidLink.cs
@@ -41,7 +41,7 @@ public static partial class Convert
         /**** Public Methods                            ****/
         /***************************************************/
 
-        public static List<RigidLink> FromGsaRigidLinks(IEnumerable<GsaElement> gsaElements, Dictionary<string, LinkConstraint> constraints, Dictionary<string, Node> nodes)
+        public static List<RigidLink> FromGsaRigidLinks(IEnumerable<GsaElement> gsaElements, Dictionary<int, LinkConstraint> constraints, Dictionary<int, Node> nodes)
         {
             List<RigidLink> linkList = new List<RigidLink>();
 
@@ -50,17 +50,17 @@ public static List<RigidLink> FromGsaRigidLinks(IEnumerable<GsaElement> gsaEleme
                 if (gsaLink.eType != 9)
                     continue;
 
-                RigidLink face = new RigidLink()
+                RigidLink link = new RigidLink()
                 {
-                    PrimaryNode = nodes[gsaLink.Topo[0].ToString()],
-                    SecondaryNodes = new List<Node> { nodes[gsaLink.Topo[1].ToString()] },
-                    Constraint = constraints[gsaLink.Property.ToString()]
+                    PrimaryNode = nodes[gsaLink.Topo[0]],
+                    SecondaryNodes = new List<Node> { nodes[gsaLink.Topo[1]] },
+                    Constraint = constraints[gsaLink.Property]
                 };
 
-                face.ApplyTaggedName(gsaLink.Name);
+                link.ApplyTaggedName(gsaLink.Name);
                 int id = gsaLink.Ref;
-                face.SetAdapterId(typeof(GSAId), id);
-                linkList.Add(face);
+                link.SetAdapterId(typeof(GSAId), id);
+                linkList.Add(link);
 
             }
             return linkList;
diff --git a/GSA_Adapter/Convert/FromGsa/Elements/Spacer.cs b/GSA_Adapter/Convert/FromGsa/Elements/Spacer.cs
index 38686c75..5ed0fd65 100644
--- a/GSA_Adapter/Convert/FromGsa/Elements/Spacer.cs
+++ b/GSA_Adapter/Convert/FromGsa/Elements/Spacer.cs
@@ -46,7 +46,7 @@ public static partial class Convert
         /**** Public Methods                            ****/
         /***************************************************/
 
-        public static List<Spacer> FromGsaSpacers(IEnumerable<GsaElement> gsaElements, Dictionary<string, SpacerProperty> spaProps, Dictionary<string, Node> nodes)
+        public static List<Spacer> FromGsaSpacers(IEnumerable<GsaElement> gsaElements, Dictionary<int, SpacerProperty> spaProps, Dictionary<int, Node> nodes)
         {
             List<Spacer> spacerList = new List<Spacer>();
 
@@ -56,16 +56,14 @@ public static List<Spacer> FromGsaSpacers(IEnumerable<GsaElement> gsaElements, D
                     continue;
 
                 Node n1, n2;
-                nodes.TryGetValue(gsaSpacer.Topo[0].ToString(), out n1);
-                nodes.TryGetValue(gsaSpacer.Topo[1].ToString(), out n2);
+                nodes.TryGetValue(gsaSpacer.Topo[0], out n1);
+                nodes.TryGetValue(gsaSpacer.Topo[1], out n2);
 
                 Spacer spacer = new Spacer { StartNode = n1, EndNode = n2 };
                 spacer.ApplyTaggedName(gsaSpacer.Name);
 
-
-
-               SpacerProperty prop;
-               spaProps.TryGetValue(gsaSpacer.Property.ToString(), out prop);
+                SpacerProperty prop;
+                spaProps.TryGetValue(gsaSpacer.Property, out prop);
 
                 spacer.SpacerProperty = prop;
 
diff --git a/GSA_Adapter/Convert/FromGsa/Loads/LoadCombination.cs b/GSA_Adapter/Convert/FromGsa/Loads/LoadCombination.cs
index 2aa9d865..b12df4d8 100644
--- a/GSA_Adapter/Convert/FromGsa/Loads/LoadCombination.cs
+++ b/GSA_Adapter/Convert/FromGsa/Loads/LoadCombination.cs
@@ -36,7 +36,7 @@ public static partial class Convert
         /**** Public Methods                            ****/
         /***************************************************/
 
-        public static LoadCombination FromGsaAnalTask(string gsaString, Dictionary<string, Loadcase> lCases)
+        public static LoadCombination FromGsaAnalTask(string gsaString, Dictionary<int, Loadcase> lCases)
         {
 
             if (string.IsNullOrWhiteSpace(gsaString))
@@ -61,7 +61,7 @@ public static LoadCombination FromGsaAnalTask(string gsaString, Dictionary<strin
                         lCaseParam[0] = "1.0";
 
                     Loadcase templCase;
-                    if (!lCases.TryGetValue(lCaseParam[1], out templCase))
+                    if (!lCases.TryGetValue(int.Parse(lCaseParam[1]), out templCase))
                     {
                         templCase = new Loadcase { Number = int.Parse(lCaseParam[1]), Nature = LoadNature.Other };
                         templCase.SetAdapterId(typeof(GSAId), templCase.Number);
diff --git a/GSA_Adapter/Convert/FromGsa/Properties/Material.cs b/GSA_Adapter/Convert/FromGsa/Properties/Material.cs
index 83ed0f37..a60a892e 100644
--- a/GSA_Adapter/Convert/FromGsa/Properties/Material.cs
+++ b/GSA_Adapter/Convert/FromGsa/Properties/Material.cs
@@ -116,9 +116,16 @@ public static IMaterialFragment FromGsaMaterial(string gsaString)
                 return null;
             }
 
-            int id = int.Parse(gStr[1]);
-            mat.SetAdapterId(typeof(GSAId),id);
 
+
+#if GSA_10_1
+            string id = gStr[1];
+            id = gsaString.Split(("_.").ToCharArray())[1] + ":" + id;
+            mat.SetAdapterId(typeof(GSAId), id);
+#else
+            int id = int.Parse(gStr[1]);
+            mat.SetAdapterId(typeof(GSAId), id);
+#endif
             return mat;
         }
 
diff --git a/GSA_Adapter/Convert/ToGsa/Properties/Material.cs b/GSA_Adapter/Convert/ToGsa/Properties/Material.cs
index a8a459a6..dec90151 100644
--- a/GSA_Adapter/Convert/ToGsa/Properties/Material.cs
+++ b/GSA_Adapter/Convert/ToGsa/Properties/Material.cs
@@ -211,16 +211,28 @@ private static void MaterialIdentifiers(this IMaterialFragment material, out str
 
             if (material.GetMaterialType() == "UNDEF" || material is Aluminium)   //Aluminium current unsuported in the GSA API
             {
-                analNum = material.GSAId().ToString();
+                analNum = material.MaterialId();
             }
             else
             {
-                matNum = material.GSAId().ToString();
+                matNum = material.MaterialId();
                 materialType = material.GetMaterialType();
             }
         }
 
+        /***************************************************/
+
+#endif
+        public static string MaterialId(this IMaterialFragment material)
+        {
+#if GSA_10_1
+            return material.AdapterId<string>(typeof(GSAId)).Split(':').Last();
+#else
+            return material.GSAId().ToString();
 #endif
+        }
+
+        /***************************************************/
 
         private static string CommaSeparatedValues(Vector v)
         {
@@ -238,8 +250,10 @@ private static string GetMaterialType(this IMaterialFragment material)
                 return "CONCRETE";
             else if (material is Aluminium)
                 return "ALUMINIUM";
-            else if (material is Timber)
-                return "TIMBER";
+            else if (material is Fabric)
+                return "FABRIC";
+            //else if (material is Timber)
+            //    return "TIMBER";
             else
                 return "UNDEF";
 #else
diff --git a/GSA_Adapter/Convert/ToGsa/Properties/SectionProperty.cs b/GSA_Adapter/Convert/ToGsa/Properties/SectionProperty.cs
index 6b2fa82e..bf38a505 100644
--- a/GSA_Adapter/Convert/ToGsa/Properties/SectionProperty.cs
+++ b/GSA_Adapter/Convert/ToGsa/Properties/SectionProperty.cs
@@ -60,8 +60,6 @@ private static string ToGsaString(this ISectionProperty prop, string index, stri
             prop.Name = prop.DescriptionOrName().ToGSACleanName();
             string name = prop.TaggedName();
 
-            string mat = prop.Material.GSAId().ToString();// materialId;  //"STEEL";// material.Name;
-
             string colour = "NO_RGB";
             string principle = "NO";
             string type = prop.SectionType();
@@ -81,6 +79,7 @@ private static string ToGsaString(this ISectionProperty prop, string index, stri
             //SECTION.7 | ref | colour | name | memb | pool | point | refY | refZ | mass | fraction | cost | left | right | slab | num { <comp> }
             string str = "SECTION.7," + index + "," + colour + "," + name + ",1D_GENERIC,0,CENTROID,0,0,0,1,0,0,0,0,1," + sectionComp + "," + prop.ISectionMaterialComp();
 #else
+            string mat = prop.Material.GSAId().ToString();// materialId;  //"STEEL";// material.Name;
             string str = "PROP_SEC" + "," + index + "," + name + "," + colour + "," + mat + "," + description + "," + principle + "," + type + "," + cost + "," + props + "," + mods + "," + plate_type + "," + calc_J;
 #endif
             return str;
diff --git a/GSA_Adapter/Convert/ToGsa/Properties/SurfaceProperties.cs b/GSA_Adapter/Convert/ToGsa/Properties/SurfaceProperties.cs
index 2df11335..3cb6c28b 100644
--- a/GSA_Adapter/Convert/ToGsa/Properties/SurfaceProperties.cs
+++ b/GSA_Adapter/Convert/ToGsa/Properties/SurfaceProperties.cs
@@ -46,7 +46,6 @@ private static string ToGsaString(ConstantThickness panProp, string index)
         {
             panProp.Name = panProp.DescriptionOrName().ToGSACleanName();
             string name = panProp.TaggedName();
-            string mat = panProp.Material.GSAId().ToString();
 
             string command = "PROP_2D";
             string colour = "NO_RGB";
@@ -83,6 +82,7 @@ private static string ToGsaString(ConstantThickness panProp, string index)
             //PROP_2D.7 | num | name | colour | type | axis | mat | mat_type | grade | design | profile | ref_pt | ref_z | mass | flex | shear | inplane | weight |
             return $"PROP_2D.7, {index}, {name}, {colour}, {type}, {axis}, {analNum}, {materialType}, {matNum}, {design}, {thick}, {ref_pt}, {ref_z}, {mass}, {bending}, {shear}, {inplane}, {weight}";
 #else
+            string mat = panProp.Material.GSAId().ToString();
             return command + "," + index + "," + name + "," + colour + "," + axis + "," + mat + "," + type + "," + thick + "," + weight + "," + mass + "," + bending + "," + inplane;
 #endif
         }
@@ -119,7 +119,7 @@ public static List<string> ToGsaStrings(this FabricPanelProperty panProp, string
             string name = panProp.TaggedName();
             string colour = "NO_RGB";
             string axis = "GLOBAL";
-            string mat = panProp.Material.GSAId().ToString();
+            string mat = panProp.Material.MaterialId();
             string type = "FABRIC";
             string thick = "0.1";
             string mass = panProp.AdditionalMass.ToString();
diff --git a/GSA_Adapter/Convert/ToGsa/_ToGsa.cs b/GSA_Adapter/Convert/ToGsa/_ToGsa.cs
index 8a5bc939..ea928623 100644
--- a/GSA_Adapter/Convert/ToGsa/_ToGsa.cs
+++ b/GSA_Adapter/Convert/ToGsa/_ToGsa.cs
@@ -34,7 +34,7 @@
 using BH.oM.Adapters.GSA.SpacerProperties;
 using BH.oM.Adapters.GSA.Elements;
 using BH.oM.Base.Attributes;
-
+using BH.oM.Adapters.GSA.MaterialFragments;
 
 namespace BH.Adapter.GSA
 {
@@ -56,9 +56,11 @@ public static string ToGsaString(this Type type)
             else if (type == typeof(Concrete))
                 return "MAT_CONCRETE";
             else if (type == typeof(Timber))
-                return "MAT_TIMBER";
+                return "MAT_ANAL";//return "MAT_TIMBER";
             else if (type == typeof(Aluminium))
-                return "MAT_ALUMINIUM";
+                return "MAT_ANAL";//return "MAT_ALUMINIUM";
+            else if (type == typeof(Fabric))
+                return "MAT_FABRIC";//return "MAT_ALUMINIUM";
             else if (type == typeof(GenericIsotropicMaterial) || type == typeof(GenericOrthotropicMaterial))
                 return "MAT_ANAL";
 #else