Updated handling of commodity category