New Qpid code