Added connection and server