improve bundle creation for EEA