Changes to config template and management