Improved config files
More changes in config