Added support for TOC