diff --git a/BotSharp.Core/BotSharp.Core.csproj b/BotSharp.Core/BotSharp.Core.csproj
index 26cb7a13..f44780f3 100644
--- a/BotSharp.Core/BotSharp.Core.csproj
+++ b/BotSharp.Core/BotSharp.Core.csproj
@@ -45,7 +45,7 @@
 
   <ItemGroup>
     <PackageReference Include="DotNetToolkit" Version="1.6.0" />
-    <PackageReference Include="EntityFrameworkCore.BootKit" Version="1.9.0" />
+    <PackageReference Include="EntityFrameworkCore.BootKit" Version="1.9.1" />
     <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="2.1.1" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="RestSharp" Version="106.3.1" />
diff --git a/BotSharp.MachineLearning/BotSharp.MachineLearning.csproj b/BotSharp.MachineLearning/BotSharp.MachineLearning.csproj
index a5c52f3f..cd84aba4 100644
--- a/BotSharp.MachineLearning/BotSharp.MachineLearning.csproj
+++ b/BotSharp.MachineLearning/BotSharp.MachineLearning.csproj
@@ -5,6 +5,10 @@
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <Folder Include="Fasttext\" />
   </ItemGroup>
diff --git a/BotSharp.NLP/BotSharp.NLP.csproj b/BotSharp.NLP/BotSharp.NLP.csproj
index b078963b..a02151a5 100644
--- a/BotSharp.NLP/BotSharp.NLP.csproj
+++ b/BotSharp.NLP/BotSharp.NLP.csproj
@@ -17,6 +17,10 @@
     <PackageTags>BotSharp, NLP, NLU, POS, CRS, NER, LSTM, CRF</PackageTags>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\BotSharp.MachineLearning\BotSharp.MachineLearning.csproj" />
   </ItemGroup>
diff --git a/BotSharp.RestApi/BotSharp.RestApi.csproj b/BotSharp.RestApi/BotSharp.RestApi.csproj
index e5c46e32..db4f656b 100644
--- a/BotSharp.RestApi/BotSharp.RestApi.csproj
+++ b/BotSharp.RestApi/BotSharp.RestApi.csproj
@@ -20,7 +20,7 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DocumentationFile>bin\Debug\netcoreapp2.1\BotSharp.RestApi.xml</DocumentationFile>
-    <DefineConstants>TRACE;DEBUG;MODE_RASA</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;RASA_UI</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
diff --git a/BotSharp.RestApi/Rasa/ConfigController.cs b/BotSharp.RestApi/Rasa/ConfigController.cs
index f86be9f4..7e211523 100644
--- a/BotSharp.RestApi/Rasa/ConfigController.cs
+++ b/BotSharp.RestApi/Rasa/ConfigController.cs
@@ -6,7 +6,7 @@ using System.Text;
 
 namespace BotSharp.RestApi.Rasa
 {
-#if MODE_RASA
+#if RASA_UI
     [Route("[controller]")]
     public class ConfigController : ControllerBase
     {
diff --git a/BotSharp.RestApi/Rasa/ParseController.cs b/BotSharp.RestApi/Rasa/ParseController.cs
index a18cbffd..56ab6d1f 100644
--- a/BotSharp.RestApi/Rasa/ParseController.cs
+++ b/BotSharp.RestApi/Rasa/ParseController.cs
@@ -8,7 +8,7 @@ using System.Text;
 
 namespace BotSharp.RestApi.Rasa
 {
-#if MODE_RASA
+#if RASA_UI
     [Route("[controller]")]
     public class ParseController : ControllerBase
     {
diff --git a/BotSharp.RestApi/Rasa/StatusController.cs b/BotSharp.RestApi/Rasa/StatusController.cs
index f6b2617f..0c2d657c 100644
--- a/BotSharp.RestApi/Rasa/StatusController.cs
+++ b/BotSharp.RestApi/Rasa/StatusController.cs
@@ -6,7 +6,7 @@ using System.Text;
 
 namespace BotSharp.RestApi.Rasa
 {
-#if MODE_RASA
+#if RASA_UI
     [Route("[controller]")]
     public class StatusController : ControllerBase
     {
diff --git a/BotSharp.RestApi/Rasa/TrainController.cs b/BotSharp.RestApi/Rasa/TrainController.cs
index 14dcc349..d6353a23 100644
--- a/BotSharp.RestApi/Rasa/TrainController.cs
+++ b/BotSharp.RestApi/Rasa/TrainController.cs
@@ -13,7 +13,7 @@ using System.Threading.Tasks;
 
 namespace BotSharp.RestApi.Rasa
 {
-#if MODE_RASA
+#if RASA_UI
     [Route("[controller]")]
     public class TrainController : ControllerBase
     {
diff --git a/BotSharp.RestApi/Rasa/VersionController.cs b/BotSharp.RestApi/Rasa/VersionController.cs
index b3f86a0a..d4378765 100644
--- a/BotSharp.RestApi/Rasa/VersionController.cs
+++ b/BotSharp.RestApi/Rasa/VersionController.cs
@@ -5,7 +5,7 @@ using System.Text;
 
 namespace BotSharp.RestApi.Rasa
 {
-#if MODE_RASA
+#if RASA_UI
     [Route("[controller]")]
     public class VersionController : ControllerBase
     {