Added commodity_type table + fk