Timeout is no more hardcoded