Prepare for upcoming people.json changes