Replaced hard-coded stuff for tokens