Refacotring to use new MQ protocol