Improve automated installer