Ensure changes in components go into rootdata so they can be saved