BK-827 Load/Save functionality must handle new TOC structure