Longer default time, optimze folder creation