Update to correspond with dbus spec