Moved methods from token to an unique class