Changes in Token Model so the tokens can be everywhere