Improved TOC creation.