Rewrote Token Class