Add missing restore call
Add withEx