Further reduce YAML dependency