Add support for commenting