diff --git a/Elsa.sln b/Elsa.sln
index 57df129b8..ec20c6364 100644
--- a/Elsa.sln
+++ b/Elsa.sln
@@ -422,6 +422,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.AI.Persistence.EFCore.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.AI.IntegrationTests", "test\integration\Elsa.AI.IntegrationTests\Elsa.AI.IntegrationTests.csproj", "{DDEA0B6A-A615-4CF8-8B23-F93E390454B2}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "weaver", "weaver", "{F52DF980-C8F7-49D5-A8A1-249B44223600}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "keyvalues", "keyvalues", "{9323DC40-29B4-4438-AAD7-C4D4069C072B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1912,7 +1916,6 @@ Global
 		{29638A67-E79F-44FE-AC05-DA499EBA929E} = {2F3E1026-5054-4E1F-899B-F1A7F70F9912}
 		{A516931E-EDBB-4FC3-BB94-1BB824D5BC61} = {5BA4A8FA-F7F4-45B3-AEC8-8886D35AAC79}
 		{BBCE36D1-6767-4ED1-B3E8-84D2567A962A} = {A516931E-EDBB-4FC3-BB94-1BB824D5BC61}
-		{73BBB1E3-AEEC-44E8-83D7-6DD9CD687FE3} = {5BA4A8FA-F7F4-45B3-AEC8-8886D35AAC79}
 		{B0946844-DE0E-4C59-9391-C0EB649DBF4E} = {18453B51-25EB-4317-A4B3-B10518252E92}
 		{34BC9836-681D-43A5-BC39-E4FEE17FC528} = {08B41FFA-CEE3-46A7-B5C0-3EB65D37A16C}
 		{CBB515F3-A0EF-43B5-A907-FD4E652DD66E} = {90031D64-CA0F-46D0-9AF4-8DC023A5FFCD}
@@ -2022,25 +2025,28 @@ Global
 		{05AC1253-922A-4BC4-93D0-765752026B29} = {B08B4E00-C2AB-48F3-8389-449F42AEF179}
 		{D1212632-20D4-4115-9E8F-05EEEC4604BE} = {78FD90A4-90A5-445F-97F2-74BA835AFA5D}
 		{215555CD-3B4A-46E7-ACE0-B4ADE1F0FE62} = {78FD90A4-90A5-445F-97F2-74BA835AFA5D}
-		{A5BE660B-BED0-4D72-BC60-2E6EB42061C0} = {5BA4A8FA-F7F4-45B3-AEC8-8886D35AAC79}
-		{86A93965-54B1-4983-9A87-6E3ADB584BED} = {5BA4A8FA-F7F4-45B3-AEC8-8886D35AAC79}
-		{E1F2B414-D9E4-4789-8138-3F9DA076FFB6} = {5BA4A8FA-F7F4-45B3-AEC8-8886D35AAC79}
-		{860546C8-60D4-4C11-A1E1-3102969F5E47} = {5BA4A8FA-F7F4-45B3-AEC8-8886D35AAC79}
-		{E0BF8169-5AB4-4F07-A166-98FE48125359} = {5BA4A8FA-F7F4-45B3-AEC8-8886D35AAC79}
-		{83836640-31A6-4EDA-AE80-BC926E6B29EC} = {5BA4A8FA-F7F4-45B3-AEC8-8886D35AAC79}
-		{6A17BD0C-8643-4684-BC3F-9E378A467605} = {5BA4A8FA-F7F4-45B3-AEC8-8886D35AAC79}
-		{2248A649-6CA4-4A1A-8BC3-34257238B560} = {5BA4A8FA-F7F4-45B3-AEC8-8886D35AAC79}
-		{807C6ACA-1C4B-4AC4-A60C-1FE6B9AB38AC} = {5BA4A8FA-F7F4-45B3-AEC8-8886D35AAC79}
 		{418472CD-1215-4962-9024-F26E9863B5A4} = {18453B51-25EB-4317-A4B3-B10518252E92}
-		{E8D76C93-4FE6-4B97-BC16-C8490CF3C8CC} = {5BA4A8FA-F7F4-45B3-AEC8-8886D35AAC79}
-		{C9E1429E-BC22-4ABC-820D-08709793ECE7} = {5BA4A8FA-F7F4-45B3-AEC8-8886D35AAC79}
-		{24CE63F9-29D1-4243-9144-BB2C1590FCC0} = {5BA4A8FA-F7F4-45B3-AEC8-8886D35AAC79}
-		{D3F07276-CD16-46BD-AEB1-8C7D6D7910C5} = {5BA4A8FA-F7F4-45B3-AEC8-8886D35AAC79}
 		{C597B963-A80F-4093-B3CC-9060854D9D38} = {18453B51-25EB-4317-A4B3-B10518252E92}
 		{E087B3BD-D579-422B-A29F-965D33E2C769} = {18453B51-25EB-4317-A4B3-B10518252E92}
 		{1C70A220-E69F-434B-966B-9C53A35B072B} = {18453B51-25EB-4317-A4B3-B10518252E92}
 		{9B74CCC3-9634-4A09-A270-CE1101D96824} = {18453B51-25EB-4317-A4B3-B10518252E92}
 		{DDEA0B6A-A615-4CF8-8B23-F93E390454B2} = {1B8D5897-902E-4632-8698-E89CAF3DDF54}
+		{F52DF980-C8F7-49D5-A8A1-249B44223600} = {5BA4A8FA-F7F4-45B3-AEC8-8886D35AAC79}
+		{E8D76C93-4FE6-4B97-BC16-C8490CF3C8CC} = {F52DF980-C8F7-49D5-A8A1-249B44223600}
+		{C9E1429E-BC22-4ABC-820D-08709793ECE7} = {F52DF980-C8F7-49D5-A8A1-249B44223600}
+		{24CE63F9-29D1-4243-9144-BB2C1590FCC0} = {F52DF980-C8F7-49D5-A8A1-249B44223600}
+		{D3F07276-CD16-46BD-AEB1-8C7D6D7910C5} = {F52DF980-C8F7-49D5-A8A1-249B44223600}
+		{A5BE660B-BED0-4D72-BC60-2E6EB42061C0} = {3D0A6C71-4B96-411B-80DB-DDFAFF77C748}
+		{86A93965-54B1-4983-9A87-6E3ADB584BED} = {3D0A6C71-4B96-411B-80DB-DDFAFF77C748}
+		{E1F2B414-D9E4-4789-8138-3F9DA076FFB6} = {3D0A6C71-4B96-411B-80DB-DDFAFF77C748}
+		{860546C8-60D4-4C11-A1E1-3102969F5E47} = {3D0A6C71-4B96-411B-80DB-DDFAFF77C748}
+		{E0BF8169-5AB4-4F07-A166-98FE48125359} = {3D0A6C71-4B96-411B-80DB-DDFAFF77C748}
+		{83836640-31A6-4EDA-AE80-BC926E6B29EC} = {3D0A6C71-4B96-411B-80DB-DDFAFF77C748}
+		{6A17BD0C-8643-4684-BC3F-9E378A467605} = {3D0A6C71-4B96-411B-80DB-DDFAFF77C748}
+		{2248A649-6CA4-4A1A-8BC3-34257238B560} = {3D0A6C71-4B96-411B-80DB-DDFAFF77C748}
+		{807C6ACA-1C4B-4AC4-A60C-1FE6B9AB38AC} = {D3E5E9EF-DE26-41BF-A239-3241B5B5FD89}
+		{9323DC40-29B4-4438-AAD7-C4D4069C072B} = {5BA4A8FA-F7F4-45B3-AEC8-8886D35AAC79}
+		{73BBB1E3-AEEC-44E8-83D7-6DD9CD687FE3} = {9323DC40-29B4-4438-AAD7-C4D4069C072B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D4B5CEAA-7D70-4FCB-A68E-B03FBE5E0E5E}