diff --git a/Apps.Crowdin/Apps.Crowdin.csproj b/Apps.Crowdin/Apps.Crowdin.csproj
index dea940d..b3c2bbd 100644
--- a/Apps.Crowdin/Apps.Crowdin.csproj
+++ b/Apps.Crowdin/Apps.Crowdin.csproj
@@ -5,11 +5,11 @@
     <Nullable>enable</Nullable>
     <Product>Crowdin</Product>
     <Description>Cloud-based solution that streamlines localization management</Description>
-    <Version>1.0.2</Version>
+    <Version>1.0.3</Version>
     <AssemblyName>Apps.Crowdin</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Blackbird.Applications.Sdk.Common" Version="2.3.2-alpha1" />
+    <PackageReference Include="Blackbird.Applications.Sdk.Common" Version="2.6.0" />
     <PackageReference Include="Blackbird.Applications.SDK.Extensions.FileManagement" Version="1.0.1" />
     <PackageReference Include="Blackbird.Applications.Sdk.Utils" Version="1.0.16" />
     <PackageReference Include="Crowdin.Api" Version="2.17.1" />
diff --git a/Apps.Crowdin/CrowdinApplication.cs b/Apps.Crowdin/CrowdinApplication.cs
index 88f7b64..15b6507 100644
--- a/Apps.Crowdin/CrowdinApplication.cs
+++ b/Apps.Crowdin/CrowdinApplication.cs
@@ -2,11 +2,18 @@
 using Blackbird.Applications.Sdk.Common;
 using Blackbird.Applications.Sdk.Common.Authentication.OAuth2;
 using Blackbird.Applications.Sdk.Common.Invocation;
+using Blackbird.Applications.Sdk.Common.Metadata;
 
 namespace Apps.Crowdin;
 
-public class CrowdinApplication : BaseInvocable, IApplication
+public class CrowdinApplication : BaseInvocable, IApplication, ICategoryProvider
 {
+    public IEnumerable<ApplicationCategory> Categories
+    {
+        get => [ApplicationCategory.CatAndTms];
+        set { }
+    }
+    
     public string Name
     {
         get => "Crowdin";
diff --git a/Apps.Crowdin/DataSourceHandlers/EnumHandlers/FileUpdateOptionHandler.cs b/Apps.Crowdin/DataSourceHandlers/EnumHandlers/FileUpdateOptionHandler.cs
index d821eb1..a3227b9 100644
--- a/Apps.Crowdin/DataSourceHandlers/EnumHandlers/FileUpdateOptionHandler.cs
+++ b/Apps.Crowdin/DataSourceHandlers/EnumHandlers/FileUpdateOptionHandler.cs
@@ -1,10 +1,10 @@
-using Blackbird.Applications.Sdk.Utils.Sdk.DataSourceHandlers;
+using Blackbird.Applications.Sdk.Common.Dictionaries;
 
 namespace Apps.Crowdin.DataSourceHandlers.EnumHandlers;
 
-public class FileUpdateOptionHandler : EnumDataHandler
+public class FileUpdateOptionHandler : IStaticDataSourceHandler
 {
-    protected override Dictionary<string, string> EnumValues => new()
+    public Dictionary<string, string> GetData() => new()
     {
         { "clear_translations_and_approvals", "Clear translations and approvals" },
         { "keep_translations", "Keep translations" },
diff --git a/Apps.Crowdin/DataSourceHandlers/EnumHandlers/IssueStatusHandler.cs b/Apps.Crowdin/DataSourceHandlers/EnumHandlers/IssueStatusHandler.cs
index 20428f7..7264d29 100644
--- a/Apps.Crowdin/DataSourceHandlers/EnumHandlers/IssueStatusHandler.cs
+++ b/Apps.Crowdin/DataSourceHandlers/EnumHandlers/IssueStatusHandler.cs
@@ -1,10 +1,10 @@
-using Blackbird.Applications.Sdk.Utils.Sdk.DataSourceHandlers;
+using Blackbird.Applications.Sdk.Common.Dictionaries;
 
 namespace Apps.Crowdin.DataSourceHandlers.EnumHandlers;
 
-public class IssueStatusHandler : EnumDataHandler
+public class IssueStatusHandler : IStaticDataSourceHandler
 {
-    protected override Dictionary<string, string> EnumValues => new()
+    public Dictionary<string, string> GetData() => new()
     {
         { "Resolved", "Resolved" },
         { "Unresolved", "Unresolved" },
diff --git a/Apps.Crowdin/DataSourceHandlers/EnumHandlers/IssueTypeHandler.cs b/Apps.Crowdin/DataSourceHandlers/EnumHandlers/IssueTypeHandler.cs
index 0ba57e8..fce1e7f 100644
--- a/Apps.Crowdin/DataSourceHandlers/EnumHandlers/IssueTypeHandler.cs
+++ b/Apps.Crowdin/DataSourceHandlers/EnumHandlers/IssueTypeHandler.cs
@@ -1,10 +1,10 @@
-using Blackbird.Applications.Sdk.Utils.Sdk.DataSourceHandlers;
+using Blackbird.Applications.Sdk.Common.Dictionaries;
 
 namespace Apps.Crowdin.DataSourceHandlers.EnumHandlers;
 
-public class IssueTypeHandler : EnumDataHandler
+public class IssueTypeHandler : IStaticDataSourceHandler
 {
-    protected override Dictionary<string, string> EnumValues => new()
+    public Dictionary<string, string> GetData() => new()
     {
         { "GeneralQuestion", "General question" },
         { "TranslationMistake", "Translation mistake" },
diff --git a/Apps.Crowdin/DataSourceHandlers/EnumHandlers/LanguageRecognitionProviderHandler.cs b/Apps.Crowdin/DataSourceHandlers/EnumHandlers/LanguageRecognitionProviderHandler.cs
index a0c715f..010ad11 100644
--- a/Apps.Crowdin/DataSourceHandlers/EnumHandlers/LanguageRecognitionProviderHandler.cs
+++ b/Apps.Crowdin/DataSourceHandlers/EnumHandlers/LanguageRecognitionProviderHandler.cs
@@ -1,10 +1,10 @@
-using Blackbird.Applications.Sdk.Utils.Sdk.DataSourceHandlers;
+using Blackbird.Applications.Sdk.Common.Dictionaries;
 
 namespace Apps.Crowdin.DataSourceHandlers.EnumHandlers;
 
-public class LanguageRecognitionProviderHandler : EnumDataHandler
+public class LanguageRecognitionProviderHandler : IStaticDataSourceHandler
 {
-    protected override Dictionary<string, string> EnumValues => new()
+    public Dictionary<string, string> GetData() => new()
     {
         { "Crowdin", "Crowdin" },
         { "Engine", "Engine" },
diff --git a/Apps.Crowdin/DataSourceHandlers/EnumHandlers/PluralCategoryNameHandler.cs b/Apps.Crowdin/DataSourceHandlers/EnumHandlers/PluralCategoryNameHandler.cs
index 673f6eb..9810048 100644
--- a/Apps.Crowdin/DataSourceHandlers/EnumHandlers/PluralCategoryNameHandler.cs
+++ b/Apps.Crowdin/DataSourceHandlers/EnumHandlers/PluralCategoryNameHandler.cs
@@ -1,10 +1,10 @@
-using Blackbird.Applications.Sdk.Utils.Sdk.DataSourceHandlers;
+using Blackbird.Applications.Sdk.Common.Dictionaries;
 
 namespace Apps.Crowdin.DataSourceHandlers.EnumHandlers;
 
-public class PluralCategoryNameHandler : EnumDataHandler
+public class PluralCategoryNameHandler : IStaticDataSourceHandler
 {
-    protected override Dictionary<string, string> EnumValues => new()
+    public Dictionary<string, string> GetData() => new()
     {
         { "Zero", "Zero" },
         { "One", "One" },
diff --git a/Apps.Crowdin/DataSourceHandlers/EnumHandlers/ProjectVisibilityHandler.cs b/Apps.Crowdin/DataSourceHandlers/EnumHandlers/ProjectVisibilityHandler.cs
index aff2795..4fe0447 100644
--- a/Apps.Crowdin/DataSourceHandlers/EnumHandlers/ProjectVisibilityHandler.cs
+++ b/Apps.Crowdin/DataSourceHandlers/EnumHandlers/ProjectVisibilityHandler.cs
@@ -1,10 +1,10 @@
-using Blackbird.Applications.Sdk.Utils.Sdk.DataSourceHandlers;
+using Blackbird.Applications.Sdk.Common.Dictionaries;
 
 namespace Apps.Crowdin.DataSourceHandlers.EnumHandlers;
 
-public class ProjectVisibilityHandler : EnumDataHandler
+public class ProjectVisibilityHandler : IStaticDataSourceHandler
 {
-    protected override Dictionary<string, string> EnumValues => new()
+    public Dictionary<string, string> GetData() => new()
     {
         { "Open", "Open" },
         { "Private", "Private" },
diff --git a/Apps.Crowdin/DataSourceHandlers/EnumHandlers/StringCommentTypeHandler.cs b/Apps.Crowdin/DataSourceHandlers/EnumHandlers/StringCommentTypeHandler.cs
index e4bd38a..b423e85 100644
--- a/Apps.Crowdin/DataSourceHandlers/EnumHandlers/StringCommentTypeHandler.cs
+++ b/Apps.Crowdin/DataSourceHandlers/EnumHandlers/StringCommentTypeHandler.cs
@@ -1,10 +1,10 @@
-using Blackbird.Applications.Sdk.Utils.Sdk.DataSourceHandlers;
+using Blackbird.Applications.Sdk.Common.Dictionaries;
 
 namespace Apps.Crowdin.DataSourceHandlers.EnumHandlers;
 
-public class StringCommentTypeHandler : EnumDataHandler
+public class StringCommentTypeHandler : IStaticDataSourceHandler
 {
-    protected override Dictionary<string, string> EnumValues => new()
+    public Dictionary<string, string> GetData() => new()
     {
         { "Comment", "Comment" },
         { "Issue", "Issue" },
diff --git a/Apps.Crowdin/DataSourceHandlers/EnumHandlers/StringScopeHandler.cs b/Apps.Crowdin/DataSourceHandlers/EnumHandlers/StringScopeHandler.cs
index 6518fc2..fc5be79 100644
--- a/Apps.Crowdin/DataSourceHandlers/EnumHandlers/StringScopeHandler.cs
+++ b/Apps.Crowdin/DataSourceHandlers/EnumHandlers/StringScopeHandler.cs
@@ -1,10 +1,10 @@
-using Blackbird.Applications.Sdk.Utils.Sdk.DataSourceHandlers;
+using Blackbird.Applications.Sdk.Common.Dictionaries;
 
 namespace Apps.Crowdin.DataSourceHandlers.EnumHandlers;
 
-public class StringScopeHandler : EnumDataHandler
+public class StringScopeHandler : IStaticDataSourceHandler
 {
-    protected override Dictionary<string, string> EnumValues => new()
+    public Dictionary<string, string> GetData() => new()
     {
         { "Identifier", "Identifier" },
         { "Text", "Text" },
diff --git a/Apps.Crowdin/DataSourceHandlers/EnumHandlers/TaskStatusHandler.cs b/Apps.Crowdin/DataSourceHandlers/EnumHandlers/TaskStatusHandler.cs
index 3a0d460..fceb682 100644
--- a/Apps.Crowdin/DataSourceHandlers/EnumHandlers/TaskStatusHandler.cs
+++ b/Apps.Crowdin/DataSourceHandlers/EnumHandlers/TaskStatusHandler.cs
@@ -1,14 +1,14 @@
-using Blackbird.Applications.Sdk.Utils.Sdk.DataSourceHandlers;
+using Blackbird.Applications.Sdk.Common.Dictionaries;
 
 namespace Apps.Crowdin.DataSourceHandlers.EnumHandlers;
 
-public class TaskStatusHandler : EnumDataHandler
+public class TaskStatusHandler : IStaticDataSourceHandler
 {
-    protected override Dictionary<string, string> EnumValues => new()
+    public Dictionary<string, string> GetData() => new()
     {
-        {"Todo", "To do"},
-        {"InProgress", "In progress"},
-        {"Done", "Done"},
-        {"Closed", "Closed"},
+        { "Todo", "To do" },
+        { "InProgress", "In progress" },
+        { "Done", "Done" },
+        { "Closed", "Closed" },
     };
 }
\ No newline at end of file
diff --git a/Apps.Crowdin/DataSourceHandlers/EnumHandlers/TaskTypeHandler.cs b/Apps.Crowdin/DataSourceHandlers/EnumHandlers/TaskTypeHandler.cs
index b2f2dba..c120c2e 100644
--- a/Apps.Crowdin/DataSourceHandlers/EnumHandlers/TaskTypeHandler.cs
+++ b/Apps.Crowdin/DataSourceHandlers/EnumHandlers/TaskTypeHandler.cs
@@ -1,10 +1,10 @@
-using Blackbird.Applications.Sdk.Utils.Sdk.DataSourceHandlers;
+using Blackbird.Applications.Sdk.Common.Dictionaries;
 
 namespace Apps.Crowdin.DataSourceHandlers.EnumHandlers;
 
-public class TaskTypeHandler : EnumDataHandler
+public class TaskTypeHandler : IStaticDataSourceHandler
 {
-    protected override Dictionary<string, string> EnumValues => new()
+    public Dictionary<string, string> GetData() => new()
     {
         { "Translate", "Translate" },
         { "Proofread", "Proofread" },
diff --git a/Apps.Crowdin/DataSourceHandlers/EnumHandlers/TmFileFormatHandler.cs b/Apps.Crowdin/DataSourceHandlers/EnumHandlers/TmFileFormatHandler.cs
index 1fb10ae..3505388 100644
--- a/Apps.Crowdin/DataSourceHandlers/EnumHandlers/TmFileFormatHandler.cs
+++ b/Apps.Crowdin/DataSourceHandlers/EnumHandlers/TmFileFormatHandler.cs
@@ -1,10 +1,10 @@
-using Blackbird.Applications.Sdk.Utils.Sdk.DataSourceHandlers;
+using Blackbird.Applications.Sdk.Common.Dictionaries;
 
 namespace Apps.Crowdin.DataSourceHandlers.EnumHandlers;
 
-public class TmFileFormatHandler : EnumDataHandler
+public class TmFileFormatHandler : IStaticDataSourceHandler
 {
-    protected override Dictionary<string, string> EnumValues => new()
+    public Dictionary<string, string> GetData() => new()
     {
         { "Tmx", "TMX" },
         { "Csv", "CSV" },
diff --git a/Apps.Crowdin/DataSourceHandlers/EnumHandlers/VendorDataHandler.cs b/Apps.Crowdin/DataSourceHandlers/EnumHandlers/VendorDataHandler.cs
index 2d0b932..130444c 100644
--- a/Apps.Crowdin/DataSourceHandlers/EnumHandlers/VendorDataHandler.cs
+++ b/Apps.Crowdin/DataSourceHandlers/EnumHandlers/VendorDataHandler.cs
@@ -1,10 +1,10 @@
-using Blackbird.Applications.Sdk.Utils.Sdk.DataSourceHandlers;
+using Blackbird.Applications.Sdk.Common.Dictionaries;
 
 namespace Apps.Crowdin.DataSourceHandlers.EnumHandlers;
 
-public class VendorDataHandler : EnumDataHandler
+public class VendorDataHandler : IStaticDataSourceHandler
 {
-    protected override Dictionary<string, string> EnumValues => new()
+    public Dictionary<string, string> GetData() => new()
     {
         { "crowdin_language_service", "Crowdin Language Services" },
         { "oht", "OneHourTranslation" },
diff --git a/Apps.Crowdin/Models/Request/Comments/AddNewCommentRequest.cs b/Apps.Crowdin/Models/Request/Comments/AddNewCommentRequest.cs
index 57a15c8..f71662f 100644
--- a/Apps.Crowdin/Models/Request/Comments/AddNewCommentRequest.cs
+++ b/Apps.Crowdin/Models/Request/Comments/AddNewCommentRequest.cs
@@ -2,6 +2,7 @@
 using Apps.Crowdin.DataSourceHandlers.EnumHandlers;
 using Apps.Crowdin.Models.Request.Project;
 using Blackbird.Applications.Sdk.Common;
+using Blackbird.Applications.Sdk.Common.Dictionaries;
 using Blackbird.Applications.Sdk.Common.Dynamic;
 
 namespace Apps.Crowdin.Models.Request.Comments;
@@ -16,10 +17,10 @@ public class AddNewCommentRequest : ProjectRequest
 
     public string Text { get; set; }
     
-    [DataSource(typeof(StringCommentTypeHandler))]
+    [StaticDataSource(typeof(StringCommentTypeHandler))]
     public string Type { get; set; }
 
     [Display("Issue type")] 
-    [DataSource(typeof(IssueTypeHandler))]
+    [StaticDataSource(typeof(IssueTypeHandler))]
     public string? IssueType { get; set; }
 }
\ No newline at end of file
diff --git a/Apps.Crowdin/Models/Request/Comments/ListCommentsRequest.cs b/Apps.Crowdin/Models/Request/Comments/ListCommentsRequest.cs
index 3678b25..a97000f 100644
--- a/Apps.Crowdin/Models/Request/Comments/ListCommentsRequest.cs
+++ b/Apps.Crowdin/Models/Request/Comments/ListCommentsRequest.cs
@@ -1,7 +1,7 @@
 using Apps.Crowdin.DataSourceHandlers.EnumHandlers;
 using Apps.Crowdin.Models.Request.Project;
 using Blackbird.Applications.Sdk.Common;
-using Blackbird.Applications.Sdk.Common.Dynamic;
+using Blackbird.Applications.Sdk.Common.Dictionaries;
 
 namespace Apps.Crowdin.Models.Request.Comments;
 
@@ -10,13 +10,13 @@ public class ListCommentsRequest : ProjectRequest
     [Display("String ID")]
     public string? StringId { get; set; }
     
-    [DataSource(typeof(StringCommentTypeHandler))]
+    [StaticDataSource(typeof(StringCommentTypeHandler))]
     public string? Type { get; set; }
     
     [Display("Issue types")]
     public IEnumerable<string>? IssueTypes { get; set; }
     
     [Display("Issue status")]
-    [DataSource(typeof(IssueStatusHandler))]
+    [StaticDataSource(typeof(IssueStatusHandler))]
     public string? IssueStatus { get; set; }
 }
\ No newline at end of file
diff --git a/Apps.Crowdin/Models/Request/File/AddOrUpdateFileRequest.cs b/Apps.Crowdin/Models/Request/File/AddOrUpdateFileRequest.cs
index 5ade512..14c3951 100644
--- a/Apps.Crowdin/Models/Request/File/AddOrUpdateFileRequest.cs
+++ b/Apps.Crowdin/Models/Request/File/AddOrUpdateFileRequest.cs
@@ -1,12 +1,12 @@
 using Apps.Crowdin.DataSourceHandlers.EnumHandlers;
 using Blackbird.Applications.Sdk.Common;
-using Blackbird.Applications.Sdk.Common.Dynamic;
+using Blackbird.Applications.Sdk.Common.Dictionaries;
 
 namespace Apps.Crowdin.Models.Request.File;
 
 public class AddOrUpdateFileRequest : AddNewFileRequest
 {
     [Display("Update option")]
-    [DataSource(typeof(FileUpdateOptionHandler))]
+    [StaticDataSource(typeof(FileUpdateOptionHandler))]
     public string? UpdateOption { get; set; }
 }
\ No newline at end of file
diff --git a/Apps.Crowdin/Models/Request/File/UpdateFileRequest.cs b/Apps.Crowdin/Models/Request/File/UpdateFileRequest.cs
index 7f4bf1c..15327d0 100644
--- a/Apps.Crowdin/Models/Request/File/UpdateFileRequest.cs
+++ b/Apps.Crowdin/Models/Request/File/UpdateFileRequest.cs
@@ -1,6 +1,6 @@
 using Apps.Crowdin.DataSourceHandlers.EnumHandlers;
 using Blackbird.Applications.Sdk.Common;
-using Blackbird.Applications.Sdk.Common.Dynamic;
+using Blackbird.Applications.Sdk.Common.Dictionaries;
 using Blackbird.Applications.Sdk.Common.Files;
 
 namespace Apps.Crowdin.Models.Request.File;
@@ -13,7 +13,7 @@ public class UpdateFileRequest
     public FileReference File { get; set; }
 
     [Display("Update option")]
-    [DataSource(typeof(FileUpdateOptionHandler))]
+    [StaticDataSource(typeof(FileUpdateOptionHandler))]
     public string? UpdateOption { get; set; }
 
 }
\ No newline at end of file
diff --git a/Apps.Crowdin/Models/Request/MachineTranslation/TranslateStringsRequest.cs b/Apps.Crowdin/Models/Request/MachineTranslation/TranslateStringsRequest.cs
index e85a604..2bb9f2c 100644
--- a/Apps.Crowdin/Models/Request/MachineTranslation/TranslateStringsRequest.cs
+++ b/Apps.Crowdin/Models/Request/MachineTranslation/TranslateStringsRequest.cs
@@ -1,6 +1,7 @@
 using Apps.Crowdin.DataSourceHandlers;
 using Apps.Crowdin.DataSourceHandlers.EnumHandlers;
 using Blackbird.Applications.Sdk.Common;
+using Blackbird.Applications.Sdk.Common.Dictionaries;
 using Blackbird.Applications.Sdk.Common.Dynamic;
 
 namespace Apps.Crowdin.Models.Request.MachineTranslation;
@@ -18,7 +19,7 @@ public class TranslateStringsRequest
     public IEnumerable<string> Text { get; set; }
     
     [Display("Language recognition provider")] 
-    [DataSource(typeof(LanguageRecognitionProviderHandler))]
+    [StaticDataSource(typeof(LanguageRecognitionProviderHandler))]
     public string LanguageRecognitionProvider { get; set; }
 
     
diff --git a/Apps.Crowdin/Models/Request/MachineTranslation/TranslateTextRequest.cs b/Apps.Crowdin/Models/Request/MachineTranslation/TranslateTextRequest.cs
index 68928a4..47a5afe 100644
--- a/Apps.Crowdin/Models/Request/MachineTranslation/TranslateTextRequest.cs
+++ b/Apps.Crowdin/Models/Request/MachineTranslation/TranslateTextRequest.cs
@@ -1,6 +1,7 @@
 using Apps.Crowdin.DataSourceHandlers;
 using Apps.Crowdin.DataSourceHandlers.EnumHandlers;
 using Blackbird.Applications.Sdk.Common;
+using Blackbird.Applications.Sdk.Common.Dictionaries;
 using Blackbird.Applications.Sdk.Common.Dynamic;
 
 namespace Apps.Crowdin.Models.Request.MachineTranslation;
@@ -18,6 +19,6 @@ public class TranslateTextRequest
     public string Text { get; set; }
     
     [Display("Language recognition provider")]
-    [DataSource(typeof(LanguageRecognitionProviderHandler))]
+    [StaticDataSource(typeof(LanguageRecognitionProviderHandler))]
     public string LanguageRecognitionProvider { get; set; }
 }
\ No newline at end of file
diff --git a/Apps.Crowdin/Models/Request/Project/AddNewProjectRequest.cs b/Apps.Crowdin/Models/Request/Project/AddNewProjectRequest.cs
index 53695bc..49a0af0 100644
--- a/Apps.Crowdin/Models/Request/Project/AddNewProjectRequest.cs
+++ b/Apps.Crowdin/Models/Request/Project/AddNewProjectRequest.cs
@@ -1,6 +1,7 @@
 using Apps.Crowdin.DataSourceHandlers;
 using Apps.Crowdin.DataSourceHandlers.EnumHandlers;
 using Blackbird.Applications.Sdk.Common;
+using Blackbird.Applications.Sdk.Common.Dictionaries;
 using Blackbird.Applications.Sdk.Common.Dynamic;
 
 namespace Apps.Crowdin.Models.Request.Project;
@@ -17,7 +18,7 @@ public class AddNewProjectRequest
 
     [Display("Target language IDs")] public IEnumerable<string>? TargetLanguageIds { get; set; }
     
-    [DataSource(typeof(ProjectVisibilityHandler))]
+    [StaticDataSource(typeof(ProjectVisibilityHandler))]
     public string? Visibility { get; set; }
     
     [Display("Custom domain name")]
diff --git a/Apps.Crowdin/Models/Request/SourceString/ListStringsRequest.cs b/Apps.Crowdin/Models/Request/SourceString/ListStringsRequest.cs
index 72f2c45..d5a260c 100644
--- a/Apps.Crowdin/Models/Request/SourceString/ListStringsRequest.cs
+++ b/Apps.Crowdin/Models/Request/SourceString/ListStringsRequest.cs
@@ -1,7 +1,7 @@
 using Apps.Crowdin.DataSourceHandlers.EnumHandlers;
 using Apps.Crowdin.Models.Request.Project;
 using Blackbird.Applications.Sdk.Common;
-using Blackbird.Applications.Sdk.Common.Dynamic;
+using Blackbird.Applications.Sdk.Common.Dictionaries;
 
 namespace Apps.Crowdin.Models.Request.SourceString;
 
@@ -20,6 +20,6 @@ public class ListStringsRequest : ProjectRequest
     public string? CroQl { get; set; }
     public string? Filter { get; set; }
     
-    [DataSource(typeof(StringScopeHandler))]
+    [StaticDataSource(typeof(StringScopeHandler))]
     public string? Scope { get; set; }
 }
\ No newline at end of file
diff --git a/Apps.Crowdin/Models/Request/Task/AddNewTaskRequest.cs b/Apps.Crowdin/Models/Request/Task/AddNewTaskRequest.cs
index d64d7bd..ba10655 100644
--- a/Apps.Crowdin/Models/Request/Task/AddNewTaskRequest.cs
+++ b/Apps.Crowdin/Models/Request/Task/AddNewTaskRequest.cs
@@ -1,6 +1,7 @@
 using Apps.Crowdin.DataSourceHandlers;
 using Apps.Crowdin.DataSourceHandlers.EnumHandlers;
 using Blackbird.Applications.Sdk.Common;
+using Blackbird.Applications.Sdk.Common.Dictionaries;
 using Blackbird.Applications.Sdk.Common.Dynamic;
 
 namespace Apps.Crowdin.Models.Request.Task;
@@ -16,15 +17,15 @@ public class AddNewTaskRequest
     [Display("File IDs")]
     public IEnumerable<string> FileIds { get; set; }
 
-    [DataSource(typeof(TaskTypeHandler))]
+    [StaticDataSource(typeof(TaskTypeHandler))]
     public string Type { get; set; }
 
-    [DataSource(typeof(TaskStatusHandler))]
+    [StaticDataSource(typeof(TaskStatusHandler))]
     public string? Status { get; set; }
 
     public string? Description { get; set; }
     
-    [DataSource(typeof(VendorDataHandler))]
+    [StaticDataSource(typeof(VendorDataHandler))]
     public string? Vendor { get; set; }
 
     [Display("Split files")]
diff --git a/Apps.Crowdin/Models/Request/Task/ListTasksRequest.cs b/Apps.Crowdin/Models/Request/Task/ListTasksRequest.cs
index 00fa047..c536777 100644
--- a/Apps.Crowdin/Models/Request/Task/ListTasksRequest.cs
+++ b/Apps.Crowdin/Models/Request/Task/ListTasksRequest.cs
@@ -1,13 +1,13 @@
 using Apps.Crowdin.DataSourceHandlers.EnumHandlers;
 using Apps.Crowdin.Models.Request.Project;
 using Blackbird.Applications.Sdk.Common;
-using Blackbird.Applications.Sdk.Common.Dynamic;
+using Blackbird.Applications.Sdk.Common.Dictionaries;
 
 namespace Apps.Crowdin.Models.Request.Task;
 
 public class ListTasksRequest : ProjectRequest
 {
-    [DataSource(typeof(TaskStatusHandler))]
+    [StaticDataSource(typeof(TaskStatusHandler))]
     public string? Status { get; set; }
     
     [Display("Assignee ID")]
diff --git a/Apps.Crowdin/Models/Request/Translation/AddNewTranslationRequest.cs b/Apps.Crowdin/Models/Request/Translation/AddNewTranslationRequest.cs
index 3a70aa2..3222a0f 100644
--- a/Apps.Crowdin/Models/Request/Translation/AddNewTranslationRequest.cs
+++ b/Apps.Crowdin/Models/Request/Translation/AddNewTranslationRequest.cs
@@ -2,6 +2,7 @@
 using Apps.Crowdin.DataSourceHandlers.EnumHandlers;
 using Apps.Crowdin.Models.Request.Project;
 using Blackbird.Applications.Sdk.Common;
+using Blackbird.Applications.Sdk.Common.Dictionaries;
 using Blackbird.Applications.Sdk.Common.Dynamic;
 
 namespace Apps.Crowdin.Models.Request.Translation;
@@ -16,6 +17,6 @@ public class AddNewTranslationRequest : ProjectRequest
     [Display("Text")] public string Text { get; set; }
     
     [Display("Plural category")]
-    [DataSource(typeof(PluralCategoryNameHandler))]
+    [StaticDataSource(typeof(PluralCategoryNameHandler))]
     public string? PluralCategoryName { get; set; }
 }
\ No newline at end of file
diff --git a/Apps.Crowdin/Models/Request/TranslationMemory/ExportTranslationMemoryRequest.cs b/Apps.Crowdin/Models/Request/TranslationMemory/ExportTranslationMemoryRequest.cs
index 9ccfa2a..b4382a8 100644
--- a/Apps.Crowdin/Models/Request/TranslationMemory/ExportTranslationMemoryRequest.cs
+++ b/Apps.Crowdin/Models/Request/TranslationMemory/ExportTranslationMemoryRequest.cs
@@ -1,6 +1,7 @@
 using Apps.Crowdin.DataSourceHandlers;
 using Apps.Crowdin.DataSourceHandlers.EnumHandlers;
 using Blackbird.Applications.Sdk.Common;
+using Blackbird.Applications.Sdk.Common.Dictionaries;
 using Blackbird.Applications.Sdk.Common.Dynamic;
 
 namespace Apps.Crowdin.Models.Request.TranslationMemory;
@@ -15,6 +16,6 @@ public class ExportTranslationMemoryRequest
     [DataSource(typeof(LanguagesDataHandler))]
     public string? TargetLanguageId { get; set; }
 
-    [DataSource(typeof(TmFileFormatHandler))]
+    [StaticDataSource(typeof(TmFileFormatHandler))]
     public string? Format { get; set; }
 }
\ No newline at end of file