diff --git a/BExIS.Modules.RBM.UI.csproj b/BExIS.Modules.RBM.UI.csproj
index 64e50c5..7428c55 100644
--- a/BExIS.Modules.RBM.UI.csproj
+++ b/BExIS.Modules.RBM.UI.csproj
@@ -19,7 +19,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BExIS.Modules.RBM.UI</RootNamespace>
     <AssemblyName>BExIS.Modules.RBM.UI</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
     <UseIISExpress>true</UseIISExpress>
     <IISExpressSSLPort />
@@ -32,6 +32,7 @@
     <Use64BitIISExpress />
     <WebGreaseLibPath>..\..\..\..\packages\WebGrease.1.5.2\lib</WebGreaseLibPath>
     <TypeScriptToolsVersion>3.1</TypeScriptToolsVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -71,13 +72,17 @@
     <Reference Include="System.ComponentModel.Composition.registration" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Entity" />
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
     </Reference>
@@ -105,56 +110,14 @@
     <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
     </Reference>
-    <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Routing" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Web.Services" />
+    <Reference Include="System.Xml.Linq" />
     <Reference Include="Telerik.Web.Mvc">
       <HintPath>..\..\..\..\packages\TelerikMvcExtensions.2013.2.611\lib\net40\Telerik.Web.Mvc.dll</HintPath>
     </Reference>
-    <Reference Include="Vaiona.Core">
-      <HintPath>..\..\..\..\Libraries\Vaiona\Vaiona.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Vaiona.Entities">
-      <HintPath>..\..\..\..\Libraries\Vaiona\Vaiona.Entities.dll</HintPath>
-    </Reference>
-    <Reference Include="Vaiona.Entities.Orm.NH">
-      <HintPath>..\..\..\..\Libraries\Vaiona\Vaiona.Entities.Orm.NH.dll</HintPath>
-    </Reference>
-    <Reference Include="Vaiona.IoC">
-      <HintPath>..\..\..\..\Libraries\Vaiona\Vaiona.IoC.dll</HintPath>
-    </Reference>
-    <Reference Include="Vaiona.Logging">
-      <HintPath>..\..\..\..\Libraries\Vaiona\Vaiona.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Vaiona.Model">
-      <HintPath>..\..\..\..\Libraries\Vaiona\Vaiona.Model.dll</HintPath>
-    </Reference>
-    <Reference Include="Vaiona.MultiTenancy.Api">
-      <HintPath>..\..\..\..\Libraries\Vaiona\Vaiona.MultiTenancy.Api.dll</HintPath>
-    </Reference>
-    <Reference Include="Vaiona.MultiTenancy.Services">
-      <HintPath>..\..\..\..\Libraries\Vaiona\Vaiona.MultiTenancy.Services.dll</HintPath>
-    </Reference>
-    <Reference Include="Vaiona.Persistence.Api">
-      <HintPath>..\..\..\..\Libraries\Vaiona\Vaiona.Persistence.Api.dll</HintPath>
-    </Reference>
-    <Reference Include="Vaiona.PersistenceProviders.NH">
-      <HintPath>..\..\..\..\Libraries\Vaiona\Vaiona.PersistenceProviders.NH.dll</HintPath>
-    </Reference>
-    <Reference Include="Vaiona.Utils">
-      <HintPath>..\..\..\..\Libraries\Vaiona\Vaiona.Utils.dll</HintPath>
-    </Reference>
-    <Reference Include="Vaiona.Web">
-      <HintPath>..\..\..\..\Libraries\Vaiona\Vaiona.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="Vaiona.Web.Mvc">
-      <HintPath>..\..\..\..\Libraries\Vaiona\Vaiona.Web.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="Vaiona.Web.Mvc.Modularity">
-      <HintPath>..\..\..\..\Libraries\Vaiona\Vaiona.Web.Mvc.Modularity.dll</HintPath>
-    </Reference>
     <Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\WebActivatorEx.2.2.0\lib\net40\WebActivatorEx.dll</HintPath>
     </Reference>
@@ -186,7 +149,6 @@
     <Compile Include="Helper\RbmSeedDataGenerator.cs" />
     <Compile Include="Helper\ResourceFilterHelper.cs" />
     <Compile Include="Helper\SendNotificationHelper.cs" />
-    <Compile Include="Helper\Settings.cs" />
     <Compile Include="Helper\StringHelper.cs" />
     <Compile Include="Helper\TimeHelper.cs" />
     <Compile Include="Helper\UserHelper.cs" />
@@ -668,6 +630,11 @@
     <Content Include="Views\Schedule\_showUsers.cshtml" />
     <Content Include="Views\Schedule\_similarResources.cshtml" />
     <Content Include="Views\Calendar\_treeFilterSchedules.cshtml" />
+    <Content Include="Rbm.Settings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <None Include="Properties\PublishProfiles\BexisServer_2030-testsite.pubxml" />
+    <None Include="Properties\PublishProfiles\BexisServer_v4-ProdTestsite.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <None Include="Properties\Settings.settings">
       <Generator>PublicSettingsSingleFileGenerator</Generator>
@@ -705,11 +672,11 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Components\AAA\BExIS.Security.Entities\BExIS.Security.Entities.csproj">
-      <Project>{C230693B-D780-438B-B26C-82257642DD5C}</Project>
+      <Project>{c230693b-d780-438b-b26c-82257642dd5c}</Project>
       <Name>BExIS.Security.Entities</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Components\AAA\BExIS.Security.Services\BExIS.Security.Services.csproj">
-      <Project>{681C8BC4-55F0-4F43-A685-90E246A88CB1}</Project>
+      <Project>{681c8bc4-55f0-4f43-a685-90e246a88cb1}</Project>
       <Name>BExIS.Security.Services</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\Components\DLM\BExIS.Dlm.Entities\BExIS.Dlm.Entities.csproj">
@@ -720,6 +687,62 @@
       <Project>{C4CA0A99-0AF3-4372-A9B7-B9073599BD8B}</Project>
       <Name>BExIS.Dlm.Services</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Components\Vaiona\Vaiona.Core\Vaiona.Core.csproj">
+      <Project>{b446c14f-9df1-4c3c-a634-e3addd05c48a}</Project>
+      <Name>Vaiona.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Components\Vaiona\Vaiona.Entities.Orm.NH\Vaiona.Entities.Orm.NH.csproj">
+      <Project>{c4d4bc9e-8832-4966-be58-cb684e9a74e8}</Project>
+      <Name>Vaiona.Entities.Orm.NH</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Components\Vaiona\Vaiona.Entities\Vaiona.Entities.csproj">
+      <Project>{0815d220-3625-4e23-bbbc-8152345637fe}</Project>
+      <Name>Vaiona.Entities</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Components\Vaiona\Vaiona.IoC\Vaiona.IoC.csproj">
+      <Project>{29a7be0f-a17c-4ae8-8ca1-15fe4dd74129}</Project>
+      <Name>Vaiona.IoC</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Components\Vaiona\Vaiona.Logging\Vaiona.Logging.csproj">
+      <Project>{e8b37581-1cac-463d-903b-b4bee8b2b0e3}</Project>
+      <Name>Vaiona.Logging</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Components\Vaiona\Vaiona.Model\Vaiona.Model.csproj">
+      <Project>{a60ac05f-8c9a-4efd-9826-452e6049da4d}</Project>
+      <Name>Vaiona.Model</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Components\Vaiona\Vaiona.MultiTenancy.Api\Vaiona.MultiTenancy.Api.csproj">
+      <Project>{bccd3d7b-8a50-4fa2-b9d3-2cb31bea60b3}</Project>
+      <Name>Vaiona.MultiTenancy.Api</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Components\Vaiona\Vaiona.MultiTenancy.Services\Vaiona.MultiTenancy.Services.csproj">
+      <Project>{4639d130-e0aa-4aef-b9bd-bef6ad99dbaf}</Project>
+      <Name>Vaiona.MultiTenancy.Services</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Components\Vaiona\Vaiona.Persistence.Api\Vaiona.Persistence.Api.csproj">
+      <Project>{640bf81d-354a-4bf0-85fc-f0ad587cf8a2}</Project>
+      <Name>Vaiona.Persistence.Api</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Components\Vaiona\Vaiona.PersistenceProviders.NH\Vaiona.PersistenceProviders.NH.csproj">
+      <Project>{2fb8def8-5749-4eae-8588-8a5aaed251a5}</Project>
+      <Name>Vaiona.PersistenceProviders.NH</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Components\Vaiona\Vaiona.Utils\Vaiona.Utils.csproj">
+      <Project>{63fcacaa-9534-4fdd-a082-78dcc06baf28}</Project>
+      <Name>Vaiona.Utils</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Components\Vaiona\Vaiona.Web.Mvc.Modularity\Vaiona.Web.Mvc.Modularity.csproj">
+      <Project>{705f8751-e58a-453e-a7fd-0c310fd3cae8}</Project>
+      <Name>Vaiona.Web.Mvc.Modularity</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Components\Vaiona\Vaiona.Web.Mvc\Vaiona.Web.Mvc.csproj">
+      <Project>{5f5d22e8-8c05-49cd-854e-8fe8eff1aa6c}</Project>
+      <Name>Vaiona.Web.Mvc</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Components\Vaiona\Vaiona.Web\Vaiona.Web.csproj">
+      <Project>{5b48b5a8-eae8-4ef8-8f2c-7fedb1b095d3}</Project>
+      <Name>Vaiona.Web</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Components\XML\BExIS.Xml.Helpers\BExIS.Xml.Helpers.csproj">
       <Project>{252f7872-a69c-43a6-84b4-4d2abdbdd9ab}</Project>
       <Name>BExIS.Xml.Helpers</Name>
@@ -791,7 +814,8 @@
   </Target>
   <PropertyGroup>
     <PostBuildEvent>mkdir "$(SolutionDir)Console\Workspace\Modules\RBM"
-C:\Windows\System32\xcopy "$(ProjectDir)Rbm.Settings.xml" "$(SolutionDir)Console\Workspace\Modules\RBM" /C /Y /I</PostBuildEvent>
+C:\Windows\System32\xcopy "$(ProjectDir)Rbm.Settings.json" "$(SolutionDir)Console\Workspace\Modules\RBM" /C /Y /I
+		</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/BExIS.Rbm.Entities/BExIS.Rbm.Entities.csproj b/BExIS.Rbm.Entities/BExIS.Rbm.Entities.csproj
index 66fe22b..5a60b03 100644
--- a/BExIS.Rbm.Entities/BExIS.Rbm.Entities.csproj
+++ b/BExIS.Rbm.Entities/BExIS.Rbm.Entities.csproj
@@ -14,7 +14,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BExIS.Rbm.Entities</RootNamespace>
     <AssemblyName>BExIS.Rbm.Entities</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
@@ -52,9 +52,6 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="Vaiona.Entities">
-      <HintPath>..\..\..\..\..\Libraries\Vaiona\Vaiona.Entities.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BookingManagementTime\PeriodicTimeInstant.cs" />
@@ -98,6 +95,10 @@
       <Project>{b4e7b1bf-01b4-40af-8d19-b8f362167261}</Project>
       <Name>BExIS.Dlm.Entities</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\Components\Vaiona\Vaiona.Entities\Vaiona.Entities.csproj">
+      <Project>{0815d220-3625-4e23-bbbc-8152345637fe}</Project>
+      <Name>Vaiona.Entities</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/BExIS.Rbm.Orm.NH/BExIS.Rbm.Orm.NH.csproj b/BExIS.Rbm.Orm.NH/BExIS.Rbm.Orm.NH.csproj
index c264399..a92b881 100644
--- a/BExIS.Rbm.Orm.NH/BExIS.Rbm.Orm.NH.csproj
+++ b/BExIS.Rbm.Orm.NH/BExIS.Rbm.Orm.NH.csproj
@@ -14,7 +14,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BExIS.Rbm.Orm.NH</RootNamespace>
     <AssemblyName>BExIS.Rbm.Orm.NH</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
diff --git a/BExIS.Rbm.Services/BExIS.Rbm.Services.csproj b/BExIS.Rbm.Services/BExIS.Rbm.Services.csproj
index 647b763..a794f7e 100644
--- a/BExIS.Rbm.Services/BExIS.Rbm.Services.csproj
+++ b/BExIS.Rbm.Services/BExIS.Rbm.Services.csproj
@@ -14,7 +14,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BExIS.Rbm.Services</RootNamespace>
     <AssemblyName>BExIS.Rbm.Services</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
@@ -51,12 +51,6 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="Vaiona.Entities">
-      <HintPath>..\..\..\..\..\Libraries\Vaiona\Vaiona.Entities.dll</HintPath>
-    </Reference>
-    <Reference Include="Vaiona.Persistence.Api">
-      <HintPath>..\..\..\..\..\Libraries\Vaiona\Vaiona.Persistence.Api.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BookingManagementTime\TimeManager.cs" />
@@ -76,7 +70,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\..\Components\AAA\BExIS.Security.Entities\BExIS.Security.Entities.csproj">
-      <Project>{c230693b-d780-438b-b26c-82257642dd5c}</Project>
+      <Project>{C230693B-D780-438B-B26C-82257642DD5C}</Project>
       <Name>BExIS.Security.Entities</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\..\..\Components\AAA\BExIS.Security.Services\BExIS.Security.Services.csproj">
@@ -91,6 +85,14 @@
       <Project>{c4ca0a99-0af3-4372-a9b7-b9073599bd8b}</Project>
       <Name>BExIS.Dlm.Services</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\Components\Vaiona\Vaiona.Entities\Vaiona.Entities.csproj">
+      <Project>{0815d220-3625-4e23-bbbc-8152345637fe}</Project>
+      <Name>Vaiona.Entities</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\Components\Vaiona\Vaiona.Persistence.Api\Vaiona.Persistence.Api.csproj">
+      <Project>{640bf81d-354a-4bf0-85fc-f0ad587cf8a2}</Project>
+      <Name>Vaiona.Persistence.Api</Name>
+    </ProjectReference>
     <ProjectReference Include="..\BExIS.Rbm.Entities\BExIS.Rbm.Entities.csproj">
       <Project>{c9f05c1a-c8a0-47b1-a0da-50af41992767}</Project>
       <Name>BExIS.Rbm.Entities</Name>
diff --git a/BExIS.Rbm.Services/app.config b/BExIS.Rbm.Services/app.config
index f059d7b..0a55499 100644
--- a/BExIS.Rbm.Services/app.config
+++ b/BExIS.Rbm.Services/app.config
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+        <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
+        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.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" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/Controllers/ActivityController.cs b/Controllers/ActivityController.cs
index d8d35ea..3b487ee 100644
--- a/Controllers/ActivityController.cs
+++ b/Controllers/ActivityController.cs
@@ -42,8 +42,8 @@ public ActionResult Activity()
                     // temp.InUse = rManager.IsInEvent(a.Id);
 
                     // get permission from logged in user
-                    temp.EditAccess = permissionManager.HasEffectiveRight(userId, new List<long> { entityTypeId }, a.Id, RightType.Read);
-                    temp.DeleteAccess = permissionManager.HasEffectiveRight(userId, new List<long> { entityTypeId }, a.Id, RightType.Delete);
+                    temp.EditAccess = permissionManager.HasEffectiveRightsAsync(userId, entityTypeId, a.Id, RightType.Read).Result;
+                    temp.DeleteAccess = permissionManager.HasEffectiveRightsAsync(userId, entityTypeId, a.Id, RightType.Delete).Result;
 
                     model.Add(temp);
                 }
@@ -88,7 +88,7 @@ public ActionResult Create(ActivityModel model)
 
                         // 31 is the sum from all rights:  Read = 1, Write = 4, Delete = 8, Grant = 16
                         int rights = (int)RightType.Read + (int)RightType.Write + (int)RightType.Delete + (int)RightType.Grant;
-                        pManager.Create(user, entityType, a.Id, rights);
+                        //pManager.CreateAsync<Activity>(user.Name, entityType.Name, a.Id, rights);
 
                         // End -> add security ------------------------------------------
                     }
diff --git a/Controllers/NotificationController.cs b/Controllers/NotificationController.cs
index c361bd0..3fda902 100644
--- a/Controllers/NotificationController.cs
+++ b/Controllers/NotificationController.cs
@@ -20,6 +20,7 @@
 using BExIS.Security.Entities.Authorization;
 using BExIS.Modules.RBM.UI.Helper;
 using BExIS.Security.Services.Objects;
+using Vaiona.Web.Mvc.Modularity;
 
 namespace BExIS.Modules.RBM.UI.Controllers
 {
@@ -48,8 +49,8 @@ public ActionResult Notification()
                     NotificationModel temp = new NotificationModel(n);
 
                     //get permission from logged in user
-                    temp.EditAccess = permissionManager.HasEffectiveRight(userId, new List<long>() { entityTypeId }, n.Id, RightType.Write);
-                    temp.DeleteAccess = permissionManager.HasEffectiveRight(userId, new List<long>() { entityTypeId }, n.Id, RightType.Delete);
+                    temp.EditAccess = permissionManager.HasEffectiveRightsAsync(userId, entityTypeId, n.Id, RightType.Write).Result;
+                    temp.DeleteAccess = permissionManager.HasEffectiveRightsAsync(userId, entityTypeId, n.Id, RightType.Delete).Result;
 
                     model.Add(temp);
                 }
@@ -168,7 +169,8 @@ public ActionResult Save(EditNotificationModel model)
 
                         //get admin groups: format= "groupname:resource structure attribute value"
                         // give rights to group if fetch to notification
-                        string[] eventAdminGroups = Helper.Settings.get("EventAdminGroups").ToString().Split(',');
+                        var settings = ModuleManager.GetModuleSettings("rbm");
+                        string[] eventAdminGroups = settings.GetValueByKey("EventAdminGroups").ToString().Split(',');
                         Dictionary<string, string> adminGroupsDictionary = new Dictionary<string, string>();
                         if (eventAdminGroups != null && eventAdminGroups.Length > 0)
                         {
@@ -195,8 +197,8 @@ public ActionResult Save(EditNotificationModel model)
                                     var group = groupManager.FindByNameAsync(g).Result;
                                     if (group != null)
                                     {
-                                        if (pManager.GetRights(group.Id, entityType.Id, notification.Id) == 0)
-                                            pManager.Create(group.Id, entityType.Id, notification.Id, fullRights);
+                                        if (pManager.GetRightsAsync(group.Id, entityType.Id, notification.Id).Result == 0)
+                                            pManager.CreateAsync(group.Id, entityType.Id, notification.Id, fullRights);
                                     }
                                 }
                             }
@@ -206,8 +208,8 @@ public ActionResult Save(EditNotificationModel model)
                         using (var groupManager = new GroupManager())
                         {
                             var adminGroup = groupManager.FindByNameAsync("administrator").Result;
-                            if (pManager.GetRights(adminGroup.Id, entityType.Id, notification.Id) == 0)
-                                pManager.Create(adminGroup.Id, entityType.Id, notification.Id, fullRights);
+                            if (pManager.GetRightsAsync(adminGroup.Id, entityType.Id, notification.Id).Result == 0)
+                                pManager.CreateAsync(adminGroup.Id, entityType.Id, notification.Id, fullRights);
 
                         }
 
@@ -215,7 +217,7 @@ public ActionResult Save(EditNotificationModel model)
                          var userTask = userManager.FindByNameAsync(HttpContext.User.Identity.Name);
                          userTask.Wait();
                          var user = userTask.Result;
-                         pManager.Create(user, entityType, notification.Id, fullRights);
+                         pManager.CreateAsync(user, entityType, notification.Id, fullRights);
                         
 
                         //End -> add security ------------------------------------------
@@ -383,7 +385,7 @@ public ActionResult Delete(long id)
                 {
                     Type entityType = entityTypeManager.FindByName("Notification").EntityType;
                     //delete security 
-                    permissionManager.Delete(entityType, id);
+                    permissionManager.DeleteAsync (entityType, id);
                 }
             }
 
@@ -442,8 +444,8 @@ public ActionResult Notification_Select()
                     NotificationModel temp = new NotificationModel(n);
 
                     //get permission from logged in user
-                    temp.EditAccess = permissionManager.HasEffectiveRight(userId, new List<long>() { entityTypeId }, n.Id, RightType.Write);
-                    temp.DeleteAccess = permissionManager.HasEffectiveRight(userId, new List<long>() { entityTypeId }, n.Id, RightType.Delete);
+                    temp.EditAccess = permissionManager.HasEffectiveRightsAsync(userId, entityTypeId, n.Id, RightType.Write).Result;
+                    temp.DeleteAccess = permissionManager.HasEffectiveRightsAsync(userId, entityTypeId, n.Id, RightType.Delete).Result;
 
                     notifications.Add(temp);
                 }
diff --git a/Controllers/ResourceController.cs b/Controllers/ResourceController.cs
index 1d75a1a..6f902d4 100644
--- a/Controllers/ResourceController.cs
+++ b/Controllers/ResourceController.cs
@@ -63,8 +63,8 @@ public ActionResult Resource()
 
 
                     //get permission from logged in user
-                    temp.EditAccess = permissionManager.HasEffectiveRight(userId, new List<long>() { entity.Id }, r.Id, RightType.Write);
-                    temp.DeleteAccess = permissionManager.HasEffectiveRight(userId, new List<long>() { entity.Id }, r.Id, RightType.Delete);
+                    temp.EditAccess = permissionManager.HasEffectiveRightsAsync(userId, entity.Id, r.Id, RightType.Write).Result;
+                    temp.DeleteAccess = permissionManager.HasEffectiveRightsAsync(userId, entity.Id, r.Id, RightType.Delete).Result;
 
                     model.Add(temp);
                 }
@@ -244,7 +244,7 @@ public ActionResult Save()
 
                         //31 is the sum from all rights:  Read = 1,  Write = 4, Delete = 8, Grant = 16
                         int rights = (int)RightType.Read + (int)RightType.Write + (int)RightType.Delete + (int)RightType.Grant;
-                        pManager.Create(user, entityType, resource.Id, rights);
+                        pManager.CreateAsync(user, entityType, resource.Id, rights);
                     }
 
                     //End -> add security ------------------------------------------
@@ -649,7 +649,7 @@ public ActionResult Delete(long id)
                 {
                     Type entityType = entityTypeManager.FindByName("SingleResource").EntityType;
                     //delete security 
-                    permissionManager.Delete(entityType, id);
+                    permissionManager.DeleteAsync(entityType, id);
                 }
             }
 
diff --git a/Controllers/ResourceStructureController.cs b/Controllers/ResourceStructureController.cs
index b3b2a9e..21c251c 100644
--- a/Controllers/ResourceStructureController.cs
+++ b/Controllers/ResourceStructureController.cs
@@ -48,8 +48,8 @@ public ActionResult ResourceStructure()
                     temp.InUse = rsManager.IsResourceStructureInUse(rs.Id);
 
                     //get permission from logged in user
-                    temp.EditAccess = permissionManager.HasEffectiveRight(userId, new List<long>() { entityTypeId }, rs.Id, RightType.Write);
-                    temp.DeleteAccess = permissionManager.HasEffectiveRight(userId, new List<long>() { entityTypeId }, rs.Id, RightType.Delete);
+                    temp.EditAccess = permissionManager.HasEffectiveRightsAsync(userId, entityTypeId, rs.Id, RightType.Write).Result;
+                    temp.DeleteAccess = permissionManager.HasEffectiveRightsAsync(userId, entityTypeId, rs.Id, RightType.Delete).Result;
 
                     model.Add(temp);
                 }
@@ -90,7 +90,7 @@ public ActionResult Create(CreateResourceStructureModel model)
 
                     //31 is the sum from all rights:  Read = 1, Write = 4, Delete = 8, Grant = 16
                     int rights = (int)RightType.Read + (int)RightType.Write + (int)RightType.Delete + (int)RightType.Grant;
-                    pManager.Create(user, entityType, rS.Id, rights);
+                    pManager.CreateAsync(user, entityType, rS.Id, rights);
 
 
                     //End -> add security ------------------------------------------
@@ -218,7 +218,7 @@ public ActionResult Delete(long id)
                 {
                     Type entityType = entityTypeManager.FindByName("ResourceStructure").EntityType;
                     //delete security 
-                    permissionManager.Delete(entityType, id);
+                    permissionManager.DeleteAsync(entityType, id);
                 }
             }
 
@@ -299,8 +299,8 @@ public ActionResult ResourceStructureAttribute()
                     long entityTypeId = entityTypeManager.FindByName("ResourceStructureAttribute").Id;
 
                     //get permission from logged in user
-                    rsaModel.EditAccess = permissionManager.HasEffectiveRight(userId, new List<long>() { entityTypeId }, a.Id, RightType.Write);
-                    rsaModel.DeleteAccess = permissionManager.HasEffectiveRight(userId, new List<long>() { entityTypeId }, a.Id, RightType.Delete);
+                    rsaModel.EditAccess = permissionManager.HasEffectiveRightsAsync(userId, entityTypeId, a.Id, RightType.Write).Result;
+                    rsaModel.DeleteAccess = permissionManager.HasEffectiveRightsAsync(userId, entityTypeId, a.Id, RightType.Delete).Result;
                     model.Add(rsaModel);
                 }
             }
@@ -384,7 +384,7 @@ public ActionResult SaveResourceStructureAttribute(EditResourceStructureAttribut
 
                                 Entity entityType = entityTypeManager.FindByName("ResourceStructureAttribute");
 
-                                pManager.Create(user, entityType, rsa.Id, 31);
+                                pManager.CreateAsync(user, entityType, rsa.Id, 31);
                             }
 
                             //End -> add security ------------------------------------------
@@ -494,7 +494,7 @@ public ActionResult DeleteResourceStructureAttribute(long id)
                     {
                         Type entityType = entityTypeManager.FindByName("Notification").EntityType;
                         //delete security 
-                        permissionManager.Delete(entityType, id);
+                        permissionManager.DeleteAsync (entityType, id);
                     }
                 }
                 else
diff --git a/Controllers/ScheduleController.cs b/Controllers/ScheduleController.cs
index f45203a..6669141 100644
--- a/Controllers/ScheduleController.cs
+++ b/Controllers/ScheduleController.cs
@@ -32,6 +32,7 @@
 using BExIS.Modules.RBM.UI.Helper;
 using BExIS.Security.Services.Objects;
 using Vaiona.Persistence.Api;
+using Vaiona.Web.Mvc.Modularity;
 
 namespace BExIS.Modules.RBM.UI.Controllers
 {
@@ -748,7 +749,8 @@ public ActionResult SaveEvent()
                 if (ModelState.IsValid)
                 {
                     //get event admin groups: format= "groupname:resource structure attribute value"
-                    string[] eventAdminGroups = Helper.Settings.get("EventAdminGroups").ToString().Split(',');
+                    var settings = ModuleManager.GetModuleSettings("rbm");
+                    string[] eventAdminGroups = settings.GetValueByKey("EventAdminGroups").ToString().Split(',');
                     Dictionary<string, string> adminGroupsDictionary = new Dictionary<string, string>();
                     if (eventAdminGroups != null && eventAdminGroups.Length > 0)
                     {
@@ -825,8 +827,8 @@ public ActionResult SaveEvent()
                                         var group = groupManager.FindByNameAsync(g).Result;
                                         if (group != null)
                                         {
-                                            if (permissionManager.GetRights(group.Id, entityTypeEvent.Id, eEvent.Id) == 0)
-                                                permissionManager.Create(group.Id, entityTypeEvent.Id, eEvent.Id, fullRights);
+                                            if (permissionManager.GetRightsAsync(group.Id, entityTypeEvent.Id, eEvent.Id).Result == 0)
+                                                permissionManager.CreateAsync(group.Id, entityTypeEvent.Id, eEvent.Id, fullRights);
                                         }
                                     }
                                 }
@@ -835,8 +837,8 @@ public ActionResult SaveEvent()
                             //rights on event for logdedin user
                             var userIdLoggedIn = UserHelper.GetUserId(HttpContext.User.Identity.Name);
 
-                            if (permissionManager.GetRights(userIdLoggedIn, entityTypeEvent.Id, eEvent.Id) == 0)
-                                permissionManager.Create(userIdLoggedIn, entityTypeEvent.Id, eEvent.Id, fullRights);
+                            if (permissionManager.GetRightsAsync(userIdLoggedIn, entityTypeEvent.Id, eEvent.Id).Result == 0)
+                                permissionManager.CreateAsync(userIdLoggedIn, entityTypeEvent.Id, eEvent.Id, fullRights);
 
 
                             List<Notification> notifications = new List<Notification>();
@@ -920,8 +922,8 @@ public ActionResult SaveEvent()
                                         if (group != null)
                                         {
                                             //rights on schedule
-                                            if (permissionManager.GetRights(group.Id, entityTypeSchedule.Id, newSchedule.Id) == 0)
-                                                permissionManager.Create(group.Id, entityTypeSchedule.Id, newSchedule.Id, fullRights);
+                                            if (permissionManager.GetRightsAsync(group.Id, entityTypeSchedule.Id, newSchedule.Id).Result == 0)
+                                                permissionManager.CreateAsync(group.Id, entityTypeSchedule.Id, newSchedule.Id, fullRights);
                                         }
                                     }
                                 }
@@ -929,8 +931,8 @@ public ActionResult SaveEvent()
                                 //add rights to logged in user if not exsit
                                 //rights on schedule 31 is the sum from all rights:  Read = 1, Write = 4, Delete = 8, Grant = 16
 
-                                if (permissionManager.GetRights(userIdLoggedIn, entityTypeSchedule.Id, newSchedule.Id) == 0)
-                                    permissionManager.Create(userIdLoggedIn, entityTypeSchedule.Id, newSchedule.Id, fullRights);
+                                if (permissionManager.GetRightsAsync(userIdLoggedIn, entityTypeSchedule.Id, newSchedule.Id).Result == 0)
+                                    permissionManager.CreateAsync(userIdLoggedIn, entityTypeSchedule.Id, newSchedule.Id, fullRights);
 
                                 //Add rights to the schedule and event for all user reserved for
                                 foreach (PersonInSchedule user in schedule.ForPersons)
@@ -940,12 +942,12 @@ public ActionResult SaveEvent()
                                     {
                                         //rights on schedule 15 is the sum from this rights:  Read = 1, Download = 2, Write = 4, Delete = 8
                                         int schedulesRights = (int)RightType.Read + (int)RightType.Write + (int)RightType.Delete;
-                                        if (permissionManager.GetRights(us.Id, entityTypeSchedule.Id, newSchedule.Id) == 0)
-                                            permissionManager.Create(us.Id, entityTypeSchedule.Id, newSchedule.Id, schedulesRights);
+                                        if (permissionManager.GetRightsAsync(us.Id, entityTypeSchedule.Id, newSchedule.Id).Result == 0)
+                                            permissionManager.CreateAsync(us.Id, entityTypeSchedule.Id, newSchedule.Id, schedulesRights);
                                         //rights on event, Read = 1, Write = 4
                                         int eventRights = (int)RightType.Read + (int)RightType.Write;
-                                        if (permissionManager.GetRights(us.Id, entityTypeEvent.Id, eEvent.Id) == 0)
-                                            permissionManager.Create(us.Id, entityTypeEvent.Id, eEvent.Id, eventRights);
+                                        if (permissionManager.GetRightsAsync(us.Id, entityTypeEvent.Id, eEvent.Id).Result == 0)
+                                            permissionManager.CreateAsync(us.Id, entityTypeEvent.Id, eEvent.Id, eventRights);
                                     }
                                 }
                             }
@@ -1147,7 +1149,8 @@ public ActionResult ShowUsersInSchedule(string index)
                     User user = userManager.FindByNameAsync(HttpContext.User.Identity.Name).Result;
 
                     //get event admin groups: format= "groupname:resource structure attribute value"
-                    string[] eventAdminGroups = Helper.Settings.get("EventAdminGroups").ToString().Split(',');
+                    var settings = ModuleManager.GetModuleSettings("rbm");
+                    string[] eventAdminGroups = settings.GetValueByKey("EventAdminGroups").ToString().Split(',');
                     Dictionary<string, string> adminGroupsDictionary = new Dictionary<string, string>();
                     if (eventAdminGroups != null && eventAdminGroups.Length > 0)
                     {
@@ -1182,7 +1185,10 @@ public ActionResult LoadUsers(string index)
         {
             // retreive list of all users 
             DataTable result = null;
-            string groupName = Helper.Settings.get("AlumniGroup").ToString();
+
+            var settings = ModuleManager.GetModuleSettings("rbm");
+            string groupName = settings.GetValueByKey("AlumniGroup").ToString();
+
             var query = "SELECT partyid, userid FROM public.partyusers Left join users on partyusers.userid = users.id where users.id not in (select userref from users_groups where groupref = (SELECT id FROM groups WHERE name = '"+ groupName +"'))";
 
             result = retrieve(query);
@@ -1198,7 +1204,8 @@ public ActionResult LoadUsers(string index)
             using (UserManager userManager = new UserManager())
             {
                 //get party type where you store the first and-lastname of the persons
-                var accountPartyTypesStr = Helper.Settings.get("AccountPartyTypes");
+
+                var accountPartyTypesStr = settings.GetValueByKey("AccountPartyTypes");
                 var partyType = partyTypeManager.PartyTypes.Where(p => p.Title == accountPartyTypesStr.ToString()).FirstOrDefault();
 
                 //get all parties with person party type
@@ -1372,7 +1379,8 @@ public ActionResult ShowAllUsers(string scheduleIndex)
                 User user = userManager.FindByNameAsync(HttpContext.User.Identity.Name).Result;
 
                 //get event admin groups: format= "groupname:resource structure attribute value"
-                string[] eventAdminGroups = Helper.Settings.get("EventAdminGroups").ToString().Split(',');
+                var settings = ModuleManager.GetModuleSettings("rbm");
+                string[] eventAdminGroups = settings.GetValueByKey("EventAdminGroups").ToString().Split(',');
                 Dictionary<string, string> adminGroupsDictionary = new Dictionary<string, string>();
                 if (eventAdminGroups != null && eventAdminGroups.Length > 0)
                 {
@@ -1604,9 +1612,12 @@ public ActionResult UseValuesForAllSchedules(string index)
 
                     if(s.ResourceHasFiles)
                     {
-                        if(s.Files.FirstOrDefault().Name == tempSchedule.Files.FirstOrDefault().Name)
+                        if (tempSchedule.Files.Count > 0)
                         {
-                            s.FileConfirmation = true;
+                            if (s.Files.FirstOrDefault().Name == tempSchedule.Files.FirstOrDefault().Name)
+                            {
+                                s.FileConfirmation = true;
+                            }
                         }
                     }
                     
@@ -2090,14 +2101,14 @@ public ActionResult Show(long id)
 
                 //Check permission for BookingEvent
                 Entity entity = entityTypeManager.FindByName("BookingEvent");
-                model.EditAccess = permissionManager.HasEffectiveRight(userId, new List<long>() { entity.Id }, id, RightType.Write);
-                model.DeleteAccess = permissionManager.HasEffectiveRight(userId, new List<long>() { entity.Id }, id, RightType.Delete);
+                model.EditAccess = permissionManager.HasEffectiveRightsAsync(userId, entity.Id, id, RightType.Write).Result;
+                model.DeleteAccess = permissionManager.HasEffectiveRightsAsync(userId, entity.Id , id, RightType.Delete).Result;
 
 
                 //Check permission for Schedule
                 Entity entity2 = entityTypeManager.FindByName("Schedule");
-                model.Schedules.ForEach(a => a.EditAccess = permissionManager.HasEffectiveRight(userId, new List<long>() { entity2.Id }, a.ScheduleId, RightType.Write));
-                model.Schedules.ForEach(a => a.DeleteAccess = permissionManager.HasEffectiveRight(userId, new List<long>() { entity2.Id }, a.ScheduleId, RightType.Delete));
+                model.Schedules.ForEach(a => a.EditAccess = permissionManager.HasEffectiveRightsAsync(userId, entity2.Id, a.ScheduleId, RightType.Write).Result);
+                model.Schedules.ForEach(a => a.DeleteAccess = permissionManager.HasEffectiveRightsAsync(userId, entity2.Id , a.ScheduleId, RightType.Delete).Result);
 
                 //Set Edit access 
                 foreach (var s in model.Schedules)
@@ -2267,7 +2278,8 @@ private bool GetAvailableQuantity(string scheduleResourceName, long resourceId,
         {
             DateTime endDate = endDateUI;
             //get resourcename for specific validation
-            string overNightResourceName = Helper.Settings.get("OverNightResource").ToString();
+            var settings = ModuleManager.GetModuleSettings("rbm");
+            string overNightResourceName = settings.GetValueByKey("OverNightResource").ToString();
 
             //if there is a resource name in settings compair the settings name with the schedule resource
             bool daysCase = false;
diff --git a/Helper/RbmSeedDataGenerator.cs b/Helper/RbmSeedDataGenerator.cs
index c51c118..a3f663c 100644
--- a/Helper/RbmSeedDataGenerator.cs
+++ b/Helper/RbmSeedDataGenerator.cs
@@ -323,7 +323,7 @@ public void GenerateSeedData()
                         var resource = rManager.CreateResource(rs_item.name, rs_item.description, rs_item.quantity, rs_item.color, rs_item.withActivity, rs_item.resourceStructure, duration);
 
                         //add entity rights
-                        permissionManager.Create(adminGroup,
+                        permissionManager.CreateAsync (adminGroup,
                                        entityManager.FindByName("SingleResource"),
                                        resource.Id,
                                        rights
diff --git a/Helper/SendNotificationHelper.cs b/Helper/SendNotificationHelper.cs
index ff67d72..e2259c0 100644
--- a/Helper/SendNotificationHelper.cs
+++ b/Helper/SendNotificationHelper.cs
@@ -11,6 +11,7 @@
 using System.Web;
 using System.Web.Configuration;
 using Vaiona.Utils.Cfg;
+using Vaiona.Web.Mvc.Modularity;
 
 namespace BExIS.Web.Shell.Areas.RBM.Helpers
 {
@@ -29,8 +30,10 @@ public static void SendNotification(List<string> receiver, string message, strin
             List<string> receiverBCC = new List<string>();
             receiverBCC.Add(ConfigurationManager.AppSettings["SystemEmail"]);
 
-            var emailService = new EmailService();
-            emailService.Send(subject, message, receiver, null, receiverBCC, null);
+            using (var emailService = new EmailService())
+            {
+                emailService.Send(subject, message, receiver, null, receiverBCC, null);
+            }
         }
 
         /// <summary>
@@ -42,13 +45,14 @@ public static void SendNotification(List<string> receiver, string message, strin
         public static void SendBookingNotification(BookingAction bookingAction, BookingEventModel model)
         {
             //get receiver and sender from the settings file
-            var receiver = Modules.RBM.UI.Helper.Settings.get("BookingMailReceiver").ToString().Split(',').ToList();
-            var receiverCC = Modules.RBM.UI.Helper.Settings.get("BookingMailReceiverCC").ToString().Split(',').ToList();
-            var receiverBCC = Modules.RBM.UI.Helper.Settings.get("BookingMailReceiverBCC").ToString().Split(',').ToList();
+            var settings = ModuleManager.GetModuleSettings("rbm");
+            var receiver = settings.GetValueByKey("BookingMailReceiver").ToString().Split(',').ToList();
+            var receiverCC = settings.GetValueByKey("BookingMailReceiverCC").ToString().Split(',').ToList();
+            var receiverBCC = settings.GetValueByKey("BookingMailReceiverBCC").ToString().Split(',').ToList();
 
-            var sender = Modules.RBM.UI.Helper.Settings.get("BookingMailSender").ToString();
+            //var sender = Modules.RBM.UI.Helper.Settings.get("BookingMailSender").ToString();
 
-            var subject = Modules.RBM.UI.Helper.Settings.get("BookingMailSubject").ToString() + ": " + bookingAction;
+            var subject = settings.GetValueByKey("BookingMailSubject").ToString() + ": " + bookingAction;
 
             string message = "";
             message += "<p>The following booking has been " + bookingAction + "</p>";
@@ -92,14 +96,16 @@ public static void SendBookingNotification(BookingAction bookingAction, BookingE
 
             receiverBCC.Add(ConfigurationManager.AppSettings["SystemEmail"].ToString()); // Allways send BCC to SystemEmail 
 
-            var emailService = new EmailService();
-            emailService.Send(
-               subject,
-               message,
-               receiver.Distinct().ToList(), 
-               receiverCC, 
-               receiverBCC 
-               );
+            using (var emailService = new EmailService())
+            {
+                emailService.Send(
+                           subject,
+                           message,
+                           receiver.Distinct().ToList(),
+                           receiverCC,
+                           receiverBCC
+                           );
+            }
         }
 
     }
diff --git a/Helper/Settings.cs b/Helper/Settings.cs
deleted file mode 100644
index 65b74bd..0000000
--- a/Helper/Settings.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Web;
-using System.Xml;
-using System.Xml.Linq;
-using Vaiona.Utils.Cfg;
-
-namespace BExIS.Modules.RBM.UI.Helper
-{
-    static class Settings
-    {
-
-        private static String filePath = Path.Combine(AppConfiguration.GetModuleWorkspacePath("RBM"), "Rbm.settings.xml");
-        private static Dictionary<string, object> settings = new Dictionary<string, object>();
-
-        /// <summary>
-        /// setup settings model
-        /// * load settings from settings.xml
-        /// </summary>
-        static Settings()
-        {
-            // intial loading of settings
-            reloadSettings();
-
-            // set up file watcher to listen for changes
-            using (FileSystemWatcher fw = new FileSystemWatcher())
-            {
-                fw.Path = Path.GetDirectoryName(filePath);
-                fw.Filter = Path.GetFileName(filePath);
-                fw.Changed += new FileSystemEventHandler(fw_Changed);
-                fw.EnableRaisingEvents = true;
-            }
-
-        }
-
-        /// <summary>
-        /// retrieve a value from the settings file
-        /// </summary>
-        /// <param name="key">the key for the parameter</param>
-        /// <returns>the respective value</returns>
-        public static object get(String key)
-        {
-            if (settings.ContainsKey(key))
-            {
-                return settings[key];
-            }
-            else
-            {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// add or change an entry in the settings
-        /// TODO persist changes in workflow file
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="value"></param>
-        public static void set(String key, object value)
-        {
-            if (settings.ContainsKey(key))
-            {
-                settings[key] = value;
-            }
-            else
-            {
-                settings.Add(key, value);
-            }
-        }
-
-        /// <summary>
-        /// Handler to listen for changes in settings file
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private static void fw_Changed(object sender, FileSystemEventArgs e)
-        {
-            reloadSettings();
-        }
-
-        /// <summary>
-        /// load settings anew from settings.xml
-        /// </summary>
-        private static void reloadSettings()
-        {
-            // get XML data
-            XDocument xDoc = XDocument.Load(filePath);
-            XmlDocument xmlDoc = new XmlDocument();
-            xmlDoc.Load(xDoc.CreateReader());
-
-            // empty old settings list
-            settings.Clear();
-
-            // parse values
-            foreach (XmlNode node in xmlDoc.SelectNodes("//settings/entry"))
-            {
-                // shortcuts
-                var key = node.Attributes["key"] != null ? node.Attributes["key"].Value : null;
-                var value = node.Attributes["value"] != null ? node.Attributes["value"].Value : null;
-                var type = node.Attributes["type"] != null ? node.Attributes["type"].Value : null;
-
-                // only parse valid entries
-                if ((null == key) || (null == value))
-                {
-                    continue;
-                }
-
-                // convert types
-                switch (type)
-                {
-                    case "int":
-                        int intVal;
-                        if (Int32.TryParse(value, out intVal))
-                        {
-                            settings.Add(key, intVal);
-                        }
-                        else
-                        {
-                            settings.Add(key, value);
-                        }
-                        break;
-
-                    // default is string
-                    default:
-                        settings.Add(key, value);
-                        break;
-                }
-            }
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/Properties/PublishProfiles/BexisServer_2030-testsite.pubxml b/Properties/PublishProfiles/BexisServer_2030-testsite.pubxml
new file mode 100644
index 0000000..c2c9d94
--- /dev/null
+++ b/Properties/PublishProfiles/BexisServer_2030-testsite.pubxml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Diese Datei wird vom Veröffentlichungs-/Paketierungsprozess Ihres Webprojekts verwendet. Sie können das Verhalten dieses Prozesses anpassen,
+indem Sie diese MSBuild-Datei bearbeiten. Weitere Informationen hierzu finden Sie unter https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+    <PublishProvider>FileSystem</PublishProvider>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <publishUrl>C:\inetpub\wwwroot\2030-TestSite\Site\Areas\RBM</publishUrl>
+    <DeleteExistingFiles>False</DeleteExistingFiles>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Properties/PublishProfiles/BexisServer_v4-ProdTestsite.pubxml b/Properties/PublishProfiles/BexisServer_v4-ProdTestsite.pubxml
new file mode 100644
index 0000000..9eae323
--- /dev/null
+++ b/Properties/PublishProfiles/BexisServer_v4-ProdTestsite.pubxml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Diese Datei wird vom Veröffentlichungs-/Paketierungsprozess Ihres Webprojekts verwendet. Sie können das Verhalten dieses Prozesses anpassen,
+indem Sie diese MSBuild-Datei bearbeiten. Weitere Informationen hierzu finden Sie unter https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+    <PublishProvider>FileSystem</PublishProvider>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <publishUrl>C:\inetpub\wwwroot\v4-ProdTestsite\Site\Areas\RBM</publishUrl>
+    <DeleteExistingFiles>False</DeleteExistingFiles>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs
index 15bc822..783c503 100644
--- a/Properties/Settings.Designer.cs
+++ b/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace BExIS.Modules.RBM.UI.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.2.0.0")]
     public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/Rbm.Settings.json b/Rbm.Settings.json
new file mode 100644
index 0000000..1dc3971
--- /dev/null
+++ b/Rbm.Settings.json
@@ -0,0 +1,78 @@
+{
+  "id": "rbm",
+  "name": "Resource Booking",
+  "description": "...",
+  "entries": [
+    {
+      "key": "help",
+      "title": "Help URL",
+      "value": "",
+      "type": "String",
+      "description": "URL to the manual. If empty, it links to the latest manual from BEXIS2"
+    },
+    {
+      "key": "BookingMailReceiver",
+      "title": "Booking Mail Receiver",
+      "value": "",
+      "description": "",
+      "type": "String",
+      "options": []
+    },
+    {
+      "key": "BookingMailReceiverCC",
+      "title": "Booking Mail Receiver CC",
+      "value": "",
+      "description": "",
+      "type": "String",
+      "options": []
+    },
+    {
+      "key": "BookingMailReceiverBCC",
+      "title": "Booking Mail Receiver BCC",
+      "value": "",
+      "description": "",
+      "type": "String",
+      "options": []
+    },
+    {
+      "key": "BookingMailSubject",
+      "title": "Booking Mail Subject",
+      "value": "Fieldbook reservation",
+      "description": "",
+      "type": "String",
+      "options": []
+    },
+    {
+      "key": "AlumniGroup",
+      "title": "Alumni group",
+      "value": "alumni",
+      "description": "",
+      "type": "String",
+      "options": []
+    },
+    {
+      "key": "AccountPartyTypes",
+      "title": "Account party type",
+      "value": "Person",
+      "description": "Setting to define party type name",
+      "type": "String",
+      "options": []
+    },
+    {
+      "key": "EventAdminGroups",
+      "title": "Event admin groups",
+      "value": "FB_Edit_HAI:Hainich-Dün,FB_Edit_SCH:Schorfheide-Chorin,FB_Edit_ALB:Schwäbische Alb",
+      "description": "Setting admin group to edit and delete events and schedules, Groupname:resource attribute value so you are able to give different rights to group depending on the classification with resource attribute value",
+      "type": "String",
+      "options": []
+    },
+    {
+      "key": "OverNightResource",
+      "title": "Over night resource",
+      "value": "Sleeping place",
+      "description": "Setting to specify resource for specific validation.",
+      "type": "String",
+      "options": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/web.config b/web.config
index dac6552..e02c24c 100644
--- a/web.config
+++ b/web.config
@@ -1,130 +1,84 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <configuration>
-
+  <!--
+    Eine Beschreibung der Änderungen von 'web.config' finden Sie unter 'http://go.microsoft.com/fwlink/?LinkId=235367'.
+
+    Die folgenden Attribute können für die <httpRuntime>-Kennung festgelegt werden.
+      <system.Web>
+        <httpRuntime targetFramework="4.8" />
+      </system.Web>
+  -->
   <system.web>
-    <httpRuntime targetFramework="4.5.2" />
-
-    <compilation debug="true" targetFramework="4.5.2">
+    <httpRuntime targetFramework="4.5.2"/>
+    <compilation debug="true" targetFramework="4.8">
       <assemblies>
-        <add assembly="BExIS.Rbm.Entities, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
-        <add assembly="BExIS.Rbm.Services, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
+        <add assembly="BExIS.Rbm.Entities, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"/>
+        <add assembly="BExIS.Rbm.Services, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"/>
       </assemblies>
     </compilation>
   </system.web>
-<!--Setting for sending booking notifications-->
-  <appSettings>
-    <add key="BookingMailReceiver" value="eleonora.petzold@uni-jena.de" />
-    <add key="BookingMailReceiverCC" value="eleonora.petzold@uni-jena.de" />
-    <add key="BookingMailReceiverBCC" value="eleonora.petzold@uni-jena.de" />
-    <add key="BookingMailSender" value="Biodiversity Exploratories: Fieldbook create reservation" />
-
-    <add key="BookingMailSubject" value="" />
-  </appSettings>
-
   <runtime>
-
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-
       <dependentAssembly>
-
-        <assemblyIdentity name="Microsoft.Web.Helpers" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-
-        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-
+        <assemblyIdentity name="Microsoft.Web.Helpers" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
       </dependentAssembly>
-
       <dependentAssembly>
-
-        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
-
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0"/>
       </dependentAssembly>
-
       <dependentAssembly>
-
-        <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
-
+        <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0"/>
       </dependentAssembly>
-
       <dependentAssembly>
-
-        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
-
+        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0"/>
       </dependentAssembly>
-
       <dependentAssembly>
-
-        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-
-        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
-
+        <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0"/>
       </dependentAssembly>
-
       <dependentAssembly>
-
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
-
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0"/>
       </dependentAssembly>
-
       <dependentAssembly>
-
-        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
-
+        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
       </dependentAssembly>
-
       <dependentAssembly>
-
-        <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
-
-        <bindingRedirect oldVersion="0.0.0.0-3.4.1.9004" newVersion="3.4.1.9004" />
-
+        <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.4.1.9004" newVersion="3.4.1.9004"/>
       </dependentAssembly>
-
       <dependentAssembly>
-
-        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-
-        <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
-
+        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
       </dependentAssembly>
-
       <dependentAssembly>
-
-        <assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
-
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.4000" newVersion="4.1.0.4000" />
-
+        <assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.4000" newVersion="4.1.0.4000"/>
       </dependentAssembly>
-
     </assemblyBinding>
-
   </runtime>
-<system.webServer>
+  <system.webServer>
     <handlers>
-      <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
-      <remove name="OPTIONSVerbHandler" />
-      <remove name="TRACEVerbHandler" />
-      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
+      <remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
+      <remove name="OPTIONSVerbHandler"/>
+      <remove name="TRACEVerbHandler"/>
+      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/>
     </handlers>
-  </system.webServer></configuration>
+  </system.webServer>
+</configuration>
\ No newline at end of file