Update to fit dbus expected standard