Added timeout to client