added uid indices to token tables