Modelling consumption and constructing long-term baselines in final demand