Added cmdline support.