Implementation of new token parser