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

We needed to fix the load/save functionality in order to work with the new TOC structure.