Refactoring: removed EDList