Better TOC with custom commands