Modified for dbus