Simplify TOC creation