Move valuation to extra file