Added uninstall capability