Enhance the installation part (in progress)