Remarks: add persistence utils