Restructuring component handling.