Changes to Component