Changes to use .ini file more efficiently