More changes to components