Improved the setup of environment with Salt