diff --git a/ProjectTerms/Sdl.Community.ProjectTerms.Plugin/PluginResources.Designer.cs b/ProjectTerms/Sdl.Community.ProjectTerms.Plugin/PluginResources.Designer.cs
index bbc3bde0de..8e9fc45024 100644
--- a/ProjectTerms/Sdl.Community.ProjectTerms.Plugin/PluginResources.Designer.cs
+++ b/ProjectTerms/Sdl.Community.ProjectTerms.Plugin/PluginResources.Designer.cs
@@ -493,6 +493,16 @@ public static string TellMe_Provider_Results {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        public static byte[] termbaseDefaultDefinitionFile {
+            get {
+                object obj = ResourceManager.GetObject("termbaseDefaultDefinitionFile", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to projectTerms-sourcecloud.
         /// </summary>
diff --git a/ProjectTerms/Sdl.Community.ProjectTerms.Plugin/PluginResources.resx b/ProjectTerms/Sdl.Community.ProjectTerms.Plugin/PluginResources.resx
index 4160c4b070..859a1ab2b9 100644
--- a/ProjectTerms/Sdl.Community.ProjectTerms.Plugin/PluginResources.resx
+++ b/ProjectTerms/Sdl.Community.ProjectTerms.Plugin/PluginResources.resx
@@ -290,4 +290,7 @@ Restart Studio and now you should be able to generate the new termbase.</value>
   <data name="TellMe_Provider_Results" xml:space="preserve">
     <value>{0} results</value>
   </data>
+  <data name="termbaseDefaultDefinitionFile" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>resources\termbasedefaultdefinitionfile.xdt;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ProjectTerms/Sdl.Community.ProjectTerms.Plugin/Properties/launchSettings.json b/ProjectTerms/Sdl.Community.ProjectTerms.Plugin/Properties/launchSettings.json
index 41f8178fc3..636de940e0 100644
--- a/ProjectTerms/Sdl.Community.ProjectTerms.Plugin/Properties/launchSettings.json
+++ b/ProjectTerms/Sdl.Community.ProjectTerms.Plugin/Properties/launchSettings.json
@@ -3,6 +3,10 @@
     "Profile 1": {
       "commandName": "Executable",
       "executablePath": "C:\\Program Files (x86)\\Trados\\Trados Studio\\Studio17\\SDLTradosStudio.exe"
+    },
+    "SR1 Beta5": {
+      "commandName": "Executable",
+      "executablePath": "C:\\Program Files (x86)\\Trados\\Trados Studio\\Studio17Beta\\SDLTradosStudio.exe"
     }
   }
 }
\ No newline at end of file
diff --git a/ProjectTerms/Sdl.Community.ProjectTerms.Plugin/Sdl.Community.ProjectTerms.Plugin.csproj b/ProjectTerms/Sdl.Community.ProjectTerms.Plugin/Sdl.Community.ProjectTerms.Plugin.csproj
index 6ee8158c45..4de2a508cb 100644
--- a/ProjectTerms/Sdl.Community.ProjectTerms.Plugin/Sdl.Community.ProjectTerms.Plugin.csproj
+++ b/ProjectTerms/Sdl.Community.ProjectTerms.Plugin/Sdl.Community.ProjectTerms.Plugin.csproj
@@ -3,62 +3,69 @@
 	<PropertyGroup>
 		<TargetFramework>net48</TargetFramework>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+		<TradosFolder>$(MSBuildProgramFiles32)\Trados\Trados Studio\Studio17</TradosFolder>
 		<PluginDeploymentPath>$(AppData)\Trados\Trados Studio\17\Plugins</PluginDeploymentPath>
 		<CreatePluginPackage>true</CreatePluginPackage>
 	</PropertyGroup>
+	<ItemGroup>
+	  <None Remove="Resources\termbaseDefaultDefinitionFile.xdt" />
+	</ItemGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Sdl.Core.Globalization">
-      <HintPath>$(MSBuildProgramFiles32)\Trados\Trados Studio\Studio17\Sdl.Core.Globalization.dll</HintPath>
+      <HintPath>$(TradosFolder)\Sdl.Core.Globalization.dll</HintPath>
     </Reference>
+		<Reference Include="Sdl.Core.Globalization.Async">
+			<HintPath>$(TradosFolder)\Sdl.Core.Globalization.Async.dll</HintPath>
+		</Reference>
     <Reference Include="Sdl.Core.Settings">
-      <HintPath>$(MSBuildProgramFiles32)\Trados\Trados Studio\Studio17\Sdl.Core.Settings.dll</HintPath>
+      <HintPath>$(TradosFolder)\Sdl.Core.Settings.dll</HintPath>
     </Reference>
     <Reference Include="Sdl.Desktop.IntegrationApi">
-      <HintPath>$(MSBuildProgramFiles32)\Trados\Trados Studio\Studio17\Sdl.Desktop.IntegrationApi.dll</HintPath>
+      <HintPath>$(TradosFolder)\Sdl.Desktop.IntegrationApi.dll</HintPath>
     </Reference>
     <Reference Include="Sdl.Desktop.IntegrationApi.Extensions">
-      <HintPath>$(MSBuildProgramFiles32)\Trados\Trados Studio\Studio17\Sdl.Desktop.IntegrationApi.Extensions.dll</HintPath>
+      <HintPath>$(TradosFolder)\Sdl.Desktop.IntegrationApi.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="Sdl.Desktop.Platform">
-      <HintPath>$(MSBuildProgramFiles32)\Trados\Trados Studio\Studio17\Sdl.Desktop.Platform.dll</HintPath>
+      <HintPath>$(TradosFolder)\Sdl.Desktop.Platform.dll</HintPath>
     </Reference>
     <Reference Include="Sdl.FileTypeSupport.Framework.Core">
-      <HintPath>$(MSBuildProgramFiles32)\Trados\Trados Studio\Studio17\Sdl.FileTypeSupport.Framework.Core.dll</HintPath>
+      <HintPath>$(TradosFolder)\Sdl.FileTypeSupport.Framework.Core.dll</HintPath>
     </Reference>
     <Reference Include="Sdl.FileTypeSupport.Framework.Core.Utilities">
-      <HintPath>$(MSBuildProgramFiles32)\Trados\Trados Studio\Studio17\Sdl.FileTypeSupport.Framework.Core.Utilities.dll</HintPath>
+      <HintPath>$(TradosFolder)\Sdl.FileTypeSupport.Framework.Core.Utilities.dll</HintPath>
     </Reference>
     <Reference Include="Sdl.FileTypeSupport.Framework.Implementation">
-      <HintPath>$(MSBuildProgramFiles32)\Trados\Trados Studio\Studio17\Sdl.FileTypeSupport.Framework.Implementation.dll</HintPath>
+      <HintPath>$(TradosFolder)\Sdl.FileTypeSupport.Framework.Implementation.dll</HintPath>
     </Reference>
     <Reference Include="Sdl.MultiTerm.TMO.Interop">
-      <HintPath>$(MSBuildProgramFiles32)\Trados\Trados Studio\Studio17\Sdl.MultiTerm.TMO.Interop.dll</HintPath>
+      <HintPath>$(TradosFolder)\Sdl.MultiTerm.TMO.Interop.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Sdl.ProjectApi">
-      <HintPath>$(MSBuildProgramFiles32)\Trados\Trados Studio\Studio17\Sdl.ProjectApi.dll</HintPath>
+      <HintPath>$(TradosFolder)\Sdl.ProjectApi.dll</HintPath>
     </Reference>
     <Reference Include="Sdl.ProjectAutomation.AutomaticTasks">
-      <HintPath>$(MSBuildProgramFiles32)\Trados\Trados Studio\Studio17\Sdl.ProjectAutomation.AutomaticTasks.dll</HintPath>
+      <HintPath>$(TradosFolder)\Sdl.ProjectAutomation.AutomaticTasks.dll</HintPath>
     </Reference>
     <Reference Include="Sdl.ProjectAutomation.Core">
-      <HintPath>$(MSBuildProgramFiles32)\Trados\Trados Studio\Studio17\Sdl.ProjectAutomation.Core.dll</HintPath>
+      <HintPath>$(TradosFolder)\Sdl.ProjectAutomation.Core.dll</HintPath>
     </Reference>
     <Reference Include="Sdl.ProjectAutomation.FileBased">
-      <HintPath>$(MSBuildProgramFiles32)\Trados\Trados Studio\Studio17\Sdl.ProjectAutomation.FileBased.dll</HintPath>
+      <HintPath>$(TradosFolder)\Sdl.ProjectAutomation.FileBased.dll</HintPath>
     </Reference>
     <Reference Include="Sdl.ProjectAutomation.Settings">
-      <HintPath>$(MSBuildProgramFiles32)\Trados\Trados Studio\Studio17\Sdl.ProjectAutomation.Settings.dll</HintPath>
+      <HintPath>$(TradosFolder)\Sdl.ProjectAutomation.Settings.dll</HintPath>
     </Reference>
     <Reference Include="Sdl.TranslationStudio.Api">
-      <HintPath>$(MSBuildProgramFiles32)\Trados\Trados Studio\Studio17\Sdl.TranslationStudio.Api.dll</HintPath>
+      <HintPath>$(TradosFolder)\Sdl.TranslationStudio.Api.dll</HintPath>
     </Reference>
     <Reference Include="Sdl.TranslationStudioAutomation.IntegrationApi">
-      <HintPath>$(MSBuildProgramFiles32)\Trados\Trados Studio\Studio17\Sdl.TranslationStudioAutomation.IntegrationApi.dll</HintPath>
+      <HintPath>$(TradosFolder)\Sdl.TranslationStudioAutomation.IntegrationApi.dll</HintPath>
     </Reference>
 		<Reference Include="Sdl.TellMe.ProviderApi">
-			<HintPath>$(MSBuildProgramFiles32)\Trados\Trados Studio\Studio17\Sdl.TellMe.ProviderApi.dll</HintPath>
+			<HintPath>$(TradosFolder)\Sdl.TellMe.ProviderApi.dll</HintPath>
 		</Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -118,6 +125,9 @@
       <Version>6.0.0</Version>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\termbaseDefaultDefinitionFile.xdt" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Update="PluginResources.Designer.cs">
       <DesignTime>True</DesignTime>
diff --git a/ProjectTerms/Sdl.Community.ProjectTerms.Plugin/TermbaseIntegrationAction/TermbaseDefinitionFile.cs b/ProjectTerms/Sdl.Community.ProjectTerms.Plugin/TermbaseIntegrationAction/TermbaseDefinitionFile.cs
index 019563053d..b0dbb92c69 100644
--- a/ProjectTerms/Sdl.Community.ProjectTerms.Plugin/TermbaseIntegrationAction/TermbaseDefinitionFile.cs
+++ b/ProjectTerms/Sdl.Community.ProjectTerms.Plugin/TermbaseIntegrationAction/TermbaseDefinitionFile.cs
@@ -25,9 +25,9 @@ public static string GetResourceTextFile(string fileName)
 
 				var result = string.Empty;
 
-				using (Stream stream = typeof(TermbaseDefinitionFile).Assembly.GetManifestResourceStream("Sdl.Community.ProjectTerms.Plugin.Resources." + fileName))
+				using (var stream = new MemoryStream (PluginResources.termbaseDefaultDefinitionFile))
 				{
-					using (StreamReader sr = new StreamReader(stream))
+					using (var sr = new StreamReader(stream))
 					{
 						result = sr.ReadToEnd();
 					}
diff --git a/ProjectTerms/Sdl.Community.ProjectTerms.Plugin/TermbaseIntegrationAction/TermbaseGenerationAction.cs b/ProjectTerms/Sdl.Community.ProjectTerms.Plugin/TermbaseIntegrationAction/TermbaseGenerationAction.cs
index 809c3a0d33..d7efbfb2f3 100644
--- a/ProjectTerms/Sdl.Community.ProjectTerms.Plugin/TermbaseIntegrationAction/TermbaseGenerationAction.cs
+++ b/ProjectTerms/Sdl.Community.ProjectTerms.Plugin/TermbaseIntegrationAction/TermbaseGenerationAction.cs
@@ -6,6 +6,7 @@
 using Sdl.Community.ProjectTerms.Plugin.Exceptions;
 using Sdl.Community.ProjectTerms.Telemetry;
 using Sdl.Core.Globalization;
+using Sdl.Core.Globalization.LanguageRegistry;
 using Sdl.Desktop.IntegrationApi;
 using Sdl.Desktop.IntegrationApi.Extensions;
 using Sdl.MultiTerm.TMO.Interop;
@@ -138,7 +139,7 @@ private void IncludeTermbaseInStudio(TermbaseGeneration termbaseCreator, string
                 {
 	                foreach (var targetLanguage in targetLanguages.Keys)
 	                {
-		                termbaseConfig.LanguageIndexes.Add(new TermbaseLanguageIndex(new Language(CultureInfo.GetCultureInfo(targetLanguages[targetLanguage])), targetLanguage));
+		                termbaseConfig.LanguageIndexes.Add(new TermbaseLanguageIndex(LanguageRegistryApi.Instance.GetLanguage(CultureInfo.GetCultureInfo(targetLanguages[targetLanguage]).Name), targetLanguage));
 	                }
                 }
                 project.UpdateTermbaseConfiguration(termbaseConfig);