Add message queue wrapper (lightly tested)