Modified Token Class