Improved coding - Installer