diff --git a/GitVersion.yml b/GitVersion.yml
index ced7a9fb..0bdc1923 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -1,4 +1,10 @@
 mode: ContinuousDeployment
 branches:  
    master:  
-      regex: ^master$|^main$
\ No newline at end of file
+      regex: ^master$|^main$
+   sc10xm:
+      regex: ^feature/sitecore-10-xm$
+      mode: ContinuousDelivery
+      increment: Major
+      tag: "sc10xm"
+      source-branches: []
\ No newline at end of file
diff --git a/README.md b/README.md
index 2febf51e..f556f774 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,12 @@ Sitecore Authors and Marketers to create amazing web form experiences.
 
 ## Changelog
 
+### 6.0
+
+* Upgrade Sitecore from 9.3 to 10.3
+* Remove XP-only features to gain XM compatibility
+* Improve *.config files for easier updates in non-Bob folder structure
+
 ### 5.0
 
 * Migration to GitHub public repository, AppVeyor and NuGet.org
diff --git a/serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value From Contact__aaa50e12-ea98-4e8b-b7eb-d2e3aa59cf2b.yml b/serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value From Contact__aaa50e12-ea98-4e8b-b7eb-d2e3aa59cf2b.yml
deleted file mode 100644
index bfa05ae5..00000000
--- a/serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value From Contact__aaa50e12-ea98-4e8b-b7eb-d2e3aa59cf2b.yml	
+++ /dev/null
@@ -1,24 +0,0 @@
----
-ID: "aaa50e12-ea98-4e8b-b7eb-d2e3aa59cf2b"
-Parent: "4281c8f6-bc60-4780-9e11-18f62fc331ca"
-Template: "f90052a5-b4e6-4e6d-9812-1e1b88a6fcea"
-Path: /sitecore/system/Settings/Rules/Definitions/Elements/Flex Load Rules/Load Field Value From Contact Field
-DB: master
-SharedFields:
-- ID: "ff55d5a7-6d4b-4cd1-83e0-bac268073f66"
-  Hint: Type
-  Value: Unic.Flex.Implementation.Rules.LoadRules.LoadFromContactFieldAction, Unic.Flex.Implementation
-Languages:
-- Language: en
-  Versions:
-  - Version: 1
-    Fields:
-    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
-      Hint: __Created
-      Value: 20171121T135719Z
-    - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
-      Hint: __Created by
-      Value: sitecore\admin
-    - ID: "eeb36a3b-40d9-4af5-862a-de257b84dca3"
-      Hint: Text
-      Value: "load the field value of the Flex field with the key [FieldKey,,,key] from the contacts field [ContactField,Tree,root=/sitecore/system/Modules/Flex/Contact Fields,contact field]"
diff --git a/serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value from Contact_.yml b/serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value from Contact_.yml
deleted file mode 100644
index 6aff7cc3..00000000
--- a/serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value from Contact_.yml	
+++ /dev/null
@@ -1,24 +0,0 @@
----
-ID: "4aafdfc8-5013-461c-9f7e-c76a89c49ed2"
-Parent: "4281c8f6-bc60-4780-9e11-18f62fc331ca"
-Template: "f90052a5-b4e6-4e6d-9812-1e1b88a6fcea"
-Path: /sitecore/system/Settings/Rules/Definitions/Elements/Flex Load Rules/Load Field Value from Contact Email Address
-DB: master
-SharedFields:
-- ID: "ff55d5a7-6d4b-4cd1-83e0-bac268073f66"
-  Hint: Type
-  Value: Unic.Flex.Implementation.Rules.LoadRules.LoadContactEmailAddressAction, Unic.Flex.Implementation
-Languages:
-- Language: en
-  Versions:
-  - Version: 1
-    Fields:
-    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
-      Hint: __Created
-      Value: 20171121T172810Z
-    - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
-      Hint: __Created by
-      Value: sitecore\admin
-    - ID: "eeb36a3b-40d9-4af5-862a-de257b84dca3"
-      Hint: Text
-      Value: "load the field value of the Flex field with the key [FieldKey,,,key] from the contacts email address with the name [EmailAddressName,,,email address name]"
diff --git a/serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value from Contact__b323c8cc-daa3-4bef-a766-96587b7e52b6.yml b/serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value from Contact__b323c8cc-daa3-4bef-a766-96587b7e52b6.yml
deleted file mode 100644
index fd0e69fd..00000000
--- a/serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value from Contact__b323c8cc-daa3-4bef-a766-96587b7e52b6.yml	
+++ /dev/null
@@ -1,24 +0,0 @@
----
-ID: "b323c8cc-daa3-4bef-a766-96587b7e52b6"
-Parent: "4281c8f6-bc60-4780-9e11-18f62fc331ca"
-Template: "f90052a5-b4e6-4e6d-9812-1e1b88a6fcea"
-Path: /sitecore/system/Settings/Rules/Definitions/Elements/Flex Load Rules/Load Field Value from Contact identifier
-DB: master
-SharedFields:
-- ID: "ff55d5a7-6d4b-4cd1-83e0-bac268073f66"
-  Hint: Type
-  Value: Unic.Flex.Implementation.Rules.LoadRules.LoadContactIdAction, Unic.Flex.Implementation
-Languages:
-- Language: en
-  Versions:
-  - Version: 1
-    Fields:
-    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
-      Hint: __Created
-      Value: 20171121T164452Z
-    - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
-      Hint: __Created by
-      Value: sitecore\admin
-    - ID: "eeb36a3b-40d9-4af5-862a-de257b84dca3"
-      Hint: Text
-      Value: "load the field value for the Flex field with the key [FieldKey,,,key] from the contacts identifier"
diff --git a/serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value from Simple C.yml b/serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value from Simple C.yml
deleted file mode 100644
index 1d69a421..00000000
--- a/serialization/modules/flex/Rules.Elements.Load/Flex Load Rules/Load Field Value from Simple C.yml	
+++ /dev/null
@@ -1,24 +0,0 @@
----
-ID: "fd9a67b1-be5d-444f-aa1f-fdc0f8ea3bf5"
-Parent: "4281c8f6-bc60-4780-9e11-18f62fc331ca"
-Template: "f90052a5-b4e6-4e6d-9812-1e1b88a6fcea"
-Path: /sitecore/system/Settings/Rules/Definitions/Elements/Flex Load Rules/Load Field Value from Simple Contact Field
-DB: master
-SharedFields:
-- ID: "ff55d5a7-6d4b-4cd1-83e0-bac268073f66"
-  Hint: Type
-  Value: Unic.Flex.Implementation.Rules.LoadRules.LoadSimpleContactFieldAction, Unic.Flex.Implementation
-Languages:
-- Language: en
-  Versions:
-  - Version: 1
-    Fields:
-    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
-      Hint: __Created
-      Value: 20171121T145805Z
-    - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
-      Hint: __Created by
-      Value: sitecore\admin
-    - ID: "eeb36a3b-40d9-4af5-862a-de257b84dca3"
-      Hint: Text
-      Value: "load the field value for the Flex field with the key [FieldKey,,,key] from the contacts simple field [ContactFieldName,,,contact field]"
diff --git a/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Identify Contact.yml b/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Identify Contact.yml
deleted file mode 100644
index f4100183..00000000
--- a/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Identify Contact.yml	
+++ /dev/null
@@ -1,24 +0,0 @@
----
-ID: "18480f1d-c5ce-4c54-b198-ea2e386247cd"
-Parent: "d6733a22-33d8-45d7-994e-ff3eb8daebf7"
-Template: "f90052a5-b4e6-4e6d-9812-1e1b88a6fcea"
-Path: /sitecore/system/Settings/Rules/Definitions/Elements/Flex Save Rules/Identify Contact
-DB: master
-SharedFields:
-- ID: "ff55d5a7-6d4b-4cd1-83e0-bac268073f66"
-  Hint: Type
-  Value: Unic.Flex.Implementation.Rules.SaveRules.IdentifyContactAction, Unic.Flex.Implementation
-Languages:
-- Language: en
-  Versions:
-  - Version: 1
-    Fields:
-    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
-      Hint: __Created
-      Value: 20180314T100832Z
-    - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
-      Hint: __Created by
-      Value: sitecore\admin
-    - ID: "eeb36a3b-40d9-4af5-862a-de257b84dca3"
-      Hint: Text
-      Value: "Identify contact by flex field with the key [FieldKey,,,key]"
diff --git a/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Contact Email Address fro.yml b/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Contact Email Address fro.yml
deleted file mode 100644
index 39f402fe..00000000
--- a/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Contact Email Address fro.yml	
+++ /dev/null
@@ -1,24 +0,0 @@
----
-ID: "093f0fd1-35df-43fd-b3a6-af3b2066a740"
-Parent: "d6733a22-33d8-45d7-994e-ff3eb8daebf7"
-Template: "f90052a5-b4e6-4e6d-9812-1e1b88a6fcea"
-Path: /sitecore/system/Settings/Rules/Definitions/Elements/Flex Save Rules/Save Contact Email Address from Field Value
-DB: master
-SharedFields:
-- ID: "ff55d5a7-6d4b-4cd1-83e0-bac268073f66"
-  Hint: Type
-  Value: Unic.Flex.Implementation.Rules.SaveRules.SaveContactEmailAction, Unic.Flex.Implementation
-Languages:
-- Language: en
-  Versions:
-  - Version: 1
-    Fields:
-    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
-      Hint: __Created
-      Value: 20171121T172612Z
-    - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
-      Hint: __Created by
-      Value: sitecore\admin
-    - ID: "eeb36a3b-40d9-4af5-862a-de257b84dca3"
-      Hint: Text
-      Value: "save the value of the Flex field with the key [FieldKey,,,key] to the contacts email address with name [EmailAddressName,,,email address name]"
diff --git a/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Contact Field from Field_.yml b/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Contact Field from Field_.yml
deleted file mode 100644
index 2108fd6e..00000000
--- a/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Contact Field from Field_.yml	
+++ /dev/null
@@ -1,24 +0,0 @@
----
-ID: "066753ae-6f49-44ed-8b51-eaec1959e0ea"
-Parent: "d6733a22-33d8-45d7-994e-ff3eb8daebf7"
-Template: "f90052a5-b4e6-4e6d-9812-1e1b88a6fcea"
-Path: /sitecore/system/Settings/Rules/Definitions/Elements/Flex Save Rules/Save Contact Field from Field Value
-DB: master
-SharedFields:
-- ID: "ff55d5a7-6d4b-4cd1-83e0-bac268073f66"
-  Hint: Type
-  Value: Unic.Flex.Implementation.Rules.SaveRules.SaveContactFieldAction, Unic.Flex.Implementation
-Languages:
-- Language: en
-  Versions:
-  - Version: 1
-    Fields:
-    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
-      Hint: __Created
-      Value: 20171121T141856Z
-    - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
-      Hint: __Created by
-      Value: sitecore\admin
-    - ID: "eeb36a3b-40d9-4af5-862a-de257b84dca3"
-      Hint: Text
-      Value: "save the value of the Flex field with the key [FieldKey,,,key] to the contacts field [ContactField,Tree,root=/sitecore/system/Modules/Flex/Contact Fields,contact field]  "
diff --git a/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Contact Language from Cur.yml b/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Contact Language from Cur.yml
deleted file mode 100644
index 9a2687bb..00000000
--- a/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Contact Language from Cur.yml	
+++ /dev/null
@@ -1,24 +0,0 @@
----
-ID: "207719f5-04c3-4496-bb53-5513098cdd46"
-Parent: "d6733a22-33d8-45d7-994e-ff3eb8daebf7"
-Template: "f90052a5-b4e6-4e6d-9812-1e1b88a6fcea"
-Path: /sitecore/system/Settings/Rules/Definitions/Elements/Flex Save Rules/Save Contact Language from Current Language
-DB: master
-SharedFields:
-- ID: "ff55d5a7-6d4b-4cd1-83e0-bac268073f66"
-  Hint: Type
-  Value: Unic.Flex.Implementation.Rules.SaveRules.SaveLanguageAction, Unic.Flex.Implementation
-Languages:
-- Language: en
-  Versions:
-  - Version: 1
-    Fields:
-    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
-      Hint: __Created
-      Value: 20180307T124133Z
-    - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
-      Hint: __Created by
-      Value: sitecore\admin
-    - ID: "eeb36a3b-40d9-4af5-862a-de257b84dca3"
-      Hint: Text
-      Value: Save current language to contact language
diff --git a/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Simple Contact Field from.yml b/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Simple Contact Field from.yml
deleted file mode 100644
index 08b9dfae..00000000
--- a/serialization/modules/flex/Rules.Elements.Save/Flex Save Rules/Save Simple Contact Field from.yml	
+++ /dev/null
@@ -1,24 +0,0 @@
----
-ID: "e0b218eb-2f7a-4104-9a94-a1045470dccd"
-Parent: "d6733a22-33d8-45d7-994e-ff3eb8daebf7"
-Template: "f90052a5-b4e6-4e6d-9812-1e1b88a6fcea"
-Path: /sitecore/system/Settings/Rules/Definitions/Elements/Flex Save Rules/Save Simple Contact Field from Field Value
-DB: master
-SharedFields:
-- ID: "ff55d5a7-6d4b-4cd1-83e0-bac268073f66"
-  Hint: Type
-  Value: Unic.Flex.Implementation.Rules.SaveRules.SaveSimpleContactFieldAction, Unic.Flex.Implementation
-Languages:
-- Language: en
-  Versions:
-  - Version: 1
-    Fields:
-    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
-      Hint: __Created
-      Value: 20171121T141856Z
-    - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
-      Hint: __Created by
-      Value: sitecore\admin
-    - ID: "eeb36a3b-40d9-4af5-862a-de257b84dca3"
-      Hint: Text
-      Value: "save the value of the Flex field with the key [FieldKey,,,key] to the contacts simple field [ContactFieldName,,,simple field name]  "
diff --git a/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs Folder/__Standard Values.yml b/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs Folder/__Standard Values.yml
index 99e4e828..9cd1c693 100644
--- a/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs Folder/__Standard Values.yml	
+++ b/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs Folder/__Standard Values.yml	
@@ -12,7 +12,6 @@ SharedFields:
     {DF5C2C2F-4A48-4206-9DFB-0DCDE27E2233}
     {A63884CE-54F1-4134-8A29-05017D5317F6}
     {77613F9B-AC9A-4229-B97A-ACD6FBFCB252}
-    {9A7F5FA1-E267-4BF2-8D3C-4D487792B636}
     {03B67200-F3F4-49C9-ADC5-31512371825D}
     {F8239638-A672-491F-BBD4-A59CD3090C8B}
 Languages:
diff --git a/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Double Optin/__Standard Values.yml b/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Double Optin/__Standard Values.yml
index e7e2fbd2..7cdcd3b2 100644
--- a/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Double Optin/__Standard Values.yml	
+++ b/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Double Optin/__Standard Values.yml	
@@ -8,9 +8,7 @@ SharedFields:
 - ID: "1172f251-dad4-4efb-a329-0c63500e4f1e"
   Hint: __Masters
   Type: TreelistEx
-  Value: |
-    {9A7F5FA1-E267-4BF2-8D3C-4D487792B636}
-    {DF5C2C2F-4A48-4206-9DFB-0DCDE27E2233}
+  Value: "{DF5C2C2F-4A48-4206-9DFB-0DCDE27E2233}"
 Languages:
 - Language: en
   Versions:
diff --git a/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Register Goal/Form Configuration.yml b/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Register Goal/Form Configuration.yml
deleted file mode 100644
index e84cbd7e..00000000
--- a/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Register Goal/Form Configuration.yml	
+++ /dev/null
@@ -1,17 +0,0 @@
----
-ID: "a8a8ea7c-0db2-42c0-9a88-1c2073cb7db3"
-Parent: "9a7f5fa1-e267-4bf2-8d3c-4d487792b636"
-Template: "e269fbb5-3750-427a-9149-7aa950b49301"
-Path: /sitecore/templates/Flex/Plugs/Save Plugs/Register Goal/Form Configuration
-DB: master
-Languages:
-- Language: en
-  Versions:
-  - Version: 1
-    Fields:
-    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
-      Hint: __Created
-      Value: 20141024T090346
-    - ID: "5dd74568-4d4b-44c1-b513-0af5f4cda34f"
-      Hint: __Created by
-      Value: sitecore\admin
diff --git a/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Register Goal/Form Configuration/Goal.yml b/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Register Goal/Form Configuration/Goal.yml
deleted file mode 100644
index d1b21ffc..00000000
--- a/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Register Goal/Form Configuration/Goal.yml	
+++ /dev/null
@@ -1,44 +0,0 @@
----
-ID: "1d858478-2d47-4a6e-9fca-62f6dfd73fe1"
-Parent: "a8a8ea7c-0db2-42c0-9a88-1c2073cb7db3"
-Template: "455a3e98-a627-4b40-8035-e683a0331ac7"
-Path: /sitecore/templates/Flex/Plugs/Save Plugs/Register Goal/Form Configuration/Goal
-DB: master
-SharedFields:
-- ID: "1eb8ae32-e190-44a6-968d-ed904c794ebf"
-  Hint: Source
-  Value: /sitecore/system/Marketing Center/Goals
-- ID: "21828437-ea4b-40a1-8c61-4ce60ea41db6"
-  Hint: Validate Button
-  Type: tree list
-  Value: "{59D4EE10-627C-4FD3-A964-61A88B092CBC}"
-- ID: "337e20e1-999a-4eea-85ad-b58a03ae75cc"
-  Hint: Quick Action Bar
-  Type: tree list
-  Value: "{59D4EE10-627C-4FD3-A964-61A88B092CBC}"
-- ID: "53c432c4-7122-4e2d-8296-db4184fd1735"
-  Hint: Workflow
-  Type: tree list
-  Value: "{59D4EE10-627C-4FD3-A964-61A88B092CBC}"
-- ID: "9c903e29-650d-4af2-b9bd-526d5c14a1a5"
-  Hint: Validator Bar
-  Type: tree list
-  Value: "{59D4EE10-627C-4FD3-A964-61A88B092CBC}"
-- ID: "ab162cc0-dc80-4abf-8871-998ee5d7ba32"
-  Hint: Type
-  Value: Droptree
-- ID: "ba3f86a2-4a1c-4d78-b63d-91c2779c1b5e"
-  Hint: __Sortorder
-  Value: 100
-- ID: "be351a73-fcb0-4213-93fa-c302d8ab4f51"
-  Hint: Shared
-  Type: Checkbox
-  Value: 1
-Languages:
-- Language: en
-  Versions:
-  - Version: 1
-    Fields:
-    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
-      Hint: __Created
-      Value: 20141024T090346
diff --git a/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Register Goal/__Standard Values.yml b/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Register Goal/__Standard Values.yml
deleted file mode 100644
index b3a7306d..00000000
--- a/serialization/modules/flex/Templates/Flex/Plugs/Save Plugs/Register Goal/__Standard Values.yml	
+++ /dev/null
@@ -1,14 +0,0 @@
----
-ID: "ca704184-a1db-4691-b0fb-faa17058aa75"
-Parent: "9a7f5fa1-e267-4bf2-8d3c-4d487792b636"
-Template: "9a7f5fa1-e267-4bf2-8d3c-4d487792b636"
-Path: /sitecore/templates/Flex/Plugs/Save Plugs/Register Goal/__Standard Values
-DB: master
-Languages:
-- Language: en
-  Versions:
-  - Version: 1
-    Fields:
-    - ID: "25bed78c-4957-4165-998a-ca1b52f67497"
-      Hint: __Created
-      Value: 20141024T090332
diff --git a/src/Unic.Flex.Core/Analytics/AnalyticsService.cs b/src/Unic.Flex.Core/Analytics/AnalyticsService.cs
deleted file mode 100644
index 3d186a33..00000000
--- a/src/Unic.Flex.Core/Analytics/AnalyticsService.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-namespace Unic.Flex.Core.Analytics
-{
-    using System;
-    using Sitecore.Analytics;
-    using Sitecore.Analytics.Data;
-    using Unic.Flex.Core.Logging;
-    using Unic.Flex.Model.Analytics;
-
-    /// <summary>
-    /// Analytics related actions.
-    /// </summary>
-    public class AnalyticsService : IAnalyticsService
-    {
-        /// <summary>
-        /// The logger
-        /// </summary>
-        private readonly ILogger logger;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AnalyticsService" /> class.
-        /// </summary>
-        /// <param name="logger">The logger.</param>
-        public AnalyticsService(ILogger logger)
-        {
-            this.logger = logger;
-        }
-
-        /// <summary>
-        /// Registers the goal.
-        /// </summary>
-        /// <param name="goal">The goal.</param>
-        /// <param name="itemId">The item identifier.</param>
-        public virtual void RegisterGoal(Goal goal, Guid itemId)
-        {
-            // check if analytics is enabled
-            if (!Tracker.IsActive)
-            {
-                this.logger.Info("Analytics is disabled, therefor the Goal has not been triggered", this);
-                return;
-            }
-
-            // check if we have a valid page
-            if (Tracker.Current == null
-                || Tracker.Current.Session == null
-                || Tracker.Current.Session.Interaction == null
-                || Tracker.Current.Session.Interaction.CurrentPage == null)
-            {
-                this.logger.Error("No valid tracker or session available, therefor the Goal has not  been triggered", this);
-                return;
-            }
-
-            // generate the data 
-            var pageEventData = new PageEventData("Flex", goal.InnerItem.ID.ToGuid())
-            {
-                ItemId = itemId,
-                Data = "Form submit completed",
-                Text = goal.Description
-            };
-
-            // register the event
-            Tracker.Current.Session.Interaction.CurrentPage.Register(pageEventData);
-        }
-    }
-}
diff --git a/src/Unic.Flex.Core/Analytics/IAnalyticsService.cs b/src/Unic.Flex.Core/Analytics/IAnalyticsService.cs
deleted file mode 100644
index ae06226c..00000000
--- a/src/Unic.Flex.Core/Analytics/IAnalyticsService.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace Unic.Flex.Core.Analytics
-{
-    using System;
-    using Unic.Flex.Model.Analytics;
-
-    /// <summary>
-    /// Analytics specific actions.
-    /// </summary>
-    public interface IAnalyticsService
-    {
-        /// <summary>
-        /// Registers the goal.
-        /// </summary>
-        /// <param name="goal">The goal.</param>
-        /// <param name="itemId">The item identifier.</param>
-        void RegisterGoal(Goal goal, Guid itemId);
-    }
-}
diff --git a/src/Unic.Flex.Core/MarketingAutomation/IMarketingAutomationContactService.cs b/src/Unic.Flex.Core/MarketingAutomation/IMarketingAutomationContactService.cs
deleted file mode 100644
index d3a778ae..00000000
--- a/src/Unic.Flex.Core/MarketingAutomation/IMarketingAutomationContactService.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace Unic.Flex.Core.MarketingAutomation
-{
-    using System;
-
-    public interface IMarketingAutomationContactService
-    {
-        object GetContactValue(Guid contactFieldDefinitionId);
-
-        void SetContactValue(Guid contactFieldDefinitionId, object value);
-
-        void SetContactValue(string simpleFieldName, string value);
-
-        object GetContactValue(string simpleFieldName);
-
-        string GetEmailAddress(string name);
-
-        void SetEmailAddress(string name, string email);
-
-        void IdentifyContact(string name);
-    }
-}
\ No newline at end of file
diff --git a/src/Unic.Flex.Core/MarketingAutomation/MarketingAutomationContactService.cs b/src/Unic.Flex.Core/MarketingAutomation/MarketingAutomationContactService.cs
deleted file mode 100644
index 3f2ade56..00000000
--- a/src/Unic.Flex.Core/MarketingAutomation/MarketingAutomationContactService.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-namespace Unic.Flex.Core.MarketingAutomation
-{
-    using System;
-    using System.Reflection;
-    using Glass.Mapper.Sc;
-    using Glass.Mapper.Sc.Web;
-    using Model.MarketingAutomation;
-    using Sitecore.Analytics.Model.Entities;
-    using Sitecore.Analytics.Rules.Conditions;
-    using Sitecore.Analytics.Tracking;
-    using Sitecore.Reflection;
-    using Utilities;
-
-    public class MarketingAutomationContactService : IMarketingAutomationContactService
-    {
-        private readonly IRequestContext requestContext;
-        private readonly ITrackerWrapper trackerWrapper;
-
-        public MarketingAutomationContactService(IRequestContext requestContext, ITrackerWrapper trackerWrapper)
-        {
-            this.requestContext = requestContext;
-            this.trackerWrapper = trackerWrapper;
-        }
-
-        public object GetContactValue(Guid contactFieldDefinitionId)
-        {
-            var options = new GetItemByIdOptions(contactFieldDefinitionId)
-            {
-                VersionCount = false
-            };
-            var contactFieldDefinition = this.requestContext.SitecoreService.GetItem<ContactFieldDefinition>(options);
-            if (contactFieldDefinition == null) return null;
-
-            var contactFacetDefinition = contactFieldDefinition.Facet;
-            if (contactFacetDefinition == null) return null;
-
-            var facetType = ReflectionUtil.GetTypeInfo(contactFacetDefinition.Type);
-            var facet = this.GetFacet(facetType, contactFacetDefinition);
-
-            var fieldProperty = facetType.GetProperty(contactFieldDefinition.FieldName,
-                BindingFlags.Public | BindingFlags.Instance);
-            if (fieldProperty == null) return null;
-
-            return fieldProperty.GetValue(facet);
-        }
-
-        public string GetEmailAddress(string name)
-        {
-            return this.GetEmailAddressEntry(name)?.SmtpAddress;
-        }
-
-        private IEmailAddress GetEmailAddressEntry(string name)
-        {
-            var contact = this.trackerWrapper.GetCurrentTracker().Contact;
-            var entries = this.GetEmailAdresses(contact).Entries;
-
-            if (entries.Contains(name))
-            {
-                return entries[name];
-            }
-
-            return null;
-        }
-
-        public void SetEmailAddress(string name, string email)
-        {
-            var contact = this.trackerWrapper.GetCurrentTracker().Contact;
-
-            var entry = this.GetEmailAddressEntry(name);
-            if (entry == null)
-            {
-                entry = this.GetEmailAdresses(contact).Entries.Create(name);
-            }
-            entry.SmtpAddress = email;
-        }
-
-        public void IdentifyContact(string identifier)
-        {
-            var hash = SecurityUtil.GenerateHash(identifier);
-
-            var tracker = this.trackerWrapper.GetCurrentTracker();
-            // Using "xDB.Tracker" as Source Identifier 
-            tracker.Session.IdentifyAs(Sitecore.Analytics.XConnect.DataAccess.Constants.IdentifierSource, hash);
-        }
-
-        private IContactEmailAddresses GetEmailAdresses(Contact contact)
-        {
-            return contact.GetFacet<IContactEmailAddresses>("Emails");
-        }
-
-        public void SetContactValue(Guid contactFieldDefinitionId, object value)
-        {
-            var options = new GetItemByIdOptions(contactFieldDefinitionId)
-            {
-                VersionCount = false
-            };
-            var contactFieldDefinition = this.requestContext.SitecoreService.GetItem<ContactFieldDefinition>(options);
-            if (contactFieldDefinition == null) return;
-
-            var contactFacetDefinition = contactFieldDefinition.Facet;
-            if (contactFacetDefinition == null) return;
-
-            var facetType = ReflectionUtil.GetTypeInfo(contactFacetDefinition.Type);
-            var facet = this.GetFacet(facetType, contactFacetDefinition);
-
-            var fieldProperty = facetType.GetProperty(contactFieldDefinition.FieldName,
-                BindingFlags.Public | BindingFlags.Instance);
-            if (fieldProperty == null) return;
-
-            fieldProperty.SetValue(facet, value);
-        }
-
-        public void SetContactValue(string contactFieldName, string value)
-        {
-            var contact = this.trackerWrapper.GetCurrentTracker().Contact;
-            contact.Extensions.SimpleValues[contactFieldName] = value;
-        }
-
-        public object GetContactValue(string simpleFieldName)
-        {
-            var contact = this.trackerWrapper.GetCurrentTracker().Contact;
-            return contact.Extensions.SimpleValues[simpleFieldName];
-        }
-
-        private object GetFacet(Type facetType, ContactFacetDefinition contactFacetDefinition)
-        {
-            var contact = this.trackerWrapper.GetCurrentTracker().Contact;
-            if (contact == null) return null;
-
-            var getFacet = typeof(Contact).GetMethod(nameof(contact.GetFacet));
-            var getFacetGeneric = getFacet.MakeGenericMethod(facetType);
-            return getFacetGeneric.Invoke(contact, new object[] { contactFacetDefinition.FacetName });
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Unic.Flex.Core/Unic.Flex.Core.csproj b/src/Unic.Flex.Core/Unic.Flex.Core.csproj
index 20112d5c..a299daba 100644
--- a/src/Unic.Flex.Core/Unic.Flex.Core.csproj
+++ b/src/Unic.Flex.Core/Unic.Flex.Core.csproj
@@ -11,7 +11,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Unic.Flex.Core</RootNamespace>
     <AssemblyName>Unic.Flex.Core</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -38,8 +38,8 @@
     <Reference Include="BouncyCastle.Crypto, Version=1.8.5.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Portable.BouncyCastle.1.8.5\lib\net40\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
-    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
+    <Reference Include="Castle.Core, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework">
       <HintPath>..\..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.dll</HintPath>
@@ -47,11 +47,11 @@
     <Reference Include="EntityFramework.SqlServer">
       <HintPath>..\..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper, Version=5.5.28.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.dll</HintPath>
+    <Reference Include="Glass.Mapper, Version=5.8.181.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper.Sc, Version=5.5.28.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.Sc.dll</HintPath>
+    <Reference Include="Glass.Mapper.Sc, Version=5.8.181.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.Sc.dll</HintPath>
     </Reference>
     <Reference Include="MailKit, Version=2.5.0.0, Culture=neutral, PublicKeyToken=4e064fe7c44a8f1b, processorArchitecture=MSIL">
       <HintPath>..\..\packages\MailKit.2.6.0\lib\net47\MailKit.dll</HintPath>
@@ -70,26 +70,14 @@
       <HintPath>..\..\packages\MvcMailer.4.5\lib\45\Mvc.Mailer.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics, Version=13.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Analytics.9.2.0\lib\net471\Sitecore.Analytics.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=18.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Sitecore.Kernel.10.3.0\lib\net48\Sitecore.Kernel.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics.Core, Version=13.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Analytics.Core.9.2.0\lib\net471\Sitecore.Analytics.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Sitecore.Analytics.Model, Version=13.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Analytics.Model.9.2.0\lib\net471\Sitecore.Analytics.Model.dll</HintPath>
-    </Reference>
-    <Reference Include="Sitecore.Analytics.XConnect, Version=13.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Analytics.XConnect.9.2.0\lib\net471\Sitecore.Analytics.XConnect.dll</HintPath>
-    </Reference>
-    <Reference Include="Sitecore.Kernel, Version=13.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Kernel.9.2.0\lib\net471\Sitecore.Kernel.dll</HintPath>
-    </Reference>
-    <Reference Include="Sitecore.Mvc, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Mvc.9.2.0\lib\net471\Sitecore.Mvc.dll</HintPath>
+    <Reference Include="Sitecore.Mvc, Version=9.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Sitecore.Mvc.10.3.0\lib\net48\Sitecore.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="sysglobl" />
     <Reference Include="System" />
@@ -143,8 +131,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Agents\PlugExecution.cs" />
-    <Compile Include="Analytics\AnalyticsService.cs" />
-    <Compile Include="Analytics\IAnalyticsService.cs" />
     <Compile Include="Attributes\ValidateFormHandlerAttribute.cs" />
     <Compile Include="Authorization\AdministratorOnly.cs" />
     <Compile Include="Commands\AsyncPlugExecutionCommand.cs" />
@@ -181,8 +167,6 @@
     <Compile Include="Mapping\Ordering\SitecoreSortOrder.cs" />
     <Compile Include="Mapping\UserDataRepository.cs" />
     <Compile Include="Mapping\ViewMapper.cs" />
-    <Compile Include="MarketingAutomation\IMarketingAutomationContactService.cs" />
-    <Compile Include="MarketingAutomation\MarketingAutomationContactService.cs" />
     <Compile Include="ModelBinding\DateTimeModelBinder.cs" />
     <Compile Include="ModelBinding\DecimalModelBinder.cs" />
     <Compile Include="ModelBinding\FieldModelBinder.cs" />
@@ -210,10 +194,8 @@
     <Compile Include="Rules\Conditions\FormCondition.cs" />
     <Compile Include="Rules\Conditions\InstanceCondition.cs" />
     <Compile Include="Utilities\ItemHelpers.cs" />
-    <Compile Include="Utilities\ITrackerWrapper.cs" />
     <Compile Include="Utilities\MappingHelper.cs" />
     <Compile Include="Utilities\SecurityUtil.cs" />
-    <Compile Include="Utilities\TrackerWrapper.cs" />
     <Compile Include="Validators\FieldValidators\FormFieldValidator.cs" />
     <Compile Include="Validators\FieldValidators\RegularExpressionValidator.cs" />
     <Compile Include="Utilities\TypeHelper.cs" />
diff --git a/src/Unic.Flex.Core/Utilities/ITrackerWrapper.cs b/src/Unic.Flex.Core/Utilities/ITrackerWrapper.cs
deleted file mode 100644
index 6b650d45..00000000
--- a/src/Unic.Flex.Core/Utilities/ITrackerWrapper.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Unic.Flex.Core.Utilities
-{
-    using Sitecore.Analytics;
-
-    public interface ITrackerWrapper
-    {
-         ITracker GetCurrentTracker();
-    }
-}
diff --git a/src/Unic.Flex.Core/Utilities/TrackerWrapper.cs b/src/Unic.Flex.Core/Utilities/TrackerWrapper.cs
deleted file mode 100644
index 5b82d150..00000000
--- a/src/Unic.Flex.Core/Utilities/TrackerWrapper.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace Unic.Flex.Core.Utilities
-{
-    using Sitecore.Analytics;
-
-    public class TrackerWrapper : ITrackerWrapper
-    {
-        public ITracker GetCurrentTracker()
-        {
-            if (Tracker.Current == null)
-            {
-                Tracker.StartTracking();
-            }
-
-            return Tracker.Current;
-        }
-    }
-}
diff --git a/src/Unic.Flex.Core/app.config b/src/Unic.Flex.Core/app.config
index 442da6ab..24c29423 100644
--- a/src/Unic.Flex.Core/app.config
+++ b/src/Unic.Flex.Core/app.config
@@ -8,7 +8,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -20,7 +20,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/src/Unic.Flex.Core/packages.config b/src/Unic.Flex.Core/packages.config
index 01e297dd..4f17c7b1 100644
--- a/src/Unic.Flex.Core/packages.config
+++ b/src/Unic.Flex.Core/packages.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="BouncyCastle" version="1.8.5" targetFramework="net45" />
-  <package id="Castle.Core" version="4.2.1" targetFramework="net45" />
+  <package id="Castle.Core" version="5.1.1" targetFramework="net48" />
   <package id="EntityFramework" version="6.1.1" targetFramework="net45" />
-  <package id="Glass.Mapper.Sc.92.Core" version="5.5.28" targetFramework="net471" />
+  <package id="Glass.Mapper.Sc.103.Core" version="5.8.181" targetFramework="net48" />
   <package id="MailKit" version="2.6.0" targetFramework="net471" />
   <package id="Microsoft.AspNet.Mvc" version="5.2.4" targetFramework="net471" />
   <package id="Microsoft.AspNet.Razor" version="3.2.4" targetFramework="net471" />
@@ -13,14 +13,10 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="MimeKit" version="2.6.0" targetFramework="net45" />
   <package id="MvcMailer" version="4.5" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net471" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
   <package id="Portable.BouncyCastle" version="1.8.5" targetFramework="net471" />
-  <package id="Sitecore.Analytics" version="9.2.0" targetFramework="net471" developmentDependency="true" />
-  <package id="Sitecore.Analytics.Core" version="9.2.0" targetFramework="net471" developmentDependency="true" />
-  <package id="Sitecore.Analytics.Model" version="9.2.0" targetFramework="net471" developmentDependency="true" />
-  <package id="Sitecore.Analytics.XConnect" version="9.2.0" targetFramework="net471" />
-  <package id="Sitecore.Kernel" version="9.2.0" targetFramework="net471" developmentDependency="true" />
-  <package id="Sitecore.Mvc" version="9.2.0" targetFramework="net471" developmentDependency="true" />
+  <package id="Sitecore.Kernel" version="10.3.0" targetFramework="net48" developmentDependency="true" />
+  <package id="Sitecore.Mvc" version="10.3.0" targetFramework="net48" developmentDependency="true" />
   <package id="T4Scaffolding.Core" version="1.0.0" targetFramework="net45" />
   <package id="Unic.Configuration.Core" version="4.0.1" targetFramework="net471" />
   <package id="Unic.Profiling" version="2.0.0" targetFramework="net471" />
diff --git a/src/Unic.Flex.Implementation/Plugs/SavePlugs/RegisterGoal.cs b/src/Unic.Flex.Implementation/Plugs/SavePlugs/RegisterGoal.cs
deleted file mode 100644
index 17454b52..00000000
--- a/src/Unic.Flex.Implementation/Plugs/SavePlugs/RegisterGoal.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-namespace Unic.Flex.Implementation.Plugs.SavePlugs
-{
-    using Glass.Mapper.Sc.Configuration.Attributes;
-    using Sitecore.Diagnostics;
-    using Unic.Flex.Core.Analytics;
-    using Unic.Flex.Model.Analytics;
-    using Unic.Flex.Model.Forms;
-    using Unic.Flex.Model.GlassExtensions.Attributes;
-    using Unic.Flex.Model.Plugs;
-
-    /// <summary>
-    /// Save plug to register a goal in the analytics
-    /// </summary>
-    [SitecoreType(TemplateId = "{9A7F5FA1-E267-4BF2-8D3C-4D487792B636}")]
-    public class RegisterGoal : SavePlugBase
-    {
-        /// <summary>
-        /// The analytics service
-        /// </summary>
-        private readonly IAnalyticsService analyticsService;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RegisterGoal" /> class.
-        /// </summary>
-        /// <param name="analyticsService">The analytics service.</param>
-        public RegisterGoal(IAnalyticsService analyticsService)
-        {
-            this.analyticsService = analyticsService;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this plug should be executed asynchronous.
-        /// </summary>
-        /// <value>
-        /// <c>true</c> if this plug should be executed asynchronous; otherwise, <c>false</c>.
-        /// </value>
-        public override bool IsAsync
-        {
-            get
-            {
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the goal.
-        /// </summary>
-        /// <value>
-        /// The goal.
-        /// </value>
-        [SitecoreSharedField("Goal")]
-        public virtual Goal Goal { get; set; }
-
-        /// <summary>
-        /// Executes the save plug.
-        /// </summary>
-        /// <param name="form">The form.</param>
-        public override void Execute(IForm form)
-        {
-            Assert.ArgumentNotNull(form, "form");
-
-            if (this.Goal != null)
-            {
-                this.analyticsService.RegisterGoal(this.Goal, Sitecore.Context.Item.ID.Guid);
-            }
-        }
-    }
-}
diff --git a/src/Unic.Flex.Implementation/Rules/LoadRules/LoadContactEmailAddressAction.cs b/src/Unic.Flex.Implementation/Rules/LoadRules/LoadContactEmailAddressAction.cs
deleted file mode 100644
index 2f87b649..00000000
--- a/src/Unic.Flex.Implementation/Rules/LoadRules/LoadContactEmailAddressAction.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace Unic.Flex.Implementation.Rules.LoadRules
-{
-    using Core.DependencyInjection;
-    using Core.MarketingAutomation;
-    using Sitecore.Rules;
-
-    public class LoadContactEmailAddressAction<T> : BaseFlexLoadAction<T>
-        where T : RuleContext
-    {
-        public string EmailAddressName { get; set; }
-
-        protected override object GetValue()
-        {
-            var marketingAutomationContactService = DependencyResolver.Resolve<IMarketingAutomationContactService>();
-            return marketingAutomationContactService.GetEmailAddress(this.EmailAddressName);
-        }
-    }
-}
diff --git a/src/Unic.Flex.Implementation/Rules/LoadRules/LoadContactIdAction.cs b/src/Unic.Flex.Implementation/Rules/LoadRules/LoadContactIdAction.cs
deleted file mode 100644
index 896c86ec..00000000
--- a/src/Unic.Flex.Implementation/Rules/LoadRules/LoadContactIdAction.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace Unic.Flex.Implementation.Rules.LoadRules
-{
-    using System.Linq;
-    using Sitecore.Analytics;
-    using Sitecore.Rules;
-
-    public class LoadContactIdAction<T> : BaseFlexLoadAction<T>
-        where T : RuleContext
-    {
-        protected override object GetValue()
-        {
-            return Tracker.Current.Contact?.Identifiers?.FirstOrDefault(x =>
-                x.Identifier == Sitecore.Analytics.XConnect.DataAccess.Constants.IdentifierSource)
-                ?.Identifier;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Unic.Flex.Implementation/Rules/LoadRules/LoadFromContactFieldAction.cs b/src/Unic.Flex.Implementation/Rules/LoadRules/LoadFromContactFieldAction.cs
deleted file mode 100644
index 9aab6ef4..00000000
--- a/src/Unic.Flex.Implementation/Rules/LoadRules/LoadFromContactFieldAction.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace Unic.Flex.Implementation.Rules.LoadRules
-{
-    using System;
-    using Core.DependencyInjection;
-    using Core.MarketingAutomation;
-    using Sitecore.Rules;
-
-    public class LoadFromContactFieldAction<T> : BaseFlexLoadAction<T>
-        where T : RuleContext
-    {
-        public Guid ContactField { get; set; }
-
-        protected override object GetValue()
-        {
-            var marketingAutomationContactService = DependencyResolver.Resolve<IMarketingAutomationContactService>();
-            return marketingAutomationContactService.GetContactValue(this.ContactField);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Unic.Flex.Implementation/Rules/LoadRules/LoadSimpleContactFieldAction.cs b/src/Unic.Flex.Implementation/Rules/LoadRules/LoadSimpleContactFieldAction.cs
deleted file mode 100644
index 3d575a53..00000000
--- a/src/Unic.Flex.Implementation/Rules/LoadRules/LoadSimpleContactFieldAction.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace Unic.Flex.Implementation.Rules.LoadRules
-{
-    using Core.DependencyInjection;
-    using Core.MarketingAutomation;
-    using Sitecore.Rules;
-
-    public class LoadSimpleContactFieldAction<T> : BaseFlexLoadAction<T>
-        where T : RuleContext
-    {
-        public string ContactFieldName { get; set; }
-
-        protected override object GetValue()
-        {
-            var marketingAutomationContactService = DependencyResolver.Resolve<IMarketingAutomationContactService>();
-            return marketingAutomationContactService.GetContactValue(this.ContactFieldName?.Trim());
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Unic.Flex.Implementation/Rules/SaveRules/IdentifyContactAction.cs b/src/Unic.Flex.Implementation/Rules/SaveRules/IdentifyContactAction.cs
deleted file mode 100644
index 50777e24..00000000
--- a/src/Unic.Flex.Implementation/Rules/SaveRules/IdentifyContactAction.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace Unic.Flex.Implementation.Rules.SaveRules
-{
-    using Core.DependencyInjection;
-    using Core.MarketingAutomation;
-    using Sitecore.Rules;
-
-    public class IdentifyContactAction<T> : BaseFlexSaveAction<T>
-        where T : RuleContext
-    {
-
-        public override void Apply(T ruleContext)
-        {
-            var marketingAutomationContactService = DependencyResolver.Resolve<IMarketingAutomationContactService>();
-
-            var value = this.GetFieldValue(ruleContext);
-            if (value == null) return;
-
-            marketingAutomationContactService.IdentifyContact(value);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Unic.Flex.Implementation/Rules/SaveRules/SaveContactEmailAction.cs b/src/Unic.Flex.Implementation/Rules/SaveRules/SaveContactEmailAction.cs
deleted file mode 100644
index d820d08c..00000000
--- a/src/Unic.Flex.Implementation/Rules/SaveRules/SaveContactEmailAction.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace Unic.Flex.Implementation.Rules.SaveRules
-{
-    using Core.DependencyInjection;
-    using Core.MarketingAutomation;
-    using Sitecore.Rules;
-
-    public class SaveContactEmailAction<T> : BaseFlexSaveAction<T> 
-        where T : RuleContext
-    {
-        public string EmailAddressName { get; set; }
-
-        public override void Apply(T ruleContext)
-        {
-            var marketingAutomationContactService = DependencyResolver.Resolve<IMarketingAutomationContactService>();
-
-            var value = this.GetFieldValue(ruleContext);
-            if (value == null) return;
-
-            marketingAutomationContactService.SetEmailAddress(this.EmailAddressName, value);
-        }
-
-    }
-}
diff --git a/src/Unic.Flex.Implementation/Rules/SaveRules/SaveContactFieldAction.cs b/src/Unic.Flex.Implementation/Rules/SaveRules/SaveContactFieldAction.cs
deleted file mode 100644
index 204206c8..00000000
--- a/src/Unic.Flex.Implementation/Rules/SaveRules/SaveContactFieldAction.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace Unic.Flex.Implementation.Rules.SaveRules
-{
-    using System;
-    using Core.DependencyInjection;
-    using Core.MarketingAutomation;
-    using Sitecore.Rules;
-
-    public class SaveContactFieldAction<T> : BaseFlexSaveAction<T>
-        where T : RuleContext
-    {
-        public Guid ContactField { get; set; }
-
-        public override void Apply(T ruleContext)
-        {
-            var marketingAutomationContactService = DependencyResolver.Resolve<IMarketingAutomationContactService>();
-
-            var value = this.GetFieldValue(ruleContext);
-            if (value == null) return;
-
-            marketingAutomationContactService.SetContactValue(this.ContactField, value);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Unic.Flex.Implementation/Rules/SaveRules/SaveLanguageAction.cs b/src/Unic.Flex.Implementation/Rules/SaveRules/SaveLanguageAction.cs
deleted file mode 100644
index 2b05dbcc..00000000
--- a/src/Unic.Flex.Implementation/Rules/SaveRules/SaveLanguageAction.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-namespace Unic.Flex.Implementation.Rules.SaveRules
-{
-    using System;
-    using Core.Context;
-    using Core.DependencyInjection;
-    using Core.MarketingAutomation;
-    using Sitecore.Rules;
-
-    public class SaveLanguageAction<T> : BaseFlexSaveAction<T>
-        where T : RuleContext
-    {
-        private static readonly Guid LanguageField = Guid.Parse("{20076F81-D4D9-43FF-B79A-A255A3F8A9DF}");
-
-        public override void Apply(T ruleContext)
-        {
-            var marketingAutomationContactService = DependencyResolver.Resolve<IMarketingAutomationContactService>();
-            var flexContext = DependencyResolver.Resolve<IFlexContext>();
-
-            var language = flexContext.LanguageName;
-
-            marketingAutomationContactService.SetContactValue(LanguageField, language);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Unic.Flex.Implementation/Rules/SaveRules/SaveSimpleContactFieldAction.cs b/src/Unic.Flex.Implementation/Rules/SaveRules/SaveSimpleContactFieldAction.cs
deleted file mode 100644
index 1dba5842..00000000
--- a/src/Unic.Flex.Implementation/Rules/SaveRules/SaveSimpleContactFieldAction.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace Unic.Flex.Implementation.Rules.SaveRules
-{
-    using Core.DependencyInjection;
-    using Core.MarketingAutomation;
-    using Sitecore.Rules;
-
-    public class SaveSimpleContactFieldAction<T> : BaseFlexSaveAction<T> where T : RuleContext
-    {
-        public string ContactFieldName { get; set; }
-
-        public override void Apply(T ruleContext)
-        {
-            var value = this.GetFieldValue(ruleContext);
-
-            if (value == null) return;
-
-            var marketingAutomationContactService = DependencyResolver.Resolve<IMarketingAutomationContactService>();
-            marketingAutomationContactService.SetContactValue(this.ContactFieldName?.Trim(), value);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj b/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj
index 88ef2f2e..98f25e22 100644
--- a/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj
+++ b/src/Unic.Flex.Implementation/Unic.Flex.Implementation.csproj
@@ -11,7 +11,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Unic.Flex.Implementation</RootNamespace>
     <AssemblyName>Unic.Flex.Implementation</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -38,17 +38,17 @@
     <Reference Include="BouncyCastle.Crypto, Version=1.8.5.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
       <HintPath>..\..\packages\BouncyCastle.1.8.5\lib\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
-    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
+    <Reference Include="Castle.Core, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll</HintPath>
     </Reference>
     <Reference Include="EPPlus">
       <HintPath>..\..\packages\EPPlus.3.1.3.3\lib\net35\EPPlus.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper, Version=5.5.28.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.dll</HintPath>
+    <Reference Include="Glass.Mapper, Version=5.8.181.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper.Sc, Version=5.5.28.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.Sc.dll</HintPath>
+    <Reference Include="Glass.Mapper.Sc, Version=5.8.181.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.Sc.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
@@ -63,20 +63,11 @@
     <Reference Include="Mvc.Mailer">
       <HintPath>..\..\packages\MvcMailer.4.5\lib\45\Mvc.Mailer.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Analytics, Version=13.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Analytics.9.2.0\lib\net471\Sitecore.Analytics.dll</HintPath>
-    </Reference>
-    <Reference Include="Sitecore.Analytics.Model, Version=13.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Analytics.Model.9.2.0\lib\net471\Sitecore.Analytics.Model.dll</HintPath>
-    </Reference>
-    <Reference Include="Sitecore.Analytics.XConnect, Version=13.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Analytics.XConnect.9.2.0\lib\net471\Sitecore.Analytics.XConnect.dll</HintPath>
-    </Reference>
-    <Reference Include="Sitecore.Kernel, Version=13.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Kernel.9.2.0\lib\net471\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=18.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Sitecore.Kernel.10.3.0\lib\net48\Sitecore.Kernel.dll</HintPath>
     </Reference>
     <Reference Include="sysglobl" />
     <Reference Include="System" />
@@ -161,7 +152,6 @@
     <Compile Include="Plugs\LoadPlugs\QueryStringLoader.cs" />
     <Compile Include="Plugs\LoadPlugs\RulesExecutionLoadPlug.cs" />
     <Compile Include="Plugs\SavePlugs\DoubleOptinSavePlug.cs" />
-    <Compile Include="Plugs\SavePlugs\RegisterGoal.cs" />
     <Compile Include="Plugs\SavePlugs\RulesExecutionSavePlug.cs" />
     <Compile Include="Plugs\SavePlugs\SaveToDatabase.cs" />
     <Compile Include="Plugs\SavePlugs\SendEmailAsync.cs" />
@@ -169,18 +159,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="DataProviders\ChildrenProvider.cs" />
     <Compile Include="Rules\LoadRules\BaseFlexLoadAction.cs" />
-    <Compile Include="Rules\LoadRules\LoadContactEmailAddressAction.cs" />
-    <Compile Include="Rules\LoadRules\LoadContactIdAction.cs" />
-    <Compile Include="Rules\LoadRules\LoadFromContactFieldAction.cs" />
-    <Compile Include="Rules\LoadRules\LoadSimpleContactFieldAction.cs" />
     <Compile Include="Rules\SaveRules\BaseFlexSaveAction.cs" />
     <Compile Include="Rules\SaveRules\FieldValueCondition.cs" />
     <Compile Include="Rules\SaveRules\FieldValueIsEmptyCondition.cs" />
-    <Compile Include="Rules\SaveRules\SaveContactEmailAction.cs" />
-    <Compile Include="Rules\SaveRules\IdentifyContactAction.cs" />
-    <Compile Include="Rules\SaveRules\SaveLanguageAction.cs" />
-    <Compile Include="Rules\SaveRules\SaveContactFieldAction.cs" />
-    <Compile Include="Rules\SaveRules\SaveSimpleContactFieldAction.cs" />
     <Compile Include="Services\DoubleOptinLinkService.cs" />
     <Compile Include="Services\DoubleOptinService.cs" />
     <Compile Include="Services\IDoubleOptinLinkService.cs" />
diff --git a/src/Unic.Flex.Implementation/app.config b/src/Unic.Flex.Implementation/app.config
index 99f0449d..58cd5a03 100644
--- a/src/Unic.Flex.Implementation/app.config
+++ b/src/Unic.Flex.Implementation/app.config
@@ -12,11 +12,11 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/src/Unic.Flex.Implementation/packages.config b/src/Unic.Flex.Implementation/packages.config
index f336932d..32fafc7e 100644
--- a/src/Unic.Flex.Implementation/packages.config
+++ b/src/Unic.Flex.Implementation/packages.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="BouncyCastle" version="1.8.5" targetFramework="net45" />
-  <package id="Castle.Core" version="4.2.1" targetFramework="net45" />
+  <package id="Castle.Core" version="5.1.1" targetFramework="net48" />
   <package id="EPPlus" version="3.1.3.3" targetFramework="net45" />
-  <package id="Glass.Mapper.Sc.92.Core" version="5.5.28" targetFramework="net471" />
+  <package id="Glass.Mapper.Sc.103.Core" version="5.8.181" targetFramework="net48" />
   <package id="Microsoft.AspNet.Mvc" version="5.2.4" targetFramework="net471" />
   <package id="Microsoft.AspNet.Razor" version="3.2.4" targetFramework="net471" />
   <package id="Microsoft.AspNet.WebPages" version="3.2.4" targetFramework="net471" />
@@ -12,11 +12,8 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="MimeKit" version="2.6.0" targetFramework="net45" />
   <package id="MvcMailer" version="4.5" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net471" />
-  <package id="Sitecore.Analytics" version="9.2.0" targetFramework="net471" />
-  <package id="Sitecore.Analytics.Model" version="9.2.0" targetFramework="net471" />
-  <package id="Sitecore.Analytics.XConnect" version="9.2.0" targetFramework="net471" />
-  <package id="Sitecore.Kernel" version="9.2.0" targetFramework="net471" developmentDependency="true" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
+  <package id="Sitecore.Kernel" version="10.3.0" targetFramework="net48" developmentDependency="true" />
   <package id="T4Scaffolding.Core" version="1.0.0" targetFramework="net45" />
   <package id="Unic.Configuration.Core" version="4.0.1" targetFramework="net471" />
   <package id="Unic.Profiling" version="2.0.0" targetFramework="net471" />
diff --git a/src/Unic.Flex.Integration.Website/Unic.Flex.Integration.Website.csproj b/src/Unic.Flex.Integration.Website/Unic.Flex.Integration.Website.csproj
index 71132a82..85c4e624 100644
--- a/src/Unic.Flex.Integration.Website/Unic.Flex.Integration.Website.csproj
+++ b/src/Unic.Flex.Integration.Website/Unic.Flex.Integration.Website.csproj
@@ -16,7 +16,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Unic.Flex.Integration.Website</RootNamespace>
     <AssemblyName>Unic.Flex.Integration.Website</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
@@ -49,8 +49,8 @@
     <Reference Include="Configy, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Configy.1.0.0\lib\net45\Configy.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper.Sc.Mvc, Version=5.5.28.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Glass.Mapper.Sc.92.Mvc.5.5.28\lib\net471\Glass.Mapper.Sc.Mvc.dll</HintPath>
+    <Reference Include="Glass.Mapper.Sc.Mvc, Version=5.8.181.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Glass.Mapper.Sc.103.Mvc.5.8.181\lib\net48\Glass.Mapper.Sc.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="Kamsar.WebConsole, Version=2.0.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Kamsar.WebConsole.2.0.1\lib\net40\Kamsar.WebConsole.dll</HintPath>
@@ -144,12 +144,9 @@
     <None Include="Web.config">
       <SubType>Designer</SubType>
     </None>
-    <Content Include="sitecore_services\admin\FlushSession.aspx" />
-    <Content Include="sitecore_services\admin\Identify.aspx" />
     <Content Include="sitecore_services\admin\jquery.json-viewer.css" />
     <Content Include="sitecore_services\admin\jquery.json-viewer.js" />
     <Content Include="sitecore_services\admin\jquery.min.js" />
-    <Content Include="sitecore_services\admin\ViewContact.aspx" />
     <Content Include="Views\Renderings\Sample\SampleInnerSublayout.cshtml" />
     <Content Include="Views\Renderings\Sample\SampleLayout.cshtml" />
     <Content Include="Views\Renderings\Sample\SampleRendering.cshtml" />
diff --git a/src/Unic.Flex.Integration.Website/packages.config b/src/Unic.Flex.Integration.Website/packages.config
index 1d3fb114..724d3ece 100644
--- a/src/Unic.Flex.Integration.Website/packages.config
+++ b/src/Unic.Flex.Integration.Website/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Configy" version="1.0.0" targetFramework="net471" />
-  <package id="Glass.Mapper.Sc.92.Mvc" version="5.5.28" targetFramework="net471" />
+  <package id="Glass.Mapper.Sc.103.Mvc" version="5.8.181" targetFramework="net48" />
   <package id="Kamsar.WebConsole" version="2.0.1" targetFramework="net471" developmentDependency="true" />
   <package id="MicroCHAP" version="1.2.2.2" targetFramework="net471" />
   <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net471" />
diff --git a/src/Unic.Flex.Integration.Website/sitecore_services/admin/FlushSession.aspx b/src/Unic.Flex.Integration.Website/sitecore_services/admin/FlushSession.aspx
deleted file mode 100644
index fd198cdf..00000000
--- a/src/Unic.Flex.Integration.Website/sitecore_services/admin/FlushSession.aspx
+++ /dev/null
@@ -1,41 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" Inherits="System.Web.UI.Page" Debug="true" %>
-<%@ Import Namespace="Sitecore.Sites" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
-    <title>Flush session</title>
-    <script runat="server">
-        protected void Page_Load(object sender, EventArgs e)
-        {
-            this.CheckSecurity();
-        }
-
-
-
-
-        private void CheckSecurity()
-        {
-            if (Sitecore.Context.User.IsAdministrator) return;
-
-            // show login page if the user does not have enough privileges
-            SiteContext site = Sitecore.Context.Site;
-            if (site != null)
-            {
-                base.Response.Redirect(string.Format("{0}?returnUrl={1}", site.LoginPage, HttpUtility.UrlEncode(base.Request.Url.PathAndQuery)));
-            }
-        }
-
-        private void btnFlushSession_OnClick(object sender, EventArgs e)
-        {
-            Session.Abandon();        
-            Response.Write("Abandoned");
-        }
-
-    </script>
-</head>
-<body>
-    <form runat=server>
-        <asp:Button ID="btnFlushSession" runat="server" Text="Flush session" OnClick="btnFlushSession_OnClick" />
-    </form>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/Unic.Flex.Integration.Website/sitecore_services/admin/Identify.aspx b/src/Unic.Flex.Integration.Website/sitecore_services/admin/Identify.aspx
deleted file mode 100644
index a11dec45..00000000
--- a/src/Unic.Flex.Integration.Website/sitecore_services/admin/Identify.aspx
+++ /dev/null
@@ -1,98 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" Inherits="System.Web.UI.Page" Debug="true" %>
-<%@ Import Namespace="Sitecore.Sites" %>
-<%@ Import Namespace="Sitecore.Analytics" %>
-<%@ Import Namespace="Sitecore.Analytics.Model.Entities" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
-    <title>Identify</title>
-    <script runat="server">
-        protected void Page_Load(object sender, EventArgs e)
-        {
-            this.CheckSecurity();
-            this.LoadData();
-        }
-
-        private void LoadData() 
-        {
-            Tracker.Initialize();
-            if(!this.IsPostBack) {
-                var contact = Tracker.Current.Contact;
-                txtIdentifier.Text = contact.Identifiers.Identifier;
-
-                var personalInfo = contact.GetFacet<IContactPersonalInfo>("Personal");
-                txtFirstname.Text = personalInfo.FirstName;
-                txtLastname.Text = personalInfo.Surname;
-                txtGender.Text = personalInfo.Gender;
-                
-                var emails = contact.GetFacet<IContactEmailAddresses>("Emails");
-                if(emails.Entries.Contains("Default")) {
-                    txtEmail.Text = emails.Entries["Default"].SmtpAddress;
-                }
-            }
-        }
-
-        private void CheckSecurity()
-        {
-            if (Sitecore.Context.User.IsAdministrator) return;
-
-            // show login page if the user does not have enough privileges
-            SiteContext site = Sitecore.Context.Site;
-            if (site != null)
-            {
-                base.Response.Redirect(string.Format("{0}?returnUrl={1}", site.LoginPage, HttpUtility.UrlEncode(base.Request.Url.PathAndQuery)));
-            }
-        }
-
-        private void btnIdentify_Clicked(object sender, EventArgs e)
-        {
-            Tracker.Current.Session.Identify(txtIdentifier.Text);
-        }
-
-        private void btnSave_Clicked(object sender, EventArgs e) 
-        {
-            var contact = Tracker.Current.Contact;
-            var emails = contact.GetFacet<IContactEmailAddresses>("Emails");
-
-            if (!emails.Entries.Contains("Default"))
-            {
-                emails.Preferred = "Default";
-                emails.Entries.Create("Default");
-            }
-
-            var personalEmail = emails.Entries["Default"];
-            personalEmail.SmtpAddress = txtEmail.Text;
-
-            var personalInfo = contact.GetFacet<IContactPersonalInfo>("Personal");
-            personalInfo.FirstName = txtFirstname.Text;
-            personalInfo.Surname = txtLastname.Text;
-            personalInfo.Gender = txtGender.Text;
-        }
-
-    </script>
-</head>
-<body>
-    <form runat=server>
-        <h1>Identify</h1>
-        <asp:TextBox ID="txtIdentifier" runat="server" Text="" />
-        <asp:Button ID="btnIdentify" OnClick="btnIdentify_Clicked" runat="server" Text="Identify" />
-
-        <h1>Contact Data</h1>
-        <div>
-            Firstname:
-        <asp:TextBox ID="txtFirstname" runat="server" Text="" />
-        <div>
-            Lastname: 
-        <asp:TextBox ID="txtLastname" runat="server" Text="" />
-        <div>
-            Email: 
-        <asp:TextBox ID="txtEmail" runat="server" Text="" />
-        <div>
-            Gender:
-        <asp:TextBox ID="txtGender" runat="server" Text="" />
-        <div>
-        <asp:Button ID="btnSave" OnClick="btnSave_Clicked" runat="server" Text="Save" />
-
-    </form>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/Unic.Flex.Integration.Website/sitecore_services/admin/ViewContact.aspx b/src/Unic.Flex.Integration.Website/sitecore_services/admin/ViewContact.aspx
deleted file mode 100644
index 71246f4c..00000000
--- a/src/Unic.Flex.Integration.Website/sitecore_services/admin/ViewContact.aspx
+++ /dev/null
@@ -1,186 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" Inherits="System.Web.UI.Page" Debug="true" %>
-<%@ Import Namespace="Sitecore.Sites" %>
-<%@ Import Namespace="Sitecore.Analytics" %>
-<%@ Import Namespace="Sitecore.Analytics.Tracking" %>
-<%@ Import Namespace="Newtonsoft.Json" %>
-<%@ Import Namespace="Newtonsoft.Json.Linq" %>
-<%@ Import Namespace="Sitecore.Analytics.Model.Framework" %>
-<%@ Import Namespace="Sitecore.Analytics.Automation.Data" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
-    <title>View Contact</title>
-    <script runat="server">
-        public class AutomationStateManagerJsonConverter : JsonConverter
-        {
-            public override bool CanRead
-            {
-                get { return false; }
-            }
-
-            public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-            {
-                var stateManager = (AutomationStateManager)value;
-
-                var token = new JObject();
-                foreach(var plan in stateManager.GetAutomationStates())
-                {
-                    var planToken = new JObject();
-                    planToken.Add("StateId", plan.StateId);
-                    planToken.Add("Created", plan.Created.ToString());
-                    planToken.Add("WakeUpDateTime", plan.WakeUpDateTime.ToString());
-                    planToken.Add("LastAccessedDateTime", plan.LastAccessedDateTime.ToString());
-                    planToken.Add("EntryDateTime", plan.EntryDateTime.ToString());
-                    token.Add(plan.PlanId.ToString(), planToken);
-                }
-
-                token.WriteTo(writer);
-            }
-
-            public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-            {
-                throw new NotImplementedException("Unnecessary because CanRead is false. The type will skip the converter.");
-            }
-
-            public override bool CanConvert(Type objectType)
-            {
-                return typeof(AutomationStateManager).IsAssignableFrom(objectType);
-            }
-        }
-
-        public class VisitProfileJsonConverter : JsonConverter
-        {
-            public override bool CanRead
-            {
-                get { return false; }
-            }
-
-            public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-            {
-                var profiles = (IVisitProfiles)value;
-
-                var token = new JObject();
-                foreach(var profileName in profiles.GetProfileNames())
-                {
-                    var profile = profiles[profileName];
-                    var profileToken = new JObject
-                    {
-                        {"PatternId", JToken.FromObject(profile.PatternId)},
-                        {"PatternLabel", JToken.FromObject(profile.PatternLabel)},
-                        {"Total", JToken.FromObject(profile.Total)},
-                        {"Count", JToken.FromObject(profile.Count)},
-                        {"Values", JToken.FromObject(profile.ToDictionary(_ => _.Key, _ => _.Value))}
-                    };
-
-                    token.Add(new JProperty(profileName, profileToken));
-                }
-
-                token.WriteTo(writer);
-            }
-
-            public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-            {
-                throw new NotImplementedException("Unnecessary because CanRead is false. The type will skip the converter.");
-            }
-
-            public override bool CanConvert(Type objectType)
-            {
-                return typeof(IVisitProfiles).IsAssignableFrom(objectType);
-            }
-        }
-
-        public class ElementDictionaryJsonConverter : JsonConverter
-        {
-            public override bool CanRead
-            {
-                get { return false; }
-            }
-
-            public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-            {
-                var dictionary = (IElementDictionary<IElement>)value;
-
-                var token = new JObject();
-                foreach(var key in dictionary.Keys)
-                {
-                    token.Add(new JProperty(key, JToken.FromObject(dictionary[key], serializer)));
-                }
-
-                token.WriteTo(writer);
-            }
-
-            public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-            {
-                throw new NotImplementedException("Unnecessary because CanRead is false. The type will skip the converter.");
-            }
-
-            public override bool CanConvert(Type objectType)
-            {
-                return typeof(IElementDictionary<IElement>).IsAssignableFrom(objectType);
-            }
-        }
-
-        protected void Page_Load(object sender, EventArgs e)
-        {
-            this.CheckSecurity();
-            this.LoadData();
-        }
-
-        private void LoadData()
-        {
-            Tracker.Initialize();
-            if(!this.IsPostBack)
-            {
-                var settings = new JsonSerializerSettings {
-                    ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
-                    Error = (serializer,err) => {
-                        err.ErrorContext.Handled = true;
-                    },
-                    Converters = new JsonConverter[] { new ElementDictionaryJsonConverter(), new VisitProfileJsonConverter(), new AutomationStateManagerJsonConverter() }
-                };
-
-                divCurrentInteraction.Attributes.Add("data-json", JsonConvert.SerializeObject(Tracker.Current.Interaction, Formatting.Indented, settings));
-
-                divContact.Attributes.Add("data-json", JsonConvert.SerializeObject(Tracker.Current.Contact, Formatting.Indented, settings));
-
-                divKeyBehaviourCache.Attributes.Add("data-json", JsonConvert.SerializeObject(Tracker.Current.Contact.GetKeyBehaviorCache(), Formatting.Indented, settings));
-            }
-        }
-
-        private void CheckSecurity()
-        {
-            if (Sitecore.Context.User.IsAdministrator) return;
-
-            // show login page if the user does not have enough privileges
-            SiteContext site = Sitecore.Context.Site;
-            if (site != null)
-            {
-                base.Response.Redirect(string.Format("{0}?returnUrl={1}", site.LoginPage, HttpUtility.UrlEncode(base.Request.Url.PathAndQuery)));
-            }
-        }
-
-    </script>
-
-    <link href="/sitecore_services/admin/jquery.json-viewer.css" type="text/css" rel="stylesheet" />
-</head>
-<body>
-<form runat=server>
-    <h1>Current Interaction</h1>
-    <pre runat="server" ID="divCurrentInteraction" class="jsoner"></pre>
-        
-    <h1>Contact</h1>
-    <pre runat="server" ID="divContact" class="jsoner"></pre>
-    <h1>Key Bahaviour Cache</h1>
-    <pre runat="server" ID="divKeyBehaviourCache" class="jsoner"></pre>
-</form>
-<script src="/sitecore_services/admin/jquery.min.js"></script>
-<script src="/sitecore_services/admin/jquery.json-viewer.js"></script>
-<script>
-    $(".jsoner").each(function(index, elem) {
-        var data = $(elem).data('json');
-        $(elem).jsonViewer(data, { collapsed: true });
-    })
-    
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/Unic.Flex.Model/Unic.Flex.Model.csproj b/src/Unic.Flex.Model/Unic.Flex.Model.csproj
index ede1399e..041828ac 100644
--- a/src/Unic.Flex.Model/Unic.Flex.Model.csproj
+++ b/src/Unic.Flex.Model/Unic.Flex.Model.csproj
@@ -11,7 +11,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Unic.Flex.Model</RootNamespace>
     <AssemblyName>Unic.Flex.Model</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -35,14 +35,14 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
+    <Reference Include="Castle.Core, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper, Version=5.5.28.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.dll</HintPath>
+    <Reference Include="Glass.Mapper, Version=5.8.181.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper.Sc, Version=5.5.28.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.Sc.dll</HintPath>
+    <Reference Include="Glass.Mapper.Sc, Version=5.8.181.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.Sc.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
@@ -51,8 +51,8 @@
       <Private>True</Private>
       <HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=13.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Kernel.9.2.0\lib\net471\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=18.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Sitecore.Kernel.10.3.0\lib\net48\Sitecore.Kernel.dll</HintPath>
     </Reference>
     <Reference Include="sysglobl" />
     <Reference Include="System" />
diff --git a/src/Unic.Flex.Model/app.config b/src/Unic.Flex.Model/app.config
index 92d4d217..6b96f19c 100644
--- a/src/Unic.Flex.Model/app.config
+++ b/src/Unic.Flex.Model/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
diff --git a/src/Unic.Flex.Model/packages.config b/src/Unic.Flex.Model/packages.config
index 835469a3..813eaad3 100644
--- a/src/Unic.Flex.Model/packages.config
+++ b/src/Unic.Flex.Model/packages.config
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Castle.Core" version="4.2.1" targetFramework="net45" />
-  <package id="Glass.Mapper.Sc.92.Core" version="5.5.28" targetFramework="net471" />
+  <package id="Castle.Core" version="5.1.1" targetFramework="net48" />
+  <package id="Glass.Mapper.Sc.103.Core" version="5.8.181" targetFramework="net48" />
   <package id="Microsoft.AspNet.Mvc" version="5.2.4" targetFramework="net471" />
   <package id="Microsoft.AspNet.Razor" version="3.2.4" targetFramework="net471" />
   <package id="Microsoft.AspNet.WebPages" version="3.2.4" targetFramework="net471" />
   <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net471" />
   <package id="Microsoft.Net.Compilers" version="1.3.2" targetFramework="net471" developmentDependency="true" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
-  <package id="Sitecore.Kernel" version="9.2.0" targetFramework="net471" developmentDependency="true" />
+  <package id="Sitecore.Kernel" version="10.3.0" targetFramework="net48" developmentDependency="true" />
   <package id="Unic.Configuration.Core" version="4.0.1" targetFramework="net471" />
   <package id="Unic.Profiling" version="2.0.0" targetFramework="net471" />
 </packages>
\ No newline at end of file
diff --git a/src/Unic.Flex.NinjectIoC/Config.cs b/src/Unic.Flex.NinjectIoC/Config.cs
index 94eda369..d0c3f031 100644
--- a/src/Unic.Flex.NinjectIoC/Config.cs
+++ b/src/Unic.Flex.NinjectIoC/Config.cs
@@ -1,12 +1,10 @@
 namespace Unic.Flex.NinjectIoC
 {
-    using Core.MarketingAutomation;
     using Glass.Mapper.Sc;
     using Implementation.Services;
     using Ninject.Modules;
     using Ninject.Web.Common;
     using Unic.Configuration.Core;
-    using Unic.Flex.Core.Analytics;
     using Unic.Flex.Core.Context;
     using Unic.Flex.Core.Database;
     using Unic.Flex.Core.Definitions;
@@ -38,7 +36,6 @@ public override void Load()
             this.Bind<IPresentationService>().To<PresentationService>();
             this.Bind<IPlugsService>().To<PlugsService>();
             this.Bind<ITaskService>().To<TaskService>();
-            this.Bind<IAnalyticsService>().To<AnalyticsService>();
             this.Bind<ICultureService>().To<CultureService>();
 
             // data access
@@ -74,9 +71,6 @@ public override void Load()
             this.Bind<ISaveToDatabaseService>().To<SaveToDatabaseService>();
             this.Bind<IDoubleOptinService>().To<DoubleOptinService>();
             this.Bind<IDoubleOptinLinkService>().To<DoubleOptinLinkService>();
-            
-            // Marketing Automation
-            this.Bind<IMarketingAutomationContactService, MarketingAutomationContactService>();
 
             // third party classes
             this.Bind<IConfigurationManager>().To<ConfigurationManager>().InSingletonScope();
diff --git a/src/Unic.Flex.NinjectIoC/Unic.Flex.NinjectIoC.csproj b/src/Unic.Flex.NinjectIoC/Unic.Flex.NinjectIoC.csproj
index 15c04749..442ff028 100644
--- a/src/Unic.Flex.NinjectIoC/Unic.Flex.NinjectIoC.csproj
+++ b/src/Unic.Flex.NinjectIoC/Unic.Flex.NinjectIoC.csproj
@@ -15,7 +15,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Unic.Flex.NinjectIoC</RootNamespace>
     <AssemblyName>Unic.Flex.NinjectIoC</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
@@ -45,14 +45,14 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
+    <Reference Include="Castle.Core, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper, Version=5.5.28.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.dll</HintPath>
+    <Reference Include="Glass.Mapper, Version=5.8.181.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper.Sc, Version=5.5.28.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.Sc.dll</HintPath>
+    <Reference Include="Glass.Mapper.Sc, Version=5.8.181.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.Sc.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
@@ -74,8 +74,8 @@
       <HintPath>..\..\packages\Ninject.Web.Common.3.2.2.0\lib\net45-full\Ninject.Web.Common.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=13.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Kernel.9.2.0\lib\net471\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=18.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Sitecore.Kernel.10.3.0\lib\net48\Sitecore.Kernel.dll</HintPath>
     </Reference>
     <Reference Include="sysglobl" />
     <Reference Include="System.Data.DataSetExtensions" />
diff --git a/src/Unic.Flex.NinjectIoC/Web.config b/src/Unic.Flex.NinjectIoC/Web.config
index 6e9c43d4..b5e9b4d4 100644
--- a/src/Unic.Flex.NinjectIoC/Web.config
+++ b/src/Unic.Flex.NinjectIoC/Web.config
@@ -20,7 +20,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
@@ -36,7 +36,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/src/Unic.Flex.NinjectIoC/packages.config b/src/Unic.Flex.NinjectIoC/packages.config
index 950429c5..8b70fca1 100644
--- a/src/Unic.Flex.NinjectIoC/packages.config
+++ b/src/Unic.Flex.NinjectIoC/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Castle.Core" version="4.2.1" targetFramework="net45" />
-  <package id="Glass.Mapper.Sc.92.Core" version="5.5.28" targetFramework="net471" />
+  <package id="Castle.Core" version="5.1.1" targetFramework="net48" />
+  <package id="Glass.Mapper.Sc.103.Core" version="5.8.181" targetFramework="net48" />
   <package id="Microsoft.AspNet.Mvc" version="5.2.4" targetFramework="net471" />
   <package id="Microsoft.AspNet.Razor" version="3.2.4" targetFramework="net471" />
   <package id="Microsoft.AspNet.WebPages" version="3.2.4" targetFramework="net471" />
@@ -11,7 +11,7 @@
   <package id="MvcMailer" version="4.5" targetFramework="net45" />
   <package id="Ninject" version="3.2.2.0" targetFramework="net45" />
   <package id="Ninject.Web.Common" version="3.2.2.0" targetFramework="net45" />
-  <package id="Sitecore.Kernel" version="9.2.0" targetFramework="net471" developmentDependency="true" />
+  <package id="Sitecore.Kernel" version="10.3.0" targetFramework="net48" developmentDependency="true" />
   <package id="T4Scaffolding.Core" version="1.0.0" targetFramework="net45" />
   <package id="Unic.Configuration.Core" version="4.0.1" targetFramework="net471" />
 </packages>
\ No newline at end of file
diff --git a/src/Unic.Flex.SimpleInjectorIoC/App_Config/Include/20_author/Unic.Feature.Flex.Config b/src/Unic.Flex.SimpleInjectorIoC/App_Config/Include/01_modules/Unic.Feature.Flex.Config
similarity index 100%
rename from src/Unic.Flex.SimpleInjectorIoC/App_Config/Include/20_author/Unic.Feature.Flex.Config
rename to src/Unic.Flex.SimpleInjectorIoC/App_Config/Include/01_modules/Unic.Feature.Flex.Config
diff --git a/src/Unic.Flex.SimpleInjectorIoC/App_Config/Include/20_delivery/Unic.Feature.Flex.Config b/src/Unic.Flex.SimpleInjectorIoC/App_Config/Include/20_delivery/Unic.Feature.Flex.Config
deleted file mode 100644
index 96623ba5..00000000
--- a/src/Unic.Flex.SimpleInjectorIoC/App_Config/Include/20_delivery/Unic.Feature.Flex.Config
+++ /dev/null
@@ -1,8 +0,0 @@
-<configuration xmlns:patch="http://www.sitecore.net/xmlconfig/" xmlns:set="http://www.sitecore.net/xmlconfig/set/">
-  <sitecore>
-    <settings>
-      <!--Database used in intialize Pipeline for Kickstart DI-->
-      <setting name="Unic.Feature.Flex.InitialDatabase" value="web" />
-    </settings>
-  </sitecore>
-</configuration>
\ No newline at end of file
diff --git a/src/Unic.Flex.SimpleInjectorIoC/Config.cs b/src/Unic.Flex.SimpleInjectorIoC/Config.cs
index 377c7f75..61a78994 100644
--- a/src/Unic.Flex.SimpleInjectorIoC/Config.cs
+++ b/src/Unic.Flex.SimpleInjectorIoC/Config.cs
@@ -1,7 +1,5 @@
 namespace Unic.Flex.SimpleInjectorIoC
 {
-    using Core.MarketingAutomation;
-    using Core.Utilities;
     using Glass.Mapper.Sc;
     using Glass.Mapper.Sc.Web;
     using Glass.Mapper.Sc.Web.Mvc;
@@ -9,7 +7,6 @@
     using SimpleInjector;
     using SimpleInjector.Diagnostics;
     using Unic.Configuration.Core;
-    using Unic.Flex.Core.Analytics;
     using Unic.Flex.Core.Context;
     using Unic.Flex.Core.Database;
     using Unic.Flex.Core.Definitions;
@@ -42,7 +39,6 @@ public static void Initialize(Container container)
             container.Register<IPresentationService, PresentationService>();
             container.Register<IPlugsService, PlugsService>();
             container.Register<ITaskService, TaskService>();
-            container.Register<IAnalyticsService, AnalyticsService>();
             container.Register<ICultureService, CultureService>();
             container.Register<IAsyncPlugExecutionService, AsyncPlugExecutionService>();
             container.Register<IServerOriginService, ServerOriginService>();
@@ -73,7 +69,6 @@ public static void Initialize(Container container)
 
             // helpers
             container.Register<IUrlService, UrlService>(Lifestyle.Singleton);
-            container.Register<ITrackerWrapper, TrackerWrapper>();
 
             // implementation classes
             container.Register<ISavePlugMailer, SavePlugMailer>();
@@ -82,9 +77,6 @@ public static void Initialize(Container container)
             container.Register<IDoubleOptinService, DoubleOptinService>();
             container.Register<IDoubleOptinLinkService, DoubleOptinLinkService>();
 
-            // Marketing Automation
-            container.Register<IMarketingAutomationContactService, MarketingAutomationContactService>();
-
             // third party classes
             container.Register<IConfigurationManager>(() => new ConfigurationManager(), Lifestyle.Singleton);
             container.Register<ISitecoreService>(GetService, Lifestyle.Scoped);
diff --git a/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj b/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj
index 0b7d5144..7278bf26 100644
--- a/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj
+++ b/src/Unic.Flex.SimpleInjectorIoC/Unic.Flex.SimpleInjectorIoC.csproj
@@ -16,7 +16,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Unic.Flex.SimpleInjectorIoC</RootNamespace>
     <AssemblyName>Unic.Flex.SimpleInjectorIoC</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
@@ -46,17 +46,17 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
+    <Reference Include="Castle.Core, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper, Version=5.5.28.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.dll</HintPath>
+    <Reference Include="Glass.Mapper, Version=5.8.181.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper.Sc, Version=5.5.28.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.Sc.dll</HintPath>
+    <Reference Include="Glass.Mapper.Sc, Version=5.8.181.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.Sc.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper.Sc.Mvc, Version=5.5.28.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Glass.Mapper.Sc.92.Mvc.5.5.28\lib\net471\Glass.Mapper.Sc.Mvc.dll</HintPath>
+    <Reference Include="Glass.Mapper.Sc.Mvc, Version=5.8.181.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Glass.Mapper.Sc.103.Mvc.5.8.181\lib\net48\Glass.Mapper.Sc.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
@@ -70,18 +70,17 @@
       <HintPath>..\..\packages\MvcMailer.4.5\lib\45\Mvc.Mailer.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SimpleInjector, Version=3.1.2.0, Culture=neutral, PublicKeyToken=984cb50dea722e99">
-      <HintPath>..\..\packages\SimpleInjector.3.1.2\lib\net45\SimpleInjector.dll</HintPath>
+    <Reference Include="SimpleInjector, Version=4.2.0.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SimpleInjector.4.2.0\lib\net45\SimpleInjector.dll</HintPath>
     </Reference>
-    <Reference Include="SimpleInjector.Extensions.LifetimeScoping, Version=3.1.2.0, Culture=neutral, PublicKeyToken=984cb50dea722e99">
-      <HintPath>..\..\packages\SimpleInjector.Extensions.LifetimeScoping.3.1.2\lib\net40-client\SimpleInjector.Extensions.LifetimeScoping.dll</HintPath>
+    <Reference Include="SimpleInjector.Extensions.LifetimeScoping, Version=4.0.0.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SimpleInjector.Extensions.LifetimeScoping.4.0.0\lib\net40\SimpleInjector.Extensions.LifetimeScoping.dll</HintPath>
     </Reference>
-    <Reference Include="SimpleInjector.Integration.Web, Version=3.1.2.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\SimpleInjector.Integration.Web.3.1.2\lib\net40\SimpleInjector.Integration.Web.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="SimpleInjector.Integration.Web, Version=4.2.0.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SimpleInjector.Integration.Web.4.2.0\lib\net40\SimpleInjector.Integration.Web.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=13.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Kernel.9.2.0\lib\net471\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=18.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Sitecore.Kernel.10.3.0\lib\net48\Sitecore.Kernel.dll</HintPath>
     </Reference>
     <Reference Include="sysglobl" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -129,10 +128,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="App_Config\Include\20_author\Unic.Feature.Flex.Config">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="App_Config\Include\20_delivery\Unic.Feature.Flex.Config">
+    <Content Include="App_Config\Include\01_modules\Unic.Feature.Flex.Config">
       <SubType>Designer</SubType>
     </Content>
     <None Include="packages.config" />
@@ -145,9 +141,6 @@
     <Compile Include="SimpleInjectorContainer.cs" />
     <Compile Include="Verify.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <Content Include="App_Config\Include\01_modules\Unic.Flex.SimpleInjector.config">
       <SubType>Designer</SubType>
diff --git a/src/Unic.Flex.SimpleInjectorIoC/Web.config b/src/Unic.Flex.SimpleInjectorIoC/Web.config
index 6e9c43d4..7530fecd 100644
--- a/src/Unic.Flex.SimpleInjectorIoC/Web.config
+++ b/src/Unic.Flex.SimpleInjectorIoC/Web.config
@@ -20,7 +20,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
@@ -36,7 +36,11 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="SimpleInjector" publicKeyToken="984cb50dea722e99" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/src/Unic.Flex.SimpleInjectorIoC/packages.config b/src/Unic.Flex.SimpleInjectorIoC/packages.config
index 8cf5e0cc..59aab714 100644
--- a/src/Unic.Flex.SimpleInjectorIoC/packages.config
+++ b/src/Unic.Flex.SimpleInjectorIoC/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Castle.Core" version="4.2.1" targetFramework="net45" />
-  <package id="Glass.Mapper.Sc.92.Core" version="5.5.28" targetFramework="net471" />
-  <package id="Glass.Mapper.Sc.92.Mvc" version="5.5.28" targetFramework="net471" />
+  <package id="Castle.Core" version="5.1.1" targetFramework="net48" />
+  <package id="Glass.Mapper.Sc.103.Core" version="5.8.181" targetFramework="net48" />
+  <package id="Glass.Mapper.Sc.103.Mvc" version="5.8.181" targetFramework="net48" />
   <package id="Microsoft.AspNet.Mvc" version="5.2.4" targetFramework="net471" />
   <package id="Microsoft.AspNet.Razor" version="3.2.4" targetFramework="net471" />
   <package id="Microsoft.AspNet.WebPages" version="3.2.4" targetFramework="net471" />
@@ -10,10 +10,10 @@
   <package id="Microsoft.Net.Compilers" version="1.3.2" targetFramework="net471" developmentDependency="true" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="MvcMailer" version="4.5" targetFramework="net45" />
-  <package id="SimpleInjector" version="3.1.2" targetFramework="net45" />
-  <package id="SimpleInjector.Extensions.LifetimeScoping" version="3.1.2" targetFramework="net45" />
-  <package id="SimpleInjector.Integration.Web" version="3.1.2" targetFramework="net45" />
-  <package id="Sitecore.Kernel" version="9.2.0" targetFramework="net471" developmentDependency="true" />
+  <package id="SimpleInjector" version="4.2.0" targetFramework="net471" />
+  <package id="SimpleInjector.Extensions.LifetimeScoping" version="4.0.0" targetFramework="net471" />
+  <package id="SimpleInjector.Integration.Web" version="4.2.0" targetFramework="net471" />
+  <package id="Sitecore.Kernel" version="10.3.0" targetFramework="net48" developmentDependency="true" />
   <package id="T4Scaffolding.Core" version="1.0.0" targetFramework="net45" />
   <package id="Unic.Bob.Muck" version="3.0.0" targetFramework="net45" developmentDependency="true" />
   <package id="Unic.Configuration.Core" version="4.0.1" targetFramework="net471" />
diff --git a/src/Unic.Flex.Website/App_Config/Include/01_modules_author/Unic.Configuration.config b/src/Unic.Flex.Website/App_Config/Include/01_modules/Unic.Configuration.Serialization.config
similarity index 87%
rename from src/Unic.Flex.Website/App_Config/Include/01_modules_author/Unic.Configuration.config
rename to src/Unic.Flex.Website/App_Config/Include/01_modules/Unic.Configuration.Serialization.config
index 267575a1..8c5cc805 100644
--- a/src/Unic.Flex.Website/App_Config/Include/01_modules_author/Unic.Configuration.config
+++ b/src/Unic.Flex.Website/App_Config/Include/01_modules/Unic.Configuration.Serialization.config
@@ -1,5 +1,5 @@
-<configuration xmlns:patch="http://www.sitecore.net/xmlconfig/" xmlns:set="http://www.sitecore.net/xmlconfig/set/">
-  <sitecore>
+<configuration xmlns:patch="http://www.sitecore.net/xmlconfig/" xmlns:set="http://www.sitecore.net/xmlconfig/set/" xmlns:role="http://www.sitecore.net/xmlconfig/role/">
+  <sitecore role:require="Standalone or ContentManagement">
 
     <unicorn>
       <configurations>
diff --git a/src/Unic.Flex.Website/App_Config/Include/01_modules_author/Unic.Flex.config b/src/Unic.Flex.Website/App_Config/Include/01_modules/Unic.Flex.Serialization.config
similarity index 100%
rename from src/Unic.Flex.Website/App_Config/Include/01_modules_author/Unic.Flex.config
rename to src/Unic.Flex.Website/App_Config/Include/01_modules/Unic.Flex.Serialization.config
diff --git a/src/Unic.Flex.Website/Unic.Flex.Website.csproj b/src/Unic.Flex.Website/Unic.Flex.Website.csproj
index d477898c..d8ff1346 100644
--- a/src/Unic.Flex.Website/Unic.Flex.Website.csproj
+++ b/src/Unic.Flex.Website/Unic.Flex.Website.csproj
@@ -16,7 +16,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Unic.Flex.Website</RootNamespace>
     <AssemblyName>Unic.Flex.Website</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
@@ -47,14 +47,14 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
+    <Reference Include="Castle.Core, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper, Version=5.5.28.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.dll</HintPath>
+    <Reference Include="Glass.Mapper, Version=5.8.181.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper.Sc, Version=5.5.28.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.Sc.dll</HintPath>
+    <Reference Include="Glass.Mapper.Sc, Version=5.8.181.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.Sc.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
@@ -64,14 +64,14 @@
       <Private>True</Private>
       <HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=13.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Kernel.9.2.0\lib\net471\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=18.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Sitecore.Kernel.10.3.0\lib\net48\Sitecore.Kernel.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Mvc, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Mvc.9.2.0\lib\net471\Sitecore.Mvc.dll</HintPath>
+    <Reference Include="Sitecore.Mvc, Version=9.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Sitecore.Mvc.10.3.0\lib\net48\Sitecore.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="sysglobl" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -152,8 +152,8 @@
     <Content Include="assets\flex\css\styling.css.min.map" />
     <Content Include="assets\flex\css\theme.css.map" />
     <Content Include="assets\flex\css\theme.css.min.map" />
-    <Content Include="App_Config\Include\01_modules_author\Unic.Flex.config" />
-    <Content Include="App_Config\Include\01_modules_author\Unic.Configuration.config" />
+    <Content Include="App_Config\Include\01_modules\Unic.Flex.Serialization.config" />
+    <Content Include="App_Config\Include\01_modules\Unic.Configuration.Serialization.config" />
     <Content Include="App_Config\Include\01_modules\Unic.Configuration.config" />
     <None Include="packages.config">
       <SubType>Designer</SubType>
diff --git a/src/Unic.Flex.Website/packages.config b/src/Unic.Flex.Website/packages.config
index 2ad3a468..828f781d 100644
--- a/src/Unic.Flex.Website/packages.config
+++ b/src/Unic.Flex.Website/packages.config
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Castle.Core" version="4.2.1" targetFramework="net45" />
-  <package id="Glass.Mapper.Sc.92.Core" version="5.5.28" targetFramework="net471" />
+  <package id="Castle.Core" version="5.1.1" targetFramework="net48" />
+  <package id="Glass.Mapper.Sc.103.Core" version="5.8.181" targetFramework="net48" />
   <package id="Microsoft.AspNet.Mvc" version="5.2.4" targetFramework="net471" />
   <package id="Microsoft.AspNet.Razor" version="3.2.4" targetFramework="net471" />
   <package id="Microsoft.AspNet.WebPages" version="3.2.4" targetFramework="net471" />
   <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net471" />
   <package id="Microsoft.Net.Compilers" version="1.3.2" targetFramework="net471" developmentDependency="true" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net471" />
-  <package id="Sitecore.Kernel" version="9.2.0" targetFramework="net471" developmentDependency="true" />
-  <package id="Sitecore.Mvc" version="9.2.0" targetFramework="net471" developmentDependency="true" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
+  <package id="Sitecore.Kernel" version="10.3.0" targetFramework="net48" developmentDependency="true" />
+  <package id="Sitecore.Mvc" version="10.3.0" targetFramework="net48" developmentDependency="true" />
   <package id="Unic.Bob.Muck" version="3.0.0" targetFramework="net45" developmentDependency="true" />
   <package id="Unic.Configuration" version="4.0.1" targetFramework="net471" />
   <package id="Unic.Configuration.Core" version="4.0.1" targetFramework="net471" />
diff --git a/src/Unic.Flex.Website/web.config b/src/Unic.Flex.Website/web.config
index 552494d1..17147829 100644
--- a/src/Unic.Flex.Website/web.config
+++ b/src/Unic.Flex.Website/web.config
@@ -36,7 +36,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Castle.Windsor" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
@@ -44,7 +44,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
diff --git a/tests/Unic.Flex.Core.Tests/Unic.Flex.Core.Tests.csproj b/tests/Unic.Flex.Core.Tests/Unic.Flex.Core.Tests.csproj
index 2e7bf4cd..887ac491 100644
--- a/tests/Unic.Flex.Core.Tests/Unic.Flex.Core.Tests.csproj
+++ b/tests/Unic.Flex.Core.Tests/Unic.Flex.Core.Tests.csproj
@@ -11,7 +11,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Unic.Flex.Core.Tests</RootNamespace>
     <AssemblyName>Unic.Flex.Core.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -35,14 +35,14 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
+    <Reference Include="Castle.Core, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper, Version=5.5.28.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.dll</HintPath>
+    <Reference Include="Glass.Mapper, Version=5.8.181.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper.Sc, Version=5.5.28.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.Sc.dll</HintPath>
+    <Reference Include="Glass.Mapper.Sc, Version=5.8.181.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.Sc.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
@@ -54,8 +54,8 @@
     <Reference Include="nunit.framework">
       <HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=13.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Kernel.9.2.0\lib\net471\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=18.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Sitecore.Kernel.10.3.0\lib\net48\Sitecore.Kernel.dll</HintPath>
     </Reference>
     <Reference Include="sysglobl" />
     <Reference Include="System" />
diff --git a/tests/Unic.Flex.Core.Tests/app.config b/tests/Unic.Flex.Core.Tests/app.config
index 57adffdf..e55384d9 100644
--- a/tests/Unic.Flex.Core.Tests/app.config
+++ b/tests/Unic.Flex.Core.Tests/app.config
@@ -12,11 +12,11 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Castle.Windsor" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
diff --git a/tests/Unic.Flex.Core.Tests/packages.config b/tests/Unic.Flex.Core.Tests/packages.config
index 7e456365..817502cb 100644
--- a/tests/Unic.Flex.Core.Tests/packages.config
+++ b/tests/Unic.Flex.Core.Tests/packages.config
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Castle.Core" version="4.2.1" targetFramework="net471" />
-  <package id="Glass.Mapper.Sc.92.Core" version="5.5.28" targetFramework="net471" />
+  <package id="Castle.Core" version="5.1.1" targetFramework="net48" />
+  <package id="Glass.Mapper.Sc.103.Core" version="5.8.181" targetFramework="net48" />
   <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net471" />
   <package id="Microsoft.Net.Compilers" version="1.3.2" targetFramework="net471" developmentDependency="true" />
   <package id="Moq" version="4.2.1402.2112" targetFramework="net471" />
   <package id="NUnit" version="2.6.3" targetFramework="net471" />
-  <package id="Sitecore.Kernel" version="9.2.0" targetFramework="net471" />
+  <package id="Sitecore.Kernel" version="10.3.0" targetFramework="net48" />
   <package id="Unic.Profiling" version="2.0.0" targetFramework="net471" />
 </packages>
\ No newline at end of file
diff --git a/tests/Unic.Flex.Implementation.Tests/Unic.Flex.Implementation.Tests.csproj b/tests/Unic.Flex.Implementation.Tests/Unic.Flex.Implementation.Tests.csproj
index 755ea8f2..f162aaaa 100644
--- a/tests/Unic.Flex.Implementation.Tests/Unic.Flex.Implementation.Tests.csproj
+++ b/tests/Unic.Flex.Implementation.Tests/Unic.Flex.Implementation.Tests.csproj
@@ -11,7 +11,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Unic.Flex.Implementation.Tests</RootNamespace>
     <AssemblyName>Unic.Flex.Implementation.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
diff --git a/tests/Unic.Flex.Implementation.Tests/app.config b/tests/Unic.Flex.Implementation.Tests/app.config
index 35b4cd6e..7bc33c8b 100644
--- a/tests/Unic.Flex.Implementation.Tests/app.config
+++ b/tests/Unic.Flex.Implementation.Tests/app.config
@@ -12,7 +12,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
@@ -20,7 +20,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/tests/Unic.Flex.Tests/Unic.Flex.Tests.csproj b/tests/Unic.Flex.Tests/Unic.Flex.Tests.csproj
index 002c3830..82176713 100644
--- a/tests/Unic.Flex.Tests/Unic.Flex.Tests.csproj
+++ b/tests/Unic.Flex.Tests/Unic.Flex.Tests.csproj
@@ -11,7 +11,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Unic.Flex.Tests</RootNamespace>
     <AssemblyName>Unic.Flex.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -35,14 +35,14 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
+    <Reference Include="Castle.Core, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper, Version=5.5.28.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.dll</HintPath>
+    <Reference Include="Glass.Mapper, Version=5.8.181.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.dll</HintPath>
     </Reference>
-    <Reference Include="Glass.Mapper.Sc, Version=5.5.28.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Glass.Mapper.Sc.92.Core.5.5.28\lib\net471\Glass.Mapper.Sc.dll</HintPath>
+    <Reference Include="Glass.Mapper.Sc, Version=5.8.181.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Glass.Mapper.Sc.103.Core.5.8.181\lib\net48\Glass.Mapper.Sc.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
@@ -50,8 +50,8 @@
     <Reference Include="Moq">
       <HintPath>..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>
     </Reference>
-    <Reference Include="Sitecore.Kernel, Version=13.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Sitecore.Kernel.9.2.0\lib\net471\Sitecore.Kernel.dll</HintPath>
+    <Reference Include="Sitecore.Kernel, Version=18.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Sitecore.Kernel.10.3.0\lib\net48\Sitecore.Kernel.dll</HintPath>
     </Reference>
     <Reference Include="sysglobl" />
     <Reference Include="System" />
diff --git a/tests/Unic.Flex.Tests/app.config b/tests/Unic.Flex.Tests/app.config
index 41685331..98b1aa51 100644
--- a/tests/Unic.Flex.Tests/app.config
+++ b/tests/Unic.Flex.Tests/app.config
@@ -8,7 +8,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -20,7 +20,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/tests/Unic.Flex.Tests/packages.config b/tests/Unic.Flex.Tests/packages.config
index 9c2c3087..4eb6d947 100644
--- a/tests/Unic.Flex.Tests/packages.config
+++ b/tests/Unic.Flex.Tests/packages.config
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Castle.Core" version="4.2.1" targetFramework="net471" />
-  <package id="Glass.Mapper.Sc.92.Core" version="5.5.28" targetFramework="net471" />
+  <package id="Castle.Core" version="5.1.1" targetFramework="net48" />
+  <package id="Glass.Mapper.Sc.103.Core" version="5.8.181" targetFramework="net48" />
   <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net471" />
   <package id="Microsoft.Net.Compilers" version="1.3.2" targetFramework="net471" developmentDependency="true" />
   <package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
-  <package id="Sitecore.Kernel" version="9.2.0" targetFramework="net471" developmentDependency="true" />
+  <package id="Sitecore.Kernel" version="10.3.0" targetFramework="net48" developmentDependency="true" />
   <package id="Unic.Configuration.Core" version="4.0.1" targetFramework="net471" />
   <package id="Unic.Profiling" version="2.0.0" targetFramework="net471" />
 </packages>
\ No newline at end of file