Added Typing to TOC