Add some plumbing for more message sending