Update theCLI tools to work with the cfg