Adding uid to token attributes