Added install/uninstall support