Added ProductId to ServiceProduct.