1.9.3+ YAML compatibility