Added classes for enhancement for Commodities