Improved YAML type spec