Add timeouts for router