Major update to only save specific components