More changes for the Installer