Add unload hook as option