GH90 - Add UIDs to source code