Changes to make use of configuration file for all setup values