Further work on implementing Table of Contents