Code changes for the moved components