Reimplement to rely on tokenparsing