Installer rewrite