Added uninstall and unload