diff --git a/aleph_message/models/__init__.py b/aleph_message/models/__init__.py
index e84adbe..f6d073b 100644
--- a/aleph_message/models/__init__.py
+++ b/aleph_message/models/__init__.py
@@ -11,11 +11,41 @@
 
 from .abstract import BaseContent
 from .base import Chain, HashType, MessageType
-from .execution.base import MachineType, Payment, PaymentType  # noqa
+from .execution.base import MachineType, Payment, PaymentType
 from .execution.instance import InstanceContent
 from .execution.program import ProgramContent
 from .item_hash import ItemHash, ItemType
 
+__all__ = [
+    "AggregateContent",
+    "AggregateMessage",
+    "AlephMessage",
+    "AlephMessageType",
+    "Chain",
+    "ChainRef",
+    "ExecutableContent",
+    "ExecutableMessage",
+    "ForgetContent",
+    "ForgetMessage",
+    "HashType",
+    "InstanceContent",
+    "InstanceMessage",
+    "ItemHash",
+    "ItemType",
+    "MachineType",
+    "MessageConfirmation",
+    "MessageConfirmationHash",
+    "MessageType",
+    "Payment",
+    "PaymentType",
+    "PostContent",
+    "PostMessage",
+    "ProgramContent",
+    "ProgramMessage",
+    "StoreContent",
+    "StoreMessage",
+]
+
 
 class MongodbId(BaseModel):
     """PyAleph returns an internal MongoDB id"""