Adding option to toggle whether to save child components