Add product_id to attributes