Adding argument-processing for the CLI scripts