diff --git a/src/core/data_verificator.py b/src/core/data_verificator.py
index a63a927..d99e703 100644
--- a/src/core/data_verificator.py
+++ b/src/core/data_verificator.py
@@ -8,6 +8,7 @@
 
 
 class DataVerificator:
+    @staticmethod
     def CheckOptionName(name: str):
         if name is None:
             RaiseError.OptionNameIsNone()
@@ -24,6 +25,7 @@ def CheckOptionName(name: str):
     sm_InvalidCommentSymbols: str = "\n\r\0"
 
     # --------------------------------------------------------------------
+    @staticmethod
     def IsValidCommentText(text: str) -> bool:
         assert text is not None
         assert type(text) is str
@@ -37,6 +39,7 @@ def IsValidCommentText(text: str) -> bool:
         return True
 
     # --------------------------------------------------------------------
+    @staticmethod
     def CheckCommentText(text: str):
         assert text is not None
         assert type(text) is str
@@ -49,6 +52,7 @@ def CheckCommentText(text: str):
         # OK
 
     # --------------------------------------------------------------------
+    @staticmethod
     def CheckStringOfFilePath(text: str):
         assert text is not None
         assert type(text) is str
diff --git a/src/implementation/v00/configuration_base.py b/src/implementation/v00/configuration_base.py
index 6d590d7..7ec77c7 100644
--- a/src/implementation/v00/configuration_base.py
+++ b/src/implementation/v00/configuration_base.py
@@ -1069,6 +1069,7 @@ def __init__(
         self.m_EventID = eventID
 
     # ---------------------------------------------------------------------
+    @staticmethod
     def Create__OptWasUpdated(
         cfg: PostgresConfiguration_Base, optData: PgCfgModel__OptionData
     ) -> PostgresConfigurationSetOptionValueResult_Base:
@@ -1081,6 +1082,7 @@ def Create__OptWasUpdated(
         )
 
     # ---------------------------------------------------------------------
+    @staticmethod
     def Create__OptWasAdded(
         cfg: PostgresConfiguration_Base, optData: PgCfgModel__OptionData
     ) -> PostgresConfigurationSetOptionValueResult_Base:
@@ -1093,12 +1095,14 @@ def Create__OptWasAdded(
         )
 
     # ---------------------------------------------------------------------
+    @staticmethod
     def Create__OptWasDeleted() -> PostgresConfigurationSetOptionValueResult_Base:
         return __class__(
             None, None, PostgresConfigurationSetOptionValueEventID.OPTION_WAS_DELETED
         )
 
     # ---------------------------------------------------------------------
+    @staticmethod
     def Create__OptValueItemWasAlreadyDefined(
         cfg: PostgresConfiguration_Base, optData: PgCfgModel__OptionData
     ) -> PostgresConfigurationSetOptionValueResult_Base:
@@ -1113,6 +1117,7 @@ def Create__OptValueItemWasAlreadyDefined(
         )
 
     # ---------------------------------------------------------------------
+    @staticmethod
     def Create__OptValueItemWasAdded(
         cfg: PostgresConfiguration_Base, optData: PgCfgModel__OptionData
     ) -> PostgresConfigurationSetOptionValueResult_Base:
@@ -2994,6 +2999,7 @@ def Helper__FinalRegSimpleOptionValue__File(
         return result
 
     # --------------------------------------------------------------------
+    @staticmethod
     def Helper__DoesOptionValueAlreadyHaveThisUniqueItem(
         optionData: PgCfgModel__OptionData, optionValueItem: typing.Any
     ) -> bool:
@@ -3030,6 +3036,7 @@ def Debug__CheckOurObjectData(self, data: PgCfgModel__ObjectData):
 
 
 class PostgresConfigurationFactory_Base:
+    @staticmethod
     def GetObject(
         cfg: PostgresConfiguration_Base, objectData: PgCfgModel__ObjectData
     ) -> PostgresConfigurationObject:
@@ -3075,6 +3082,7 @@ def GetObject(
         return cfgObject
 
     # --------------------------------------------------------------------
+    @staticmethod
     def Helper__CreateObject(
         cfg: PostgresConfiguration_Base,
         objectData: PgCfgModel__ObjectData,
@@ -3107,6 +3115,7 @@ def Helper__CreateObject(
         BugCheckError.UnkObjectDataType(typeOfObjectData)
 
     # --------------------------------------------------------------------
+    @staticmethod
     def Helper__CreateFile(
         objectData: PgCfgModel__FileData,
         objectParent: PostgresConfigurationObject,
@@ -3124,6 +3133,7 @@ def Helper__CreateFile(
         RaiseError.MethodIsNotImplemented(__class__, "Helper__CreateFile")
 
     # --------------------------------------------------------------------
+    @staticmethod
     def Helper__CreateFileLine(
         objectData: PgCfgModel__FileLineData,
         objectParent: PostgresConfigurationObject,
@@ -3136,6 +3146,7 @@ def Helper__CreateFileLine(
         return PostgresConfigurationFileLine_Base(objectParent, objectData)
 
     # --------------------------------------------------------------------
+    @staticmethod
     def Helper__CreateFileLineComment(
         fileLineDataItem: PgCfgModel__FileLineData.tagItem,
         fileLine: PostgresConfigurationObject,
@@ -3148,6 +3159,7 @@ def Helper__CreateFileLineComment(
         return PostgresConfigurationComment_Base(fileLine, fileLineDataItem)
 
     # --------------------------------------------------------------------
+    @staticmethod
     def Helper__CreateOption(
         objectData: PgCfgModel__OptionData,
         objectParent: PostgresConfigurationObject,
@@ -3165,6 +3177,7 @@ def Helper__CreateOption(
 
 
 class PostgresConfigurationReader_Base:
+    @staticmethod
     def LoadConfigurationFile(
         cfg: PostgresConfiguration_Base, filePath: str
     ) -> PostgresConfigurationTopLevelFile_Base:
@@ -3329,6 +3342,7 @@ def Helper__LoadFileContent(
             __class__.Helper__ProcessLineData(file, lineReader)
 
     # --------------------------------------------------------------------
+    @staticmethod
     def Helper__ProcessLineData(
         file: PostgresConfigurationFile_Base, lineReader: ReadUtils__LineReader
     ):
@@ -3405,6 +3419,7 @@ def Helper__ProcessLineData(
             )
 
     # --------------------------------------------------------------------
+    @staticmethod
     def Helper__ProcessLineData__Comment(
         fileLine: PostgresConfigurationFileLine_Base, lineReader: ReadUtils__LineReader
     ):
@@ -3430,6 +3445,7 @@ def Helper__ProcessLineData__Comment(
         fileLine.AddComment(commentText, commentOffset)
 
     # --------------------------------------------------------------------
+    @staticmethod
     def Helper__ProcessLineData__Include(
         fileLine: PostgresConfigurationFileLine_Base,
         lineReader: ReadUtils__LineReader,
@@ -3554,6 +3570,7 @@ def Helper__ProcessLineData__Include(
         fileLine.AddInclude(filePath, includeOffset)
 
     # --------------------------------------------------------------------
+    @staticmethod
     def Helper__ProcessLineData__Option(
         fileLine: PostgresConfigurationFileLine_Base,
         lineReader: ReadUtils__LineReader,
@@ -3616,6 +3633,7 @@ def Helper__ProcessLineData__Option(
             )
 
     # --------------------------------------------------------------------
+    @staticmethod
     def Helper__ProcessLineData__Option__Quoted(
         fileLine: PostgresConfigurationFileLine_Base,
         lineReader: ReadUtils__LineReader,
@@ -3719,6 +3737,7 @@ def Helper__ProcessLineData__Option__Quoted(
         fileLine.AddOption(optionName, optionValue, optionOffset)
 
     # --------------------------------------------------------------------
+    @staticmethod
     def Helper__ProcessLineData__Option__Generic(
         fileLine: PostgresConfigurationFileLine_Base,
         lineReader: ReadUtils__LineReader,
@@ -4234,6 +4253,7 @@ def Helper__IncludeToString(
 
 
 class PostgresConfigurationController__Base:
+    @staticmethod
     def AddOption(
         cfg: PostgresConfiguration_Base,
         target: typing.Union[None, PgCfgModel__FileData, PgCfgModel__FileLineData],
@@ -4277,6 +4297,7 @@ def AddOption(
         return option
 
     # --------------------------------------------------------------------
+    @staticmethod
     def SetOptionValue(
         cfg: PostgresConfiguration_Base,
         targetData: typing.Union[None, PgCfgModel__FileData, PgCfgModel__OptionData],
@@ -4325,6 +4346,7 @@ def SetOptionValue(
         return r
 
     # --------------------------------------------------------------------
+    @staticmethod
     def SetOptionValueItem(
         cfg: PostgresConfiguration_Base,
         targetData: typing.Union[None, PgCfgModel__FileData, PgCfgModel__OptionData],
@@ -4371,6 +4393,7 @@ def SetOptionValueItem(
         return r
 
     # --------------------------------------------------------------------
+    @staticmethod
     def GetOptionValue(
         cfg: PostgresConfiguration_Base,
         sourceData: typing.Union[None, PgCfgModel__FileData, PgCfgModel__OptionData],
@@ -4394,6 +4417,7 @@ def GetOptionValue(
         return r
 
     # Helper methods -----------------------------------------------------
+    @staticmethod
     def Helper__PrepareSetValue(
         cfg: PostgresConfiguration_Base, optionName: str, optionValue: typing.Any
     ) -> typing.Any:
@@ -4412,6 +4436,7 @@ def Helper__PrepareSetValue(
         return prepareHandler.PrepareSetValue(prepareCtx)
 
     # --------------------------------------------------------------------
+    @staticmethod
     def Helper__PrepareSetValueItem(
         cfg: PostgresConfiguration_Base, optionName: str, optionValueItem: typing.Any
     ) -> typing.Any:
diff --git a/src/implementation/v00/configuration_std.py b/src/implementation/v00/configuration_std.py
index e81a811..34829ee 100644
--- a/src/implementation/v00/configuration_std.py
+++ b/src/implementation/v00/configuration_std.py
@@ -509,6 +509,7 @@ def Helper__GetOptionHandlers(self, name: str) -> tagOptionHandlers:
 
 
 class PostgresConfigurationReader_Std:
+    @staticmethod
     def LoadConfiguration(cfg: PostgresConfiguration_Std) -> None:
         assert isinstance(cfg, PostgresConfiguration_Std)
 
@@ -526,6 +527,7 @@ def LoadConfiguration(cfg: PostgresConfiguration_Std) -> None:
 
 
 class PostgresConfigurationWriter_Std:
+    @staticmethod
     def WriteConfiguration(cfg: PostgresConfiguration_Std) -> None:
         assert isinstance(cfg, PostgresConfiguration_Std)