added number of subtokens to token struct