Change: Token class "reference" removed