Updating the component to reflect the latest changes to the core