Changed Token struct to include an identifier