diff --git a/Editor/EditorAddons/Drawers/Gizmo/GizmoElementBehaviour.cs b/Editor/EditorAddons/Drawers/Gizmo/GizmoElementBehaviour.cs
new file mode 100644
index 0000000..255645c
--- /dev/null
+++ b/Editor/EditorAddons/Drawers/Gizmo/GizmoElementBehaviour.cs
@@ -0,0 +1,25 @@
+using Better.Commons.EditorAddons.Drawers.BehavioredElements;
+using Better.Commons.Runtime.Extensions;
+using UnityEngine.UIElements;
+
+namespace Better.Attributes.EditorAddons.Drawers.Gizmo
+{
+    public class GizmoElementBehaviour : DefaultElementBehaviour<Button>
+    {
+        public override void OnLink(BehavioredElement<Button> behavioredElement)
+        {
+            base.OnLink(behavioredElement);
+            BehavioredElement.style
+                .FlexGrow(new StyleFloat(1f));
+            BehavioredElement.SubElement.style.FlexGrow(new StyleFloat(1f));
+        }
+        
+        public override void OnAttach(VisualElement root)
+        {
+            if (root.Contains(BehavioredElement)) return;
+            BehavioredElement.RemoveFromHierarchy();
+
+            root.Add(BehavioredElement);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Editor/EditorAddons/Drawers/Gizmo/GizmoElementBehaviour.cs.meta b/Editor/EditorAddons/Drawers/Gizmo/GizmoElementBehaviour.cs.meta
new file mode 100644
index 0000000..6a97a47
--- /dev/null
+++ b/Editor/EditorAddons/Drawers/Gizmo/GizmoElementBehaviour.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 845068b754aa4a02b5fc4c11e8fb6df8
+timeCreated: 1722554331
\ No newline at end of file
diff --git a/Editor/EditorAddons/Drawers/Select/Handlers/SelectImplementationHandler.cs b/Editor/EditorAddons/Drawers/Select/Handlers/SelectImplementationHandler.cs
index 53ea89e..e1e194c 100644
--- a/Editor/EditorAddons/Drawers/Select/Handlers/SelectImplementationHandler.cs
+++ b/Editor/EditorAddons/Drawers/Select/Handlers/SelectImplementationHandler.cs
@@ -1,12 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Better.Attributes.Runtime.Select;
 using Better.Commons.EditorAddons.Enums;
 using Better.Commons.EditorAddons.Extensions;
 using Better.Commons.Runtime.Extensions;
-using UnityEditor.UIElements;
 using UnityEngine;
-using UnityEngine.UIElements;
 
 namespace Better.Attributes.EditorAddons.Drawers.Select
 {
@@ -21,7 +20,7 @@ public override void Update(object value)
             var property = _container.SerializedProperty;
             if (!property.Verify()) return;
             var typeValue = (Type)value;
-            property.managedReferenceValue = typeValue == null ? null : Activator.CreateInstance(typeValue);
+            property.managedReferenceValue = typeValue == null ? null : Activator.CreateInstance(typeValue, true);
 
             base.Update(value);
         }
@@ -38,7 +37,9 @@ public override object GetCurrentValue()
 
         protected override IEnumerable<Type> GetInheritedTypes(Type fieldType)
         {
-            return fieldType.GetAllInheritedTypesWithoutUnityObject();
+            var inheritedTypes = fieldType.GetAllInheritedTypesWithoutUnityObject()
+                .Where(type => !type.IsGenericType && !type.IsGenericTypeDefinition);
+            return inheritedTypes;
         }
 
         public override bool IsSkippingFieldDraw()
diff --git a/Editor/EditorAddons/Drawers/Select/SelectDrawer.cs b/Editor/EditorAddons/Drawers/Select/SelectDrawer.cs
index 15956f0..2efd3dc 100644
--- a/Editor/EditorAddons/Drawers/Select/SelectDrawer.cs
+++ b/Editor/EditorAddons/Drawers/Select/SelectDrawer.cs
@@ -54,7 +54,7 @@ protected override void PopulateContainer(ElementsContainer container)
             container.SerializedPropertyChanged += UpdateElement;
 
             handler.OnPopulateContainer();
-            container.RootElement.OnElementAppear<Label>(behavioredElement.Attach);
+            container.RootElement.OnElementAppear<Label>(behavioredElement.Attach).Until(null).Every(100).Resume();
         }
 
         private void OnReferenceTypeChange(ReferenceTypeChangeEvent changeEvent, ElementsContainer container)
diff --git a/Editor/EditorAddons/Drawers/Select/SelectElementBehaviour.cs b/Editor/EditorAddons/Drawers/Select/SelectElementBehaviour.cs
new file mode 100644
index 0000000..2a47106
--- /dev/null
+++ b/Editor/EditorAddons/Drawers/Select/SelectElementBehaviour.cs
@@ -0,0 +1,19 @@
+using Better.Commons.EditorAddons.Drawers.BehavioredElements;
+using Better.Commons.EditorAddons.Enums;
+using Better.Commons.EditorAddons.Extensions;
+using Better.Commons.Runtime.Extensions;
+using UnityEngine.UIElements;
+
+namespace Better.Attributes.EditorAddons.Drawers.Select
+{
+    public class SelectElementBehaviour : DefaultElementBehaviour<Button>
+    {
+        public override void OnLink(BehavioredElement<Button> behavioredElement)
+        {
+            base.OnLink(behavioredElement);
+
+            var icon = BehavioredElement.SubElement.AddIcon(IconType.GrayDropdown);
+            icon.style.AlignSelf(new StyleEnum<Align>(Align.FlexEnd));
+        }
+    }
+}
\ No newline at end of file
diff --git a/Editor/EditorAddons/Drawers/Select/SelectElementBehaviour.cs.meta b/Editor/EditorAddons/Drawers/Select/SelectElementBehaviour.cs.meta
new file mode 100644
index 0000000..5a986e4
--- /dev/null
+++ b/Editor/EditorAddons/Drawers/Select/SelectElementBehaviour.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 95cadc4cd01f4d269d7fdb6cfc422e1e
+timeCreated: 1722554331
\ No newline at end of file
diff --git a/Samples~/TestSamples/Scripts/Test.cs b/Samples~/TestSamples/Scripts/Test.cs
index b5fe35c..4e22e67 100644
--- a/Samples~/TestSamples/Scripts/Test.cs
+++ b/Samples~/TestSamples/Scripts/Test.cs
@@ -64,9 +64,20 @@ public class TestInner
     [Serializable]
     public class TestSerializableType : ITestSerializableType
     {
-        [Select(typeof(ISomeInterface))] 
-        [SerializeField]
+        [Select(typeof(ISomeInterface))] [SerializeField]
         private List<SerializedType> serializedTypes;
+
+        protected TestSerializableType()
+        {
+        }
+    }
+    
+    [Serializable]
+    public class TestSerializableType<T> : ITestSerializableType
+    {
+        protected TestSerializableType()
+        {
+        }
     }
 
     public interface ITestSerializableType
@@ -75,44 +86,36 @@ public interface ITestSerializableType
 
     public class Test : MonoBehaviour
     {
-        [HideLabel] [Select(typeof(ISomeInterface))] 
-        [SerializeField]
+        [HideLabel] [Select(typeof(ISomeInterface))] [SerializeField]
         private SerializedType serializedType;
-        
-        [Select] 
-        [SerializeReference]
-        private List<ITestSerializableType> serializedTypes;
-        
-        [Select(typeof(ISomeInterface))] 
-        [SerializeField]
+
+        [Select] [SerializeReference] private List<ITestSerializableType> serializedTypes;
+
+        [Select(typeof(ISomeInterface))] [SerializeField]
         private SerializedType serializedType2;
-        
+
         [Select] [SerializeField] private KeyCode keyCode;
 
-        
-        [DisableIf(nameof(keyCode), KeyCode.D)] [Select] 
-        [SerializeField]
+
+        [DisableIf(nameof(keyCode), KeyCode.D)] [Select] [SerializeField]
         private MyFlagEnum myFlagEnumTest;
-        
-        [EnumButtons] [HideLabel] 
-        [SerializeField]
+
+        [EnumButtons] [HideLabel] [SerializeField]
         private TestEnum myEnumTest;
+
         //
-        [ShowIf(nameof(keyCode), KeyCode.Backspace)] [Preview] [DrawInspector] 
-        [SerializeField]
+        [ShowIf(nameof(keyCode), KeyCode.Backspace)] [Preview] [DrawInspector] [SerializeField]
         private PreviewTest component;
-        
-        [Preview] [CustomTooltip("Test tooltip")] 
-        [SerializeField] private Texture2D texture;
-        
-        [HelpBox("It's help box")] [DrawInspector] 
-        [SerializeField] private List<TestScriptableObject> scriptableObjectList;
-        
-        [DrawInspector] 
-        [SerializeField] private TestScriptableObject[] scriptableObjectArray;
-        [DrawInspector] 
-        [SerializeField] private TestScriptableObject scriptableObject;
-        
+
+        [Preview] [CustomTooltip("Test tooltip")] [SerializeField]
+        private Texture2D texture;
+
+        [HelpBox("It's help box")] [DrawInspector] [SerializeField]
+        private List<TestScriptableObject> scriptableObjectList;
+
+        [DrawInspector] [SerializeField] private TestScriptableObject[] scriptableObjectArray;
+        [DrawInspector] [SerializeField] private TestScriptableObject scriptableObject;
+
         [GizmoLocal] [SerializeField] private Vector3 vector3Local;
         [SerializeField] private Vector3 vector3Local2;
 
@@ -136,58 +139,47 @@ [HideLabel] [Select(DisplayGrouping.GroupedFlat)] [SerializeReference]
         [Dropdown("r:SingletonTest.Instance.GetIDs()")] [SerializeField]
         private int testInt2;
 
-        [HideLabel]
-        [SerializeField] private TestInner _testInner;
-        
-
-        [Select(typeof(ISomeInterface), DisplayGrouping.Grouped)] 
-        [SerializeReference] private List<ISomeInterface> someInterfaces;
-        
-        [GizmoLocal] 
-        [SerializeField] private Bounds bounds;
-        
-        [DisableInEditorMode] 
-        [SerializeField] private List<Vector3> _vector3s;
-        
-        [ShowInEditorMode] 
-        [SerializeField] private int showInEditorMode;
-        
-        [HideInEditorMode] 
-        [SerializeField] private int hideInEditorMode;
-        
-        [HideInPlayMode] 
-        [SerializeField] private int hideInPlayMode;
-        
-        [ShowInPlayMode] 
-        [SerializeField] private int showInPlayMode;
-        
-        [EnableInPlayMode] 
-        [SerializeField] private int enableInPlayMode;
-        
-        [DisableInEditorMode] 
-        [SerializeField] private int disableInEditorMode;
-        
-        [EnableInEditorMode] 
-        [SerializeField] private int enableInEditorMode;
-        
-        [DisableInPlayMode] 
-        [SerializeField] private int disableInPlayMode;
-        
-        [HelpBox("TestHelpBox()")]
-        [SerializeField] private bool boolField;
-        
-        [ShowIf(nameof(boolField), true)] 
-        [SerializeField] private int showIfBool;
-        
-        [HideIf(nameof(boolField), true)] 
-        [SerializeField] private int hideIfBool;
-        
-        [DisableIf(nameof(boolField), true)] 
-        [SerializeField] private int disableIfBool;
-        
-        [EnableIf(nameof(boolField), true)] 
-        [SerializeField] private int enableIfBool;
-        
+        [HideLabel] [SerializeField] private TestInner _testInner;
+
+
+        [Select(typeof(ISomeInterface), DisplayGrouping.Grouped)] [SerializeReference]
+        private List<ISomeInterface> someInterfaces;
+
+        [GizmoLocal] [SerializeField] private Bounds bounds;
+
+        [DisableInEditorMode] [SerializeField] private List<Vector3> _vector3s;
+
+        [ShowInEditorMode] [SerializeField] private int showInEditorMode;
+
+        [HideInEditorMode] [SerializeField] private int hideInEditorMode;
+
+        [HideInPlayMode] [SerializeField] private int hideInPlayMode;
+
+        [ShowInPlayMode] [SerializeField] private int showInPlayMode;
+
+        [EnableInPlayMode] [SerializeField] private int enableInPlayMode;
+
+        [DisableInEditorMode] [SerializeField] private int disableInEditorMode;
+
+        [EnableInEditorMode] [SerializeField] private int enableInEditorMode;
+
+        [DisableInPlayMode] [SerializeField] private int disableInPlayMode;
+
+        [HelpBox("TestHelpBox()")] [SerializeField]
+        private bool boolField;
+
+        [ShowIf(nameof(boolField), true)] [SerializeField]
+        private int showIfBool;
+
+        [HideIf(nameof(boolField), true)] [SerializeField]
+        private int hideIfBool;
+
+        [DisableIf(nameof(boolField), true)] [SerializeField]
+        private int disableIfBool;
+
+        [EnableIf(nameof(boolField), true)] [SerializeField]
+        private int enableIfBool;
+
 
         ///Default usage of attribute.
         [EditorButton]
diff --git a/package.json b/package.json
index 8364e8b..b711dff 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,11 @@
 {
   "name": "com.uurha.betterattributes",
   "displayName": "Better Attributes",
-  "version": "3.1.7",
+  "version": "3.1.8",
   "unity": "2021.3",
   "description": "Unity attributes, allows to serialize interfaces, draw handles for Vector3/Vector2/Quaternion/Bounds, create read only fields.",
   "dependencies": {
-    "com.tdw.better.commons" : "0.0.26",
+    "com.tdw.better.commons" : "0.0.32",
     "com.tdw.better.internal.core" : "0.0.2"
   },
   "author": {