New methods for improved token parsing