TOC Installer changes