MotherEntry refactoring