Adapt this to the new people.yaml format