Added support for array arguments and options.