Add missing timeouts. Update doc