[NPG] add support for ToC