Updating to new Socket + Bus API