Added support both for arguments and options.