Code changes for Component Updates