Added zap_disk option