Added a messagebuffer in the connection for testing