Refactor child-updates