Add back in Thread support for connection