Moved DBus support to its own file