Add uninstall support