Add missing changes for new e/g clustering