Simplified the Token datastructure.