diff --git a/src/Debug/Editor/SettingsEditor.cs b/src/Debug/Editor/SettingsEditor.cs
index f32d9c2..e1f1f51 100644
--- a/src/Debug/Editor/SettingsEditor.cs
+++ b/src/Debug/Editor/SettingsEditor.cs
@@ -1,6 +1,7 @@
 #if UNITY_EDITOR
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using UnityEditor;
 using UnityEditor.Build;
 using UnityEngine;
@@ -21,16 +22,7 @@ namespace DCFApixels.DragonECS.Unity.Editors
         private void InitDefines()
         {
             string symbolsString = PlayerSettings.GetScriptingDefineSymbols(NamedBuildTarget.Standalone);
-            _defineSymbols = new List<DefineSymbolsInfo>()
-            {
-                nameof(EcsConsts.DISABLE_POOLS_EVENTS),
-                nameof(EcsConsts.ENABLE_DRAGONECS_DEBUGGER),
-                nameof(EcsConsts.ENABLE_DRAGONECS_ASSERT_CHEKS),
-                nameof(EcsConsts.REFLECTION_DISABLED),
-                nameof(EcsConsts.DISABLE_DEBUG),
-                nameof(EcsConsts.ENABLE_DUMMY_SPAN),
-                nameof(EcsConsts.DISABLE_CATH_EXCEPTIONS),
-            };
+            _defineSymbols = new List<DefineSymbolsInfo>(typeof(EcsDefines).GetFields(BindingFlags.Static | BindingFlags.Public).Select(o => new DefineSymbolsInfo(o.Name, false)));
             for (int i = 0; i < _defineSymbols.Count; i++)
             {
                 var symbol = _defineSymbols[i];
diff --git a/src/EcsPipelineTemplate/EcsPipelineTemplateSO.cs b/src/EcsPipelineTemplate/EcsPipelineTemplateSO.cs
index d6e0f46..67b0207 100644
--- a/src/EcsPipelineTemplate/EcsPipelineTemplateSO.cs
+++ b/src/EcsPipelineTemplate/EcsPipelineTemplateSO.cs
@@ -22,7 +22,7 @@ namespace DCFApixels.DragonECS
         private string[] _layers = _defaultLayers.ToArray();
 
         [SerializeField]
-        private SystemRecord[] _systems;
+        private Record[] _systems;
 
         [SerializeField]
         [SerializeReference]
@@ -34,17 +34,9 @@ namespace DCFApixels.DragonECS
             b.Layers.MergeWith(_layers);
             foreach (var s in _systems)
             {
-                if (s.system == null) { continue; }
+                if (s.target == null) { continue; }
 
-                int? sortOrder = s.isCustomSortOrder ? s.sortOrder : default(int?);
-                if (s.isUnique)
-                {
-                    b.AddUnique(s.system, s.layer, sortOrder);
-                }
-                else
-                {
-                    b.Add(s.system, s.layer, sortOrder);
-                }
+                b.Add(s.target, s.parameters);
             }
         }
 
@@ -53,11 +45,11 @@ namespace DCFApixels.DragonECS
             EcsPipelineTemplate result = new EcsPipelineTemplate();
             result.layers = new string[_layers.Length];
             Array.Copy(_layers, result.layers, _layers.Length);
-            result.systems = new EcsPipelineTemplate.SystemRecord[_systems.Length];
+            result.systems = new EcsPipelineTemplate.AddCommand[_systems.Length];
             for (int i = 0; i < result.systems.Length; i++)
             {
                 ref var s = ref _systems[i];
-                result.systems[i] = new EcsPipelineTemplate.SystemRecord(s.system, s.layer, s.NullableSortOrder, s.isUnique);
+                result.systems[i] = new EcsPipelineTemplate.AddCommand(s.target, s.parameters);
             }
             return result;
         }
@@ -66,11 +58,11 @@ namespace DCFApixels.DragonECS
         {
             _layers = new string[template.layers.Length];
             Array.Copy(template.layers, _layers, template.layers.Length);
-            _systems = new SystemRecord[template.systems.Length];
+            _systems = new Record[template.systems.Length];
             for (int i = 0; i < _systems.Length; i++)
             {
                 ref var s = ref template.systems[i];
-                _systems[i] = new SystemRecord(s.system, s.layer, s.NullableSortOrder, s.isUnique);
+                _systems[i] = new Record(s.target, s.parameters);
             }
         }
 
@@ -128,23 +120,16 @@ namespace DCFApixels.DragonECS
         }
 
         [Serializable]
-        public struct SystemRecord
+        public struct Record
         {
             [SerializeReference]
             [ReferenceButton]
-            public IEcsProcess system;
-            public string layer;
-            public int sortOrder;
-            public bool isCustomSortOrder;
-            public bool isUnique;
-            public int? NullableSortOrder { get { return isCustomSortOrder ? sortOrder : default(int?); } }
-            public SystemRecord(IEcsProcess system, string layer, int? sortOrder, bool isUnique)
+            public object target;
+            public AddParams parameters;
+            public Record(object target, AddParams parameters)
             {
-                this.system = system;
-                this.layer = layer;
-                this.sortOrder = sortOrder.HasValue ? sortOrder.Value : 0;
-                isCustomSortOrder = sortOrder.HasValue;
-                this.isUnique = isUnique;
+                this.target = target;
+                this.parameters = parameters;
             }
         }
     }