Add defer_update option