Added support for Toggle Comment.