Updated for config-file changes