KRACOEUS-7065 moving some persistence code into sys