Add conditional request and data persistence support