Update config files and code