BK-824 Editor should manage new TOC structure