diff --git a/java_indexer/src/main/java/com/sourcetrail/ReferenceKind.java b/java_indexer/src/main/java/com/sourcetrail/ReferenceKind.java
index 10d7498f..aa8d52a9 100644
--- a/java_indexer/src/main/java/com/sourcetrail/ReferenceKind.java
+++ b/java_indexer/src/main/java/com/sourcetrail/ReferenceKind.java
@@ -8,15 +8,12 @@ public enum ReferenceKind
 	CALL(3),
 	INHERITANCE(4),
 	OVERRIDE(5),
-	TEMPLATE_ARGUMENT(6),
-	TYPE_ARGUMENT(7),
-	TEMPLATE_DEFAULT_ARGUMENT(8),
-	TEMPLATE_SPECIALIZATION_OF(9),
-	TEMPLATE_MEMBER_SPECIALIZATION_OF(10),
-	INCLUDE(11),
-	IMPORT(12),
-	MACRO_USAGE(13),
-	ANNOTATION_USAGE(14);
+	TYPE_ARGUMENT(6),
+	TEMPLATE_SPECIALIZATION(7),
+	INCLUDE(8),
+	IMPORT(9),
+	MACRO_USAGE(10),
+	ANNOTATION_USAGE(11);
 	
 	private final int m_value;
 	
diff --git a/java_indexer/src/main/java/com/sourcetrail/SymbolKind.java b/java_indexer/src/main/java/com/sourcetrail/SymbolKind.java
index 469e9a75..c08e2a46 100644
--- a/java_indexer/src/main/java/com/sourcetrail/SymbolKind.java
+++ b/java_indexer/src/main/java/com/sourcetrail/SymbolKind.java
@@ -17,11 +17,10 @@ public enum SymbolKind
 	NAMESPACE(13),
 	PACKAGE(14),
 	STRUCT(15),
-	TEMPLATE_PARAMETER(16),
-	TYPEDEF(17),
-	TYPE_PARAMETER(18),
-	UNION(19),
-	TYPE_MAX(20);
+	TYPEDEF(16),
+	TYPE_PARAMETER(17),
+	UNION(18),
+	TYPE_MAX(19);
 	
 	private final int m_value;
 	
diff --git a/script/download_python_indexer.sh b/script/download_python_indexer.sh
index 571ffb7d..52d38b3e 100755
--- a/script/download_python_indexer.sh
+++ b/script/download_python_indexer.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SOURCETRAIL_PYTHON_INDEXER_VERSION="v1_db24_p2"
+SOURCETRAIL_PYTHON_INDEXER_VERSION="v1_db25_p0"
 
 # Determine current platform
 PLATFORM='unknown'
diff --git a/src/lib/data/NodeType.h b/src/lib/data/NodeType.h
index d42ca653..172d38a9 100644
--- a/src/lib/data/NodeType.h
+++ b/src/lib/data/NodeType.h
@@ -35,11 +35,11 @@ public:
 		NODE_ENUM = 1 << 14,
 		NODE_ENUM_CONSTANT = 1 << 15,
 		NODE_TYPEDEF = 1 << 16,
-		NODE_TYPE_PARAMETER = 1 << 18,
+		NODE_TYPE_PARAMETER = 1 << 17,
 
-		NODE_FILE = 1 << 19,
-		NODE_MACRO = 1 << 20,
-		NODE_UNION = 1 << 21,
+		NODE_FILE = 1 << 18,
+		NODE_MACRO = 1 << 19,
+		NODE_UNION = 1 << 20,
 
 		NODE_MAX_VALUE = NODE_UNION
 	};
diff --git a/src/lib/data/graph/Edge.h b/src/lib/data/graph/Edge.h
index 9c117300..d9536e60 100644
--- a/src/lib/data/graph/Edge.h
+++ b/src/lib/data/graph/Edge.h
@@ -22,13 +22,13 @@ public:
 		EDGE_CALL								= 1 << 3,
 		EDGE_INHERITANCE						= 1 << 4,
 		EDGE_OVERRIDE							= 1 << 5,
-		EDGE_TYPE_ARGUMENT						= 1 << 7,
-		EDGE_TEMPLATE_SPECIALIZATION			= 1 << 9,
-		EDGE_INCLUDE							= 1 << 11,
-		EDGE_IMPORT								= 1 << 12,
-		EDGE_AGGREGATION						= 1 << 13,
-		EDGE_MACRO_USAGE						= 1 << 14,
-		EDGE_ANNOTATION_USAGE					= 1 << 15,
+		EDGE_TYPE_ARGUMENT						= 1 << 6,
+		EDGE_TEMPLATE_SPECIALIZATION			= 1 << 7,
+		EDGE_INCLUDE							= 1 << 8,
+		EDGE_IMPORT								= 1 << 9,
+		EDGE_AGGREGATION						= 1 << 10,
+		EDGE_MACRO_USAGE						= 1 << 11,
+		EDGE_ANNOTATION_USAGE					= 1 << 12,
 
 		EDGE_MAX_VALUE = EDGE_ANNOTATION_USAGE
 	};
diff --git a/src/lib/data/parser/ReferenceKind.h b/src/lib/data/parser/ReferenceKind.h
index 14082eee..5f31e938 100644
--- a/src/lib/data/parser/ReferenceKind.h
+++ b/src/lib/data/parser/ReferenceKind.h
@@ -9,12 +9,12 @@ enum ReferenceKind
 	REFERENCE_CALL = 3,
 	REFERENCE_INHERITANCE = 4,
 	REFERENCE_OVERRIDE = 5,
-	REFERENCE_TYPE_ARGUMENT = 7,
-	REFERENCE_TEMPLATE_SPECIALIZATION = 9,
-	REFERENCE_INCLUDE = 11,
-	REFERENCE_IMPORT = 12,
-	REFERENCE_MACRO_USAGE = 13,
-	REFERENCE_ANNOTATION_USAGE = 14
+	REFERENCE_TYPE_ARGUMENT = 6,
+	REFERENCE_TEMPLATE_SPECIALIZATION = 7,
+	REFERENCE_INCLUDE = 8,
+	REFERENCE_IMPORT = 9,
+	REFERENCE_MACRO_USAGE = 10,
+	REFERENCE_ANNOTATION_USAGE = 11
 };
 
 ReferenceKind intToReferenceKind(int v);
diff --git a/src/lib/data/parser/SymbolKind.h b/src/lib/data/parser/SymbolKind.h
index 289d4240..88a7cde8 100644
--- a/src/lib/data/parser/SymbolKind.h
+++ b/src/lib/data/parser/SymbolKind.h
@@ -18,10 +18,10 @@ enum SymbolKind
 	SYMBOL_NAMESPACE = 13,
 	SYMBOL_PACKAGE = 14,
 	SYMBOL_STRUCT = 15,
-	SYMBOL_TYPEDEF = 17,
-	SYMBOL_TYPE_PARAMETER = 18,
-	SYMBOL_UNION = 19,
-	SYMBOL_KIND_MAX = 20
+	SYMBOL_TYPEDEF = 16,
+	SYMBOL_TYPE_PARAMETER = 17,
+	SYMBOL_UNION = 18,
+	SYMBOL_KIND_MAX = 19
 };
 
 SymbolKind intToSymbolKind(int v);
diff --git a/src/lib/data/storage/sqlite/SqliteIndexStorage.cpp b/src/lib/data/storage/sqlite/SqliteIndexStorage.cpp
index 9e1889b6..3b08daa3 100644
--- a/src/lib/data/storage/sqlite/SqliteIndexStorage.cpp
+++ b/src/lib/data/storage/sqlite/SqliteIndexStorage.cpp
@@ -11,7 +11,7 @@
 #include "SourceLocationFile.h"
 #include "utilityString.h"
 
-const size_t SqliteIndexStorage::s_storageVersion = 24;
+const size_t SqliteIndexStorage::s_storageVersion = 25;
 
 namespace
 {