Separated goods tracking into new GoodsHolder class.