Personal Identity rework

by Nicolas L.