Hunter's changes with the new CLI options