added tokens for map?