Add some new options to CLI version