updated billing models, added products, consumables and donations