Added unloading signal handling