Updated dbus implementation