Added better toc support