AZ-31 YAML conversion script improvements