Improved installation and uninstallation