Added more ToC returns.