Updated token model and creation.

Updated token model and creation.