Updated more installer logic