Updates to the component classes