Added config.yml support