Changed config file to have ENV variables