Add the argument configurations
Improve the management of the option values