Improve installation