Make unload optional via interface