Installation script is improved