Household income and expenditure in extended input-output models