FatherEntry refactoring