R18: Add command options.