Add TOC functions. Simplification of Renderer objects.