Refactoring for usage of new MQ protocol