Include better calculation of people ids
Added the renamer