Enhanced child/data handling