added types in TokenGenerator