Refacotoring for usage with new RMC + MQ protocol