Refactor parent/child/solo