diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 9a3f502..73a76b4 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -4,7 +4,7 @@ set(PROJECT_NAME "SourcetrailDBCore")
 set(LIB_NAME "sourcetraildb")
 
 set(INTERFACE_VERSION 0)
-set(DATABASE_VERSION 21)
+set(DATABASE_VERSION 22)
 set(COMMIT_VERSION 1)
 set(VERSION_STRING "v${INTERFACE_VERSION}_db${DATABASE_VERSION}_c${COMMIT_VERSION}")
 
diff --git a/core/include/NodeKind.h b/core/include/NodeKind.h
index 94bf7c8..a897de8 100644
--- a/core/include/NodeKind.h
+++ b/core/include/NodeKind.h
@@ -27,24 +27,25 @@ namespace sourcetrail
 		NODE_UNKNOWN = 1 << 0,
 		NODE_TYPE = 1 << 1,
 		NODE_BUILTIN_TYPE = 1 << 2,
-		NODE_NAMESPACE = 1 << 3,
-		NODE_PACKAGE = 1 << 4,
-		NODE_STRUCT = 1 << 5,
-		NODE_CLASS = 1 << 6,
-		NODE_INTERFACE = 1 << 7,
-		NODE_ANNOTATION = 1 << 8,
-		NODE_GLOBAL_VARIABLE = 1 << 9,
-		NODE_FIELD = 1 << 10,
-		NODE_FUNCTION = 1 << 11,
-		NODE_METHOD = 1 << 12,
-		NODE_ENUM = 1 << 13,
-		NODE_ENUM_CONSTANT = 1 << 14,
-		NODE_TYPEDEF = 1 << 15,
-		NODE_TEMPLATE_PARAMETER = 1 << 16,
-		NODE_TYPE_PARAMETER = 1 << 17,
-		NODE_FILE = 1 << 18,
-		NODE_MACRO = 1 << 19,
-		NODE_UNION = 1 << 20,
+		NODE_MODULE = 1 << 3,
+		NODE_NAMESPACE = 1 << 4,
+		NODE_PACKAGE = 1 << 5,
+		NODE_STRUCT = 1 << 6,
+		NODE_CLASS = 1 << 7,
+		NODE_INTERFACE = 1 << 8,
+		NODE_ANNOTATION = 1 << 9,
+		NODE_GLOBAL_VARIABLE = 1 << 10,
+		NODE_FIELD = 1 << 11,
+		NODE_FUNCTION = 1 << 12,
+		NODE_METHOD = 1 << 13,
+		NODE_ENUM = 1 << 14,
+		NODE_ENUM_CONSTANT = 1 << 15,
+		NODE_TYPEDEF = 1 << 16,
+		NODE_TEMPLATE_PARAMETER = 1 << 17,
+		NODE_TYPE_PARAMETER = 1 << 18,
+		NODE_FILE = 1 << 19,
+		NODE_MACRO = 1 << 20,
+		NODE_UNION = 1 << 21
 	};
 
 	int nodeKindToInt(NodeKind v);
diff --git a/core/include/SymbolKind.h b/core/include/SymbolKind.h
index 6fd22db..d1bc5aa 100644
--- a/core/include/SymbolKind.h
+++ b/core/include/SymbolKind.h
@@ -28,6 +28,7 @@ namespace sourcetrail
 	{
 		SYMBOL_TYPE,
 		SYMBOL_BUILTIN_TYPE,
+		SYMBOL_MODULE,
 		SYMBOL_NAMESPACE,
 		SYMBOL_PACKAGE,
 		SYMBOL_STRUCT,
diff --git a/core/src/NodeKind.cpp b/core/src/NodeKind.cpp
index c658a2a..fb4b0eb 100644
--- a/core/src/NodeKind.cpp
+++ b/core/src/NodeKind.cpp
@@ -28,6 +28,7 @@ namespace sourcetrail
 		if (v == nodeKindToInt(NODE_UNKNOWN)) { return NODE_UNKNOWN; }
 		if (v == nodeKindToInt(NODE_TYPE)) { return NODE_TYPE; }
 		if (v == nodeKindToInt(NODE_BUILTIN_TYPE)) { return NODE_BUILTIN_TYPE; }
+		if (v == nodeKindToInt(NODE_MODULE)) { return NODE_MODULE; }
 		if (v == nodeKindToInt(NODE_NAMESPACE)) { return NODE_NAMESPACE; }
 		if (v == nodeKindToInt(NODE_PACKAGE)) { return NODE_PACKAGE; }
 		if (v == nodeKindToInt(NODE_STRUCT)) { return NODE_STRUCT; }
diff --git a/core/src/SymbolKind.cpp b/core/src/SymbolKind.cpp
index 5af5f26..243bf61 100644
--- a/core/src/SymbolKind.cpp
+++ b/core/src/SymbolKind.cpp
@@ -28,6 +28,8 @@ namespace sourcetrail
 			return NODE_TYPE;
 		case SYMBOL_BUILTIN_TYPE:
 			return NODE_BUILTIN_TYPE;
+		case SYMBOL_MODULE:
+			return NODE_MODULE;
 		case SYMBOL_NAMESPACE:
 			return NODE_NAMESPACE;
 		case SYMBOL_PACKAGE:
diff --git a/resources_swig/include/sourcetraildb.h b/resources_swig/include/sourcetraildb.h
index 7dc7c69..3fee721 100644
--- a/resources_swig/include/sourcetraildb.h
+++ b/resources_swig/include/sourcetraildb.h
@@ -13,6 +13,7 @@ enum SymbolKind
 {
 	SYMBOL_TYPE,
 	SYMBOL_BUILTIN_TYPE,
+	SYMBOL_MODULE,
 	SYMBOL_NAMESPACE,
 	SYMBOL_PACKAGE,
 	SYMBOL_STRUCT,
diff --git a/resources_swig/src/sourcetraildb.cpp b/resources_swig/src/sourcetraildb.cpp
index 8239c9e..6e3dbc0 100644
--- a/resources_swig/src/sourcetraildb.cpp
+++ b/resources_swig/src/sourcetraildb.cpp
@@ -27,6 +27,7 @@ namespace
 		{
 		case SYMBOL_TYPE: return sourcetrail::SYMBOL_TYPE;
 		case SYMBOL_BUILTIN_TYPE: return sourcetrail::SYMBOL_BUILTIN_TYPE;
+		case SYMBOL_MODULE: return sourcetrail::SYMBOL_MODULE;
 		case SYMBOL_NAMESPACE: return sourcetrail::SYMBOL_NAMESPACE;
 		case SYMBOL_PACKAGE: return sourcetrail::SYMBOL_PACKAGE;
 		case SYMBOL_STRUCT: return sourcetrail::SYMBOL_STRUCT;