Enhancing the Links Between Income Sources, User Expenditures and Taxes in a CGE Database