Added client timeout mechanism and route discovery.