Add support for toggle comments