diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 23a24bbdc..2f70194d4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,12 +8,16 @@ if(MSVC)
     add_subdirectory(dll)
 else()
     #file(GLOB CPP_SOURCES *.cpp)
-    set(CPP_SOURCES abstract_data_store.cpp ann_exception.cpp disk_utils.cpp 
-        distance.cpp index.cpp in_mem_graph_store.cpp in_mem_data_store.cpp
-        linux_aligned_file_reader.cpp math_utils.cpp natural_number_map.cpp
-        in_mem_data_store.cpp in_mem_graph_store.cpp
-        natural_number_set.cpp memory_mapper.cpp partition.cpp pq.cpp
-        pq_flash_index.cpp scratch.cpp logger.cpp utils.cpp filter_utils.cpp index_factory.cpp abstract_index.cpp pq_l2_distance.cpp pq_data_store.cpp neighbor_list.cpp in_mem_static_graph_store.cpp)
+    set(CPP_SOURCES abstract_data_store.cpp abstract_index.cpp ann_exception.cpp
+        color_helper.cpp color_info.cpp disk_utils.cpp distance.cpp
+        filter_match_proxy.cpp filter_utils.cpp
+        in_mem_data_store.cpp in_mem_graph_reformat_store.cpp in_mem_graph_store.cpp
+        in_mem_reorder_data_store.cpp in_mem_static_graph_reformat.cpp in_mem_static_graph_store.cpp
+        index.cpp index_factory.cpp integer_label_vector.cpp
+        label_bitmask.cpp label_helper.cpp linux_aligned_file_reader.cpp logger.cpp
+        math_utils.cpp memory_mapper.cpp natural_number_map.cpp natural_number_set.cpp
+        neighbor_list.cpp partition.cpp pq.cpp pq_data_store.cpp pq_flash_index.cpp
+        pq_l2_distance.cpp scratch.cpp utils.cpp)
     if (RESTAPI)
         list(APPEND CPP_SOURCES restapi/search_wrapper.cpp restapi/server.cpp)
     endif()
diff --git a/src/dll/CMakeLists.txt b/src/dll/CMakeLists.txt
index 11dde1432..4b23b41d4 100644
--- a/src/dll/CMakeLists.txt
+++ b/src/dll/CMakeLists.txt
@@ -1,10 +1,17 @@
 #Copyright(c) Microsoft Corporation.All rights reserved.
 #Licensed under the MIT                        license.
 
-add_library(${PROJECT_NAME} SHARED dllmain.cpp ../abstract_data_store.cpp ../partition.cpp ../pq.cpp ../pq_flash_index.cpp ../logger.cpp ../utils.cpp 
-    ../windows_aligned_file_reader.cpp ../distance.cpp ../pq_l2_distance.cpp ../memory_mapper.cpp ../index.cpp 
-    ../in_mem_data_store.cpp ../pq_data_store.cpp ../in_mem_graph_store.cpp ../math_utils.cpp ../disk_utils.cpp ../filter_utils.cpp 
-    ../ann_exception.cpp ../natural_number_set.cpp ../natural_number_map.cpp ../scratch.cpp ../index_factory.cpp ../abstract_index.cpp ../neighbor_list.cpp ../in_mem_static_graph_store.cpp)
+add_library(${PROJECT_NAME} SHARED dllmain.cpp
+    ../abstract_data_store.cpp ../abstract_index.cpp ../ann_exception.cpp
+    ../color_helper.cpp ../color_info.cpp ../disk_utils.cpp ../distance.cpp
+    ../filter_match_proxy.cpp ../filter_utils.cpp
+    ../in_mem_data_store.cpp ../in_mem_graph_reformat_store.cpp ../in_mem_graph_store.cpp
+    ../in_mem_reorder_data_store.cpp ../in_mem_static_graph_reformat.cpp ../in_mem_static_graph_store.cpp
+    ../index.cpp ../index_factory.cpp ../integer_label_vector.cpp
+    ../label_bitmask.cpp ../label_helper.cpp ../logger.cpp
+    ../math_utils.cpp ../memory_mapper.cpp ../natural_number_map.cpp ../natural_number_set.cpp
+    ../neighbor_list.cpp ../partition.cpp ../pq.cpp ../pq_data_store.cpp ../pq_flash_index.cpp
+    ../pq_l2_distance.cpp ../scratch.cpp ../utils.cpp ../windows_aligned_file_reader.cpp)
 
 set(TARGET_DIR "$<$<CONFIG:Debug>:${CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG}>$<$<CONFIG:Release>:${CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE}>")