Refactoring of Entry-Classes