Refactor Publisher, message adapter moves completely into the publisher