Added some connection health checking