diff --git a/python/src/messages/__init__.py b/python/src/messages/__init__.py
index 358d0d738..8f8fe0f9f 100644
--- a/python/src/messages/__init__.py
+++ b/python/src/messages/__init__.py
@@ -1 +1,127 @@
-from .messages import *
+from .messages import (
+    Attachment,
+    Background,
+    Ci,
+    Comment,
+    ContentEncoding,
+    DataTable,
+    DocString,
+    Duration,
+    Envelope,
+    Examples,
+    ExceptionMessage,
+    ExpressionType,
+    Feature,
+    FeatureChild,
+    GherkinDocument,
+    Git,
+    Group,
+    Hook,
+    JavaMethod,
+    JavaStackTraceElement,
+    KeywordType,
+    Location,
+    MediaType,
+    Meta,
+    ParameterType,
+    ParseError,
+    Pickle,
+    PickleDocString,
+    PickleStep,
+    PickleStepArgument,
+    PickleTable,
+    PickleTableCell,
+    PickleTableRow,
+    PickleTag,
+    Product,
+    Rule,
+    RuleChild,
+    Scenario,
+    Source,
+    SourceReference,
+    Status,
+    Step,
+    StepDefinition,
+    StepDefinitionPattern,
+    StepMatchArgument,
+    StepMatchArgumentsList,
+    TableCell,
+    TableRow,
+    Tag,
+    TestCase,
+    TestCaseFinished,
+    TestCaseStarted,
+    TestRunFinished,
+    TestRunStarted,
+    TestStep,
+    TestStepFinished,
+    TestStepResult,
+    TestStepStarted,
+    Timestamp,
+    Type,
+    UndefinedParameterType,
+)
+
+__all__ = [
+    "ContentEncoding",
+    "MediaType",
+    "Source",
+    "Location",
+    "Comment",
+    "DocString",
+    "KeywordType",
+    "TableCell",
+    "TableRow",
+    "Tag",
+    "JavaMethod",
+    "JavaStackTraceElement",
+    "Git",
+    "Product",
+    "PickleDocString",
+    "Type",
+    "PickleTableCell",
+    "PickleTableRow",
+    "PickleTag",
+    "ExpressionType",
+    "StepDefinitionPattern",
+    "Group",
+    "StepMatchArgument",
+    "StepMatchArgumentsList",
+    "TestStep",
+    "Timestamp",
+    "TestCaseStarted",
+    "ExceptionMessage",
+    "TestRunStarted",
+    "Status",
+    "Duration",
+    "TestStepStarted",
+    "UndefinedParameterType",
+    "Attachment",
+    "DataTable",
+    "Examples",
+    "Step",
+    "SourceReference",
+    "Ci",
+    "ParameterType",
+    "ParseError",
+    "PickleTable",
+    "StepDefinition",
+    "TestCase",
+    "TestCaseFinished",
+    "TestRunFinished",
+    "TestStepResult",
+    "Background",
+    "Scenario",
+    "Hook",
+    "Meta",
+    "PickleStepArgument",
+    "TestStepFinished",
+    "RuleChild",
+    "PickleStep",
+    "Rule",
+    "Pickle",
+    "FeatureChild",
+    "Feature",
+    "GherkinDocument",
+    "Envelope",
+]