Made ToCs more complete