PIM-1818 : use crud strategy