Added dbus/avahi support