Feature/Risk management/Commodities