Add in UID tracker