Added optional YAML support

for now turned on by default