Support for optional comment