Add universal installer and make some adjusts