Added connection stuffs