Updated handling of products