add token to id's and constants