More EE changes
Edits for EE integration