Converted for using unique identities.
Merge branch 'master' of https://github.com/VizGrimoire/GrimoireLib