Improved installation and configuration process - Check in 4