diff --git a/pyuavcan/pyuavcan/dsdl/parser.py b/pyuavcan/pyuavcan/dsdl/parser.py
index 7a10c822ff..39f74fd449 100644
--- a/pyuavcan/pyuavcan/dsdl/parser.py
+++ b/pyuavcan/pyuavcan/dsdl/parser.py
@@ -22,8 +22,8 @@ except NameError:
     long = int
 
 MAX_FULL_TYPE_NAME_LEN = 80
-DATA_TYPE_ID_MAX = 1023
-MAX_DATA_STRUCT_LEN_BYTES = 439
+DATA_TYPE_ID_MAX = 2047         # TODO: different limits for messages and services
+MAX_DATA_STRUCT_LEN_BYTES = 439 # TODO: different limits for messages and services
 
 class Type:
     '''