Add TOC support