Project update report: Development of energy system models to improve treatment of energy system architecture