Adding support for comments