Added client side support for recconection