diff --git a/GenerateCLP/GenerateCLP.cxx b/GenerateCLP/GenerateCLP.cxx
index b492d43..413765c 100644
--- a/GenerateCLP/GenerateCLP.cxx
+++ b/GenerateCLP/GenerateCLP.cxx
@@ -520,8 +520,12 @@ void GenerateDeSerialization( std::ostream & sout,
     | "        return EXIT_FAILURE;"
     | "        }"
     | "      Json::Value root;"
-    | "      Json::Reader reader;"
-    | "      reader.parse( fStream, root );"
+    | "      Json::CharReaderBuilder builder;"
+    | "      JSONCPP_STRING errs;"
+    | "      if (!parseFromStream(builder, fStream, &root, &errs)) {"
+    | "        std::cout << errs << std::endl;"
+    | "        return EXIT_FAILURE;"
+    | "      }"
     | "      const Json::Value & parameters = root[\"Parameters\"];";
 
   typedef std::vector<ModuleParameterGroup> ModuleParameterGroupsType;
@@ -686,8 +690,9 @@ void GenerateSerialization( std::ostream & sout,
     | "    std::cerr << \"Could not open file: \" << parametersSerializeArg.getValue() << \" for writing.\" << std::endl;"
     | "    return EXIT_FAILURE;"
     | "    }"
-    | "  Json::StyledStreamWriter writer;"
-    | "  writer.write( fStream, root );"
+    | "  Json::StreamWriterBuilder builder;"
+    | "  const std::unique_ptr<Json::StreamWriter> writer(builder.newStreamWriter());"
+    | "  writer->write( root, &fStream );"
     | "  fStream.close();"
     | "  }";
 }
diff --git a/GenerateCLP/GenerateCLPConfig.cmake.in b/GenerateCLP/GenerateCLPConfig.cmake.in
index c5feddc..7832588 100644
--- a/GenerateCLP/GenerateCLPConfig.cmake.in
+++ b/GenerateCLP/GenerateCLPConfig.cmake.in
@@ -11,7 +11,9 @@ set(SlicerExecutionModel_USE_UTF8 "@SlicerExecutionModel_USE_UTF8@")
 set(SlicerExecutionModel_CMAKE_DIR "@SlicerExecutionModel_CMAKE_DIR@")
 set(TCLAP_DIR "@TCLAP_DIR@")
 set(ModuleDescriptionParser_DIR "@ModuleDescriptionParser_DIR@")
-set(ITK_DIR "@ITK_DIR_CONFIG@")
+if (NOT DEFINED ITK_DIR)
+  set(ITK_DIR "@ITK_DIR_CONFIG@")
+endif()
 
 set(GenerateCLP_JsonCpp_INCLUDE_DIR "@JsonCpp_INCLUDE_DIR@")
 if(NOT "${GenerateCLP_JsonCpp_INCLUDE_DIR}" STREQUAL "")
diff --git a/GenerateCLP/GenerateCLPInstallConfig.cmake.in b/GenerateCLP/GenerateCLPInstallConfig.cmake.in
index a53fa54..bbc88c6 100644
--- a/GenerateCLP/GenerateCLPInstallConfig.cmake.in
+++ b/GenerateCLP/GenerateCLPInstallConfig.cmake.in
@@ -18,5 +18,6 @@ set(GENERATECLP_EXE "${GENERATECLP_EXE}${__EXE_EXT}")
 get_filename_component(GENERATECLP_EXE "${GENERATECLP_EXE}" ABSOLUTE)
 set(TCLAP_DIR "@TCLAP_DIR@")
 set(ModuleDescriptionParser_DIR "@ModuleDescriptionParser_DIR@")
-set(ITK_DIR "@ITK_DIR@")
-
+if (NOT DEFINED ITK_DIR)
+  set(ITK_DIR "@ITK_DIR@")
+endif()
diff --git a/ModuleDescriptionParser/ModuleDescriptionParserConfig.cmake.in b/ModuleDescriptionParser/ModuleDescriptionParserConfig.cmake.in
index 04d5be2..ae1bf72 100644
--- a/ModuleDescriptionParser/ModuleDescriptionParserConfig.cmake.in
+++ b/ModuleDescriptionParser/ModuleDescriptionParserConfig.cmake.in
@@ -9,7 +9,9 @@ set(ModuleDescriptionParser_USE_FILE
   "@ModuleDescriptionParser_USE_FILE_CONFIG@"
   )
 
-set(ITK_DIR "@ITK_DIR_CONFIG@")
+if (NOT DEFINED ITK_DIR)
+  set(ITK_DIR "@ITK_DIR_CONFIG@")
+endif()
 
 set(ModuleDescriptionParser_ITK_COMPONENTS "@ModuleDescriptionParser_ITK_COMPONENTS@")
 
diff --git a/ModuleDescriptionParser/ModuleDescriptionParserInstallConfig.cmake.in b/ModuleDescriptionParser/ModuleDescriptionParserInstallConfig.cmake.in
index 0490599..a315b78 100644
--- a/ModuleDescriptionParser/ModuleDescriptionParserInstallConfig.cmake.in
+++ b/ModuleDescriptionParser/ModuleDescriptionParserInstallConfig.cmake.in
@@ -16,4 +16,6 @@ set(ModuleDescriptionParser_USE_FILE
   "${ModuleDescriptionParser_CONFIG_DIR}/UseModuleDescriptionParser.cmake"
   )
 
-set(ITK_DIR "@ITK_DIR@")
+if (NOT DEFINED ITK_DIR)
+  set(ITK_DIR "@ITK_DIR@")
+endif()