add more for PreProcessCLI