Change some methods to use Token object again instead of Identifier
object