Change the structure for rescue