Updated configuration files and templates