Refactor to single message buffers