Renamed productId for product_id for consistency