Improve installer