Upgrade withOut
New withOut API