Added Token and it's subclass