Added connection and message support