Added support for table of contents