Updated config to YAML-like