Updated for TOC generation.