Switch to TOC oriented design