Fully add TT parsing