I'll try removing the Token class and see how it plays out.