diff --git a/trio_paho_mqtt/client.py b/trio_paho_mqtt/client.py
index 209c2cd..f869847 100644
--- a/trio_paho_mqtt/client.py
+++ b/trio_paho_mqtt/client.py
@@ -5,12 +5,12 @@ from typing import Any, AsyncGenerator, Generator, List, Optional
 
 import paho.mqtt.client as mqtt
 import trio
+from paho.mqtt.client import MQTTMessage
 from paho.mqtt.properties import Properties
 from paho.mqtt.reasoncodes import ReasonCodes
 from trio import CancelScope, MemoryReceiveChannel, MemorySendChannel
 
-# TODO
-Message = Any
+Message = MQTTMessage
 
 
 class AsyncClient:
diff --git a/trio_paho_mqtt/py.typed b/trio_paho_mqtt/py.typed
new file mode 100644
index 0000000..e69de29