Added compatibility with Config.yml