PIM-3225 : rework product persister