Updated subcomponents