diff --git a/LICENSE b/LICENSE
index 7cfc99ac..45d14401 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@ Apache License
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2021 Niket Naidu
+   Copyright 2021-2022 Niket Naidu
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/bootstrap/include/bootstrap/build_buildcc.h b/bootstrap/include/bootstrap/build_buildcc.h
index 2bbbfbc6..340066a5 100644
--- a/bootstrap/include/bootstrap/build_buildcc.h
+++ b/bootstrap/include/bootstrap/build_buildcc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bootstrap/include/bootstrap/build_cli11.h b/bootstrap/include/bootstrap/build_cli11.h
index 2f0d0952..44fdc96a 100644
--- a/bootstrap/include/bootstrap/build_cli11.h
+++ b/bootstrap/include/bootstrap/build_cli11.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bootstrap/include/bootstrap/build_flatbuffers.h b/bootstrap/include/bootstrap/build_flatbuffers.h
index d0adf845..e61d2430 100644
--- a/bootstrap/include/bootstrap/build_flatbuffers.h
+++ b/bootstrap/include/bootstrap/build_flatbuffers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bootstrap/include/bootstrap/build_fmtlib.h b/bootstrap/include/bootstrap/build_fmtlib.h
index a09fd383..1c3a978a 100644
--- a/bootstrap/include/bootstrap/build_fmtlib.h
+++ b/bootstrap/include/bootstrap/build_fmtlib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bootstrap/include/bootstrap/build_spdlog.h b/bootstrap/include/bootstrap/build_spdlog.h
index f71dab43..4b796d7d 100644
--- a/bootstrap/include/bootstrap/build_spdlog.h
+++ b/bootstrap/include/bootstrap/build_spdlog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bootstrap/include/bootstrap/build_taskflow.h b/bootstrap/include/bootstrap/build_taskflow.h
index f0a70250..1335ee77 100644
--- a/bootstrap/include/bootstrap/build_taskflow.h
+++ b/bootstrap/include/bootstrap/build_taskflow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bootstrap/include/bootstrap/build_tpl.h b/bootstrap/include/bootstrap/build_tpl.h
index 296892a2..9695f7d3 100644
--- a/bootstrap/include/bootstrap/build_tpl.h
+++ b/bootstrap/include/bootstrap/build_tpl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bootstrap/main.buildcc.cpp b/bootstrap/main.buildcc.cpp
index 6104c73a..8ec1d5a7 100644
--- a/bootstrap/main.buildcc.cpp
+++ b/bootstrap/main.buildcc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bootstrap/src/build_buildcc.cpp b/bootstrap/src/build_buildcc.cpp
index 76bf48a9..23fe6df6 100644
--- a/bootstrap/src/build_buildcc.cpp
+++ b/bootstrap/src/build_buildcc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bootstrap/src/build_cli11.cpp b/bootstrap/src/build_cli11.cpp
index d464c7c4..13d4d2f9 100644
--- a/bootstrap/src/build_cli11.cpp
+++ b/bootstrap/src/build_cli11.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bootstrap/src/build_flatbuffers.cpp b/bootstrap/src/build_flatbuffers.cpp
index 68c706d6..82f47af5 100644
--- a/bootstrap/src/build_flatbuffers.cpp
+++ b/bootstrap/src/build_flatbuffers.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bootstrap/src/build_fmtlib.cpp b/bootstrap/src/build_fmtlib.cpp
index 0ce2aa34..d19d9f6d 100644
--- a/bootstrap/src/build_fmtlib.cpp
+++ b/bootstrap/src/build_fmtlib.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bootstrap/src/build_spdlog.cpp b/bootstrap/src/build_spdlog.cpp
index 483807fe..2636c512 100644
--- a/bootstrap/src/build_spdlog.cpp
+++ b/bootstrap/src/build_spdlog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bootstrap/src/build_taskflow.cpp b/bootstrap/src/build_taskflow.cpp
index 22049ad3..4852235a 100644
--- a/bootstrap/src/build_taskflow.cpp
+++ b/bootstrap/src/build_taskflow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/bootstrap/src/build_tpl.cpp b/bootstrap/src/build_tpl.cpp
index b212f2c7..0bd53b14 100644
--- a/bootstrap/src/build_tpl.cpp
+++ b/bootstrap/src/build_tpl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/args/include/args/args.h b/buildcc/lib/args/include/args/args.h
index c6ac17c6..4f461707 100644
--- a/buildcc/lib/args/include/args/args.h
+++ b/buildcc/lib/args/include/args/args.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/args/include/args/persistent_storage.h b/buildcc/lib/args/include/args/persistent_storage.h
index 9e4c86e7..573c0172 100644
--- a/buildcc/lib/args/include/args/persistent_storage.h
+++ b/buildcc/lib/args/include/args/persistent_storage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/args/include/args/register.h b/buildcc/lib/args/include/args/register.h
index 49999fc8..906641d5 100644
--- a/buildcc/lib/args/include/args/register.h
+++ b/buildcc/lib/args/include/args/register.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/args/include/args/register/test_info.h b/buildcc/lib/args/include/args/register/test_info.h
index b254be7f..033a8f1c 100644
--- a/buildcc/lib/args/include/args/register/test_info.h
+++ b/buildcc/lib/args/include/args/register/test_info.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/args/src/args.cpp b/buildcc/lib/args/src/args.cpp
index c9ab18cb..9bccd157 100644
--- a/buildcc/lib/args/src/args.cpp
+++ b/buildcc/lib/args/src/args.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/args/src/parse.cpp b/buildcc/lib/args/src/parse.cpp
index c2db2908..637ee6f4 100644
--- a/buildcc/lib/args/src/parse.cpp
+++ b/buildcc/lib/args/src/parse.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/args/src/register.cpp b/buildcc/lib/args/src/register.cpp
index 4ea1ed9e..f7afb40d 100644
--- a/buildcc/lib/args/src/register.cpp
+++ b/buildcc/lib/args/src/register.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/args/src/tasks.cpp b/buildcc/lib/args/src/tasks.cpp
index a0068999..e4c0653b 100644
--- a/buildcc/lib/args/src/tasks.cpp
+++ b/buildcc/lib/args/src/tasks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/env/include/env/assert_fatal.h b/buildcc/lib/env/include/env/assert_fatal.h
index b7754670..481e7a3c 100644
--- a/buildcc/lib/env/include/env/assert_fatal.h
+++ b/buildcc/lib/env/include/env/assert_fatal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/env/include/env/assert_throw.h b/buildcc/lib/env/include/env/assert_throw.h
index bdb5618b..1c58f089 100644
--- a/buildcc/lib/env/include/env/assert_throw.h
+++ b/buildcc/lib/env/include/env/assert_throw.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/env/include/env/command.h b/buildcc/lib/env/include/env/command.h
index 07290c9d..0c54a355 100644
--- a/buildcc/lib/env/include/env/command.h
+++ b/buildcc/lib/env/include/env/command.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/env/include/env/env.h b/buildcc/lib/env/include/env/env.h
index 5142fc72..efb6ead1 100644
--- a/buildcc/lib/env/include/env/env.h
+++ b/buildcc/lib/env/include/env/env.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/env/include/env/host_compiler.h b/buildcc/lib/env/include/env/host_compiler.h
index 1d34c556..0340fc9a 100644
--- a/buildcc/lib/env/include/env/host_compiler.h
+++ b/buildcc/lib/env/include/env/host_compiler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/env/include/env/host_os.h b/buildcc/lib/env/include/env/host_os.h
index 18740211..9ec18ad6 100644
--- a/buildcc/lib/env/include/env/host_os.h
+++ b/buildcc/lib/env/include/env/host_os.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/env/include/env/host_os_util.h b/buildcc/lib/env/include/env/host_os_util.h
index e8a5ca3f..a65e46c1 100644
--- a/buildcc/lib/env/include/env/host_os_util.h
+++ b/buildcc/lib/env/include/env/host_os_util.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/env/include/env/logging.h b/buildcc/lib/env/include/env/logging.h
index 8a4f8179..865721bc 100644
--- a/buildcc/lib/env/include/env/logging.h
+++ b/buildcc/lib/env/include/env/logging.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/env/include/env/task_state.h b/buildcc/lib/env/include/env/task_state.h
index 0dec0222..629a8aee 100644
--- a/buildcc/lib/env/include/env/task_state.h
+++ b/buildcc/lib/env/include/env/task_state.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/env/include/env/util.h b/buildcc/lib/env/include/env/util.h
index 7300af04..be467b34 100644
--- a/buildcc/lib/env/include/env/util.h
+++ b/buildcc/lib/env/include/env/util.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/env/src/assert_fatal.cpp b/buildcc/lib/env/src/assert_fatal.cpp
index d52ead39..7d7becf3 100644
--- a/buildcc/lib/env/src/assert_fatal.cpp
+++ b/buildcc/lib/env/src/assert_fatal.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/env/src/command.cpp b/buildcc/lib/env/src/command.cpp
index febb59c8..6620c37e 100644
--- a/buildcc/lib/env/src/command.cpp
+++ b/buildcc/lib/env/src/command.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/env/src/env.cpp b/buildcc/lib/env/src/env.cpp
index 08d3cc71..ffb0f008 100644
--- a/buildcc/lib/env/src/env.cpp
+++ b/buildcc/lib/env/src/env.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/env/src/execute.cpp b/buildcc/lib/env/src/execute.cpp
index 3ff6032f..60fe41cf 100644
--- a/buildcc/lib/env/src/execute.cpp
+++ b/buildcc/lib/env/src/execute.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/env/src/logging.cpp b/buildcc/lib/env/src/logging.cpp
index 301b8ec4..a532f7b8 100644
--- a/buildcc/lib/env/src/logging.cpp
+++ b/buildcc/lib/env/src/logging.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/env/src/task_state.cpp b/buildcc/lib/env/src/task_state.cpp
index 93f14d45..d0b14a64 100644
--- a/buildcc/lib/env/src/task_state.cpp
+++ b/buildcc/lib/env/src/task_state.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/api/deps_api.h b/buildcc/lib/target/include/target/api/deps_api.h
index e3e87b94..f8a06bf6 100644
--- a/buildcc/lib/target/include/target/api/deps_api.h
+++ b/buildcc/lib/target/include/target/api/deps_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/api/flag_api.h b/buildcc/lib/target/include/target/api/flag_api.h
index 3591ecf8..08d6c109 100644
--- a/buildcc/lib/target/include/target/api/flag_api.h
+++ b/buildcc/lib/target/include/target/api/flag_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/api/include_api.h b/buildcc/lib/target/include/target/api/include_api.h
index 04d7d67f..c8f54b9c 100644
--- a/buildcc/lib/target/include/target/api/include_api.h
+++ b/buildcc/lib/target/include/target/api/include_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/api/lib_api.h b/buildcc/lib/target/include/target/api/lib_api.h
index c787a4bb..e58832a0 100644
--- a/buildcc/lib/target/include/target/api/lib_api.h
+++ b/buildcc/lib/target/include/target/api/lib_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/api/pch_api.h b/buildcc/lib/target/include/target/api/pch_api.h
index 1a7bc027..9e277eda 100644
--- a/buildcc/lib/target/include/target/api/pch_api.h
+++ b/buildcc/lib/target/include/target/api/pch_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/api/source_api.h b/buildcc/lib/target/include/target/api/source_api.h
index 339632c8..314ec741 100644
--- a/buildcc/lib/target/include/target/api/source_api.h
+++ b/buildcc/lib/target/include/target/api/source_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/api/sync_api.h b/buildcc/lib/target/include/target/api/sync_api.h
index f7407113..f20e644e 100644
--- a/buildcc/lib/target/include/target/api/sync_api.h
+++ b/buildcc/lib/target/include/target/api/sync_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/api/target_getter.h b/buildcc/lib/target/include/target/api/target_getter.h
index 2665c40a..5adb44bb 100644
--- a/buildcc/lib/target/include/target/api/target_getter.h
+++ b/buildcc/lib/target/include/target/api/target_getter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/api/target_info_getter.h b/buildcc/lib/target/include/target/api/target_info_getter.h
index e26db49e..f4e33aac 100644
--- a/buildcc/lib/target/include/target/api/target_info_getter.h
+++ b/buildcc/lib/target/include/target/api/target_info_getter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/base/generator_loader.h b/buildcc/lib/target/include/target/base/generator_loader.h
index da8c5463..a3bc0e85 100644
--- a/buildcc/lib/target/include/target/base/generator_loader.h
+++ b/buildcc/lib/target/include/target/base/generator_loader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/base/target_loader.h b/buildcc/lib/target/include/target/base/target_loader.h
index b02138dc..9bf1161f 100644
--- a/buildcc/lib/target/include/target/base/target_loader.h
+++ b/buildcc/lib/target/include/target/base/target_loader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/base/target_storer.h b/buildcc/lib/target/include/target/base/target_storer.h
index c750e9ca..c8cceea6 100644
--- a/buildcc/lib/target/include/target/base/target_storer.h
+++ b/buildcc/lib/target/include/target/base/target_storer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/common/path.h b/buildcc/lib/target/include/target/common/path.h
index f520d3f6..faa6e0f8 100644
--- a/buildcc/lib/target/include/target/common/path.h
+++ b/buildcc/lib/target/include/target/common/path.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/common/target_config.h b/buildcc/lib/target/include/target/common/target_config.h
index d7faf2dd..6f735fa7 100644
--- a/buildcc/lib/target/include/target/common/target_config.h
+++ b/buildcc/lib/target/include/target/common/target_config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/common/target_env.h b/buildcc/lib/target/include/target/common/target_env.h
index c7bcbfa3..f1f003cd 100644
--- a/buildcc/lib/target/include/target/common/target_env.h
+++ b/buildcc/lib/target/include/target/common/target_env.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/common/target_file_ext.h b/buildcc/lib/target/include/target/common/target_file_ext.h
index 3edfafd9..0aadabd3 100644
--- a/buildcc/lib/target/include/target/common/target_file_ext.h
+++ b/buildcc/lib/target/include/target/common/target_file_ext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/common/target_state.h b/buildcc/lib/target/include/target/common/target_state.h
index 49affaba..23945d9f 100644
--- a/buildcc/lib/target/include/target/common/target_state.h
+++ b/buildcc/lib/target/include/target/common/target_state.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/common/target_type.h b/buildcc/lib/target/include/target/common/target_type.h
index c706d7fa..375e6107 100644
--- a/buildcc/lib/target/include/target/common/target_type.h
+++ b/buildcc/lib/target/include/target/common/target_type.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/common/util.h b/buildcc/lib/target/include/target/common/util.h
index 67d543f3..c95f7daa 100644
--- a/buildcc/lib/target/include/target/common/util.h
+++ b/buildcc/lib/target/include/target/common/util.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/friend/compile_object.h b/buildcc/lib/target/include/target/friend/compile_object.h
index 3bc165b3..65dd5f01 100644
--- a/buildcc/lib/target/include/target/friend/compile_object.h
+++ b/buildcc/lib/target/include/target/friend/compile_object.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/friend/compile_pch.h b/buildcc/lib/target/include/target/friend/compile_pch.h
index a592f9c4..9fdaed70 100644
--- a/buildcc/lib/target/include/target/friend/compile_pch.h
+++ b/buildcc/lib/target/include/target/friend/compile_pch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/friend/link_target.h b/buildcc/lib/target/include/target/friend/link_target.h
index 0a3020be..a00c0e91 100644
--- a/buildcc/lib/target/include/target/friend/link_target.h
+++ b/buildcc/lib/target/include/target/friend/link_target.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/generator.h b/buildcc/lib/target/include/target/generator.h
index 96976ef6..ce4e91a9 100644
--- a/buildcc/lib/target/include/target/generator.h
+++ b/buildcc/lib/target/include/target/generator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/interface/builder_interface.h b/buildcc/lib/target/include/target/interface/builder_interface.h
index f0384986..fd4abd43 100644
--- a/buildcc/lib/target/include/target/interface/builder_interface.h
+++ b/buildcc/lib/target/include/target/interface/builder_interface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/interface/loader_interface.h b/buildcc/lib/target/include/target/interface/loader_interface.h
index fb085bfa..9bf838bd 100644
--- a/buildcc/lib/target/include/target/interface/loader_interface.h
+++ b/buildcc/lib/target/include/target/interface/loader_interface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/private/schema_util.h b/buildcc/lib/target/include/target/private/schema_util.h
index 83d3d000..d962e83e 100644
--- a/buildcc/lib/target/include/target/private/schema_util.h
+++ b/buildcc/lib/target/include/target/private/schema_util.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/target.h b/buildcc/lib/target/include/target/target.h
index 344deb38..99435cc4 100644
--- a/buildcc/lib/target/include/target/target.h
+++ b/buildcc/lib/target/include/target/target.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/include/target/target_info.h b/buildcc/lib/target/include/target/target_info.h
index 228c0b78..a734086e 100644
--- a/buildcc/lib/target/include/target/target_info.h
+++ b/buildcc/lib/target/include/target/target_info.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/src/api/deps_api.cpp b/buildcc/lib/target/src/api/deps_api.cpp
index f0c85a91..82b8645c 100644
--- a/buildcc/lib/target/src/api/deps_api.cpp
+++ b/buildcc/lib/target/src/api/deps_api.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/src/api/flag_api.cpp b/buildcc/lib/target/src/api/flag_api.cpp
index 7145f54b..3c9ef740 100644
--- a/buildcc/lib/target/src/api/flag_api.cpp
+++ b/buildcc/lib/target/src/api/flag_api.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/src/api/include_api.cpp b/buildcc/lib/target/src/api/include_api.cpp
index 3b5de205..1003137b 100644
--- a/buildcc/lib/target/src/api/include_api.cpp
+++ b/buildcc/lib/target/src/api/include_api.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/src/api/lib_api.cpp b/buildcc/lib/target/src/api/lib_api.cpp
index 55eca4b1..e5dadda1 100644
--- a/buildcc/lib/target/src/api/lib_api.cpp
+++ b/buildcc/lib/target/src/api/lib_api.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/src/api/pch_api.cpp b/buildcc/lib/target/src/api/pch_api.cpp
index 58692067..7531c500 100644
--- a/buildcc/lib/target/src/api/pch_api.cpp
+++ b/buildcc/lib/target/src/api/pch_api.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/src/api/source_api.cpp b/buildcc/lib/target/src/api/source_api.cpp
index 154c1fda..f3d0a8c4 100644
--- a/buildcc/lib/target/src/api/source_api.cpp
+++ b/buildcc/lib/target/src/api/source_api.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/src/api/sync_api.cpp b/buildcc/lib/target/src/api/sync_api.cpp
index 80746dd0..12e949f0 100644
--- a/buildcc/lib/target/src/api/sync_api.cpp
+++ b/buildcc/lib/target/src/api/sync_api.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/src/api/target_getter.cpp b/buildcc/lib/target/src/api/target_getter.cpp
index 3b2e3c58..72bd404d 100644
--- a/buildcc/lib/target/src/api/target_getter.cpp
+++ b/buildcc/lib/target/src/api/target_getter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/src/api/target_info_getter.cpp b/buildcc/lib/target/src/api/target_info_getter.cpp
index d9171169..51bf8791 100644
--- a/buildcc/lib/target/src/api/target_info_getter.cpp
+++ b/buildcc/lib/target/src/api/target_info_getter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/src/common/target_config.cpp b/buildcc/lib/target/src/common/target_config.cpp
index aaddfbf7..fa0d0a4a 100644
--- a/buildcc/lib/target/src/common/target_config.cpp
+++ b/buildcc/lib/target/src/common/target_config.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/src/common/target_state.cpp b/buildcc/lib/target/src/common/target_state.cpp
index b1b7e035..baaa6d1c 100644
--- a/buildcc/lib/target/src/common/target_state.cpp
+++ b/buildcc/lib/target/src/common/target_state.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/src/common/util.cpp b/buildcc/lib/target/src/common/util.cpp
index 17772657..881e610a 100644
--- a/buildcc/lib/target/src/common/util.cpp
+++ b/buildcc/lib/target/src/common/util.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/src/generator/generator.cpp b/buildcc/lib/target/src/generator/generator.cpp
index 5efa1683..81f22c22 100644
--- a/buildcc/lib/target/src/generator/generator.cpp
+++ b/buildcc/lib/target/src/generator/generator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/src/generator/generator_loader.cpp b/buildcc/lib/target/src/generator/generator_loader.cpp
index 3cc62cb1..0a54b820 100644
--- a/buildcc/lib/target/src/generator/generator_loader.cpp
+++ b/buildcc/lib/target/src/generator/generator_loader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/src/generator/generator_storer.cpp b/buildcc/lib/target/src/generator/generator_storer.cpp
index 5f7f20c2..02bc413d 100644
--- a/buildcc/lib/target/src/generator/generator_storer.cpp
+++ b/buildcc/lib/target/src/generator/generator_storer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/src/generator/recheck_states.cpp b/buildcc/lib/target/src/generator/recheck_states.cpp
index 57149745..63bb8356 100644
--- a/buildcc/lib/target/src/generator/recheck_states.cpp
+++ b/buildcc/lib/target/src/generator/recheck_states.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/src/generator/task.cpp b/buildcc/lib/target/src/generator/task.cpp
index 77796998..b7f6eeb6 100644
--- a/buildcc/lib/target/src/generator/task.cpp
+++ b/buildcc/lib/target/src/generator/task.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/src/target/build.cpp b/buildcc/lib/target/src/target/build.cpp
index ef9654a5..4aabe76a 100644
--- a/buildcc/lib/target/src/target/build.cpp
+++ b/buildcc/lib/target/src/target/build.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/src/target/friend/compile_object.cpp b/buildcc/lib/target/src/target/friend/compile_object.cpp
index fe6b74ae..fac6062d 100644
--- a/buildcc/lib/target/src/target/friend/compile_object.cpp
+++ b/buildcc/lib/target/src/target/friend/compile_object.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -96,33 +96,60 @@ CompileObject::GetObjectData(const fs::path &absolute_source) const {
 // - {target_absolute_root_dir} / FOOLIB / source -> {target_absolute_build_dir}
 // / FOOLIB / source
 
-// TODO, Discuss PathReplacementStrategy API (Grey areas?)
-// NOTE, Replace part of the `relative path` with a path of users choice
-// - Add `folder/nested` -> FOLDER_NESTED
-// - {target_root_dir} / random / folder / nested / source -> {target_build_dir}
-// / random / FOLDER_NESTED / source.compiled
+// TODO, Discuss DifferentOutputFolder API
+// {target_root_dir} / random / folder / file.cpp -> {target_build_dir} / random
+// / folder / file.cpp.o (SAME)
+// {OUT_OF_ROOT_FOLDER} / file.cpp -> {target_build_dir} / {USER_OUTPUT_FOLDER}
+// / file.cpp.o
+// {OUT_OF_ROOT_FOLDER} / random / folder / file.cpp -> {target_build_dir} /
+// {USER_OUTPUT_FOLDER} / random / folder / file.cpp.o
 fs::path
 CompileObject::ConstructObjectPath(const fs::path &absolute_source_file) const {
 
   // Compute the relative compiled source path
+  // Expects to convert
+  // 1. {project_root_dir} / file.cpp -> file.cpp
+  // 2. {project_root_dir} / folder / file.cpp -> folder / file.cpp
   fs::path relative =
       absolute_source_file.lexically_relative(target_.GetTargetRootDir());
 
-  // TODO, Add path replacement strategy on relative
-
+  // Expects to convert
+  // 1. {project_root_dir} / .. / file.cpp -> .. / file.cpp
+  // 2. {project_root_dir} / .. / folder / file.cpp -> .. / folder / file.cpp
   // - Check if out of root
   // - Convert .. to __
   // NOTE, Similar to how CMake handles out of root files
   std::string relstr = relative.string();
   if (relstr.find("..") != std::string::npos) {
-    env::log_warning(__FUNCTION__,
-                     fmt::format("Out of Root Source detected '{}'. Use "
-                                 "TargetEnv to supply absolute target root "
-                                 "path -> absolute target build path. By "
-                                 "default converts '..' to '__'",
-                                 relstr));
+    env::log_warning(
+        __FUNCTION__,
+        fmt::format("Out of Root Source detected '{}' -> '{}'. Use "
+                    "TargetEnv to supply absolute target root "
+                    "path -> absolute target build path. By "
+                    "default converts '..' to '__'",
+                    absolute_source_file.string(), relstr));
     std::replace(relstr.begin(), relstr.end(), '.', '_');
+    // Converts above
+    // .. / file.cpp -> __ / file.cpp
+    // .. / folder / file.cpp -> __ / folder / file.cpp
     relative = relstr;
+
+    // TODO, path replacement found
+    // * API
+    // AddSourceAbsolute("BUILDCC_HOME / libs / fmt / build.fmt.cpp",
+    //                   {"BUILDCC_HOME / libs / fmt", "fmt"});
+
+    // Converts above
+    // .. / file.cpp -> {REPLACEMENT_DIR} / file.cpp
+    // .. / folder / file.cpp -> {REPLACEMENT_DIR} / folder / file.cpp
+    // relative = relative_replacement_dir / absolute_source_file.filename();
+
+    // std::string absolute_source_file_str =
+    //     path_as_string(absolute_source_file);
+    // auto iter = absolute_source_file_str.find(replacement_strategy.first);
+    // relative = absolute_source_file_str.replace(
+    //     iter, replacement_strategy.first.length(),
+    //     replacement_strategy.second);
   }
 
   // Compute relative object path
diff --git a/buildcc/lib/target/src/target/friend/compile_pch.cpp b/buildcc/lib/target/src/target/friend/compile_pch.cpp
index 23767692..aa0688c9 100644
--- a/buildcc/lib/target/src/target/friend/compile_pch.cpp
+++ b/buildcc/lib/target/src/target/friend/compile_pch.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/src/target/friend/link_target.cpp b/buildcc/lib/target/src/target/friend/link_target.cpp
index f88aa723..31ea50a3 100644
--- a/buildcc/lib/target/src/target/friend/link_target.cpp
+++ b/buildcc/lib/target/src/target/friend/link_target.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/src/target/recheck_states.cpp b/buildcc/lib/target/src/target/recheck_states.cpp
index 0b0c8072..8c9686cb 100644
--- a/buildcc/lib/target/src/target/recheck_states.cpp
+++ b/buildcc/lib/target/src/target/recheck_states.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/src/target/target.cpp b/buildcc/lib/target/src/target/target.cpp
index d6dab01f..aba3b0a6 100644
--- a/buildcc/lib/target/src/target/target.cpp
+++ b/buildcc/lib/target/src/target/target.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/src/target/target_loader.cpp b/buildcc/lib/target/src/target/target_loader.cpp
index 7d971407..35d40d13 100644
--- a/buildcc/lib/target/src/target/target_loader.cpp
+++ b/buildcc/lib/target/src/target/target_loader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/src/target/target_storer.cpp b/buildcc/lib/target/src/target/target_storer.cpp
index cf76ff9f..26d17985 100644
--- a/buildcc/lib/target/src/target/target_storer.cpp
+++ b/buildcc/lib/target/src/target/target_storer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/target/src/target/tasks.cpp b/buildcc/lib/target/src/target/tasks.cpp
index cd305195..794cb143 100644
--- a/buildcc/lib/target/src/target/tasks.cpp
+++ b/buildcc/lib/target/src/target/tasks.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/toolchain/include/toolchain/api/toolchain_verify.h b/buildcc/lib/toolchain/include/toolchain/api/toolchain_verify.h
index 35e006bc..684618e1 100644
--- a/buildcc/lib/toolchain/include/toolchain/api/toolchain_verify.h
+++ b/buildcc/lib/toolchain/include/toolchain/api/toolchain_verify.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/toolchain/include/toolchain/toolchain.h b/buildcc/lib/toolchain/include/toolchain/toolchain.h
index 9eeb278c..5a82db7a 100644
--- a/buildcc/lib/toolchain/include/toolchain/toolchain.h
+++ b/buildcc/lib/toolchain/include/toolchain/toolchain.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/lib/toolchain/src/api/toolchain_verify.cpp b/buildcc/lib/toolchain/src/api/toolchain_verify.cpp
index 289c13bf..d1c7bee2 100644
--- a/buildcc/lib/toolchain/src/api/toolchain_verify.cpp
+++ b/buildcc/lib/toolchain/src/api/toolchain_verify.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/plugins/include/plugins/buildcc_find.h b/buildcc/plugins/include/plugins/buildcc_find.h
index 2ebd4433..1c8f3661 100644
--- a/buildcc/plugins/include/plugins/buildcc_find.h
+++ b/buildcc/plugins/include/plugins/buildcc_find.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/plugins/include/plugins/clang_compile_commands.h b/buildcc/plugins/include/plugins/clang_compile_commands.h
index 45a376ac..274fcd66 100644
--- a/buildcc/plugins/include/plugins/clang_compile_commands.h
+++ b/buildcc/plugins/include/plugins/clang_compile_commands.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/plugins/src/buildcc_find.cpp b/buildcc/plugins/src/buildcc_find.cpp
index deea60ac..94e6aac9 100644
--- a/buildcc/plugins/src/buildcc_find.cpp
+++ b/buildcc/plugins/src/buildcc_find.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/plugins/src/clang_compile_commands.cpp b/buildcc/plugins/src/clang_compile_commands.cpp
index c34e2ebf..52402b09 100644
--- a/buildcc/plugins/src/clang_compile_commands.cpp
+++ b/buildcc/plugins/src/clang_compile_commands.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/schema/generator.fbs b/buildcc/schema/generator.fbs
index 54c205cc..08166702 100644
--- a/buildcc/schema/generator.fbs
+++ b/buildcc/schema/generator.fbs
@@ -1,4 +1,4 @@
-// Copyright 2021 Niket Naidu. All rights reserved.
+// Copyright 2021-2022 Niket Naidu. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/buildcc/schema/path.fbs b/buildcc/schema/path.fbs
index 35a38e8a..3407649e 100644
--- a/buildcc/schema/path.fbs
+++ b/buildcc/schema/path.fbs
@@ -1,4 +1,4 @@
-// Copyright 2021 Niket Naidu. All rights reserved.
+// Copyright 2021-2022 Niket Naidu. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/buildcc/schema/target.fbs b/buildcc/schema/target.fbs
index 755d3660..0eff9a0e 100644
--- a/buildcc/schema/target.fbs
+++ b/buildcc/schema/target.fbs
@@ -1,4 +1,4 @@
-// Copyright 2021 Niket Naidu. All rights reserved.
+// Copyright 2021-2022 Niket Naidu. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/buildcc/targets/include/targets/target_config_interface.h b/buildcc/targets/include/targets/target_config_interface.h
index 62e94358..ce741013 100644
--- a/buildcc/targets/include/targets/target_config_interface.h
+++ b/buildcc/targets/include/targets/target_config_interface.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/targets/include/targets/target_custom.h b/buildcc/targets/include/targets/target_custom.h
index 0124e1b8..ea674dda 100644
--- a/buildcc/targets/include/targets/target_custom.h
+++ b/buildcc/targets/include/targets/target_custom.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/targets/include/targets/target_gcc.h b/buildcc/targets/include/targets/target_gcc.h
index d7a768e0..60df007f 100644
--- a/buildcc/targets/include/targets/target_gcc.h
+++ b/buildcc/targets/include/targets/target_gcc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/targets/include/targets/target_msvc.h b/buildcc/targets/include/targets/target_msvc.h
index 77c85ae3..0d8e91ae 100644
--- a/buildcc/targets/include/targets/target_msvc.h
+++ b/buildcc/targets/include/targets/target_msvc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/toolchains/include/toolchains/toolchain_gcc.h b/buildcc/toolchains/include/toolchains/toolchain_gcc.h
index 02540f48..b61ed52f 100644
--- a/buildcc/toolchains/include/toolchains/toolchain_gcc.h
+++ b/buildcc/toolchains/include/toolchains/toolchain_gcc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/buildcc/toolchains/include/toolchains/toolchain_msvc.h b/buildcc/toolchains/include/toolchains/toolchain_msvc.h
index 7b6e8e2a..3a16f3e8 100644
--- a/buildcc/toolchains/include/toolchains/toolchain_msvc.h
+++ b/buildcc/toolchains/include/toolchains/toolchain_msvc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Niket Naidu. All rights reserved.
+ * Copyright 2021-2022 Niket Naidu. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.