Token model changes