Updates to Token Class