More component reworking