Refactoring of EOverview