Child entry and contact list refactoring