Remarks persistence WIP