Fix TOC
Extract TOC to Synergy engine