diff --git a/src_main/piversion.h b/src_main/piversion.h
index c29432fe..ce8d88b1 100644
--- a/src_main/piversion.h
+++ b/src_main/piversion.h
@@ -3,7 +3,7 @@
 #define PIVERSION_H
 
 #define PIP_VERSION_MAJOR      1
-#define PIP_VERSION_MINOR      5
+#define PIP_VERSION_MINOR      6
 #define PIP_VERSION_REVISION   0
 #define PIP_VERSION_SUFFIX     ""
 
diff --git a/utils/code_model_generator/main.cpp b/utils/code_model_generator/main.cpp
index c43602ad..0a57b3ba 100755
--- a/utils/code_model_generator/main.cpp
+++ b/utils/code_model_generator/main.cpp
@@ -167,6 +167,8 @@ void writeClassStreamMembersOut(PIFile & f, const PICodeParser::Entity * e, int
 		if (is_union && m.isBitfield())
 			continue;
 		++cnt;
+		if (m.meta.contains("id"))
+			cnt = m.meta.value("id").toInt();
 		if (m.dims.isEmpty()) {
 			f << "\tcs << cs.chunk(" << cnt << ", ";
 			if (parser.isEnum(m.type))
@@ -203,6 +205,8 @@ void writeClassStreamMembersIn(PIFile & f, const PICodeParser::Entity * e, int &
 		if (is_union && m.isBitfield())
 			continue;
 		++cnt;
+		if (m.meta.contains("id"))
+			cnt = m.meta.value("id").toInt();
 		if (m.dims.isEmpty()) {
 			f << "\t\tcase " << cnt << ": cs.get(";
 			if (parser.isEnum(m.type))