Added dbus and command line flags.