Changed Data structures used for commodities and added a few more parameters to constructors