Updates on the token file maker class.