PIM-1544 : Update product writer