Updated conf files and defaults