diff --git a/AnnService/CMakeLists.txt b/AnnService/CMakeLists.txt
index f5102115..3c65409e 100644
--- a/AnnService/CMakeLists.txt
+++ b/AnnService/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 file(GLOB HDR_FILES ${PROJECT_SOURCE_DIR}/AnnService/inc/Core/*.h ${PROJECT_SOURCE_DIR}/AnnService/inc/Core/Common/*.h ${PROJECT_SOURCE_DIR}/AnnService/inc/Core/BKT/*.h ${PROJECT_SOURCE_DIR}/AnnService/inc/Core/KDT/*.h ${PROJECT_SOURCE_DIR}/AnnService/inc/Helper/*.h)
 file(GLOB SRC_FILES ${PROJECT_SOURCE_DIR}/AnnService/src/Core/*.cpp ${PROJECT_SOURCE_DIR}/AnnService/src/Core/Common/*.cpp ${PROJECT_SOURCE_DIR}/AnnService/src/Core/BKT/*.cpp ${PROJECT_SOURCE_DIR}/AnnService/src/Core/KDT/*.cpp ${PROJECT_SOURCE_DIR}/AnnService/src/Helper/*.cpp)
 
diff --git a/AnnService/inc/Aggregator/AggregatorContext.h b/AnnService/inc/Aggregator/AggregatorContext.h
index a4df9567..97ccc197 100644
--- a/AnnService/inc/Aggregator/AggregatorContext.h
+++ b/AnnService/inc/Aggregator/AggregatorContext.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_AGGREGATOR_AGGREGATORCONTEXT_H_
 #define _SPTAG_AGGREGATOR_AGGREGATORCONTEXT_H_
 
diff --git a/AnnService/inc/Aggregator/AggregatorExecutionContext.h b/AnnService/inc/Aggregator/AggregatorExecutionContext.h
index cc34b847..12948a21 100644
--- a/AnnService/inc/Aggregator/AggregatorExecutionContext.h
+++ b/AnnService/inc/Aggregator/AggregatorExecutionContext.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_AGGREGATOR_AGGREGATOREXECUTIONCONTEXT_H_
 #define _SPTAG_AGGREGATOR_AGGREGATOREXECUTIONCONTEXT_H_
 
diff --git a/AnnService/inc/Aggregator/AggregatorService.h b/AnnService/inc/Aggregator/AggregatorService.h
index 7984adfd..4d864aa5 100644
--- a/AnnService/inc/Aggregator/AggregatorService.h
+++ b/AnnService/inc/Aggregator/AggregatorService.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_AGGREGATOR_AGGREGATORSERVICE_H_
 #define _SPTAG_AGGREGATOR_AGGREGATORSERVICE_H_
 
diff --git a/AnnService/inc/Aggregator/AggregatorSettings.h b/AnnService/inc/Aggregator/AggregatorSettings.h
index 56ec4e2f..cb1e9fe7 100644
--- a/AnnService/inc/Aggregator/AggregatorSettings.h
+++ b/AnnService/inc/Aggregator/AggregatorSettings.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_AGGREGATOR_AGGREGATORSETTINGS_H_
 #define _SPTAG_AGGREGATOR_AGGREGATORSETTINGS_H_
 
diff --git a/AnnService/inc/Client/ClientWrapper.h b/AnnService/inc/Client/ClientWrapper.h
index a94c8614..d96a6706 100644
--- a/AnnService/inc/Client/ClientWrapper.h
+++ b/AnnService/inc/Client/ClientWrapper.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_CLIENT_CLIENTWRAPPER_H_
 #define _SPTAG_CLIENT_CLIENTWRAPPER_H_
 
diff --git a/AnnService/inc/Client/Options.h b/AnnService/inc/Client/Options.h
index a52dc676..062061f0 100644
--- a/AnnService/inc/Client/Options.h
+++ b/AnnService/inc/Client/Options.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_CLIENT_OPTIONS_H_
 #define _SPTAG_CLIENT_OPTIONS_H_
 
diff --git a/AnnService/inc/Core/BKT/Index.h b/AnnService/inc/Core/BKT/Index.h
index 2ead4acd..329aacbd 100644
--- a/AnnService/inc/Core/BKT/Index.h
+++ b/AnnService/inc/Core/BKT/Index.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_BKT_INDEX_H_
 #define _SPTAG_BKT_INDEX_H_
 
diff --git a/AnnService/inc/Core/BKT/ParameterDefinitionList.h b/AnnService/inc/Core/BKT/ParameterDefinitionList.h
index 15c0cc01..716c9b81 100644
--- a/AnnService/inc/Core/BKT/ParameterDefinitionList.h
+++ b/AnnService/inc/Core/BKT/ParameterDefinitionList.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifdef DefineBKTParameter
 
 // DefineBKTParameter(VarName, VarType, DefaultValue, RepresentStr)
diff --git a/AnnService/inc/Core/Common.h b/AnnService/inc/Core/Common.h
index 7d61675b..91c6239b 100644
--- a/AnnService/inc/Core/Common.h
+++ b/AnnService/inc/Core/Common.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_CORE_COMMONDEFS_H_
 #define _SPTAG_CORE_COMMONDEFS_H_
 
diff --git a/AnnService/inc/Core/Common/BKTree.h b/AnnService/inc/Core/Common/BKTree.h
index 70140621..74b592b7 100644
--- a/AnnService/inc/Core/Common/BKTree.h
+++ b/AnnService/inc/Core/Common/BKTree.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_COMMON_BKTREE_H_
 #define _SPTAG_COMMON_BKTREE_H_
 
diff --git a/AnnService/inc/Core/Common/CommonUtils.h b/AnnService/inc/Core/Common/CommonUtils.h
index f959f80c..ca5ed83f 100644
--- a/AnnService/inc/Core/Common/CommonUtils.h
+++ b/AnnService/inc/Core/Common/CommonUtils.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_COMMON_COMMONUTILS_H_
 #define _SPTAG_COMMON_COMMONUTILS_H_
 
diff --git a/AnnService/inc/Core/Common/DataUtils.h b/AnnService/inc/Core/Common/DataUtils.h
index 2ecd7faa..affc4687 100644
--- a/AnnService/inc/Core/Common/DataUtils.h
+++ b/AnnService/inc/Core/Common/DataUtils.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_COMMON_DATAUTILS_H_
 #define _SPTAG_COMMON_DATAUTILS_H_
 
diff --git a/AnnService/inc/Core/Common/Dataset.h b/AnnService/inc/Core/Common/Dataset.h
index fd7817f8..b5ebbf34 100644
--- a/AnnService/inc/Core/Common/Dataset.h
+++ b/AnnService/inc/Core/Common/Dataset.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_COMMON_DATASET_H_
 #define _SPTAG_COMMON_DATASET_H_
 
diff --git a/AnnService/inc/Core/Common/DistanceUtils.h b/AnnService/inc/Core/Common/DistanceUtils.h
index c64e63da..75a35761 100644
--- a/AnnService/inc/Core/Common/DistanceUtils.h
+++ b/AnnService/inc/Core/Common/DistanceUtils.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_COMMON_DISTANCEUTILS_H_
 #define _SPTAG_COMMON_DISTANCEUTILS_H_
 
diff --git a/AnnService/inc/Core/Common/FineGrainedLock.h b/AnnService/inc/Core/Common/FineGrainedLock.h
index e1d5dc39..d8bfbaa9 100644
--- a/AnnService/inc/Core/Common/FineGrainedLock.h
+++ b/AnnService/inc/Core/Common/FineGrainedLock.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_COMMON_FINEGRAINEDLOCK_H_
 #define _SPTAG_COMMON_FINEGRAINEDLOCK_H_
 
diff --git a/AnnService/inc/Core/Common/Heap.h b/AnnService/inc/Core/Common/Heap.h
index 7d4dcc56..261aa498 100644
--- a/AnnService/inc/Core/Common/Heap.h
+++ b/AnnService/inc/Core/Common/Heap.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_COMMON_HEAP_H_
 #define _SPTAG_COMMON_HEAP_H_
 
diff --git a/AnnService/inc/Core/Common/KDTree.h b/AnnService/inc/Core/Common/KDTree.h
index ab2e1779..f6a5aebb 100644
--- a/AnnService/inc/Core/Common/KDTree.h
+++ b/AnnService/inc/Core/Common/KDTree.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_COMMON_KDTREE_H_
 #define _SPTAG_COMMON_KDTREE_H_
 
diff --git a/AnnService/inc/Core/Common/NeighborhoodGraph.h b/AnnService/inc/Core/Common/NeighborhoodGraph.h
index 9e646b69..3da45a1c 100644
--- a/AnnService/inc/Core/Common/NeighborhoodGraph.h
+++ b/AnnService/inc/Core/Common/NeighborhoodGraph.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_COMMON_NG_H_
 #define _SPTAG_COMMON_NG_H_
 
diff --git a/AnnService/inc/Core/Common/QueryResultSet.h b/AnnService/inc/Core/Common/QueryResultSet.h
index f410b29d..52745322 100644
--- a/AnnService/inc/Core/Common/QueryResultSet.h
+++ b/AnnService/inc/Core/Common/QueryResultSet.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_COMMON_QUERYRESULTSET_H_
 #define _SPTAG_COMMON_QUERYRESULTSET_H_
 
diff --git a/AnnService/inc/Core/Common/RelativeNeighborhoodGraph.h b/AnnService/inc/Core/Common/RelativeNeighborhoodGraph.h
index 83d5ee4a..49925086 100644
--- a/AnnService/inc/Core/Common/RelativeNeighborhoodGraph.h
+++ b/AnnService/inc/Core/Common/RelativeNeighborhoodGraph.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_COMMON_RNG_H_
 #define _SPTAG_COMMON_RNG_H_
 
diff --git a/AnnService/inc/Core/Common/WorkSpace.h b/AnnService/inc/Core/Common/WorkSpace.h
index f2ce87a0..74d0a503 100644
--- a/AnnService/inc/Core/Common/WorkSpace.h
+++ b/AnnService/inc/Core/Common/WorkSpace.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_COMMON_WORKSPACE_H_
 #define _SPTAG_COMMON_WORKSPACE_H_
 
diff --git a/AnnService/inc/Core/Common/WorkSpacePool.h b/AnnService/inc/Core/Common/WorkSpacePool.h
index e25afdc5..9a7154e6 100644
--- a/AnnService/inc/Core/Common/WorkSpacePool.h
+++ b/AnnService/inc/Core/Common/WorkSpacePool.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_COMMON_WORKSPACEPOOL_H_
 #define _SPTAG_COMMON_WORKSPACEPOOL_H_
 
diff --git a/AnnService/inc/Core/CommonDataStructure.h b/AnnService/inc/Core/CommonDataStructure.h
index 7a747793..d357e975 100644
--- a/AnnService/inc/Core/CommonDataStructure.h
+++ b/AnnService/inc/Core/CommonDataStructure.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_COMMONDATASTRUCTURE_H_
 #define _SPTAG_COMMONDATASTRUCTURE_H_
 
diff --git a/AnnService/inc/Core/DefinitionList.h b/AnnService/inc/Core/DefinitionList.h
index 23b1dc46..ed6f33e9 100644
--- a/AnnService/inc/Core/DefinitionList.h
+++ b/AnnService/inc/Core/DefinitionList.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifdef DefineVectorValueType
 
 DefineVectorValueType(Int8, std::int8_t)
diff --git a/AnnService/inc/Core/KDT/Index.h b/AnnService/inc/Core/KDT/Index.h
index 5dd094e1..ce2b34b3 100644
--- a/AnnService/inc/Core/KDT/Index.h
+++ b/AnnService/inc/Core/KDT/Index.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_KDT_INDEX_H_
 #define _SPTAG_KDT_INDEX_H_
 
diff --git a/AnnService/inc/Core/KDT/ParameterDefinitionList.h b/AnnService/inc/Core/KDT/ParameterDefinitionList.h
index 8ca2ef74..62dbc3a1 100644
--- a/AnnService/inc/Core/KDT/ParameterDefinitionList.h
+++ b/AnnService/inc/Core/KDT/ParameterDefinitionList.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifdef DefineKDTParameter
 
 // DefineKDTParameter(VarName, VarType, DefaultValue, RepresentStr)
diff --git a/AnnService/inc/Core/MetadataSet.h b/AnnService/inc/Core/MetadataSet.h
index f476531e..259f7dd6 100644
--- a/AnnService/inc/Core/MetadataSet.h
+++ b/AnnService/inc/Core/MetadataSet.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_METADATASET_H_
 #define _SPTAG_METADATASET_H_
 
diff --git a/AnnService/inc/Core/SearchQuery.h b/AnnService/inc/Core/SearchQuery.h
index 8b8c5f7b..ede82cc9 100644
--- a/AnnService/inc/Core/SearchQuery.h
+++ b/AnnService/inc/Core/SearchQuery.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_SEARCHQUERY_H_
 #define _SPTAG_SEARCHQUERY_H_
 
diff --git a/AnnService/inc/Core/VectorIndex.h b/AnnService/inc/Core/VectorIndex.h
index cbe1b579..0156bff6 100644
--- a/AnnService/inc/Core/VectorIndex.h
+++ b/AnnService/inc/Core/VectorIndex.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_VECTORINDEX_H_
 #define _SPTAG_VECTORINDEX_H_
 
diff --git a/AnnService/inc/Core/VectorSet.h b/AnnService/inc/Core/VectorSet.h
index 09a6620a..4d0727aa 100644
--- a/AnnService/inc/Core/VectorSet.h
+++ b/AnnService/inc/Core/VectorSet.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_VECTORSET_H_
 #define _SPTAG_VECTORSET_H_
 
diff --git a/AnnService/inc/Helper/ArgumentsParser.h b/AnnService/inc/Helper/ArgumentsParser.h
index 8d3ed7aa..0ae19b8e 100644
--- a/AnnService/inc/Helper/ArgumentsParser.h
+++ b/AnnService/inc/Helper/ArgumentsParser.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_HELPER_ARGUMENTSPARSER_H_
 #define _SPTAG_HELPER_ARGUMENTSPARSER_H_
 
diff --git a/AnnService/inc/Helper/Base64Encode.h b/AnnService/inc/Helper/Base64Encode.h
index 9dd8883e..8e791934 100644
--- a/AnnService/inc/Helper/Base64Encode.h
+++ b/AnnService/inc/Helper/Base64Encode.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_HELPER_BASE64ENCODE_H_
 #define _SPTAG_HELPER_BASE64ENCODE_H_
 
diff --git a/AnnService/inc/Helper/CommonHelper.h b/AnnService/inc/Helper/CommonHelper.h
index 84ac4c8e..7f147847 100644
--- a/AnnService/inc/Helper/CommonHelper.h
+++ b/AnnService/inc/Helper/CommonHelper.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_HELPER_COMMONHELPER_H_
 #define _SPTAG_HELPER_COMMONHELPER_H_
 
diff --git a/AnnService/inc/Helper/Concurrent.h b/AnnService/inc/Helper/Concurrent.h
index 77a95c90..41c9c5ff 100644
--- a/AnnService/inc/Helper/Concurrent.h
+++ b/AnnService/inc/Helper/Concurrent.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_HELPER_CONCURRENT_H_
 #define _SPTAG_HELPER_CONCURRENT_H_
 
diff --git a/AnnService/inc/Helper/SimpleIniReader.h b/AnnService/inc/Helper/SimpleIniReader.h
index fd9ccd77..31b797ab 100644
--- a/AnnService/inc/Helper/SimpleIniReader.h
+++ b/AnnService/inc/Helper/SimpleIniReader.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_HELPER_INIREADER_H_
 #define _SPTAG_HELPER_INIREADER_H_
 
diff --git a/AnnService/inc/Helper/StringConvert.h b/AnnService/inc/Helper/StringConvert.h
index 7aeee749..b6e53df7 100644
--- a/AnnService/inc/Helper/StringConvert.h
+++ b/AnnService/inc/Helper/StringConvert.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_HELPER_STRINGCONVERTHELPER_H_
 #define _SPTAG_HELPER_STRINGCONVERTHELPER_H_
 
diff --git a/AnnService/inc/IndexBuilder/Options.h b/AnnService/inc/IndexBuilder/Options.h
index b143a9a9..7c939efa 100644
--- a/AnnService/inc/IndexBuilder/Options.h
+++ b/AnnService/inc/IndexBuilder/Options.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_INDEXBUILDER_OPTIONS_H_
 #define _SPTAG_INDEXBUILDER_OPTIONS_H_
 
diff --git a/AnnService/inc/IndexBuilder/ThreadPool.h b/AnnService/inc/IndexBuilder/ThreadPool.h
index 48b90bd5..7256f71a 100644
--- a/AnnService/inc/IndexBuilder/ThreadPool.h
+++ b/AnnService/inc/IndexBuilder/ThreadPool.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_INDEXBUILDER_THREADPOOL_H_
 #define _SPTAG_INDEXBUILDER_THREADPOOL_H_
 
diff --git a/AnnService/inc/IndexBuilder/VectorSetReader.h b/AnnService/inc/IndexBuilder/VectorSetReader.h
index bfdb6e17..6bb3026a 100644
--- a/AnnService/inc/IndexBuilder/VectorSetReader.h
+++ b/AnnService/inc/IndexBuilder/VectorSetReader.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_INDEXBUILDER_VECTORSETREADER_H_
 #define _SPTAG_INDEXBUILDER_VECTORSETREADER_H_
 
diff --git a/AnnService/inc/IndexBuilder/VectorSetReaders/DefaultReader.h b/AnnService/inc/IndexBuilder/VectorSetReaders/DefaultReader.h
index a2102498..f12ec7f5 100644
--- a/AnnService/inc/IndexBuilder/VectorSetReaders/DefaultReader.h
+++ b/AnnService/inc/IndexBuilder/VectorSetReaders/DefaultReader.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_INDEXBUILDER_VECTORSETREADERS_DEFAULTREADER_H_
 #define _SPTAG_INDEXBUILDER_VECTORSETREADERS_DEFAULTREADER_H_
 
diff --git a/AnnService/inc/Server/QueryParser.h b/AnnService/inc/Server/QueryParser.h
index 6df80733..9444e408 100644
--- a/AnnService/inc/Server/QueryParser.h
+++ b/AnnService/inc/Server/QueryParser.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_SERVER_QUERYPARSER_H_
 #define _SPTAG_SERVER_QUERYPARSER_H_
 
diff --git a/AnnService/inc/Server/SearchExecutionContext.h b/AnnService/inc/Server/SearchExecutionContext.h
index 00c5eab9..cba4df46 100644
--- a/AnnService/inc/Server/SearchExecutionContext.h
+++ b/AnnService/inc/Server/SearchExecutionContext.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_SERVER_SEARCHEXECUTIONCONTEXT_H_
 #define _SPTAG_SERVER_SEARCHEXECUTIONCONTEXT_H_
 
diff --git a/AnnService/inc/Server/SearchExecutor.h b/AnnService/inc/Server/SearchExecutor.h
index 73a3a15f..20183265 100644
--- a/AnnService/inc/Server/SearchExecutor.h
+++ b/AnnService/inc/Server/SearchExecutor.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_SERVER_SEARCHEXECUTOR_H_
 #define _SPTAG_SERVER_SEARCHEXECUTOR_H_
 
diff --git a/AnnService/inc/Server/SearchService.h b/AnnService/inc/Server/SearchService.h
index c3290892..34d0c606 100644
--- a/AnnService/inc/Server/SearchService.h
+++ b/AnnService/inc/Server/SearchService.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_SERVER_SERVICE_H_
 #define _SPTAG_SERVER_SERVICE_H_
 
diff --git a/AnnService/inc/Server/ServiceContext.h b/AnnService/inc/Server/ServiceContext.h
index b18a8154..b1a7b840 100644
--- a/AnnService/inc/Server/ServiceContext.h
+++ b/AnnService/inc/Server/ServiceContext.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_SERVER_SERVICECONTEX_H_
 #define _SPTAG_SERVER_SERVICECONTEX_H_
 
diff --git a/AnnService/inc/Server/ServiceSettings.h b/AnnService/inc/Server/ServiceSettings.h
index bc51e6ba..90774873 100644
--- a/AnnService/inc/Server/ServiceSettings.h
+++ b/AnnService/inc/Server/ServiceSettings.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_SERVER_SERVICESTTINGS_H_
 #define _SPTAG_SERVER_SERVICESTTINGS_H_
 
diff --git a/AnnService/inc/Socket/Client.h b/AnnService/inc/Socket/Client.h
index 4857b3a7..a57465df 100644
--- a/AnnService/inc/Socket/Client.h
+++ b/AnnService/inc/Socket/Client.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_SOCKET_CLIENT_H_
 #define _SPTAG_SOCKET_CLIENT_H_
 
diff --git a/AnnService/inc/Socket/Common.h b/AnnService/inc/Socket/Common.h
index ad1a3df5..dc06af1b 100644
--- a/AnnService/inc/Socket/Common.h
+++ b/AnnService/inc/Socket/Common.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_SOCKET_COMMON_H_
 #define _SPTAG_SOCKET_COMMON_H_
 
diff --git a/AnnService/inc/Socket/Connection.h b/AnnService/inc/Socket/Connection.h
index b4e3b1c3..1d75d093 100644
--- a/AnnService/inc/Socket/Connection.h
+++ b/AnnService/inc/Socket/Connection.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_SOCKET_CONNECTION_H_
 #define _SPTAG_SOCKET_CONNECTION_H_
 
diff --git a/AnnService/inc/Socket/ConnectionManager.h b/AnnService/inc/Socket/ConnectionManager.h
index 8e27f3dd..e487c610 100644
--- a/AnnService/inc/Socket/ConnectionManager.h
+++ b/AnnService/inc/Socket/ConnectionManager.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_SOCKET_CONNECTIONMANAGER_H_
 #define _SPTAG_SOCKET_CONNECTIONMANAGER_H_
 
diff --git a/AnnService/inc/Socket/Packet.h b/AnnService/inc/Socket/Packet.h
index e7a85c61..8c99b09f 100644
--- a/AnnService/inc/Socket/Packet.h
+++ b/AnnService/inc/Socket/Packet.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_SOCKET_PACKET_H_
 #define _SPTAG_SOCKET_PACKET_H_
 
diff --git a/AnnService/inc/Socket/RemoteSearchQuery.h b/AnnService/inc/Socket/RemoteSearchQuery.h
index 40de407a..900aa6cb 100644
--- a/AnnService/inc/Socket/RemoteSearchQuery.h
+++ b/AnnService/inc/Socket/RemoteSearchQuery.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_SOCKET_REMOTESEARCHQUERY_H_
 #define _SPTAG_SOCKET_REMOTESEARCHQUERY_H_
 
diff --git a/AnnService/inc/Socket/ResourceManager.h b/AnnService/inc/Socket/ResourceManager.h
index b19dad12..404cac83 100644
--- a/AnnService/inc/Socket/ResourceManager.h
+++ b/AnnService/inc/Socket/ResourceManager.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_SOCKET_RESOURCEMANAGER_H_
 #define _SPTAG_SOCKET_RESOURCEMANAGER_H_
 
diff --git a/AnnService/inc/Socket/Server.h b/AnnService/inc/Socket/Server.h
index 0b67c838..aac97bf8 100644
--- a/AnnService/inc/Socket/Server.h
+++ b/AnnService/inc/Socket/Server.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_SOCKET_SERVER_H_
 #define _SPTAG_SOCKET_SERVER_H_
 
diff --git a/AnnService/inc/Socket/SimpleSerialization.h b/AnnService/inc/Socket/SimpleSerialization.h
index 71a34b03..6da92562 100644
--- a/AnnService/inc/Socket/SimpleSerialization.h
+++ b/AnnService/inc/Socket/SimpleSerialization.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_SOCKET_SIMPLESERIALIZATION_H_
 #define _SPTAG_SOCKET_SIMPLESERIALIZATION_H_
 
diff --git a/AnnService/src/Aggregator/AggregatorContext.cpp b/AnnService/src/Aggregator/AggregatorContext.cpp
index 229d386e..dd2f4b20 100644
--- a/AnnService/src/Aggregator/AggregatorContext.cpp
+++ b/AnnService/src/Aggregator/AggregatorContext.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Aggregator/AggregatorContext.h"
 #include "inc/Helper/SimpleIniReader.h"
 
diff --git a/AnnService/src/Aggregator/AggregatorExecutionContext.cpp b/AnnService/src/Aggregator/AggregatorExecutionContext.cpp
index 3ca8ad1b..8f7a2837 100644
--- a/AnnService/src/Aggregator/AggregatorExecutionContext.cpp
+++ b/AnnService/src/Aggregator/AggregatorExecutionContext.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Aggregator/AggregatorExecutionContext.h"
 
 using namespace SPTAG;
diff --git a/AnnService/src/Aggregator/AggregatorService.cpp b/AnnService/src/Aggregator/AggregatorService.cpp
index b0fd8f47..89d974c9 100644
--- a/AnnService/src/Aggregator/AggregatorService.cpp
+++ b/AnnService/src/Aggregator/AggregatorService.cpp
@@ -1,5 +1,7 @@
-#include "inc/Aggregator/AggregatorService.h"
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
+#include "inc/Aggregator/AggregatorService.h"
 
 using namespace SPTAG;
 using namespace SPTAG::Aggregator;
diff --git a/AnnService/src/Aggregator/AggregatorSettings.cpp b/AnnService/src/Aggregator/AggregatorSettings.cpp
index 55e10779..a3e2bc68 100644
--- a/AnnService/src/Aggregator/AggregatorSettings.cpp
+++ b/AnnService/src/Aggregator/AggregatorSettings.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Aggregator/AggregatorSettings.h"
 
 using namespace SPTAG;
diff --git a/AnnService/src/Aggregator/main.cpp b/AnnService/src/Aggregator/main.cpp
index 23ad1155..2a06025d 100644
--- a/AnnService/src/Aggregator/main.cpp
+++ b/AnnService/src/Aggregator/main.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Aggregator/AggregatorService.h"
 
 SPTAG::Aggregator::AggregatorService g_service;
diff --git a/AnnService/src/Client/ClientWrapper.cpp b/AnnService/src/Client/ClientWrapper.cpp
index f2cb89cd..7e91c631 100644
--- a/AnnService/src/Client/ClientWrapper.cpp
+++ b/AnnService/src/Client/ClientWrapper.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Client/ClientWrapper.h"
 
 using namespace SPTAG;
diff --git a/AnnService/src/Client/Options.cpp b/AnnService/src/Client/Options.cpp
index 870aac8f..bb067d3d 100644
--- a/AnnService/src/Client/Options.cpp
+++ b/AnnService/src/Client/Options.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Client/Options.h"
 #include "inc/Helper/StringConvert.h"
 
diff --git a/AnnService/src/Client/main.cpp b/AnnService/src/Client/main.cpp
index 2b3a2f76..b15121dc 100644
--- a/AnnService/src/Client/main.cpp
+++ b/AnnService/src/Client/main.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Client/Options.h"
 #include "inc/Client/ClientWrapper.h"
 
diff --git a/AnnService/src/Core/BKT/BKTIndex.cpp b/AnnService/src/Core/BKT/BKTIndex.cpp
index c6f3d466..ef25f30c 100644
--- a/AnnService/src/Core/BKT/BKTIndex.cpp
+++ b/AnnService/src/Core/BKT/BKTIndex.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Core/BKT/Index.h"
 
 #pragma warning(disable:4996)  // 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
diff --git a/AnnService/src/Core/Common/NeighborhoodGraph.cpp b/AnnService/src/Core/Common/NeighborhoodGraph.cpp
index 20ed8630..94115dd0 100644
--- a/AnnService/src/Core/Common/NeighborhoodGraph.cpp
+++ b/AnnService/src/Core/Common/NeighborhoodGraph.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Core/Common/NeighborhoodGraph.h"
 #include "inc/Core/Common/RelativeNeighborhoodGraph.h"
 
diff --git a/AnnService/src/Core/Common/WorkSpacePool.cpp b/AnnService/src/Core/Common/WorkSpacePool.cpp
index 6ac6ee88..036e281e 100644
--- a/AnnService/src/Core/Common/WorkSpacePool.cpp
+++ b/AnnService/src/Core/Common/WorkSpacePool.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Core/Common/WorkSpacePool.h"
 
 using namespace SPTAG;
diff --git a/AnnService/src/Core/CommonDataStructure.cpp b/AnnService/src/Core/CommonDataStructure.cpp
index 719ae951..7f59e706 100644
--- a/AnnService/src/Core/CommonDataStructure.cpp
+++ b/AnnService/src/Core/CommonDataStructure.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Core/CommonDataStructure.h"
 
 using namespace SPTAG;
diff --git a/AnnService/src/Core/KDT/KDTIndex.cpp b/AnnService/src/Core/KDT/KDTIndex.cpp
index 00bb877f..d0ed6f50 100644
--- a/AnnService/src/Core/KDT/KDTIndex.cpp
+++ b/AnnService/src/Core/KDT/KDTIndex.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Core/KDT/Index.h"
 
 #pragma warning(disable:4996)  // 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
@@ -54,13 +57,14 @@ namespace SPTAG
             } \
             for (int i = 0; i < m_pGraph.m_iNeighborhoodSize; i++) \
                 _mm_prefetch((const char *)(m_pSamples)[node[i]], _MM_HINT_T0); \
+            float upperBound = max(p_query.worstDist(), gnode.distance); \
             bool bLocalOpt = true; \
             for (int i = 0; i < m_pGraph.m_iNeighborhoodSize; i++) { \
                 int nn_index = node[i]; \
                 if (nn_index < 0) break; \
                 if (p_space.CheckAndSet(nn_index)) continue; \
                 float distance2leaf = m_fComputeDistance(p_query.GetTarget(), (m_pSamples)[nn_index], GetFeatureDim()); \
-                if (distance2leaf <= p_query.worstDist() || distance2leaf < gnode.distance) bLocalOpt = false; \
+                if (distance2leaf <= upperBound) bLocalOpt = false; \
                 p_space.m_iNumberOfCheckedLeaves++; \
                 p_space.m_NGQueue.insert(COMMON::HeapCell(nn_index, distance2leaf)); \
             } \
diff --git a/AnnService/src/Core/MetadataSet.cpp b/AnnService/src/Core/MetadataSet.cpp
index 999c5b47..a45da038 100644
--- a/AnnService/src/Core/MetadataSet.cpp
+++ b/AnnService/src/Core/MetadataSet.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Core/MetadataSet.h"
 
 #include <fstream>
diff --git a/AnnService/src/Core/VectorIndex.cpp b/AnnService/src/Core/VectorIndex.cpp
index af6cf601..657978b7 100644
--- a/AnnService/src/Core/VectorIndex.cpp
+++ b/AnnService/src/Core/VectorIndex.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Core/VectorIndex.h"
 #include "inc/Core/Common/DataUtils.h"
 #include "inc/Helper/CommonHelper.h"
diff --git a/AnnService/src/Core/VectorSet.cpp b/AnnService/src/Core/VectorSet.cpp
index 99f801fe..36178d62 100644
--- a/AnnService/src/Core/VectorSet.cpp
+++ b/AnnService/src/Core/VectorSet.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Core/VectorSet.h"
 
 using namespace SPTAG;
diff --git a/AnnService/src/Helper/ArgumentsParser.cpp b/AnnService/src/Helper/ArgumentsParser.cpp
index b20df09c..4f630ec0 100644
--- a/AnnService/src/Helper/ArgumentsParser.cpp
+++ b/AnnService/src/Helper/ArgumentsParser.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Helper/ArgumentsParser.h"
 
 using namespace SPTAG::Helper;
diff --git a/AnnService/src/Helper/Base64Encode.cpp b/AnnService/src/Helper/Base64Encode.cpp
index cafaeb33..5992fa5a 100644
--- a/AnnService/src/Helper/Base64Encode.cpp
+++ b/AnnService/src/Helper/Base64Encode.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Helper/Base64Encode.h"
 
 using namespace SPTAG;
diff --git a/AnnService/src/Helper/CommonHelper.cpp b/AnnService/src/Helper/CommonHelper.cpp
index 4d472a95..2d4dc0de 100644
--- a/AnnService/src/Helper/CommonHelper.cpp
+++ b/AnnService/src/Helper/CommonHelper.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Helper/CommonHelper.h"
 
 #include <iostream>
diff --git a/AnnService/src/Helper/Concurrent.cpp b/AnnService/src/Helper/Concurrent.cpp
index 1050d172..36988cb4 100644
--- a/AnnService/src/Helper/Concurrent.cpp
+++ b/AnnService/src/Helper/Concurrent.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Helper/Concurrent.h"
 
 using namespace SPTAG;
diff --git a/AnnService/src/Helper/SimpleIniReader.cpp b/AnnService/src/Helper/SimpleIniReader.cpp
index 0d4a746a..7456ad9d 100644
--- a/AnnService/src/Helper/SimpleIniReader.cpp
+++ b/AnnService/src/Helper/SimpleIniReader.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Helper/SimpleIniReader.h"
 #include "inc/Helper/CommonHelper.h"
 
diff --git a/AnnService/src/IndexBuilder/Options.cpp b/AnnService/src/IndexBuilder/Options.cpp
index cdfe7307..d0fcd0fd 100644
--- a/AnnService/src/IndexBuilder/Options.cpp
+++ b/AnnService/src/IndexBuilder/Options.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/IndexBuilder/Options.h"
 #include "inc/Helper/StringConvert.h"
 
diff --git a/AnnService/src/IndexBuilder/ThreadPool.cpp b/AnnService/src/IndexBuilder/ThreadPool.cpp
index 0ac09d24..0ecddc12 100644
--- a/AnnService/src/IndexBuilder/ThreadPool.cpp
+++ b/AnnService/src/IndexBuilder/ThreadPool.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/IndexBuilder/ThreadPool.h"
 
 #include <boost/asio.hpp>
diff --git a/AnnService/src/IndexBuilder/VectorSetReader.cpp b/AnnService/src/IndexBuilder/VectorSetReader.cpp
index 40d83fa8..e50f6f5e 100644
--- a/AnnService/src/IndexBuilder/VectorSetReader.cpp
+++ b/AnnService/src/IndexBuilder/VectorSetReader.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/IndexBuilder/VectorSetReader.h"
 #include "inc/IndexBuilder/VectorSetReaders/DefaultReader.h"
 
diff --git a/AnnService/src/IndexBuilder/VectorSetReaders/DefaultReader.cpp b/AnnService/src/IndexBuilder/VectorSetReaders/DefaultReader.cpp
index 30639bcb..a7259867 100644
--- a/AnnService/src/IndexBuilder/VectorSetReaders/DefaultReader.cpp
+++ b/AnnService/src/IndexBuilder/VectorSetReaders/DefaultReader.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/IndexBuilder/VectorSetReaders/DefaultReader.h"
 #include "inc/Helper/StringConvert.h"
 #include "inc/Helper/CommonHelper.h"
diff --git a/AnnService/src/IndexBuilder/main.cpp b/AnnService/src/IndexBuilder/main.cpp
index c265d758..1f83b818 100644
--- a/AnnService/src/IndexBuilder/main.cpp
+++ b/AnnService/src/IndexBuilder/main.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/IndexBuilder/ThreadPool.h"
 #include "inc/IndexBuilder/Options.h"
 #include "inc/IndexBuilder/VectorSetReader.h"
diff --git a/AnnService/src/Server/QueryParser.cpp b/AnnService/src/Server/QueryParser.cpp
index f4d5ccb5..0fb47e93 100644
--- a/AnnService/src/Server/QueryParser.cpp
+++ b/AnnService/src/Server/QueryParser.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Server/QueryParser.h"
 
 #include <cctype>
diff --git a/AnnService/src/Server/SearchExecutionContext.cpp b/AnnService/src/Server/SearchExecutionContext.cpp
index 1d8112c5..36ff0824 100644
--- a/AnnService/src/Server/SearchExecutionContext.cpp
+++ b/AnnService/src/Server/SearchExecutionContext.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Server/SearchExecutionContext.h"
 #include "inc/Helper/StringConvert.h"
 #include "inc/Helper/CommonHelper.h"
diff --git a/AnnService/src/Server/SearchExecutor.cpp b/AnnService/src/Server/SearchExecutor.cpp
index d89cc094..2bc3832d 100644
--- a/AnnService/src/Server/SearchExecutor.cpp
+++ b/AnnService/src/Server/SearchExecutor.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Server/SearchExecutor.h"
 
 using namespace SPTAG;
diff --git a/AnnService/src/Server/SearchService.cpp b/AnnService/src/Server/SearchService.cpp
index fd9349d3..a85fdcdb 100644
--- a/AnnService/src/Server/SearchService.cpp
+++ b/AnnService/src/Server/SearchService.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Server/SearchService.h"
 #include "inc/Server/SearchExecutor.h"
 #include "inc/Socket/RemoteSearchQuery.h"
diff --git a/AnnService/src/Server/ServiceContext.cpp b/AnnService/src/Server/ServiceContext.cpp
index 7af4e8bb..8d62b2c7 100644
--- a/AnnService/src/Server/ServiceContext.cpp
+++ b/AnnService/src/Server/ServiceContext.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Server/ServiceContext.h"
 #include "inc/Helper/SimpleIniReader.h"
 #include "inc/Helper/CommonHelper.h"
diff --git a/AnnService/src/Server/ServiceSettings.cpp b/AnnService/src/Server/ServiceSettings.cpp
index d0d52e5f..d5115319 100644
--- a/AnnService/src/Server/ServiceSettings.cpp
+++ b/AnnService/src/Server/ServiceSettings.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Server/ServiceSettings.h"
 
 using namespace SPTAG;
diff --git a/AnnService/src/Server/main.cpp b/AnnService/src/Server/main.cpp
index d4afc2f1..5aa5dc1e 100644
--- a/AnnService/src/Server/main.cpp
+++ b/AnnService/src/Server/main.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Server/SearchService.h"
 
 SPTAG::Service::SearchService g_service;
diff --git a/AnnService/src/Socket/Client.cpp b/AnnService/src/Socket/Client.cpp
index cd05d769..9c4101e4 100644
--- a/AnnService/src/Socket/Client.cpp
+++ b/AnnService/src/Socket/Client.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Socket/Client.h"
 
 #include <limits>
diff --git a/AnnService/src/Socket/Common.cpp b/AnnService/src/Socket/Common.cpp
index c71936d4..2cfc1178 100644
--- a/AnnService/src/Socket/Common.cpp
+++ b/AnnService/src/Socket/Common.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Socket/Common.h"
 
 
diff --git a/AnnService/src/Socket/Connection.cpp b/AnnService/src/Socket/Connection.cpp
index 18908bb1..6e536cbf 100644
--- a/AnnService/src/Socket/Connection.cpp
+++ b/AnnService/src/Socket/Connection.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Socket/Connection.h"
 #include "inc/Socket/ConnectionManager.h"
 
diff --git a/AnnService/src/Socket/ConnectionManager.cpp b/AnnService/src/Socket/ConnectionManager.cpp
index ea3906a8..eeb26c71 100644
--- a/AnnService/src/Socket/ConnectionManager.cpp
+++ b/AnnService/src/Socket/ConnectionManager.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Socket/ConnectionManager.h"
 
 using namespace SPTAG::Socket;
diff --git a/AnnService/src/Socket/Packet.cpp b/AnnService/src/Socket/Packet.cpp
index d6596c5a..335400bb 100644
--- a/AnnService/src/Socket/Packet.cpp
+++ b/AnnService/src/Socket/Packet.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Socket/Packet.h"
 #include "inc/Socket/SimpleSerialization.h"
 
diff --git a/AnnService/src/Socket/RemoteSearchQuery.cpp b/AnnService/src/Socket/RemoteSearchQuery.cpp
index ab1f7285..2cb45032 100644
--- a/AnnService/src/Socket/RemoteSearchQuery.cpp
+++ b/AnnService/src/Socket/RemoteSearchQuery.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Socket/RemoteSearchQuery.h"
 #include "inc/Socket/SimpleSerialization.h"
 
diff --git a/AnnService/src/Socket/Server.cpp b/AnnService/src/Socket/Server.cpp
index 094de3de..86d60040 100644
--- a/AnnService/src/Socket/Server.cpp
+++ b/AnnService/src/Socket/Server.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Socket/Server.h"
 
 #include <exception>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 617dd76f..cc5a893f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,7 @@
-cmake_minimum_required (VERSION 2.8)
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+cmake_minimum_required (VERSION 3.12)
 
 project (SPTAGLib)
 
diff --git a/PythonWrapper/CMakeLists.txt b/PythonWrapper/CMakeLists.txt
index 261c4181..9aa134b1 100644
--- a/PythonWrapper/CMakeLists.txt
+++ b/PythonWrapper/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 find_package(Python2 COMPONENTS Development)
 if (Python2_FOUND)    
     include_directories (${Python2_INCLUDE_DIRS})
diff --git a/PythonWrapper/inc/ClientInterface.h b/PythonWrapper/inc/ClientInterface.h
index e13a0d25..210c9443 100644
--- a/PythonWrapper/inc/ClientInterface.h
+++ b/PythonWrapper/inc/ClientInterface.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_PW_CLIENTINTERFACE_H_
 #define _SPTAG_PW_CLIENTINTERFACE_H_
 
diff --git a/PythonWrapper/inc/CoreInterface.h b/PythonWrapper/inc/CoreInterface.h
index 903cfe05..a62fad4c 100644
--- a/PythonWrapper/inc/CoreInterface.h
+++ b/PythonWrapper/inc/CoreInterface.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_PW_COREINTERFACE_H_
 #define _SPTAG_PW_COREINTERFACE_H_
 
diff --git a/PythonWrapper/inc/TransferDataType.h b/PythonWrapper/inc/TransferDataType.h
index 12f81c6e..51ef9614 100644
--- a/PythonWrapper/inc/TransferDataType.h
+++ b/PythonWrapper/inc/TransferDataType.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #ifndef _SPTAG_PW_TRANSFERDATATYPE_H_
 #define _SPTAG_PW_TRANSFERDATATYPE_H_
 
diff --git a/PythonWrapper/src/ClientInterface.cpp b/PythonWrapper/src/ClientInterface.cpp
index 16358a43..eeff8f45 100644
--- a/PythonWrapper/src/ClientInterface.cpp
+++ b/PythonWrapper/src/ClientInterface.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/ClientInterface.h"
 #include "inc/Helper/CommonHelper.h"
 #include "inc/Helper/Concurrent.h"
diff --git a/PythonWrapper/src/CoreInterface.cpp b/PythonWrapper/src/CoreInterface.cpp
index fa14e415..1587e9ef 100644
--- a/PythonWrapper/src/CoreInterface.cpp
+++ b/PythonWrapper/src/CoreInterface.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/CoreInterface.h"
 #include "inc/Helper/StringConvert.h"
 
diff --git a/Search/CMakeLists.txt b/Search/CMakeLists.txt
index acfa0b38..4fe79d68 100644
--- a/Search/CMakeLists.txt
+++ b/Search/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 file(GLOB HDR_FILES ${PROJECT_SOURCE_DIR}/AnnService/inc/Core/*.h ${PROJECT_SOURCE_DIR}/AnnService/inc/Core/Common/*.h ${PROJECT_SOURCE_DIR}/AnnService/inc/Core/BKT/*.h ${PROJECT_SOURCE_DIR}/AnnService/inc/Core/KDT/*.h ${PROJECT_SOURCE_DIR}/AnnService/inc/Helper/*.h)
 file(GLOB SRC_FILES ${PROJECT_SOURCE_DIR}/AnnService/src/Core/*.cpp ${PROJECT_SOURCE_DIR}/AnnService/src/Core/Common/*.cpp ${PROJECT_SOURCE_DIR}/AnnService/src/Core/BKT/*.cpp ${PROJECT_SOURCE_DIR}/AnnService/src/Core/KDT/*.cpp ${PROJECT_SOURCE_DIR}/AnnService/src/Helper/*.cpp)
 
diff --git a/Search/main.cpp b/Search/main.cpp
index 7cd28b60..f6dd4f5b 100644
--- a/Search/main.cpp
+++ b/Search/main.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Helper/SimpleIniReader.h"
 #include "inc/Helper/CommonHelper.h"
 #include "inc/Core/Common.h"
diff --git a/Test/CMakeLists.txt b/Test/CMakeLists.txt
index 93a9f1b8..e1179631 100644
--- a/Test/CMakeLists.txt
+++ b/Test/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
 if(NOT WIN32)
   ADD_DEFINITIONS(-DBOOST_TEST_DYN_LINK)
   message (STATUS "BOOST_TEST_DYN_LINK")
diff --git a/Test/inc/Test.h b/Test/inc/Test.h
index be44ae45..da6c096b 100644
--- a/Test/inc/Test.h
+++ b/Test/inc/Test.h
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #pragma once
 
 #include <iostream>
diff --git a/Test/src/AlgoTest.cpp b/Test/src/AlgoTest.cpp
index 1999d349..5a4d24c2 100644
--- a/Test/src/AlgoTest.cpp
+++ b/Test/src/AlgoTest.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Test.h"
 #include "inc/Helper/SimpleIniReader.h"
 #include "inc/Core/VectorIndex.h"
diff --git a/Test/src/Base64HelperTest.cpp b/Test/src/Base64HelperTest.cpp
index 57fec601..2ead4753 100644
--- a/Test/src/Base64HelperTest.cpp
+++ b/Test/src/Base64HelperTest.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Test.h"
 #include "inc/Helper/Base64Encode.h"
 
diff --git a/Test/src/CommonHelperTest.cpp b/Test/src/CommonHelperTest.cpp
index 581fa53b..17015642 100644
--- a/Test/src/CommonHelperTest.cpp
+++ b/Test/src/CommonHelperTest.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Test.h"
 #include "inc/Helper/CommonHelper.h"
 
diff --git a/Test/src/DistanceTest.cpp b/Test/src/DistanceTest.cpp
index 548dd32e..26c5cee3 100644
--- a/Test/src/DistanceTest.cpp
+++ b/Test/src/DistanceTest.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include <bitset>
 #include "inc/Test.h"
 #include "inc/Core/Common/DistanceUtils.h"
diff --git a/Test/src/IniReaderTest.cpp b/Test/src/IniReaderTest.cpp
index 6f060f4d..c5dd0baa 100644
--- a/Test/src/IniReaderTest.cpp
+++ b/Test/src/IniReaderTest.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Test.h"
 #include "inc/Helper/SimpleIniReader.h"
 
diff --git a/Test/src/StringConvertTest.cpp b/Test/src/StringConvertTest.cpp
index 82903e03..fa457deb 100644
--- a/Test/src/StringConvertTest.cpp
+++ b/Test/src/StringConvertTest.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #include "inc/Test.h"
 #include "inc/Helper/StringConvert.h"
 
diff --git a/Test/src/main.cpp b/Test/src/main.cpp
index 91444f66..7bf61ea1 100644
--- a/Test/src/main.cpp
+++ b/Test/src/main.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_MODULE Main
 #include "inc/Test.h"