Add support for package-installer