Added additional cmdline flags