ChildEntry refactoring