More work on the installer