Fixed change handling for child components