Updated timeouts