Switch to product to array conversion and add update