Fixed templates
Changes to configuration management