Add timeout to client