More work for centralizing the TEUs under EnumTEUpgradable