Add resume handling