Added 2030 distinction for electricity supply and endogenous thermal capacity