More refactoring for parent/child/solo