Fix arity warning
Use store/restore functionality