Support latest E<> structure