More working TokenUtils into TypeUtils