Make sure we aren't reusing an instance of connection
Adding support for message object