Redo rabbitmq for #19 and #52