Added new valuation methods and improved model