Adjusting json_convert to new yaml structure