Updated some of the components used