Config and template changes