Improve install/uninstall method