refactor active mq