diff --git a/cmake/BuildDynamicSample.in b/cmake/BuildDynamicSample.in
index 64f4a50..31e5a45 100644
--- a/cmake/BuildDynamicSample.in
+++ b/cmake/BuildDynamicSample.in
@@ -1,87 +1,87 @@
 # Copyright 2016-2021 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
 
 ################################################################################
 #    This file is part of NUISANCE.
 #
 #    NUISANCE is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation, either version 3 of the License, or
 #    (at your option) any later version.
 #
 #    NUISANCE is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
 #!/bin/bash
 
 if [ ! "${1}" ] || [ ! -e ${1} ] || [ ! "${2}" ]; then
   echo "[USAGE]: ${0} input.cxx outputLibName.so [classname]"
   exit 1
 fi
 
 if [ ! "${3}" ]; then
   CN=$(grep "class .*" $1 | sed "s/^class \([0-9a-zA-Z]\+\).*$/\1/g")
 else
   CN=${3}
 fi
 
 if [ ! "${CN}" ]; then
   echo "[ERROR]: Couldn't find class name -- Expected to find a line like: \"class XXXX : public Measurement1D\" in \"$1\". You can also forcibly specify your classes name by passing a third argument to this script."
   exit 1
 fi
 
 if [ ! -e compile.tmp ]; then
   mkdir compile.tmp
 fi
 
 cat $1 > compile.tmp/$1
 
 echo -e "static char const * SampleNames[] = {\"${CN}\"};\n"\
 "static int const NSamples = 1;\n"\
 "\n"\
 "extern \"C\" {\n"\
 "int DSF_NSamples() { return NSamples; }\n"\
 "char const* DSF_GetSampleName(int i) {\n"\
 "  if (i < NSamples) {\n"\
 "    return SampleNames[i];\n"\
 "  }\n"\
 "  return 0;\n"\
 "}\n"\
 "MeasurementBase* DSF_GetSample(int i, void* samplekey) {\n"\
 "  nuiskey* sk = reinterpret_cast<nuiskey *>(samplekey);\n"\
 "  if (!sk) {\n"\
 "    return 0;\n"\
 "  }\n"\
 "\n"\
 "  if (sk->GetS(\"name\") != DSF_GetSampleName(i)) {\n"\
 "    std::cout\n"\
 "        << \"[ERROR]: When instantiating dynamic sample. Samplekey named: \"\n"\
 "        << sk->GetS(\"name\") << \", but requested sample named: \"\n"\
 "        << DSF_GetSampleName(i)\n"\
 "        << \". It is possible that the nuiskey object is lost in translation. \"\n"\
 "           \"Was NUISANCE and this dynamic sample manifest built with the same \"\n"\
 "           \"environment and compiler?\"\n"\
 "        << std::endl;\n"\
 "  }\n"\
 "\n"\
 "  if (i == 0) {\n"\
 "    return new ${CN}(*sk);\n"\
 "  }\n"\
 "  return 0;\n"\
 "}\n"\
 "void DSF_DestroySample(MeasurementBase* mb) { delete mb; }\n"\
 "}" >> compile.tmp/$1
 
-echo "g++ ${DYNSAMPLE_EXTRA_BUILD_FLAGS} compile.tmp/$1 -shared -o $2 -fPIC @CMAKE_CXX_FLAGS@ -I. -I@ALL_INCLUDES_STR@ -L@CMAKE_INSTALL_PREFIX@/lib @ALL_MODULETARGETS_STR@ @CMAKE_LINK_FLAGS@ @CMAKE_DEPENDLIB_FLAGS@"
+echo "g++ ${DYNSAMPLE_EXTRA_BUILD_FLAGS} compile.tmp/$1 @NUIS_CXX_STD_FLAG@ -shared -o $2 -fPIC @CMAKE_CXX_FLAGS@ -I. -I@ALL_INCLUDES_STR@ -L@CMAKE_INSTALL_PREFIX@/lib @ALL_MODULETARGETS_STR@ @CMAKE_LINK_FLAGS@ @CMAKE_DEPENDLIB_FLAGS@"
 
-if ! g++ ${DYNSAMPLE_EXTRA_BUILD_FLAGS} compile.tmp/$1 -shared -o $2 -fPIC @CMAKE_CXX_FLAGS@ -I. -I@ALL_INCLUDES_STR@ -L@CMAKE_INSTALL_PREFIX@/lib @ALL_MODULETARGETS_STR@ @CMAKE_LINK_FLAGS@ @CMAKE_DEPENDLIB_FLAGS@; then
+if ! g++ ${DYNSAMPLE_EXTRA_BUILD_FLAGS} compile.tmp/$1 @NUIS_CXX_STD_FLAG@ -shared -o $2 -fPIC @CMAKE_CXX_FLAGS@ -I. -I@ALL_INCLUDES_STR@ -L@CMAKE_INSTALL_PREFIX@/lib @ALL_MODULETARGETS_STR@ @CMAKE_LINK_FLAGS@ @CMAKE_DEPENDLIB_FLAGS@; then
   echo "[ERROR]: Failed to compile $1. Generated code can be found in ./compile.tmp/$1"
 else
   rm -r compile.tmp
   echo "Successfully build: $2."
 fi
diff --git a/cmake/ROOTSetup.cmake b/cmake/ROOTSetup.cmake
index 910931a..0276d52 100644
--- a/cmake/ROOTSetup.cmake
+++ b/cmake/ROOTSetup.cmake
@@ -1,187 +1,195 @@
 # Copyright 2016-2021 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
 
 ################################################################################
 #    This file is part of NUISANCE.
 #
 #    NUISANCE is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation, either version 3 of the License, or
 #    (at your option) any later version.
 #
 #    NUISANCE is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
 #    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
 if ( NOT DEFINED ENV{ROOTSYS} )
   cmessage (FATAL_ERROR "$ROOTSYS is not defined, please set up ROOT first.")
 else()
   cmessage(STATUS "Using ROOT installed at $ENV{ROOTSYS}")
   set(CMAKE_ROOTSYS $ENV{ROOTSYS})
 endif()
 
 # Get cflags from ROOT
 execute_process (COMMAND root-config
   --cflags OUTPUT_VARIABLE ROOT_CXX_FLAGS_RAW OUTPUT_STRIP_TRAILING_WHITESPACE)
 string(REPLACE " " ";" ROOT_CXX_FLAGS "${ROOT_CXX_FLAGS_RAW}")
 # Get libdir from ROOT
 execute_process (COMMAND root-config
   --libdir OUTPUT_VARIABLE ROOT_LIBDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
 # Get version from ROOT
 execute_process (COMMAND root-config
   --version OUTPUT_VARIABLE ROOT_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
 # Get features from ROOT
 execute_process (COMMAND root-config
   --features OUTPUT_VARIABLE ROOT_FEATURES OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 LIST(APPEND EXTRA_LINK_DIRS ${ROOT_LIBDIR})
 
 LIST(APPEND ROOT_LIBS
   Core
   Cint
   RIO
   XMLIO
   Net
   Hist
   Graf
   Graf3d
   Gpad
   Tree
   Rint
   Postscript
   Matrix
   Physics
   MathMore
   MathCore
   Thread
   EG
   Geom
   GenVector)
 
 cmessage(STATUS "Checking ROOT version: ${ROOT_VERSION}")
 string(REGEX MATCH "^6.*" ROOTVERSIXMATCH ${ROOT_VERSION})
 if(ROOTVERSIXMATCH)
   cmessage(STATUS "Using ROOT6, We are essentially flying blind here.")
   LIST(REMOVE_ITEM ROOT_LIBS Cint)
   LIST(APPEND EXTRA_CXX_FLAGS -DROOT6_USE_FIT_FITTER_INTERFACE -DROOT6)
   set(USE_ROOT6 True)
 else()
   string(REGEX MATCH "5.34/([0-9]+)" ROOTVERSMATCH ${ROOT_VERSION})
   if(NOT ROOTVERSMATCH OR ${CMAKE_MATCH_1} LESS "19")
     cmessage(FATAL_ERROR "ROOT Version: ${ROOT_VERSION} has out of date minimizer interface, but minimizer functionality requested. Please configure with -DUSE_MINIMIZER=FALSE or update to 5.34/19 or greater to enable minimization features.")
   endif()
 endif()
 
 if(USE_MINIMIZER)
 
   if("${ROOT_FEATURES}" MATCHES "minuit2")
     cmessage(STATUS "ROOT built with MINUIT2 support")
     LIST(APPEND EXTRA_CXX_FLAGS -D__MINUIT2_ENABLED__)
   else()
     cmessage(FATAL_ERROR "ROOT built without MINUIT2 support but minimizer functionality requested. Either configure with -DUSE_MINIMIZER=FALSE or use a version of ROOT with MINUIT2 support.")
   endif()
 
 endif()
 
 if("${ROOT_FEATURES}" MATCHES "opengl")
   cmessage(STATUS "ROOT built with OpenGL support")
   LIST(APPEND ROOT_LIBS RGL)
 endif()
 
 if(DEFINED NEED_ROOTPYTHIA6 AND NEED_ROOTPYTHIA6)
   LIST(APPEND ROOT_LIBS EGPythia6 Pythia6)
 endif()
 
 #Check what ROOT thinks the standard is, set that project-wide
 # and then remove it from ROOT_CXX_FLAGS
 list (FIND ROOT_CXX_FLAGS "-std=c++11" CPP11_INDEX)
 list (FIND ROOT_CXX_FLAGS "-std=c++14" CPP14_INDEX)
 list (FIND ROOT_CXX_FLAGS "-std=c++17" CPP17_INDEX)
+list (FIND ROOT_CXX_FLAGS "-std=c++20" CPP20_INDEX)
+SET(NUIS_CXX_STD_FLAG "-std=c++03")
+
 if (${CPP11_INDEX} GREATER -1)
   SET(CMAKE_CXX_STANDARD 11)
+  SET(NUIS_CXX_STD_FLAG "-std=c++11")
 elseif (${CPP14_INDEX} GREATER -1)
   SET(CMAKE_CXX_STANDARD 14)
+  SET(NUIS_CXX_STD_FLAG "-std=c++14")
 elseif (${CPP17_INDEX} GREATER -1)
   SET(CMAKE_CXX_STANDARD 17)
-elseif (${CPP11_INDEX} GREATER -1)
-  SET(CMAKE_CXX_STANDARD 11)
+  SET(NUIS_CXX_STD_FLAG "-std=c++17")
+elseif (${CPP20_INDEX} GREATER -1)
+  SET(CMAKE_CXX_STANDARD 20)
+  SET(NUIS_CXX_STD_FLAG "-std=c++20")
 endif()
 list(REMOVE_ITEM ROOT_CXX_FLAGS "-std=c++11")
 list(REMOVE_ITEM ROOT_CXX_FLAGS "-std=c++14")
 list(REMOVE_ITEM ROOT_CXX_FLAGS "-std=c++17")
+list(REMOVE_ITEM ROOT_CXX_FLAGS "-std=c++20")
 
 cmessage ( STATUS "[ROOT]: root-config --version: ${ROOT_VERSION} ")
 cmessage ( STATUS "[ROOT]: root-config --cflags : ${ROOT_CXX_FLAGS} ")
 cmessage ( STATUS "[ROOT]: root-config --libs   : ${ROOT_LD_FLAGS} ")
 
 LIST(APPEND EXTRA_CXX_FLAGS ${ROOT_CXX_FLAGS})
 
 #Helper functions for building dictionaries
 function(GenROOTDictionary OutputDictName Header LinkDef)
 
   get_directory_property(incdirs INCLUDE_DIRECTORIES)
   string(REPLACE ";" ";-I" LISTDIRINCLUDES "-I${incdirs}")
   string(REPLACE " " ";" LISTCPPFLAGS "${EXTRA_CXX_FLAGS}")
 
   message(STATUS "LISTCPPFLAGS: ${LISTCPPFLAGS}")
   message(STATUS "LISTINCLUDES: ${LISTDIRINCLUDES}")
   #Learn how to generate the Dict.cxx and Dict.hxx
   add_custom_command(
     OUTPUT "${OutputDictName}.cxx" "${OutputDictName}.h"
     COMMAND rootcint
     ARGS -f ${OutputDictName}.cxx -c
     -p ${LISTDIRINCLUDES} ${LISTCPPFLAGS} ${Header} ${LinkDef}
     DEPENDS ${Header};${LinkDef})
 endfunction()
 
 
 function(BuildROOTProject ProjectName InputFile CommaSeparatedClassesToDump LIBLINKMODE)
 
   string(REPLACE "," ";" HeadersToDump ${CommaSeparatedClassesToDump})
   set(OUTPUTFILES ${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}ProjectSource.cxx
     ${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}LinkDef.h
     ${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}ProjectHeaders.h
     ${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}ProjectInstances.h)
 
   cmessage(STATUS "As part of ROOT project: ${ProjectName}")
   foreach (header ${HeadersToDump})
     LIST(APPEND OUTPUTFILES "${CMAKE_BINARY_DIR}/${ProjectName}/${header}.h")
     cmessage(STATUS "Will generate: ${CMAKE_BINARY_DIR}/${ProjectName}/${header}.h")
   endforeach()
 
   add_custom_command(
     OUTPUT ${OUTPUTFILES}
     COMMAND ${CMAKE_BINARY_DIR}/src/Utils/DumpROOTClassesFromVector
     ARGS ${InputFile}
       ${CMAKE_BINARY_DIR}/${ProjectName}
       ${CommaSeparatedClassesToDump}
     VERBATIM
     DEPENDS DumpROOTClassesFromVector)
 
   add_custom_target(${ProjectName}_sources
     DEPENDS ${OUTPUTFILES})
 
   GenROOTDictionary(
     ${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}ProjectDict
     ${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}ProjectHeaders.h
     ${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}LinkDef.h
     )
 
   add_custom_target(${ProjectName}ProjectDict
     DEPENDS
     ${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}ProjectDict.cxx
     ${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}ProjectDict.h )
   # add_dependencies(${ProjectName}ProjectDict ${ProjectName}_sources)
 
   #ProjectSource.cxx includes ProjectDict.cxx, so no need to add to compilation.
   set(ROAA_SOURCEFILES
     ${CMAKE_BINARY_DIR}/${ProjectName}/${ProjectName}ProjectSource.cxx)
 
   add_library(${ProjectName} ${LIBLINKMODE} ${ROAA_SOURCEFILES})
   add_dependencies(${ProjectName} ${ProjectName}ProjectDict)
 
 endfunction()