diff --git a/StructureHelper/Infrastructure/UI/Resources/Materials.xaml b/StructureHelper/Infrastructure/UI/Resources/Materials.xaml
index e4de792..5cd1ae1 100644
--- a/StructureHelper/Infrastructure/UI/Resources/Materials.xaml
+++ b/StructureHelper/Infrastructure/UI/Resources/Materials.xaml
@@ -28,6 +28,14 @@
                     </DataTemplate>
                 </ComboBox.ItemTemplate>
             </ComboBox>
+            <TextBlock Text="Material Model"/>
+            <ComboBox Height="25" VerticalAlignment="Top" ItemsSource="{Binding MaterialLogics}" SelectedItem="{Binding MaterialLogic}">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding Name}"/>
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
         </StackPanel>
     </DataTemplate>
     
diff --git a/StructureHelper/Libraries/LoaderCalculator.dll b/StructureHelper/Libraries/LoaderCalculator.dll
index 9b84c07..f2db256 100644
Binary files a/StructureHelper/Libraries/LoaderCalculator.dll and b/StructureHelper/Libraries/LoaderCalculator.dll differ
diff --git a/StructureHelper/Windows/Graphs/MaterialDiagramView.xaml b/StructureHelper/Windows/Graphs/MaterialDiagramView.xaml
index 30b0748..d75bbfa 100644
--- a/StructureHelper/Windows/Graphs/MaterialDiagramView.xaml
+++ b/StructureHelper/Windows/Graphs/MaterialDiagramView.xaml
@@ -55,6 +55,7 @@
             <ContentControl Grid.Row="1" ContentTemplate="{StaticResource ResourceKey=LineVisualProperties}" Content="{Binding VisualProps}"/>
             <StackPanel Grid.Row="2" Orientation="Horizontal">
                 <Button Margin="3" Content="Draw Lines" ToolTip="Draw lines" Command="{Binding RedrawLinesCommand}"/>
+                <Button Margin="3" Content="Show Areas" ToolTip="Area under lines" Command="{Binding GetAreaCommand}"/>
             </StackPanel>
         </Grid>
         <lvc:CartesianChart Grid.Column="1" Series="{Binding SeriesCollection}" LegendLocation="Bottom" Zoom="Xy">
diff --git a/StructureHelper/Windows/Graphs/MaterialDiagramViewModel.cs b/StructureHelper/Windows/Graphs/MaterialDiagramViewModel.cs
index c2ba808..dfd6410 100644
--- a/StructureHelper/Windows/Graphs/MaterialDiagramViewModel.cs
+++ b/StructureHelper/Windows/Graphs/MaterialDiagramViewModel.cs
@@ -4,10 +4,12 @@ using StructureHelper.Infrastructure;
 using StructureHelper.Infrastructure.UI.Converters.Units;
 using StructureHelper.Models.Materials;
 using StructureHelper.Windows.ViewModels;
+using StructureHelperCommon.Infrastructures.Enums;
 using StructureHelperCommon.Infrastructures.Settings;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media;
 
@@ -15,12 +17,22 @@ namespace StructureHelper.Windows.Graphs
 {
     public class MaterialDiagramViewModel : ViewModelBase
     {
+        class StressEntity
+        {
+            public LimitStateEntity LimitState { get; set; }
+            public CalcTermEntity CalcTerm { get; set; }
+            public IHeadMaterial Material { get; set; }
+            public double Strain { get; set; }
+            public double Stress { get; set; }
+        }
+
         private IHeadMaterial material;
         private ICommand redrawLinesCommand;
         double minValue;
         double maxValue;
         int stepCount;
         bool positiveInTension;
+        private ICommand getAreaCommand;
 
         public string MaterialName => material.Name;
         public GraphVisualProps VisualProps { get; }
@@ -79,6 +91,15 @@ namespace StructureHelper.Windows.Graphs
             get => redrawLinesCommand ??= new RelayCommand(o => DrawLines(), b => IsDrawPossible());
         }
 
+        public ICommand GetAreaCommand
+        {
+            get => getAreaCommand ??= new RelayCommand(o =>
+            {
+                var str = GetAreas();
+                MessageBox.Show(str);
+            }, b => IsDrawPossible());
+        }
+
         public MaterialDiagramViewModel(IEnumerable<IHeadMaterial> headMaterials, IHeadMaterial material)
         {
             MaterialsModel = new SelectItemsViewModel<IHeadMaterial>(headMaterials) { ShowButtons = true };
@@ -100,12 +121,80 @@ namespace StructureHelper.Windows.Graphs
             VisualProps = new();
             SetLines();
         }
+        private string GetAreas()
+        {
+            var materials = MaterialsModel.SelectedItems;
+            var limitStates = LimitStatesModel.SelectedItems;
+            var calcTerms = CalcTermsModel.SelectedItems;
+            double step = (maxValue - minValue) / stepCount;
+            var factor = positiveInTension ? 1d : -1d;
+
+            var values = GetValueList();
+
+            string str = string.Empty;
+
+            foreach (var limitState in limitStates)
+                {
+                foreach (var calcTerm in calcTerms)
+                    {
+                    foreach (var material in materials)
+                    {
+                        double sumStress = 0d;
+                        var stressList = values
+                            .Where(x => x.LimitState == limitState & x.CalcTerm == calcTerm & x.Material == material).ToList();
+                        for (int i = 1; i < stressList.Count(); i++)
+                        {
+                            double midStress = (stressList[i - 1].Stress + stressList[i].Stress) / 2;
+                            sumStress += midStress * UnitConstants.Stress * step;
+                        }
+                        str += $"{material.Name}, {limitState.Name}, {calcTerm.Name}: {sumStress} \n";
+                    }
+                }
+            }
+            return str;
+        }
+
+        private List<StressEntity> GetValueList()
+        {
+            var materials = MaterialsModel.SelectedItems;
+            var limitStates = LimitStatesModel.SelectedItems;
+            var calcTerms = CalcTermsModel.SelectedItems;
+            double step = (maxValue - minValue) / stepCount;
+            var factor = positiveInTension ? 1d : -1d;
+
+            var result = new List<StressEntity>();
+            foreach (var limitState in limitStates)
+            {
+                foreach (var calcTerm in calcTerms)
+                {
+                    foreach (var material in materials)
+                    {
+                        var loaderMaterial = material.GetLoaderMaterial(limitState.LimitState, calcTerm.CalcTerm);
+                        for (double s = minValue; s < maxValue; s += step)
+                        {
+                            double strain = s * factor;
+                            double diagramValue = loaderMaterial.Diagram.Invoke(loaderMaterial.DiagramParameters, strain) * factor;
+                            StressEntity stressEntity = new()
+                            {
+                                LimitState = limitState,
+                                CalcTerm = calcTerm,
+                                Material = material,
+                                Strain = strain,
+                                Stress = diagramValue
+                            };
+                            result.Add(stressEntity);
+                        }
+                    }
+                }
+            }
+            return result;
+        }
 
         private void SetLines()
         {
             var materials = MaterialsModel.SelectedItems;
             var limitStates = LimitStatesModel.SelectedItems;
-            var calcTerms = CalcTermsModel.SelectedItems; ;
+            var calcTerms = CalcTermsModel.SelectedItems;
             var labels = new List<string>();
             var factor = positiveInTension ? 1d : -1d;
 
diff --git a/StructureHelper/Windows/ViewModels/Materials/HeadMaterialViewModel.cs b/StructureHelper/Windows/ViewModels/Materials/HeadMaterialViewModel.cs
index 25bbd66..bb341af 100644
--- a/StructureHelper/Windows/ViewModels/Materials/HeadMaterialViewModel.cs
+++ b/StructureHelper/Windows/ViewModels/Materials/HeadMaterialViewModel.cs
@@ -2,6 +2,7 @@
 using StructureHelper.Models.Materials;
 using StructureHelper.Windows.AddMaterialWindow;
 using StructureHelperCommon.Infrastructures.Exceptions;
+using StructureHelperCommon.Models.Materials;
 using StructureHelperCommon.Models.Materials.Libraries;
 using StructureHelperCommon.Services.ColorServices;
 using StructureHelperLogics.Models.Materials;
diff --git a/StructureHelper/Windows/ViewModels/Materials/LibMaterialViewModel.cs b/StructureHelper/Windows/ViewModels/Materials/LibMaterialViewModel.cs
index d4a1a45..02ec6da 100644
--- a/StructureHelper/Windows/ViewModels/Materials/LibMaterialViewModel.cs
+++ b/StructureHelper/Windows/ViewModels/Materials/LibMaterialViewModel.cs
@@ -4,6 +4,7 @@ using StructureHelper.Windows.AddMaterialWindow;
 using StructureHelperCommon.Infrastructures.Enums;
 using StructureHelperCommon.Infrastructures.Settings;
 using StructureHelperCommon.Models.Codes;
+using StructureHelperCommon.Models.Materials;
 using StructureHelperCommon.Models.Materials.Libraries;
 using StructureHelperLogics.Models.Materials;
 using System;
@@ -22,6 +23,7 @@ namespace StructureHelper.Windows.ViewModels.Materials
         ICommand showSafetyFactors;
         SafetyFactorsViewModel safetyFactorsViewModel;
         private ICodeEntity codeEntity;
+        private IMaterialLogic materialLogic;
 
         public ILibMaterialEntity MaterialEntity
         {
@@ -47,6 +49,9 @@ namespace StructureHelper.Windows.ViewModels.Materials
             }
         }
 
+        public List<IMaterialLogic> MaterialLogics => material.MaterialLogics;
+        public IMaterialLogic MaterialLogic { get => material.MaterialLogic; set => material.MaterialLogic = value; }
+
         private void FillMaterialKinds()
         {
             var materialKinds = ProgramSetting
diff --git a/StructureHelperCommon/Infrastructures/Settings/ProgramSetting.cs b/StructureHelperCommon/Infrastructures/Settings/ProgramSetting.cs
index f794e7e..44f1129 100644
--- a/StructureHelperCommon/Infrastructures/Settings/ProgramSetting.cs
+++ b/StructureHelperCommon/Infrastructures/Settings/ProgramSetting.cs
@@ -1,6 +1,7 @@
 using StructureHelperCommon.Infrastructures.Enums;
 using StructureHelperCommon.Models.Codes;
 using StructureHelperCommon.Models.Codes.Factories;
+using StructureHelperCommon.Models.Materials;
 using StructureHelperCommon.Models.Materials.Libraries;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,6 +12,7 @@ namespace StructureHelperCommon.Infrastructures.Settings
 {
     public static class ProgramSetting
     {
+        private static List<IMaterialLogic> materialLogics;
         private static List<ICodeEntity> codesList;
         private static IMaterialRepository materialRepository;
         private static NatSystems natSystem;
@@ -52,5 +54,13 @@ namespace StructureHelperCommon.Infrastructures.Settings
             }
         }
 
+        public static List<IMaterialLogic> MaterialLogics
+        {
+            get
+            {
+                materialLogics ??= MaterialLogicsFactory.GetMaterialLogics();
+                return materialLogics;
+            }
+        }
     }
 }
diff --git a/StructureHelperCommon/Models/Materials/ConcreteCurveLogic.cs b/StructureHelperCommon/Models/Materials/ConcreteCurveLogic.cs
index 464663c..fc07e65 100644
--- a/StructureHelperCommon/Models/Materials/ConcreteCurveLogic.cs
+++ b/StructureHelperCommon/Models/Materials/ConcreteCurveLogic.cs
@@ -1,5 +1,6 @@
 using LoaderCalculator.Data.Materials;
 using LoaderCalculator.Data.Materials.MaterialBuilders;
+using StructureHelperCommon.Infrastructures.Enums;
 using StructureHelperCommon.Infrastructures.Exceptions;
 
 namespace StructureHelperCommon.Models.Materials
@@ -25,6 +26,9 @@ namespace StructureHelperCommon.Models.Materials
             }
         }
 
+        public MaterialTypes MaterialType { get; set; }
+        public DiagramType DiagramType { get; set; }
+
         public IMaterial GetLoaderMaterial()
         {
             GetLoaderOptions();
diff --git a/StructureHelperCommon/Models/Materials/Factories/MaterialLogicsFactory.cs b/StructureHelperCommon/Models/Materials/Factories/MaterialLogicsFactory.cs
new file mode 100644
index 0000000..a9912ff
--- /dev/null
+++ b/StructureHelperCommon/Models/Materials/Factories/MaterialLogicsFactory.cs
@@ -0,0 +1,25 @@
+using LoaderCalculator.Data.Materials.MaterialBuilders;
+using StructureHelperCommon.Infrastructures.Enums;
+using StructureHelperCommon.Models.Materials;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StructureHelperCommon.Models.Materials
+{
+    internal static class MaterialLogicsFactory
+    {
+        public static List<IMaterialLogic> GetMaterialLogics()
+        {
+            var items = new List<IMaterialLogic>()
+            {
+                new ReinforcementByBuilderLogic() { MaterialType = MaterialTypes.Reinforcement, Name="Bilinear", DiagramType = DiagramType.Bilinear},
+                new ReinforcementByBuilderLogic() { MaterialType = MaterialTypes.Reinforcement, Name="Triplelinear", DiagramType = DiagramType.TripleLinear},
+                new ConcreteCurveLogic() { MaterialType = MaterialTypes.Concrete, Name = "Curve", DiagramType = DiagramType.Curve},
+            };
+            return items;
+        }
+    }
+}
diff --git a/StructureHelperCommon/Models/Materials/IMaterialLogic.cs b/StructureHelperCommon/Models/Materials/IMaterialLogic.cs
index d6af9ed..71e77f8 100644
--- a/StructureHelperCommon/Models/Materials/IMaterialLogic.cs
+++ b/StructureHelperCommon/Models/Materials/IMaterialLogic.cs
@@ -1,4 +1,5 @@
 using LoaderCalculator.Data.Materials;
+using LoaderCalculator.Data.Materials.MaterialBuilders;
 using StructureHelperCommon.Infrastructures.Enums;
 using System;
 using System.Collections.Generic;
@@ -13,5 +14,7 @@ namespace StructureHelperCommon.Models.Materials
         string Name { get; set; }
         IMaterialLogicOptions Options { get; set; }
         IMaterial GetLoaderMaterial();
+        MaterialTypes MaterialType { get; set; }
+        DiagramType DiagramType { get; set; }
     }
 }
diff --git a/StructureHelperCommon/Models/Materials/Libraries/ConcreteMaterialEntity.cs b/StructureHelperCommon/Models/Materials/Libraries/ConcreteMaterialEntity.cs
index a41a884..406fcdd 100644
--- a/StructureHelperCommon/Models/Materials/Libraries/ConcreteMaterialEntity.cs
+++ b/StructureHelperCommon/Models/Materials/Libraries/ConcreteMaterialEntity.cs
@@ -11,6 +11,7 @@ namespace StructureHelperCommon.Models.Materials.Libraries
         public ICodeEntity Code { get; set; }
         public string Name { get; set; }
         public double MainStrength { get; set; }
+        public double InitModulus { get; set; }
 
         public ConcreteMaterialEntity(Guid id)
         {
diff --git a/StructureHelperCommon/Models/Materials/Libraries/Factories/LibMaterialFactory.cs b/StructureHelperCommon/Models/Materials/Libraries/Factories/LibMaterialFactory.cs
index 844e7ce..c85cb09 100644
--- a/StructureHelperCommon/Models/Materials/Libraries/Factories/LibMaterialFactory.cs
+++ b/StructureHelperCommon/Models/Materials/Libraries/Factories/LibMaterialFactory.cs
@@ -231,21 +231,48 @@ namespace StructureHelperCommon.Models.Materials.Libraries
                     CodeType = codeType,
                     Code = code,
                     Name = "A240",
-                    MainStrength = 240e6
+                    InitModulus = 2e11d,
+                    MainStrength = 240e6d
                 },
                 new ReinforcementMaterialEntity(new Guid("ea422282-3465-433c-9b93-c5bbfba5a904"))
                 {
                     CodeType = codeType,
                     Code = code,
                     Name = "A400",
-                    MainStrength = 400e6
+                    InitModulus = 2e11d,
+                    MainStrength = 400e6d
                 },
                 new ReinforcementMaterialEntity(new Guid("045b54b1-0bbf-41fd-a27d-aeb20f600bb4"))
                 {
                     CodeType = codeType,
                     Code = code,
                     Name = "A500",
-                    MainStrength = 500e6
+                    InitModulus = 2e11d,
+                    MainStrength = 500e6d
+                },
+                new ReinforcementMaterialEntity(new Guid("e3cfc6fb-fbd0-47dd-ab4a-79c030704acf"))
+                {
+                    CodeType = codeType,
+                    Code = code,
+                    Name = "A600",
+                    InitModulus = 2e11d,
+                    MainStrength = 600e6d
+                },
+                new ReinforcementMaterialEntity(new Guid("6f0882ef-53bf-464e-acf7-da421a43a825"))
+                {
+                    CodeType = codeType,
+                    Code = code,
+                    Name = "A800",
+                    InitModulus = 2e11d,
+                    MainStrength = 800e6d
+                },
+                new ReinforcementMaterialEntity(new Guid("509fbaae-a3de-43c2-aae6-33387908dc43"))
+                {
+                    CodeType = codeType,
+                    Code = code,
+                    Name = "A1000",
+                    InitModulus = 2e11d,
+                    MainStrength = 1000e6d
                 }
             };
             return range;
@@ -262,6 +289,7 @@ namespace StructureHelperCommon.Models.Materials.Libraries
                     CodeType = codeType,
                     Code = code,
                     Name = "K1400/1670",
+                    InitModulus = 1.95e11d,
                     MainStrength = 1400e6
                 },
                 new ReinforcementMaterialEntity(new Guid("93c48a27-ab37-4bd2-aeb8-2a7247e74a1b"))
@@ -269,6 +297,7 @@ namespace StructureHelperCommon.Models.Materials.Libraries
                     CodeType = codeType,
                     Code = code,
                     Name = "K1500/1770",
+                    InitModulus = 1.95e11d,
                     MainStrength = 1500e6
                 },
                 new ReinforcementMaterialEntity(new Guid("6e0df35e-4839-4cf1-9182-c7ad7f81a548"))
@@ -276,6 +305,7 @@ namespace StructureHelperCommon.Models.Materials.Libraries
                     CodeType = codeType,
                     Code = code,
                     Name = "K1600/1860",
+                    InitModulus = 1.95e11d,
                     MainStrength = 1600e6
                 },
                 new ReinforcementMaterialEntity(new Guid("29d7ef1b-bd30-471e-af0e-8b419eb9f043"))
@@ -283,6 +313,7 @@ namespace StructureHelperCommon.Models.Materials.Libraries
                     CodeType = codeType,
                     Code = code,
                     Name = "K1700/1960",
+                    InitModulus = 1.95e11d,
                     MainStrength = 1700e6
                 },
                 new ReinforcementMaterialEntity(new Guid("494b959f-0194-4f02-9dcf-ff313c5e352b"))
@@ -290,6 +321,7 @@ namespace StructureHelperCommon.Models.Materials.Libraries
                     CodeType = codeType,
                     Code = code,
                     Name = "K1800/2060",
+                    InitModulus = 1.95e11d,
                     MainStrength = 1800e6
                 },
                 new ReinforcementMaterialEntity(new Guid("02031332-fe1e-456d-b339-143eb9ca8293"))
@@ -297,6 +329,7 @@ namespace StructureHelperCommon.Models.Materials.Libraries
                     CodeType = codeType,
                     Code = code,
                     Name = "K1900/2160",
+                    InitModulus = 1.95e11d,
                     MainStrength = 1900e6
                 }
             };
diff --git a/StructureHelperCommon/Models/Materials/Libraries/FiberMaterialEntity.cs b/StructureHelperCommon/Models/Materials/Libraries/FiberMaterialEntity.cs
index 4cbb094..a256a87 100644
--- a/StructureHelperCommon/Models/Materials/Libraries/FiberMaterialEntity.cs
+++ b/StructureHelperCommon/Models/Materials/Libraries/FiberMaterialEntity.cs
@@ -16,7 +16,7 @@ namespace StructureHelperCommon.Models.Materials.Libraries
         public ICodeEntity Code { get; set; }
         public string Name { get; }
         ///<inheritdoc/>
-        public double YoungsModulus { get; set; }
+        public double InitModulus { get; set; }
         ///<inheritdoc/>
         public double MainStrength { get; }
         public FiberMaterialEntity(Guid id)
diff --git a/StructureHelperCommon/Models/Materials/Libraries/IFiberMaterialEntity.cs b/StructureHelperCommon/Models/Materials/Libraries/IFiberMaterialEntity.cs
index 909bcba..aadb084 100644
--- a/StructureHelperCommon/Models/Materials/Libraries/IFiberMaterialEntity.cs
+++ b/StructureHelperCommon/Models/Materials/Libraries/IFiberMaterialEntity.cs
@@ -11,6 +11,6 @@ namespace StructureHelperCommon.Models.Materials.Libraries
         /// <summary>
         /// Modulus of elasticity, Pa
         /// </summary>
-        double YoungsModulus { get; set; }
+        double InitModulus { get; set; }
     }
 }
diff --git a/StructureHelperCommon/Models/Materials/Libraries/ILibMaterialEntity.cs b/StructureHelperCommon/Models/Materials/Libraries/ILibMaterialEntity.cs
index 75440d8..459dc70 100644
--- a/StructureHelperCommon/Models/Materials/Libraries/ILibMaterialEntity.cs
+++ b/StructureHelperCommon/Models/Materials/Libraries/ILibMaterialEntity.cs
@@ -10,6 +10,10 @@ namespace StructureHelperCommon.Models.Materials.Libraries
         ICodeEntity Code { get; set; }
         string Name { get; }
         /// <summary>
+        /// Initial Young's Modulus, Pa
+        /// </summary>
+        double InitModulus { get; set; }
+        /// <summary>
         /// Strength of material, Pa
         /// </summary>
         double MainStrength { get; }
diff --git a/StructureHelperCommon/Models/Materials/Libraries/ReinforcementMaterialEntity.cs b/StructureHelperCommon/Models/Materials/Libraries/ReinforcementMaterialEntity.cs
index 6d55283..0537189 100644
--- a/StructureHelperCommon/Models/Materials/Libraries/ReinforcementMaterialEntity.cs
+++ b/StructureHelperCommon/Models/Materials/Libraries/ReinforcementMaterialEntity.cs
@@ -11,6 +11,7 @@ namespace StructureHelperCommon.Models.Materials.Libraries
         public ICodeEntity Code { get; set; }
         public string Name { get; set; }
         public double MainStrength { get; set; }
+        public double InitModulus { get; set; }
 
         public ReinforcementMaterialEntity(Guid id)
         {
diff --git a/StructureHelperCommon/Models/Materials/MaterialCommonOptionLogic.cs b/StructureHelperCommon/Models/Materials/MaterialCommonOptionLogic.cs
index 1d141ef..80097e1 100644
--- a/StructureHelperCommon/Models/Materials/MaterialCommonOptionLogic.cs
+++ b/StructureHelperCommon/Models/Materials/MaterialCommonOptionLogic.cs
@@ -15,6 +15,7 @@ namespace StructureHelperCommon.Models.Materials
 
         public void SetMaterialOptions(LCMB.IMaterialOptions materialOptions)
         {
+            materialOptions.InitModulus = options.MaterialEntity.InitModulus;
             materialOptions.Strength = options.MaterialEntity.MainStrength;
             if (options.MaterialEntity.CodeType == CodeTypes.EuroCode_2_1990)
             {
diff --git a/StructureHelperCommon/Models/Materials/ReinforcementBiLinearLogic.cs b/StructureHelperCommon/Models/Materials/ReinforcementByBuilderLogic.cs
similarity index 75%
rename from StructureHelperCommon/Models/Materials/ReinforcementBiLinearLogic.cs
rename to StructureHelperCommon/Models/Materials/ReinforcementByBuilderLogic.cs
index 8c607d2..6104cdd 100644
--- a/StructureHelperCommon/Models/Materials/ReinforcementBiLinearLogic.cs
+++ b/StructureHelperCommon/Models/Materials/ReinforcementByBuilderLogic.cs
@@ -1,30 +1,31 @@
 using LoaderCalculator.Data.Materials;
 using LoaderCalculator.Data.Materials.MaterialBuilders;
+using StructureHelperCommon.Infrastructures.Enums;
 using StructureHelperCommon.Infrastructures.Exceptions;
+using StructureHelperCommon.Services;
 
 namespace StructureHelperCommon.Models.Materials
 {
-    public class ReinforcementBiLinearLogic : IMaterialLogic
+    public class ReinforcementByBuilderLogic : IMaterialLogic
     {
+        private ReinforcementLogicOptions options;
         private ReinforcementOptions materialOptions;
         private IMaterialOptionLogic optionLogic;
-        private ReinforcementLogicOptions options;
-        private IMaterialLogicOptions options1;
 
         public string Name { get; set; }
+        public DiagramType DiagramType { get; set; }
         public IMaterialLogicOptions Options
         {
             get => options;
             set
             {
-                if (value is not ReinforcementLogicOptions)
-                {
-                    throw new StructureHelperException($"{ErrorStrings.ExpectedWas(typeof(ReinforcementLogicOptions), value)}");
-                }
+                CheckObject.CheckType(value, typeof(ReinforcementLogicOptions));
                 options = (ReinforcementLogicOptions)value;
             }
         }
 
+        public MaterialTypes MaterialType { get; set; }
+
         public IMaterial GetLoaderMaterial()
         {
             GetLoaderOptions();
@@ -42,7 +43,7 @@ namespace StructureHelperCommon.Models.Materials
 
         private void GetLoaderOptions()
         {
-            materialOptions = new ReinforcementOptions();
+            materialOptions = new ReinforcementOptions() { DiagramType = DiagramType};
             optionLogic = new MaterialCommonOptionLogic(options);
             optionLogic.SetMaterialOptions(materialOptions);
         }
diff --git a/StructureHelperCommon/Services/CheckObject.cs b/StructureHelperCommon/Services/CheckObject.cs
index 63f0540..bd56adc 100644
--- a/StructureHelperCommon/Services/CheckObject.cs
+++ b/StructureHelperCommon/Services/CheckObject.cs
@@ -1,6 +1,7 @@
 using StructureHelperCommon.Infrastructures.Exceptions;
 using StructureHelperCommon.Infrastructures.Interfaces;
 using StructureHelperCommon.Models.Forces;
+using StructureHelperCommon.Models.Materials;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -32,7 +33,15 @@ namespace StructureHelperCommon.Services
         }
         public static void IsNull(object item, string message = "")
         {
-            if (item is null) {throw new StructureHelperException (ErrorStrings.ParameterIsNull + message);}
+            if (item is null) { throw new StructureHelperException(ErrorStrings.ParameterIsNull + message); }
+        }
+
+        public static void CheckType(object sourceObject, Type targetType)
+        {
+            if (sourceObject.GetType() != targetType)
+            {
+                throw new StructureHelperException($"{ErrorStrings.ExpectedWas(targetType, sourceObject.GetType())}");
+            }
         }
     }
 }
diff --git a/StructureHelperLogics/Models/Materials/ConcreteLibMaterial.cs b/StructureHelperLogics/Models/Materials/ConcreteLibMaterial.cs
index b4b8923..352e9c6 100644
--- a/StructureHelperLogics/Models/Materials/ConcreteLibMaterial.cs
+++ b/StructureHelperLogics/Models/Materials/ConcreteLibMaterial.cs
@@ -12,6 +12,8 @@ namespace StructureHelperLogics.Models.Materials
 {
     public class ConcreteLibMaterial : IConcreteLibMaterial
     {
+        const MaterialTypes materialType = MaterialTypes.Concrete;
+        private readonly List<IMaterialLogic> materialLogics;
         private LMBuilders.ConcreteOptions lmOptions;
         private IMaterialOptionLogic optionLogic;
         private IFactorLogic factorLogic => new FactorLogic(SafetyFactors);
@@ -31,11 +33,11 @@ namespace StructureHelperLogics.Models.Materials
         /// <inheritdoc/>
         public IMaterialLogic MaterialLogic { get; set; }
         /// <inheritdoc/>
-        public List<IMaterialLogic> MaterialLogics { get; }
-
+        public List<IMaterialLogic> MaterialLogics => materialLogics;
         public ConcreteLibMaterial()
         {
-            MaterialLogic = new ConcreteCurveLogic();
+            materialLogics = ProgramSetting.MaterialLogics.Where(x => x.MaterialType == materialType).ToList();
+            MaterialLogic = materialLogics.First();
             SafetyFactors = new List<IMaterialSafetyFactor>();
             lmOptions = new LMBuilders.ConcreteOptions();
             SafetyFactors.AddRange(PartialCoefficientFactory.GetDefaultConcreteSafetyFactors(ProgramSetting.CodeType));
diff --git a/StructureHelperLogics/Models/Materials/Logics/ConcreteLibUpdateStrategy.cs b/StructureHelperLogics/Models/Materials/Logics/ConcreteLibUpdateStrategy.cs
index 88f0819..343a940 100644
--- a/StructureHelperLogics/Models/Materials/Logics/ConcreteLibUpdateStrategy.cs
+++ b/StructureHelperLogics/Models/Materials/Logics/ConcreteLibUpdateStrategy.cs
@@ -17,7 +17,6 @@ namespace StructureHelperLogics.Models.Materials
             targetObject.TensionForULS = sourceObject.TensionForULS;
             targetObject.TensionForSLS = sourceObject.TensionForSLS;
             targetObject.RelativeHumidity = sourceObject.RelativeHumidity;
-            targetObject.MaterialLogic = sourceObject.MaterialLogic;
         }
     }
 }
diff --git a/StructureHelperLogics/Models/Materials/Logics/LibMaterialUpdateStrategy.cs b/StructureHelperLogics/Models/Materials/Logics/LibMaterialUpdateStrategy.cs
index 8d4456f..5fe96f9 100644
--- a/StructureHelperLogics/Models/Materials/Logics/LibMaterialUpdateStrategy.cs
+++ b/StructureHelperLogics/Models/Materials/Logics/LibMaterialUpdateStrategy.cs
@@ -15,6 +15,7 @@ namespace StructureHelperLogics.Models.Materials
             if (ReferenceEquals(targetObject, sourceObject)) { return; }
             targetObject.MaterialEntity = sourceObject.MaterialEntity;
             targetObject.SafetyFactors.Clear();
+            targetObject.MaterialLogic = sourceObject.MaterialLogic;
             foreach (var item in sourceObject.SafetyFactors)
             {
                 targetObject.SafetyFactors.Add(item.Clone() as IMaterialSafetyFactor);
diff --git a/StructureHelperLogics/Models/Materials/ReinforcementLibMaterial.cs b/StructureHelperLogics/Models/Materials/ReinforcementLibMaterial.cs
index 8a2b08c..08872ac 100644
--- a/StructureHelperLogics/Models/Materials/ReinforcementLibMaterial.cs
+++ b/StructureHelperLogics/Models/Materials/ReinforcementLibMaterial.cs
@@ -10,26 +10,28 @@ using LMBuilders = LoaderCalculator.Data.Materials.MaterialBuilders;
 using LoaderMaterialLogics = LoaderCalculator.Data.Materials.MaterialBuilders.MaterialLogics;
 using LoaderCalculator.Data.Materials;
 using StructureHelperCommon.Models.Materials;
+using StructureHelperCommon.Infrastructures.Settings;
 
 namespace StructureHelperLogics.Models.Materials
 {
     public class ReinforcementLibMaterial : IReinforcementLibMaterial
     {
-        private LMBuilders.ReinforcementOptions lmOptions;
-        private IMaterialOptionLogic optionLogic;
+        const MaterialTypes materialType = MaterialTypes.Reinforcement;
+
         private IFactorLogic factorLogic => new FactorLogic(SafetyFactors);
         private LoaderMaterialLogics.ITrueStrengthLogic strengthLogic;
+        private readonly List<IMaterialLogic> materialLogics;
+
         public ILibMaterialEntity MaterialEntity { get; set; }
         public List<IMaterialSafetyFactor> SafetyFactors { get; }
         public IMaterialLogic MaterialLogic { get; set; }
 
-        public List<IMaterialLogic> MaterialLogics { get; }
-
+        public List<IMaterialLogic> MaterialLogics => materialLogics;
         public ReinforcementLibMaterial()
         {
-            MaterialLogic = new ReinforcementBiLinearLogic();
+            materialLogics = ProgramSetting.MaterialLogics.Where(x => x.MaterialType == materialType).ToList();
+            MaterialLogic = materialLogics.First();
             SafetyFactors = new List<IMaterialSafetyFactor>();
-            lmOptions = new LMBuilders.ReinforcementOptions();
         }
 
         public object Clone()