KRACOEUS-8372 : Save custom data with arg value lookups