diff --git a/src/uuid/uuid.h b/src/uuid/uuid.h
index 4707378..1ee0686 100644
--- a/src/uuid/uuid.h
+++ b/src/uuid/uuid.h
@@ -20,6 +20,8 @@ struct WUUID {
 	Str8 uuid;
 };
 
+// TODO (Abdelrahman): Update UUID implementation to work properly with C++ and tests for validation
+
 #define wapp_uuid_gen_uuid4() *(wapp_uuid_init_uuid4(&wapp_uuid_create()))
 
 /* Low level UUID API */