Added connection manager