More EAD refactoring