Modify generation of PR dictionaries for new scheme