Added cmdline switches