Added rebuild to support PriceSource. NOT TESTED YET!