Add some YAML support