updates for new rabbit module