Updates to allow additional variables in conf file.