Re-add max-time, set better timeout