Ensure component models are saved to the correct component