Improve installation methods